rollback of
r08642c7da4a3b5e05be51a8b45995e799bbc4bbf ("add DLC button to net game room")
--- a/QTfrontend/hwform.cpp Fri Oct 26 10:31:26 2012 -0400
+++ b/QTfrontend/hwform.cpp Fri Oct 26 17:05:12 2012 +0200
@@ -204,8 +204,6 @@
connect(ui.pageMain->BtnDataDownload, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
pageSwitchMapper->setMapping(ui.pageMain->BtnDataDownload, ID_PAGE_DATADOWNLOAD);
- connect(ui.pageNetGame, SIGNAL(DLCClicked()), pageSwitchMapper, SLOT(map()));
- pageSwitchMapper->setMapping(ui.pageNetGame, ID_PAGE_DATADOWNLOAD);
#ifdef VIDEOREC
connect(ui.pageMain->BtnVideos, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
--- a/QTfrontend/ui/page/pagedata.cpp Fri Oct 26 10:31:26 2012 -0400
+++ b/QTfrontend/ui/page/pagedata.cpp Fri Oct 26 17:05:12 2012 +0200
@@ -222,10 +222,7 @@
return false;
}
- if (this->isVisible())
- m_contentDownloaded = true;
- else
- DataManager::instance().reload();
+ m_contentDownloaded = true;
}
file.close();
--- a/QTfrontend/ui/page/pagenetgame.cpp Fri Oct 26 10:31:26 2012 -0400
+++ b/QTfrontend/ui/page/pagenetgame.cpp Fri Oct 26 17:05:12 2012 +0200
@@ -62,9 +62,6 @@
{
QHBoxLayout * bottomLayout = new QHBoxLayout;
- btnDLC = addButton(tr("DLC"), bottomLayout, 0);
- btnDLC->setWhatsThis(tr("Downloadable Content"));
-
leRoomName = new HistoryLineEdit(this,10);
leRoomName->setMaxLength(60);
leRoomName->setMinimumWidth(200);
@@ -79,23 +76,21 @@
BtnGo->setMinimumHeight(50);
bottomLayout->addWidget(leRoomName);
- BtnUpdate = addButton(QAction::tr("Update"), bottomLayout, 2);
+ BtnUpdate = addButton(QAction::tr("Update"), bottomLayout, 1);
bottomLayout->addStretch();
bottomLayout->addWidget(BtnGo);
- BtnMaster = addButton(tr("Control"), bottomLayout, 4);
+ BtnMaster = addButton(tr("Control"), bottomLayout, 3);
bottomLayout->insertStretch(3, 100);
- BtnStart = addButton(QAction::tr("Start"), bottomLayout, 4);
+ BtnStart = addButton(QAction::tr("Start"), bottomLayout, 3);
return bottomLayout;
}
void PageNetGame::connectSignals()
{
- connect(btnDLC, SIGNAL(clicked()), this, SIGNAL(DLCClicked()));
-
connect(btnSetup, SIGNAL(clicked()), this, SIGNAL(SetupClicked()));
connect(BtnUpdate, SIGNAL(clicked()), this, SLOT(onUpdateClick()));
--- a/QTfrontend/ui/page/pagenetgame.h Fri Oct 26 10:31:26 2012 -0400
+++ b/QTfrontend/ui/page/pagenetgame.h Fri Oct 26 17:05:12 2012 +0200
@@ -65,7 +65,6 @@
signals:
void SetupClicked();
- void DLCClicked();
void askForUpdateRoomName(const QString &);
private:
@@ -77,7 +76,6 @@
HistoryLineEdit * leRoomName;
QPushButton * btnSetup;
- QPushButton * btnDLC;
};
#endif