From aeca2a7782a29f3d893f318d91d00109b6451f7e Mon Sep 17 00:00:00 2001 From: Silarn Date: Wed, 3 Jul 2019 14:14:10 -0500 Subject: Restore UI files to VS project and remove unused files --- src/CMakeLists.txt | 9 +-- src/finddialog.ui | 76 --------------------- src/gameinfoimpl.cpp | 56 --------------- src/installdialog.ui | 165 --------------------------------------------- src/simpleinstalldialog.ui | 82 ---------------------- 5 files changed, 3 insertions(+), 385 deletions(-) delete mode 100644 src/finddialog.ui delete mode 100644 src/gameinfoimpl.cpp delete mode 100644 src/installdialog.ui delete mode 100644 src/simpleinstalldialog.ui (limited to 'src') 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 @@ - - - FindDialog - - - - 0 - 0 - 400 - 72 - - - - Find - - - - - - - - - - Find what: - - - - - - - Search term - - - Search term - - - - - - - - - - - - - Find next occurence from current file position. - - - Find next occurence from current file position. - - - &Find Next - - - - - - - Close - - - Close - - - Close - - - - - - - - - - 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 . -*/ - -#include "gameinfoimpl.h" -#include -#include -#include - - -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 @@ - - - InstallDialog - - - - 0 - 0 - 516 - 407 - - - - - 16777215 - 16777215 - - - - Install Mods - - - - - - false - - - - - - New Mod - - - - - - - - - 50 - 0 - - - - Name - - - - - - - Pick a name for the mod - - - 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. - - - - - - - - - Content - - - - - - - Qt::CustomContextMenu - - - Content of the archive. You can change the directory structure by using drag&drop. Hint: Also try right clicking... - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">This displays the content of the archive. &lt;data&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;drop</span></p></body></html> - - - - - - true - - - QAbstractItemView::DragDrop - - - QAbstractItemView::ExtendedSelection - - - false - - - - 1 - - - - - - - - - - - - - - 12 - 75 - true - - - - Placeholder - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - OK - - - - - - - Cancel - - - - - - - - - - ArchiveTree - QTreeWidget -
archivetree.h
- - - - - 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 @@ - - - SimpleInstallDialog - - - - 0 - 0 - 400 - 71 - - - - Quick Install - - - - - - - - Name - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Opens a Dialog that allows custom modifications. - - - Opens a Dialog that allows custom modifications. - - - Manual - - - - - - - OK - - - true - - - - - - - Cancel - - - - - - - - - - -- cgit v1.3.1