# HG changeset patch # User dag10 # Date 1362175080 18000 # Node ID 2045bdf1b11b1ced6dfc635643fb9133c6b8bdff # Parent 253750e192e7cbf2b21c4ba71de8853f456ae0bd Resolves issue 528. Fixed platform-specific order of buttons on seed prompt and new room prompt. Fixed height of back button on all pages -- now aligns to bottom. On pagemain, feedback and dlc buttons no longer fixed size. diff -r 253750e192e7 -r 2045bdf1b11b QTfrontend/ui/page/AbstractPage.cpp --- a/QTfrontend/ui/page/AbstractPage.cpp Fri Mar 01 15:50:00 2013 -0500 +++ b/QTfrontend/ui/page/AbstractPage.cpp Fri Mar 01 16:58:00 2013 -0500 @@ -53,7 +53,7 @@ // add back/exit button btnBack = formattedButton(":/res/Exit.png", true); btnBack->setWhatsThis(tr("Go back")); - bottomLeftLayout->addWidget(btnBack, 0); + bottomLeftLayout->addWidget(btnBack, 0, Qt::AlignBottom); // add body layout as defined by the subclass pageLayout->addLayout(bodyLayoutDefinition(), 0, 0, 1, 3); diff -r 253750e192e7 -r 2045bdf1b11b QTfrontend/ui/page/pagemain.cpp --- a/QTfrontend/ui/page/pagemain.cpp Fri Mar 01 15:50:00 2013 -0500 +++ b/QTfrontend/ui/page/pagemain.cpp Fri Mar 01 16:58:00 2013 -0500 @@ -78,12 +78,12 @@ pageLayout->setAlignment(BtnInfo, Qt::AlignHCenter); BtnFeedback = addButton("Feedback", pageLayout, 4, 0, 1, 4, false); - BtnFeedback->setFixedSize(86, 27); + BtnFeedback->setStyleSheet("padding: 5px 10px"); BtnFeedback->setWhatsThis(tr("Leave a feedback here reporting issues, suggesting features or just saying how you like Hedgewars")); pageLayout->setAlignment(BtnFeedback, Qt::AlignHCenter); BtnDataDownload = addButton(tr("Downloadable Content"), pageLayout, 5, 0, 1, 4, false); - BtnDataDownload->setFixedSize(176, 27); + BtnDataDownload->setStyleSheet("padding: 5px 10px"); BtnDataDownload->setWhatsThis(tr("Access the user created content downloadable from our website")); pageLayout->setAlignment(BtnDataDownload, Qt::AlignHCenter); diff -r 253750e192e7 -r 2045bdf1b11b QTfrontend/ui/widget/roomnameprompt.cpp --- a/QTfrontend/ui/widget/roomnameprompt.cpp Fri Mar 01 15:50:00 2013 -0500 +++ b/QTfrontend/ui/widget/roomnameprompt.cpp Fri Mar 01 16:58:00 2013 -0500 @@ -62,8 +62,13 @@ QPushButton * btnOkay = new QPushButton(tr("Create room")); connect(btnCancel, SIGNAL(clicked()), this, SLOT(reject())); connect(btnOkay, SIGNAL(clicked()), this, SLOT(accept())); - buttonLayout->addWidget(btnCancel); - buttonLayout->addWidget(btnOkay); +#ifdef Q_WS_MAC + buttonLayout->addWidget(btnCancel); + buttonLayout->addWidget(btnOkay); +#else + buttonLayout->addWidget(btnOkay); + buttonLayout->addWidget(btnCancel); +#endif btnOkay->setDefault(true); setStyleSheet("QPushButton { padding: 5px; }"); diff -r 253750e192e7 -r 2045bdf1b11b QTfrontend/ui/widget/seedprompt.cpp --- a/QTfrontend/ui/widget/seedprompt.cpp Fri Mar 01 15:50:00 2013 -0500 +++ b/QTfrontend/ui/widget/seedprompt.cpp Fri Mar 01 16:58:00 2013 -0500 @@ -62,8 +62,13 @@ QPushButton * btnOkay = new QPushButton(tr("Set seed")); connect(btnCancel, SIGNAL(clicked()), this, SLOT(reject())); connect(btnOkay, SIGNAL(clicked()), this, SLOT(accept())); +#ifdef Q_WS_MAC buttonLayout->addWidget(btnCancel); buttonLayout->addWidget(btnOkay); +#else + buttonLayout->addWidget(btnOkay); + buttonLayout->addWidget(btnCancel); +#endif btnOkay->setDefault(true); } else