equal
deleted
inserted
replaced
19 #include <QDir> |
19 #include <QDir> |
20 #include <QFile> |
20 #include <QFile> |
21 #include <QTextStream> |
21 #include <QTextStream> |
22 #include <QMessageBox> |
22 #include <QMessageBox> |
23 #include <QPushButton> |
23 #include <QPushButton> |
|
24 #include <QSpinBox> |
24 #include <QListWidget> |
25 #include <QListWidget> |
25 #include <QStackedLayout> |
26 #include <QStackedLayout> |
26 #include <QLineEdit> |
27 #include <QLineEdit> |
27 #include <QLabel> |
28 #include <QLabel> |
28 #include <QRadioButton> |
29 #include <QRadioButton> |
141 #ifdef USE_XFIRE |
142 #ifdef USE_XFIRE |
142 xfire_init(); |
143 xfire_init(); |
143 #endif |
144 #endif |
144 this->setStyleSheet(styleSheet); |
145 this->setStyleSheet(styleSheet); |
145 ui.setupUi(this); |
146 ui.setupUi(this); |
146 setMinimumSize(760, 580); |
147 setMinimumSize(760, 610); |
147 //setFocusPolicy(Qt::StrongFocus); |
148 //setFocusPolicy(Qt::StrongFocus); |
148 CustomizePalettes(); |
149 CustomizePalettes(); |
149 |
150 |
150 ui.pageOptions->CBResolution->addItems(SDLInteraction::instance().getResolutions()); |
151 ui.pageOptions->CBResolution->addItems(SDLInteraction::instance().getResolutions()); |
151 |
152 |
1731 if (hwnet) |
1732 if (hwnet) |
1732 { |
1733 { |
1733 // disconnect connections first to ensure their inexistance and not to connect twice |
1734 // disconnect connections first to ensure their inexistance and not to connect twice |
1734 ui.pageNetGame->BtnStart->disconnect(hwnet); |
1735 ui.pageNetGame->BtnStart->disconnect(hwnet); |
1735 ui.pageNetGame->BtnUpdate->disconnect(hwnet); |
1736 ui.pageNetGame->BtnUpdate->disconnect(hwnet); |
|
1737 ui.pageNetGame->leRoomName->disconnect(hwnet); |
1736 ui.pageNetGame->restrictJoins->disconnect(hwnet); |
1738 ui.pageNetGame->restrictJoins->disconnect(hwnet); |
1737 ui.pageNetGame->restrictTeamAdds->disconnect(hwnet); |
1739 ui.pageNetGame->restrictTeamAdds->disconnect(hwnet); |
1738 ui.pageNetGame->disconnect(hwnet, SLOT(updateRoomName(const QString&))); |
1740 ui.pageNetGame->disconnect(hwnet, SLOT(updateRoomName(const QString&))); |
1739 |
1741 |
1740 ui.pageNetGame->setRoomName(hwnet->getRoom()); |
1742 ui.pageNetGame->setRoomName(hwnet->getRoom()); |
1759 if (hwnet) |
1761 if (hwnet) |
1760 { |
1762 { |
1761 NetAmmoSchemeModel * netAmmo = new NetAmmoSchemeModel(hwnet); |
1763 NetAmmoSchemeModel * netAmmo = new NetAmmoSchemeModel(hwnet); |
1762 connect(hwnet, SIGNAL(netSchemeConfig(QStringList &)), netAmmo, SLOT(setNetSchemeConfig(QStringList &))); |
1764 connect(hwnet, SIGNAL(netSchemeConfig(QStringList &)), netAmmo, SLOT(setNetSchemeConfig(QStringList &))); |
1763 ui.pageNetGame->pGameCFG->GameSchemes->setModel(netAmmo); |
1765 ui.pageNetGame->pGameCFG->GameSchemes->setModel(netAmmo); |
|
1766 |
|
1767 ui.pageNetGame->setRoomName(hwnet->getRoom()); |
1764 |
1768 |
1765 ui.pageNetGame->pGameCFG->GameSchemes->view()->disconnect(hwnet); |
1769 ui.pageNetGame->pGameCFG->GameSchemes->view()->disconnect(hwnet); |
1766 connect(hwnet, SIGNAL(netSchemeConfig(QStringList &)), |
1770 connect(hwnet, SIGNAL(netSchemeConfig(QStringList &)), |
1767 this, SLOT(selectFirstNetScheme())); |
1771 this, SLOT(selectFirstNetScheme())); |
1768 } |
1772 } |