summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-10-06 03:07:57 +0200
committerPetr Mrázek <peterix@gmail.com>2013-10-06 03:07:57 +0200
commit8b18af051585108a65a01347d333ce79e2e82d23 (patch)
tree4d41019c47556fbe26a8f0cdc0f4d0abd82dbe77 /gui
parent9cef16a47d8e6085baec08c4b2823631ef8f1b30 (diff)
downloadMultiMC-8b18af051585108a65a01347d333ce79e2e82d23.tar
MultiMC-8b18af051585108a65a01347d333ce79e2e82d23.tar.gz
MultiMC-8b18af051585108a65a01347d333ce79e2e82d23.tar.lz
MultiMC-8b18af051585108a65a01347d333ce79e2e82d23.tar.xz
MultiMC-8b18af051585108a65a01347d333ce79e2e82d23.zip
Get rid of junky timestamps, along with some select pointless log messages
Diffstat (limited to 'gui')
-rw-r--r--gui/mainwindow.cpp4
-rw-r--r--gui/mainwindow.h98
2 files changed, 50 insertions, 52 deletions
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index ecf5f79d..da767709 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -437,7 +437,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
// settings->getConfig().setValue("MainWindowState", saveState());
QMainWindow::closeEvent(event);
}
-
+/*
void MainWindow::on_instanceView_customContextMenuRequested(const QPoint &pos)
{
QMenu *instContextMenu = new QMenu("Instance", this);
@@ -447,7 +447,7 @@ void MainWindow::on_instanceView_customContextMenuRequested(const QPoint &pos)
instContextMenu->exec(view->mapToGlobal(pos));
}
-
+*/
void MainWindow::on_actionLaunchInstance_triggered()
{
if (m_selectedInstance)
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index cc9b0b7b..86f21113 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -3,7 +3,7 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
@@ -39,115 +39,113 @@ class MainWindow;
class MainWindow : public QMainWindow
{
Q_OBJECT
-
+
public:
explicit MainWindow(QWidget *parent = 0);
~MainWindow();
-
+
void closeEvent(QCloseEvent *event);
// Browser Dialog
void openWebPage(QUrl url);
-
-
+
private slots:
void onCatToggled(bool);
-
+
void on_actionAbout_triggered();
-
+
void on_actionAddInstance_triggered();
-
+
void on_actionChangeInstGroup_triggered();
-
+
void on_actionChangeInstIcon_triggered();
-
+
void on_actionViewInstanceFolder_triggered();
-
+
void on_actionConfig_Folder_triggered();
-
+
void on_actionViewSelectedInstFolder_triggered();
void on_actionRefresh_triggered();
-
+
void on_actionViewCentralModsFolder_triggered();
-
+
void on_actionCheckUpdate_triggered();
-
+
void on_actionSettings_triggered();
-
+
void on_actionReportBug_triggered();
-
+
void on_actionNews_triggered();
-
+
void on_mainToolBar_visibilityChanged(bool);
-
- void on_instanceView_customContextMenuRequested(const QPoint &pos);
-
+
+ // void on_instanceView_customContextMenuRequested(const QPoint &pos);
+
void on_actionLaunchInstance_triggered();
-
+
void on_actionDeleteInstance_triggered();
-
+
void on_actionRenameInstance_triggered();
-
+
void on_actionMakeDesktopShortcut_triggered();
-
+
void on_actionChangeInstMCVersion_triggered();
-
+
void on_actionEditInstMods_triggered();
-
+
void on_actionEditInstNotes_triggered();
-
- void doLogin(const QString& errorMsg = "");
-
-
+
+ void doLogin(const QString &errorMsg = "");
+
void onLoginComplete();
-
-
+
void onGameUpdateComplete();
void onGameUpdateError(QString error);
-
+
void taskStart();
void taskEnd();
void on_actionChangeInstLWJGLVersion_triggered();
-
+
void instanceEnded();
-
- void on_actionInstanceSettings_triggered();
+
+ void on_actionInstanceSettings_triggered();
public slots:
- void instanceActivated ( QModelIndex );
+ void instanceActivated(QModelIndex);
+
+ void instanceChanged(const QModelIndex &current, const QModelIndex &previous);
- void instanceChanged (const QModelIndex & current,const QModelIndex & previous);
-
void selectionBad();
-
+
void startTask(Task *task);
-
+
void launchInstance(BaseInstance *inst, LoginResponse response);
protected:
bool eventFilter(QObject *obj, QEvent *ev);
void setCatBackground(bool enabled);
+
private:
-
+
Ui::MainWindow *ui;
- KCategoryDrawer * drawer;
- KCategorizedView * view;
- InstanceProxyModel * proxymodel;
+ KCategoryDrawer *drawer;
+ KCategorizedView *view;
+ InstanceProxyModel *proxymodel;
MinecraftProcess *proc;
ConsoleWindow *console;
OneSixAssets *assets_downloader;
- LabeledToolButton * renameButton;
-
+ LabeledToolButton *renameButton;
+
BaseInstance *m_selectedInstance;
-
+
// A pointer to the instance we are actively doing stuff with.
// This is set when the user launches an instance and is used to refer to that
// instance throughout the launching process.
BaseInstance *m_activeInst;
LoginResponse m_activeLogin;
-
+
Task *m_versionLoadTask;
};