From e178284172396ee51acb77c2daa8135b4855c12b Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Wed, 16 Jul 2014 00:13:40 +0200 Subject: Merge global settings and accounts into a pagedialog Also split external tools into it's own page --- gui/dialogs/SettingsDialog.h | 106 ------------------------------------------- 1 file changed, 106 deletions(-) delete mode 100644 gui/dialogs/SettingsDialog.h (limited to 'gui/dialogs/SettingsDialog.h') diff --git a/gui/dialogs/SettingsDialog.h b/gui/dialogs/SettingsDialog.h deleted file mode 100644 index c65e9fb5..00000000 --- a/gui/dialogs/SettingsDialog.h +++ /dev/null @@ -1,106 +0,0 @@ -/* Copyright 2013 MultiMC Contributors - * - * 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 - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#include -#include - -#include "logic/java/JavaChecker.h" - -class SettingsObject; - -namespace Ui -{ -class SettingsDialog; -} - -class SettingsDialog : public QDialog -{ - Q_OBJECT - -public: - explicit SettingsDialog(QWidget *parent = 0); - ~SettingsDialog(); - - void updateCheckboxStuff(); - - void applySettings(SettingsObject *s); - void loadSettings(SettingsObject *s); - -protected: - virtual void showEvent(QShowEvent *ev); - virtual void closeEvent(QCloseEvent *ev); - -private -slots: - void on_ftbLauncherBrowseBtn_clicked(); - - void on_ftbBrowseBtn_clicked(); - - void on_instDirBrowseBtn_clicked(); - - void on_modsDirBrowseBtn_clicked(); - - void on_lwjglDirBrowseBtn_clicked(); - - - void on_jsonEditorBrowseBtn_clicked(); - - void on_iconsDirBrowseBtn_clicked(); - - void on_maximizedCheckBox_clicked(bool checked); - - void on_buttonBox_accepted(); - - void on_buttonBox_rejected(); - - void on_javaDetectBtn_clicked(); - - void on_javaTestBtn_clicked(); - - void on_javaBrowseBtn_clicked(); - - void checkFinished(JavaCheckResult result); - - void on_jprofilerPathBtn_clicked(); - void on_jprofilerCheckBtn_clicked(); - void on_jvisualvmPathBtn_clicked(); - void on_jvisualvmCheckBtn_clicked(); - void on_mceditPathBtn_clicked(); - void on_mceditCheckBtn_clicked(); - - /*! - * Updates the list of update channels in the combo box. - */ - void refreshUpdateChannelList(); - - /*! - * Updates the channel description label. - */ - void refreshUpdateChannelDesc(); - - void updateChannelSelectionChanged(int index); - void proxyChanged(int); - -private: - Ui::SettingsDialog *ui; - std::shared_ptr checker; - - /*! - * Stores the currently selected update channel. - */ - QString m_currentUpdateChannel; -}; -- cgit v1.2.3