equal
deleted
inserted
replaced
142 #ifdef USE_XFIRE |
142 #ifdef USE_XFIRE |
143 xfire_init(); |
143 xfire_init(); |
144 #endif |
144 #endif |
145 this->setStyleSheet(styleSheet); |
145 this->setStyleSheet(styleSheet); |
146 ui.setupUi(this); |
146 ui.setupUi(this); |
147 setMinimumSize(760, 610); |
147 setMinimumSize(760, 580); |
148 //setFocusPolicy(Qt::StrongFocus); |
148 //setFocusPolicy(Qt::StrongFocus); |
149 CustomizePalettes(); |
149 CustomizePalettes(); |
150 |
150 |
151 ui.pageOptions->CBResolution->addItems(SDLInteraction::instance().getResolutions()); |
151 ui.pageOptions->CBResolution->addItems(SDLInteraction::instance().getResolutions()); |
152 |
152 |