Merge branch 'develop'

1 files changed, 29 insertions, 14 deletions

diff --git a/gui/OneSixModEditDialog.h b/gui/OneSixModEditDialog.h
index 3430bd26..5376e526 100644
--- a/gui/OneSixModEditDialog.h
+++ b/gui/OneSixModEditDialog.h
@@ -1,9 +1,9 @@
 /* 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
@@ -18,35 +18,50 @@
 
 #include <logic/OneSixInstance.h>
 
-namespace Ui {
-	class OneSixModEditDialog;
+class EnabledItemFilter;
+namespace Ui
+{
+class OneSixModEditDialog;
 }
 
 class OneSixModEditDialog : public QDialog
 {
 	Q_OBJECT
-	
+
 public:
-	explicit OneSixModEditDialog(OneSixInstance* inst, QWidget *parent = 0);
+	explicit OneSixModEditDialog(OneSixInstance *inst, QWidget *parent = 0);
 	virtual ~OneSixModEditDialog();
-	
-private slots:
+
+private
+slots:
 	void on_addModBtn_clicked();
 	void on_rmModBtn_clicked();
 	void on_viewModBtn_clicked();
-	 
+
 	void on_addResPackBtn_clicked();
 	void on_rmResPackBtn_clicked();
 	void on_viewResPackBtn_clicked();
 	// Questionable: SettingsDialog doesn't need this for some reason?
 	void on_buttonBox_rejected();
+	void on_forgeBtn_clicked();
+	void on_customizeBtn_clicked();
+	void on_revertBtn_clicked();
+	void updateVersionControls();
+	void disableVersionControls();
+
 protected:
 	bool eventFilter(QObject *obj, QEvent *ev);
-	bool loaderListFilter( QKeyEvent* ev );
-	bool resourcePackListFilter( QKeyEvent* ev );
+	bool loaderListFilter(QKeyEvent *ev);
+	bool resourcePackListFilter(QKeyEvent *ev);
+
 private:
 	Ui::OneSixModEditDialog *ui;
-	QSharedPointer<ModList> m_mods;
-	QSharedPointer<ModList> m_resourcepacks;
-	OneSixInstance * m_inst;
+	std::shared_ptr<OneSixVersion> m_version;
+	std::shared_ptr<ModList> m_mods;
+	std::shared_ptr<ModList> m_resourcepacks;
+	EnabledItemFilter *main_model;
+	OneSixInstance *m_inst;
+public
+slots:
+	void loaderCurrent(QModelIndex current, QModelIndex previous);
 };