Restore UI files to VS project and remove unused files

5 files changed, 3 insertions, 385 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 929ee296..f197211a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -253,7 +253,6 @@ SET(organizer_HDRS
 SET(organizer_UIS
     transfersavesdialog.ui
     syncoverwritedialog.ui
-    simpleinstalldialog.ui
     settingsdialog.ui
     selectiondialog.ui
     queryoverwritedialog.ui
@@ -265,8 +264,6 @@ SET(organizer_UIS
     mainwindow.ui
     lockeddialog.ui
     waitingonclosedialog.ui
-    installdialog.ui
-    finddialog.ui
     editexecutablesdialog.ui
     credentialsdialog.ui
     categoriesdialog.ui
@@ -293,7 +290,7 @@ SET(organizer_RCS
 	)
 
 
-source_group(src REGULAR_EXPRESSION ".*\\.(h|cpp)")
+source_group(src REGULAR_EXPRESSION ".*\\.(h|cpp|ui)")
 
 set(application
 	iuserinterface
@@ -457,7 +454,7 @@ set(src_filters
 foreach(filter in list ${src_filters})
 	set(files)
 	foreach(d in lists ${${filter}})
-		set(files ${files} ${d}.cpp ${d}.h ${d}.inc)
+		set(files ${files} ${d}.cpp ${d}.h ${d}.inc ${d}.ui)
 	endforeach()
 
 	source_group(src\\${filter} FILES ${files})
@@ -553,7 +550,7 @@ ELSE()
   SET(usvfs_name usvfs_x86)
 ENDIF()
 
-ADD_EXECUTABLE(ModOrganizer WIN32 ${organizer_HDRS} ${organizer_SRCS} ${organizer_RCS} ${organizer_QRCS} ${organizer_translations_qm})
+ADD_EXECUTABLE(ModOrganizer WIN32 ${organizer_HDRS} ${organizer_SRCS} ${organizer_UIS} ${organizer_RCS} ${organizer_QRCS} ${organizer_translations_qm})
 TARGET_LINK_LIBRARIES(ModOrganizer
                       Qt5::Widgets Qt5::WinExtras Qt5::WebEngineWidgets Qt5::Quick
                       Qt5::Qml Qt5::QuickWidgets Qt5::Network Qt5::WebSockets
diff --git a/src/finddialog.ui b/src/finddialog.ui
deleted file mode 100644
index 2c4c80b8..00000000
--- a/src/finddialog.ui
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ui version="4.0">

- <class>FindDialog</class>

- <widget class="QDialog" name="FindDialog">

-  <property name="geometry">

-   <rect>

-    <x>0</x>

-    <y>0</y>

-    <width>400</width>

-    <height>72</height>

-   </rect>

-  </property>

-  <property name="windowTitle">

-   <string>Find</string>

-  </property>

-  <layout class="QHBoxLayout" name="horizontalLayout">

-   <item>

-    <layout class="QVBoxLayout" name="verticalLayout">

-     <item>

-      <layout class="QHBoxLayout" name="horizontalLayout_2">

-       <item>

-        <widget class="QLabel" name="label">

-         <property name="text">

-          <string>Find what:</string>

-         </property>

-        </widget>

-       </item>

-       <item>

-        <widget class="QLineEdit" name="patternEdit">

-         <property name="toolTip">

-          <string>Search term</string>

-         </property>

-         <property name="whatsThis">

-          <string>Search term</string>

-         </property>

-        </widget>

-       </item>

-      </layout>

-     </item>

-    </layout>

-   </item>

-   <item>

-    <layout class="QVBoxLayout" name="verticalLayout_2">

-     <item>

-      <widget class="QPushButton" name="nextBtn">

-       <property name="toolTip">

-        <string>Find next occurence from current file position.</string>

-       </property>

-       <property name="whatsThis">

-        <string>Find next occurence from current file position.</string>

-       </property>

-       <property name="text">

-        <string>&amp;Find Next</string>

-       </property>

-      </widget>

-     </item>

-     <item>

-      <widget class="QPushButton" name="closeBtn">

-       <property name="toolTip">

-        <string>Close</string>

-       </property>

-       <property name="whatsThis">

-        <string>Close</string>

-       </property>

-       <property name="text">

-        <string>Close</string>

-       </property>

-      </widget>

-     </item>

-    </layout>

-   </item>

-  </layout>

- </widget>

- <resources/>

- <connections/>

-</ui>

diff --git a/src/gameinfoimpl.cpp b/src/gameinfoimpl.cpp
deleted file mode 100644
index 61a4c523..00000000
--- a/src/gameinfoimpl.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*

-Copyright (C) 2012 Sebastian Herbord. All rights reserved.

-

-This file is part of Mod Organizer.

-

-Mod Organizer is free software: you can redistribute it and/or modify

-it under the terms of the GNU General Public License as published by

-the Free Software Foundation, either version 3 of the License, or

-(at your option) any later version.

-

-Mod Organizer is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-#include "gameinfoimpl.h"

-#include <gameinfo.h>

-#include <utility.h>

-#include <QDir>

-

-

-using namespace MOBase;

-using namespace MOShared;

-

-

-GameInfoImpl::GameInfoImpl()

-{

-}

-

-IGameInfo::Type GameInfoImpl::type() const

-{

-  switch (GameInfo::instance().getType()) {

-    case GameInfo::TYPE_OBLIVION: return IGameInfo::TYPE_OBLIVION;

-    case GameInfo::TYPE_FALLOUT3: return IGameInfo::TYPE_FALLOUT3;

-    case GameInfo::TYPE_FALLOUT4: return IGameInfo::TYPE_FALLOUT4;

-    case GameInfo::TYPE_FALLOUTNV: return IGameInfo::TYPE_FALLOUTNV;

-    case GameInfo::TYPE_SKYRIM: return IGameInfo::TYPE_SKYRIM;

-	case GameInfo::TYPE_SKYRIMSE: return IGameInfo::TYPE_SKYRIMSE;

-    default: throw MyException(QObject::tr("invalid game type %1").arg(GameInfo::instance().getType()));

-  }

-}

-

-

-QString GameInfoImpl::path() const

-{

-  return QDir::fromNativeSeparators(ToQString(GameInfo::instance().getGameDirectory()));

-}

-

-QString GameInfoImpl::binaryName() const

-{

-  return ToQString(GameInfo::instance().getBinaryName());

-}

diff --git a/src/installdialog.ui b/src/installdialog.ui
deleted file mode 100644
index 88019c77..00000000
--- a/src/installdialog.ui
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ui version="4.0">

- <class>InstallDialog</class>

- <widget class="QDialog" name="InstallDialog">

-  <property name="geometry">

-   <rect>

-    <x>0</x>

-    <y>0</y>

-    <width>516</width>

-    <height>407</height>

-   </rect>

-  </property>

-  <property name="maximumSize">

-   <size>

-    <width>16777215</width>

-    <height>16777215</height>

-   </size>

-  </property>

-  <property name="windowTitle">

-   <string>Install Mods</string>

-  </property>

-  <layout class="QVBoxLayout" name="verticalLayout">

-   <item>

-    <widget class="QGroupBox" name="groupBox">

-     <property name="acceptDrops">

-      <bool>false</bool>

-     </property>

-     <property name="toolTip">

-      <string/>

-     </property>

-     <property name="title">

-      <string>New Mod</string>

-     </property>

-     <layout class="QVBoxLayout" name="verticalLayout_3">

-      <item>

-       <layout class="QHBoxLayout" name="horizontalLayout_3">

-        <item>

-         <widget class="QLabel" name="label">

-          <property name="minimumSize">

-           <size>

-            <width>50</width>

-            <height>0</height>

-           </size>

-          </property>

-          <property name="text">

-           <string>Name</string>

-          </property>

-         </widget>

-        </item>

-        <item>

-         <widget class="QLineEdit" name="editName">

-          <property name="toolTip">

-           <string>Pick a name for the mod</string>

-          </property>

-          <property name="whatsThis">

-           <string>Pick a name for the mod. This is also used as a directory name, so please don't use characters that are illegal in file names.</string>

-          </property>

-         </widget>

-        </item>

-       </layout>

-      </item>

-      <item>

-       <widget class="QLabel" name="label_3">

-        <property name="text">

-         <string>Content</string>

-        </property>

-       </widget>

-      </item>

-      <item>

-       <widget class="ArchiveTree" name="treeContent">

-        <property name="contextMenuPolicy">

-         <enum>Qt::CustomContextMenu</enum>

-        </property>

-        <property name="toolTip">

-         <string>Content of the archive. You can change the directory structure by using drag&amp;drop. Hint: Also try right clicking...</string>

-        </property>

-        <property name="whatsThis">

-         <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;

-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;

-p, li { white-space: pre-wrap; }

-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;

-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;This displays the content of the archive. &amp;lt;data&amp;gt; represents the base directory which will map to the game's data directory. You can change the base directory via the right-click context menu and you can move around files via drag&amp;amp;drop&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

-        </property>

-        <property name="locale">

-         <locale language="English" country="UnitedStates"/>

-        </property>

-        <property name="dragEnabled">

-         <bool>true</bool>

-        </property>

-        <property name="dragDropMode">

-         <enum>QAbstractItemView::DragDrop</enum>

-        </property>

-        <property name="selectionMode">

-         <enum>QAbstractItemView::ExtendedSelection</enum>

-        </property>

-        <attribute name="headerVisible">

-         <bool>false</bool>

-        </attribute>

-        <column>

-         <property name="text">

-          <string notr="true">1</string>

-         </property>

-        </column>

-       </widget>

-      </item>

-     </layout>

-    </widget>

-   </item>

-   <item>

-    <layout class="QHBoxLayout" name="horizontalLayout_2">

-     <item>

-      <widget class="QLabel" name="problemLabel">

-       <property name="font">

-        <font>

-         <pointsize>12</pointsize>

-         <weight>75</weight>

-         <bold>true</bold>

-        </font>

-       </property>

-       <property name="text">

-        <string>Placeholder</string>

-       </property>

-      </widget>

-     </item>

-     <item>

-      <spacer name="horizontalSpacer">

-       <property name="orientation">

-        <enum>Qt::Horizontal</enum>

-       </property>

-       <property name="sizeHint" stdset="0">

-        <size>

-         <width>40</width>

-         <height>20</height>

-        </size>

-       </property>

-      </spacer>

-     </item>

-     <item>

-      <widget class="QPushButton" name="okButton">

-       <property name="text">

-        <string>OK</string>

-       </property>

-      </widget>

-     </item>

-     <item>

-      <widget class="QPushButton" name="cancelButton">

-       <property name="text">

-        <string>Cancel</string>

-       </property>

-      </widget>

-     </item>

-    </layout>

-   </item>

-  </layout>

- </widget>

- <customwidgets>

-  <customwidget>

-   <class>ArchiveTree</class>

-   <extends>QTreeWidget</extends>

-   <header>archivetree.h</header>

-  </customwidget>

- </customwidgets>

- <resources/>

- <connections/>

-</ui>

diff --git a/src/simpleinstalldialog.ui b/src/simpleinstalldialog.ui
deleted file mode 100644
index a9fdc1d5..00000000
--- a/src/simpleinstalldialog.ui
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ui version="4.0">

- <class>SimpleInstallDialog</class>

- <widget class="QDialog" name="SimpleInstallDialog">

-  <property name="geometry">

-   <rect>

-    <x>0</x>

-    <y>0</y>

-    <width>400</width>

-    <height>71</height>

-   </rect>

-  </property>

-  <property name="windowTitle">

-   <string>Quick Install</string>

-  </property>

-  <layout class="QVBoxLayout" name="verticalLayout">

-   <item>

-    <layout class="QHBoxLayout" name="horizontalLayout">

-     <item>

-      <widget class="QLabel" name="label">

-       <property name="text">

-        <string>Name</string>

-       </property>

-      </widget>

-     </item>

-     <item>

-      <widget class="QLineEdit" name="nameEdit"/>

-     </item>

-    </layout>

-   </item>

-   <item>

-    <layout class="QHBoxLayout" name="horizontalLayout_2">

-     <item>

-      <spacer name="horizontalSpacer">

-       <property name="orientation">

-        <enum>Qt::Horizontal</enum>

-       </property>

-       <property name="sizeHint" stdset="0">

-        <size>

-         <width>40</width>

-         <height>20</height>

-        </size>

-       </property>

-      </spacer>

-     </item>

-     <item>

-      <widget class="QPushButton" name="manualBtn">

-       <property name="toolTip">

-        <string>Opens a Dialog that allows custom modifications.</string>

-       </property>

-       <property name="whatsThis">

-        <string>Opens a Dialog that allows custom modifications.</string>

-       </property>

-       <property name="text">

-        <string>Manual</string>

-       </property>

-      </widget>

-     </item>

-     <item>

-      <widget class="QPushButton" name="okBtn">

-       <property name="text">

-        <string>OK</string>

-       </property>

-       <property name="default">

-        <bool>true</bool>

-       </property>

-      </widget>

-     </item>

-     <item>

-      <widget class="QPushButton" name="cancelBtn">

-       <property name="text">

-        <string>Cancel</string>

-       </property>

-      </widget>

-     </item>

-    </layout>

-   </item>

-  </layout>

- </widget>

- <resources/>

- <connections/>

-</ui>