CactiChameleon9/PrismLauncher
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
Download Patch File Download Diff File Expand all files Collapse all files

5
logic/InstanceList.cpp
View File

@ -36,7 +36,6 @@
#include "OneSixInstance.h"
#include "LegacyInstance.h"
#include "logger/QsLog.h"
#include "gui/groupview/GroupView.h"
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();
return ENV.icons()->getIcon(key);
}
// for now.
case GroupViewRoles::GroupRole:
// HACK: see GroupView.h in gui!
case GroupRole:
{
return pdata->group();
}

2
logic/InstanceList.h
View File

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

38
logic/NagUtils.cpp
View File

@ -1,38 +0,0 @@
/* Copyright 2013-2015 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "logic/NagUtils.h"
#include "gui/dialogs/CustomMessageBox.h"
namespace NagUtils
{
void checkJVMArgs(QString jvmargs, QWidget *parent)
{
if (jvmargs.contains("-XX:PermSize=") || jvmargs.contains(QRegExp("-Xm[sx]")))
{
CustomMessageBox::selectable(
parent, QObject::tr("JVM arguments warning"),
QObject::tr("You tried to manually set a JVM memory option (using "
" \"-XX:PermSize\", \"-Xmx\" or \"-Xms\") - there"
" are dedicated boxes for these in the settings (Java"
" tab, in the Memory group at the top).\n"
"Your manual settings will be overridden by the"
" dedicated options.\n"
"This message will be displayed until you remove them"
" from the JVM arguments."),
QMessageBox::Warning)->exec();
}
}
}

23
logic/NagUtils.h
View File

@ -1,23 +0,0 @@
/* Copyright 2013-2015 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#pragma once
#include <QWidget>
namespace NagUtils
{
void checkJVMArgs(QString args, QWidget *parent);
}