dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'feature_theme_support' into develop

Browse source 
Conflicts:
	main.cpp
This commit is contained in:
Petr Mrázek 2014-06-30 22:22:09 +02:00
commit e241c3625c
60 changed files with 2108 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
main.cpp
View file

@ -10,7 +10,7 @@
int main_gui(MultiMC &app)
{
// show main window
QIcon::setThemeName("multimc");
QIcon::setThemeName(MMC->settings()->get("IconTheme").toString());
MainWindow mainWin;
mainWin.restoreState(QByteArray::fromBase64(MMC->settings()->get("MainWindowState").toByteArray()));
mainWin.restoreGeometry(QByteArray::fromBase64(MMC->settings()->get("MainWindowGeometry").toByteArray()));
@ -34,6 +34,8 @@ int main(int argc, char *argv[])
// Register signal handler for generating crash reports.
initBlackMagic();
#endif
Q_INIT_RESOURCE(pe_dark);
Q_INIT_RESOURCE(pe_light);
switch (app.status())
{