From 4e9006769e3554524096d45f8a1ce16ccfa78bfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Wed, 6 Feb 2013 07:07:44 +0100
Subject: Some minor changes in the instance model and control

---
 gui/mainwindow.ui | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'gui')

diff --git a/gui/mainwindow.ui b/gui/mainwindow.ui
index ccc7e777..5abfb37d 100644
--- a/gui/mainwindow.ui
+++ b/gui/mainwindow.ui
@@ -34,7 +34,17 @@
      <number>0</number>
     </property>
     <item>
-     <widget class="QTreeView" name="instanceView"/>
+     <widget class="QTreeView" name="instanceView">
+      <property name="animated">
+       <bool>true</bool>
+      </property>
+      <property name="allColumnsShowFocus">
+       <bool>true</bool>
+      </property>
+      <attribute name="headerVisible">
+       <bool>false</bool>
+      </attribute>
+     </widget>
     </item>
    </layout>
   </widget>
-- 
cgit v1.2.3


From 6e5017e48b633e20bbba61ac2e7cd58e693aec4e Mon Sep 17 00:00:00 2001
From: Andrew <forkk@forkk.net>
Date: Tue, 19 Feb 2013 12:15:22 -0600
Subject: Implemented loadList() stuff.

---
 gui/mainwindow.cpp | 9 +++++----
 gui/mainwindow.h   | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'gui')

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index bc0840a0..d19d69dc 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -29,6 +29,7 @@
 #include "gui/logindialog.h"
 #include "gui/taskdialog.h"
 
+#include "data/inst/instancelist.h"
 #include "data/appsettings.h"
 #include "data/version.h"
 
@@ -36,7 +37,8 @@
 
 MainWindow::MainWindow(QWidget *parent) :
 	QMainWindow(parent),
-	ui(new Ui::MainWindow)
+	ui(new Ui::MainWindow),
+	instList(settings->getInstanceDir())
 {
 	ui->setupUi(this);
 	
@@ -45,8 +47,7 @@ MainWindow::MainWindow(QWidget *parent) :
 	restoreGeometry(settings->getConfig().value("MainWindowGeometry", saveGeometry()).toByteArray());
 	restoreState(settings->getConfig().value("MainWindowState", saveState()).toByteArray());
 	
-	instList.initialLoad("instances");
-	ui->instanceView->setModel(&instList);
+	instList.loadList();
 }
 
 MainWindow::~MainWindow()
@@ -67,7 +68,7 @@ void MainWindow::on_actionViewInstanceFolder_triggered()
 
 void MainWindow::on_actionRefresh_triggered()
 {
-	instList.initialLoad("instances");
+	instList.loadList();
 }
 
 void MainWindow::on_actionViewCentralModsFolder_triggered()
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 28ca341a..d286bd0e 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -18,7 +18,7 @@
 
 #include <QMainWindow>
 
-#include "data/instancemodel.h"
+#include "data/inst/instancelist.h"
 #include "data/loginresponse.h"
 
 namespace Ui
@@ -70,7 +70,7 @@ private slots:
 private:
 	Ui::MainWindow *ui;
 	
-	InstanceModel instList;
+	InstanceList instList;
 };
 
 #endif // MAINWINDOW_H
-- 
cgit v1.2.3


From dd2e836b4cf4cfa043f9ea2911f58f1d22d4e282 Mon Sep 17 00:00:00 2001
From: Andrew <forkk@forkk.net>
Date: Wed, 20 Feb 2013 19:10:09 -0600
Subject: Split MultiMC up into a few separate libraries.

Fixed plugin system.

Tons of other stuff...
---
 gui/mainwindow.cpp     | 16 +++++++++++++---
 gui/mainwindow.h       |  2 +-
 gui/settingsdialog.cpp |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'gui')

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index d19d69dc..19ff2108 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -21,20 +21,25 @@
 
 #include <QDesktopServices>
 #include <QUrl>
+#include <QFileInfo>
 
-#include "util/osutils.h"
+#include "osutils.h"
 
 #include "gui/settingsdialog.h"
 #include "gui/newinstancedialog.h"
 #include "gui/logindialog.h"
 #include "gui/taskdialog.h"
 
-#include "data/inst/instancelist.h"
-#include "data/appsettings.h"
+#include "instancelist.h"
+#include "appsettings.h"
 #include "data/version.h"
 
 #include "tasks/logintask.h"
 
+// Opens the given file in the default application.
+// TODO: Move this somewhere.
+void openInDefaultProgram(QString filename);
+
 MainWindow::MainWindow(QWidget *parent) :
 	QMainWindow(parent),
 	ui(new Ui::MainWindow),
@@ -156,3 +161,8 @@ void MainWindow::onLoginComplete(LoginResponse response)
 							 QString("Logged in as %1 with session ID %2.").
 							 arg(response.getUsername(), response.getSessionID()));
 }
+
+void openInDefaultProgram(QString filename)
+{
+	QDesktopServices::openUrl("file:///" + QFileInfo(filename).absolutePath());
+}
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index d286bd0e..591d0632 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -18,7 +18,7 @@
 
 #include <QMainWindow>
 
-#include "data/inst/instancelist.h"
+#include "instancelist.h"
 #include "data/loginresponse.h"
 
 namespace Ui
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp
index ab4d18ee..b3c42380 100644
--- a/gui/settingsdialog.cpp
+++ b/gui/settingsdialog.cpp
@@ -16,7 +16,7 @@
 #include "settingsdialog.h"
 #include "ui_settingsdialog.h"
 
-#include "data/appsettings.h"
+#include "appsettings.h"
 
 #include <QFileDialog>
 #include <QMessageBox>
-- 
cgit v1.2.3