From 6b3d1101cb801367edef8f35b3eee4499e04866b Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Tue, 3 Jun 2014 01:34:44 +0200
Subject: Tweaks to page dialog and version page.

---
 gui/pages/BasePage.h      | 12 +++++++
 gui/pages/VersionPage.cpp |  1 +
 gui/pages/VersionPage.ui  | 88 +++++++++++++++++++++++++++++++----------------
 3 files changed, 71 insertions(+), 30 deletions(-)

(limited to 'gui/pages')

diff --git a/gui/pages/BasePage.h b/gui/pages/BasePage.h
index 90e27d6f..d057d8f7 100644
--- a/gui/pages/BasePage.h
+++ b/gui/pages/BasePage.h
@@ -25,6 +25,18 @@ public:
 	virtual QString id() = 0;
 	virtual QString displayName() = 0;
 	virtual QIcon icon() = 0;
+	virtual bool accept()
+	{
+		return true;
+	}
+	virtual bool reject()
+	{
+		return true;
+	}
+	virtual bool apply()
+	{
+		return true;
+	}
 	virtual bool shouldDisplay()
 	{
 		return true;
diff --git a/gui/pages/VersionPage.cpp b/gui/pages/VersionPage.cpp
index 34b959e0..99232a25 100644
--- a/gui/pages/VersionPage.cpp
+++ b/gui/pages/VersionPage.cpp
@@ -79,6 +79,7 @@ VersionPage::VersionPage(OneSixInstance *inst, QWidget *parent)
 		main_model->setSourceModel(m_version.get());
 		ui->libraryTreeView->setModel(main_model);
 		ui->libraryTreeView->installEventFilter(this);
+		ui->libraryTreeView->setSelectionMode(QAbstractItemView::SingleSelection);
 		connect(ui->libraryTreeView->selectionModel(), &QItemSelectionModel::currentChanged,
 				this, &VersionPage::versionCurrent);
 		updateVersionControls();
diff --git a/gui/pages/VersionPage.ui b/gui/pages/VersionPage.ui
index 036295f0..f770df55 100644
--- a/gui/pages/VersionPage.ui
+++ b/gui/pages/VersionPage.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>326</height>
+    <height>475</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -51,6 +51,16 @@
    </item>
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_4">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Selection</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="QPushButton" name="changeMCVersionBtn">
        <property name="text">
@@ -59,74 +69,79 @@
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="forgeBtn">
+      <widget class="QPushButton" name="moveLibraryUpBtn">
        <property name="toolTip">
-        <string>Replace any current custom version with Minecraft Forge</string>
+        <string>This isn't implemented yet.</string>
        </property>
        <property name="text">
-        <string>Install Forge</string>
+        <string>Move up</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="liteloaderBtn">
+      <widget class="QPushButton" name="moveLibraryDownBtn">
+       <property name="toolTip">
+        <string>This isn't implemented yet.</string>
+       </property>
        <property name="text">
-        <string>Install LiteLoader</string>
+        <string>Move down</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="jarmodBtn">
+      <widget class="QPushButton" name="removeLibraryBtn">
        <property name="text">
-        <string>Add jar mod</string>
+        <string>Remove</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="Line" name="line">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
+      <widget class="LineSeparator" name="separator" native="true"/>
      </item>
      <item>
-      <widget class="QPushButton" name="reloadLibrariesBtn">
+      <widget class="QLabel" name="label_2">
        <property name="text">
-        <string>Reload</string>
+        <string>Install</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="removeLibraryBtn">
+      <widget class="QPushButton" name="forgeBtn">
+       <property name="toolTip">
+        <string>Replace any current custom version with Minecraft Forge</string>
+       </property>
        <property name="text">
-        <string>Remove</string>
+        <string>Install Forge</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="Line" name="line_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+      <widget class="QPushButton" name="liteloaderBtn">
+       <property name="text">
+        <string>Install LiteLoader</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="moveLibraryUpBtn">
-       <property name="toolTip">
-        <string>This isn't implemented yet.</string>
-       </property>
+      <widget class="QPushButton" name="jarmodBtn">
        <property name="text">
-        <string>Move up</string>
+        <string>Add jar mod</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="moveLibraryDownBtn">
-       <property name="toolTip">
-        <string>This isn't implemented yet.</string>
-       </property>
+      <widget class="LineSeparator" name="widget" native="true"/>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_5">
        <property name="text">
-        <string>Move down</string>
+        <string>List</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
        </property>
       </widget>
      </item>
@@ -140,6 +155,13 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QPushButton" name="reloadLibrariesBtn">
+       <property name="text">
+        <string>Reload</string>
+       </property>
+      </widget>
+     </item>
      <item>
       <spacer name="verticalSpacer_7">
        <property name="orientation">
@@ -163,6 +185,12 @@
    <extends>QTreeView</extends>
    <header>gui/widgets/ModListView.h</header>
   </customwidget>
+  <customwidget>
+   <class>LineSeparator</class>
+   <extends>QWidget</extends>
+   <header>gui/widgets/LineSeparator.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
-- 
cgit