equal
deleted
inserted
replaced
41 #include <QDesktopServices> |
41 #include <QDesktopServices> |
42 #include <QInputDialog> |
42 #include <QInputDialog> |
43 #include <QPropertyAnimation> |
43 #include <QPropertyAnimation> |
44 #include <QGraphicsEffect> |
44 #include <QGraphicsEffect> |
45 #include <QParallelAnimationGroup> |
45 #include <QParallelAnimationGroup> |
|
46 #include <QSettings> |
46 |
47 |
47 #include "hwform.h" |
48 #include "hwform.h" |
48 #include "game.h" |
49 #include "game.h" |
49 #include "team.h" |
50 #include "team.h" |
50 #include "teamselect.h" |
51 #include "teamselect.h" |
99 // I started handing this down to each place it touches, but it was getting ridiculous |
100 // I started handing this down to each place it touches, but it was getting ridiculous |
100 // and this one flag does not warrant a static class |
101 // and this one flag does not warrant a static class |
101 bool frontendEffects = true; |
102 bool frontendEffects = true; |
102 QString playerHash; |
103 QString playerHash; |
103 |
104 |
|
105 GameUIConfig* HWForm::config = NULL; |
|
106 QSettings* HWForm::gameSettings = NULL; |
|
107 |
104 HWForm::HWForm(QWidget *parent, QString styleSheet) |
108 HWForm::HWForm(QWidget *parent, QString styleSheet) |
105 : QMainWindow(parent) |
109 : QMainWindow(parent) |
106 , game(0) |
110 , game(0) |
107 , pnetserver(0) |
111 , pnetserver(0) |
108 , pRegisterServer(0) |
112 , pRegisterServer(0) |
128 CustomizePalettes(); |
132 CustomizePalettes(); |
129 |
133 |
130 ui.pageOptions->CBResolution->addItems(SDLInteraction::instance().getResolutions()); |
134 ui.pageOptions->CBResolution->addItems(SDLInteraction::instance().getResolutions()); |
131 |
135 |
132 config = new GameUIConfig(this, cfgdir->absolutePath() + "/hedgewars.ini"); |
136 config = new GameUIConfig(this, cfgdir->absolutePath() + "/hedgewars.ini"); |
133 |
|
134 |
137 |
135 #ifdef __APPLE__ |
138 #ifdef __APPLE__ |
136 panel = new M3Panel; |
139 panel = new M3Panel; |
137 |
140 |
138 #ifdef SPARKLE_ENABLED |
141 #ifdef SPARKLE_ENABLED |