equal
deleted
inserted
replaced
110 ui.setupUi(this); |
110 ui.setupUi(this); |
111 setMinimumSize(760, 580); |
111 setMinimumSize(760, 580); |
112 //setFocusPolicy(Qt::StrongFocus); |
112 //setFocusPolicy(Qt::StrongFocus); |
113 CustomizePalettes(); |
113 CustomizePalettes(); |
114 |
114 |
115 ui.pageOptions->CBResolution->addItems(sdli.getResolutions()); |
115 ui.pageOptions->CBResolution->addItems(SDLInteraction::instance().getResolutions()); |
116 |
116 |
117 config = new GameUIConfig(this, cfgdir->absolutePath() + "/hedgewars.ini"); |
117 config = new GameUIConfig(this, cfgdir->absolutePath() + "/hedgewars.ini"); |
118 |
118 |
119 |
119 |
120 #ifdef __APPLE__ |
120 #ifdef __APPLE__ |
1174 } |
1174 } |
1175 |
1175 |
1176 void HWForm::Music(bool checked) |
1176 void HWForm::Music(bool checked) |
1177 { |
1177 { |
1178 if (checked) |
1178 if (checked) |
1179 sdli.StartMusic(); |
1179 SDLInteraction::instance().startMusic(); |
1180 else |
1180 else |
1181 sdli.StopMusic(); |
1181 SDLInteraction::instance().stopMusic(); |
1182 } |
1182 } |
1183 |
1183 |
1184 void HWForm::NetGameChangeStatus(bool isMaster) |
1184 void HWForm::NetGameChangeStatus(bool isMaster) |
1185 { |
1185 { |
1186 ui.pageNetGame->pGameCFG->setEnabled(isMaster); |
1186 ui.pageNetGame->pGameCFG->setEnabled(isMaster); |