diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-06-30 22:22:09 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-06-30 22:22:09 +0200 |
| commit | e241c3625c2e0f005ee2cb01577ceeb054bbbd98 (patch) | |
| tree | b874caae329a536ca15b331be386cf481307d28f /main.cpp | |
| parent | 421a46e3d3036ea0dea4889125ee58309d0ed21e (diff) | |
| parent | d2b2d55aa9a4031d1e179534796cbe07bc57080f (diff) | |
| download | MultiMC-e241c3625c2e0f005ee2cb01577ceeb054bbbd98.tar MultiMC-e241c3625c2e0f005ee2cb01577ceeb054bbbd98.tar.gz MultiMC-e241c3625c2e0f005ee2cb01577ceeb054bbbd98.tar.lz MultiMC-e241c3625c2e0f005ee2cb01577ceeb054bbbd98.tar.xz MultiMC-e241c3625c2e0f005ee2cb01577ceeb054bbbd98.zip | |
Merge branch 'feature_theme_support' into develop
Conflicts:
main.cpp
Diffstat (limited to 'main.cpp')
| -rw-r--r-- | main.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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()) { |