CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change naming from Derp -> OneSix until the new instance type supports legacy

Browse Source
This commit is contained in:
Jan Dalheimer
2014-01-24 18:12:02 +01:00
parent 156bc8f276
commit 7d5787025a
35 changed files with 375 additions and 821 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/MainWindow.cpp
View File

@ -84,7 +84,7 @@
#include "logic/BaseInstance.h"
#include "logic/InstanceFactory.h"
#include "logic/MinecraftProcess.h"
#include "logic/DerpUpdate.h"
#include "logic/OneSixUpdate.h"
#include "logic/JavaUtils.h"
#include "logic/NagUtils.h"
#include "logic/SkinUtils.h"
@ -1257,7 +1257,7 @@ void MainWindow::on_actionChangeInstMCVersion_triggered()
VersionSelectDialog vselect(m_selectedInstance->versionList().get(),
tr("Change Minecraft version"), this);
vselect.setFilter(1, "Derp");
vselect.setFilter(1, "OneSix");
if(!vselect.exec() || !vselect.selectedVersion())
return;

46
gui/dialogs/DerpModEditDialog.cpp → gui/dialogs/OneSixModEditDialog.cpp
View File

@ -23,9 +23,9 @@
#include <QKeyEvent>
#include <QDesktopServices>
#include "DerpModEditDialog.h"
#include "OneSixModEditDialog.h"
#include "ModEditDialogCommon.h"
#include "ui_DerpModEditDialog.h"
#include "ui_OneSixModEditDialog.h"
#include "gui/Platform.h"
#include "gui/dialogs/CustomMessageBox.h"
@ -34,14 +34,14 @@
#include "gui/dialogs/ProgressDialog.h"
#include "logic/ModList.h"
#include "logic/DerpVersion.h"
#include "logic/OneSixVersion.h"
#include "logic/EnabledItemFilter.h"
#include "logic/lists/ForgeVersionList.h"
#include "logic/ForgeInstaller.h"
#include "logic/LiteLoaderInstaller.h"
DerpModEditDialog::DerpModEditDialog(DerpInstance *inst, QWidget *parent)
: QDialog(parent), ui(new Ui::DerpModEditDialog), m_inst(inst)
OneSixModEditDialog::OneSixModEditDialog(OneSixInstance *inst, QWidget *parent)
: QDialog(parent), ui(new Ui::OneSixModEditDialog), m_inst(inst)
{
MultiMCPlatform::fixWM_CLASS(this);
ui->setupUi(this);
@ -81,17 +81,17 @@ DerpModEditDialog::DerpModEditDialog(DerpInstance *inst, QWidget *parent)
m_resourcepacks->startWatching();
}
connect(m_inst, &DerpInstance::versionReloaded, this, &DerpModEditDialog::updateVersionControls);
connect(m_inst, &OneSixInstance::versionReloaded, this, &OneSixModEditDialog::updateVersionControls);
}
DerpModEditDialog::~DerpModEditDialog()
OneSixModEditDialog::~OneSixModEditDialog()
{
m_mods->stopWatching();
m_resourcepacks->stopWatching();
delete ui;
}
void DerpModEditDialog::updateVersionControls()
void OneSixModEditDialog::updateVersionControls()
{
bool customVersion = m_inst->versionIsCustom();
ui->forgeBtn->setEnabled(true);
@ -100,7 +100,7 @@ void DerpModEditDialog::updateVersionControls()
ui->mainClassEdit->setText(m_version->mainClass);
}
void DerpModEditDialog::disableVersionControls()
void OneSixModEditDialog::disableVersionControls()
{
ui->forgeBtn->setEnabled(false);
ui->liteloaderBtn->setEnabled(false);
@ -108,7 +108,7 @@ void DerpModEditDialog::disableVersionControls()
ui->mainClassEdit->setText("");
}
void DerpModEditDialog::on_customEditorBtn_clicked()
void OneSixModEditDialog::on_customEditorBtn_clicked()
{
if (QDir(m_inst->instanceRoot()).exists("custom.json"))
{
@ -119,7 +119,7 @@ void DerpModEditDialog::on_customEditorBtn_clicked()
}
}
void DerpModEditDialog::on_forgeBtn_clicked()
void OneSixModEditDialog::on_forgeBtn_clicked()
{
VersionSelectDialog vselect(MMC->forgelist().get(), tr("Select Forge version"), this);
vselect.setFilter(1, m_inst->currentVersionId());
@ -165,7 +165,7 @@ void DerpModEditDialog::on_forgeBtn_clicked()
m_inst->reloadFullVersion(this);
}
void DerpModEditDialog::on_liteloaderBtn_clicked()
void OneSixModEditDialog::on_liteloaderBtn_clicked()
{
LiteLoaderInstaller liteloader;
if (!liteloader.canApply(m_inst))
@ -188,7 +188,7 @@ void DerpModEditDialog::on_liteloaderBtn_clicked()
}
}
bool DerpModEditDialog::loaderListFilter(QKeyEvent *keyEvent)
bool OneSixModEditDialog::loaderListFilter(QKeyEvent *keyEvent)
{
switch (keyEvent->key())
{
@ -204,7 +204,7 @@ bool DerpModEditDialog::loaderListFilter(QKeyEvent *keyEvent)
return QDialog::eventFilter(ui->loaderModTreeView, keyEvent);
}
bool DerpModEditDialog::resourcePackListFilter(QKeyEvent *keyEvent)
bool OneSixModEditDialog::resourcePackListFilter(QKeyEvent *keyEvent)
{
switch (keyEvent->key())
{
@ -220,7 +220,7 @@ bool DerpModEditDialog::resourcePackListFilter(QKeyEvent *keyEvent)
return QDialog::eventFilter(ui->resPackTreeView, keyEvent);
}
bool DerpModEditDialog::eventFilter(QObject *obj, QEvent *ev)
bool OneSixModEditDialog::eventFilter(QObject *obj, QEvent *ev)
{
if (ev->type() != QEvent::KeyPress)
{
@ -234,12 +234,12 @@ bool DerpModEditDialog::eventFilter(QObject *obj, QEvent *ev)
return QDialog::eventFilter(obj, ev);
}
void DerpModEditDialog::on_buttonBox_rejected()
void OneSixModEditDialog::on_buttonBox_rejected()
{
close();
}
void DerpModEditDialog::on_addModBtn_clicked()
void OneSixModEditDialog::on_addModBtn_clicked()
{
QStringList fileNames = QFileDialog::getOpenFileNames(
this, QApplication::translate("LegacyModEditDialog", "Select Loader Mods"));
@ -250,7 +250,7 @@ void DerpModEditDialog::on_addModBtn_clicked()
m_mods->startWatching();
}
}
void DerpModEditDialog::on_rmModBtn_clicked()
void OneSixModEditDialog::on_rmModBtn_clicked()
{
int first, last;
auto list = ui->loaderModTreeView->selectionModel()->selectedRows();
@ -261,12 +261,12 @@ void DerpModEditDialog::on_rmModBtn_clicked()
m_mods->deleteMods(first, last);
m_mods->startWatching();
}
void DerpModEditDialog::on_viewModBtn_clicked()
void OneSixModEditDialog::on_viewModBtn_clicked()
{
openDirInDefaultProgram(m_inst->loaderModsDir(), true);
}
void DerpModEditDialog::on_addResPackBtn_clicked()
void OneSixModEditDialog::on_addResPackBtn_clicked()
{
QStringList fileNames = QFileDialog::getOpenFileNames(
this, QApplication::translate("LegacyModEditDialog", "Select Resource Packs"));
@ -277,7 +277,7 @@ void DerpModEditDialog::on_addResPackBtn_clicked()
m_resourcepacks->startWatching();
}
}
void DerpModEditDialog::on_rmResPackBtn_clicked()
void OneSixModEditDialog::on_rmResPackBtn_clicked()
{
int first, last;
auto list = ui->resPackTreeView->selectionModel()->selectedRows();
@ -288,12 +288,12 @@ void DerpModEditDialog::on_rmResPackBtn_clicked()
m_resourcepacks->deleteMods(first, last);
m_resourcepacks->startWatching();
}
void DerpModEditDialog::on_viewResPackBtn_clicked()
void OneSixModEditDialog::on_viewResPackBtn_clicked()
{
openDirInDefaultProgram(m_inst->resourcePacksDir(), true);
}
void DerpModEditDialog::loaderCurrent(QModelIndex current, QModelIndex previous)
void OneSixModEditDialog::loaderCurrent(QModelIndex current, QModelIndex previous)
{
if (!current.isValid())
{

16
gui/dialogs/DerpModEditDialog.h → gui/dialogs/OneSixModEditDialog.h
View File

@ -16,21 +16,21 @@
#pragma once
#include <QDialog>
#include <logic/DerpInstance.h>
#include <logic/OneSixInstance.h>
class EnabledItemFilter;
namespace Ui
{
class DerpModEditDialog;
class OneSixModEditDialog;
}
class DerpModEditDialog : public QDialog
class OneSixModEditDialog : public QDialog
{
Q_OBJECT
public:
explicit DerpModEditDialog(DerpInstance *inst, QWidget *parent = 0);
virtual ~DerpModEditDialog();
explicit OneSixModEditDialog(OneSixInstance *inst, QWidget *parent = 0);
virtual ~OneSixModEditDialog();
private
slots:
@ -55,12 +55,12 @@ protected:
bool resourcePackListFilter(QKeyEvent *ev);
private:
Ui::DerpModEditDialog *ui;
std::shared_ptr<DerpVersion> m_version;
Ui::OneSixModEditDialog *ui;
std::shared_ptr<OneSixVersion> m_version;
std::shared_ptr<ModList> m_mods;
std::shared_ptr<ModList> m_resourcepacks;
EnabledItemFilter *main_model;
DerpInstance *m_inst;
OneSixInstance *m_inst;
public
slots:
void loaderCurrent(QModelIndex current, QModelIndex previous);

4
gui/dialogs/DerpModEditDialog.ui → gui/dialogs/OneSixModEditDialog.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>DerpModEditDialog</class>
<widget class="QDialog" name="DerpModEditDialog">
<class>OneSixModEditDialog</class>
<widget class="QDialog" name="OneSixModEditDialog">
<property name="geometry">
<rect>
<x>0</x>