0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix NagUtils and hack GroupView to work

Browse Source
This commit is contained in:
Petr Mrázek 2015-02-01 18:54:58 +01:00
parent aa70ed2244
commit 382ae78a0b
10 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -408,8 +408,8 @@ SET(MULTIMC_SOURCES
logic/minecraft/VersionFilterData.cpp logic/minecraft/VersionFilterData.cpp
# Annoying nag screen logic # Annoying nag screen logic
logic/NagUtils.h gui/NagUtils.h
logic/NagUtils.cpp gui/NagUtils.cpp
# Player skin utilities # Player skin utilities
logic/SkinUtils.h logic/SkinUtils.h

2
gui/MainWindow.cpp
View File

@ -382,7 +382,7 @@ namespace Ui {
#include "logic/BaseProcess.h" #include "logic/BaseProcess.h"
#include "logic/OneSixUpdate.h" #include "logic/OneSixUpdate.h"
#include "logic/java/JavaUtils.h" #include "logic/java/JavaUtils.h"
#include "logic/NagUtils.h" #include "gui/NagUtils.h"
#include "logic/SkinUtils.h" #include "logic/SkinUtils.h"
#include "logic/LegacyInstance.h" #include "logic/LegacyInstance.h"

2
logic/NagUtils.cpp → gui/NagUtils.cpp
View File

@ -13,7 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "logic/NagUtils.h" #include "gui/NagUtils.h"
#include "gui/dialogs/CustomMessageBox.h" #include "gui/dialogs/CustomMessageBox.h"
namespace NagUtils namespace NagUtils

0
logic/NagUtils.h → gui/NagUtils.h
View File

2
gui/pages/InstanceSettingsPage.cpp
View File

@ -6,7 +6,7 @@
#include <QMessageBox> #include <QMessageBox>
#include "gui/dialogs/VersionSelectDialog.h" #include "gui/dialogs/VersionSelectDialog.h"
#include "logic/NagUtils.h" #include "gui/NagUtils.h"
#include "logic/java/JavaVersionList.h" #include "logic/java/JavaVersionList.h"
#include "MultiMC.h" #include "MultiMC.h"

2
gui/pages/global/JavaPage.cpp
View File

@ -22,7 +22,7 @@
#include <pathutils.h> #include <pathutils.h>
#include "logic/NagUtils.h" #include "gui/NagUtils.h"
#include "gui/Platform.h" #include "gui/Platform.h"
#include "gui/dialogs/VersionSelectDialog.h" #include "gui/dialogs/VersionSelectDialog.h"

2
gui/pages/global/MinecraftPage.cpp
View File

@ -26,7 +26,7 @@
#include "gui/dialogs/VersionSelectDialog.h" #include "gui/dialogs/VersionSelectDialog.h"
#include "gui/dialogs/CustomMessageBox.h" #include "gui/dialogs/CustomMessageBox.h"
#include "logic/NagUtils.h" #include "gui/NagUtils.h"
#include "logic/java/JavaUtils.h" #include "logic/java/JavaUtils.h"
#include "logic/java/JavaVersionList.h" #include "logic/java/JavaVersionList.h"

2
gui/pages/global/MultiMCPage.cpp
View File

@ -28,7 +28,7 @@
#include "gui/dialogs/CustomMessageBox.h" #include "gui/dialogs/CustomMessageBox.h"
#include <gui/ColumnResizer.h> #include <gui/ColumnResizer.h>
#include "logic/NagUtils.h" #include "gui/NagUtils.h"
#include "logic/java/JavaUtils.h" #include "logic/java/JavaUtils.h"
#include "logic/java/JavaVersionList.h" #include "logic/java/JavaVersionList.h"

5
logic/InstanceList.cpp
View File

@ -36,7 +36,6 @@
#include "OneSixInstance.h" #include "OneSixInstance.h"
#include "LegacyInstance.h" #include "LegacyInstance.h"
#include "logger/QsLog.h" #include "logger/QsLog.h"
#include "gui/groupview/GroupView.h"
const static int GROUP_FILE_FORMAT_VERSION = 1; const static int GROUP_FILE_FORMAT_VERSION = 1;
@ -99,8 +98,8 @@ QVariant InstanceList::data(const QModelIndex &index, int role) const
QString key = pdata->iconKey(); QString key = pdata->iconKey();
return ENV.icons()->getIcon(key); return ENV.icons()->getIcon(key);
} }
// for now. // HACK: see GroupView.h in gui!
case GroupViewRoles::GroupRole: case GroupRole:
{ {
return pdata->group(); return pdata->group();
} }

2
logic/InstanceList.h
View File

@ -18,7 +18,6 @@
#include <QObject> #include <QObject>
#include <QAbstractListModel> #include <QAbstractListModel>
#include <QSet> #include <QSet>
#include <gui/groupview/GroupedProxyModel.h>
#include "logic/BaseInstance.h" #include "logic/BaseInstance.h"
@ -47,6 +46,7 @@ public:
enum AdditionalRoles enum AdditionalRoles
{ {
GroupRole = Qt::UserRole,
InstancePointerRole = 0x34B1CB48, ///< Return pointer to real instance InstancePointerRole = 0x34B1CB48, ///< Return pointer to real instance
InstanceIDRole = 0x34B1CB49 ///< Return id if the instance InstanceIDRole = 0x34B1CB49 ///< Return id if the instance
}; };