Author: mir3x
Date: Thu Aug 21 19:06:22 2014
New Revision: 25981
URL: http://svn.gna.org/viewcvs/freeciv?rev=25981&view=rev
Log:
QMessageBox wont open tabs on taskbar anymore
See patch #5055
Modified:
trunk/client/gui-qt/citydlg.cpp
trunk/client/gui-qt/dialogs.cpp
trunk/client/gui-qt/gui_main.cpp
trunk/client/gui-qt/menu.cpp
trunk/client/gui-qt/repodlgs.cpp
Modified: trunk/client/gui-qt/citydlg.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/citydlg.cpp?rev=25981&r1=25980&r2=25981&view=diff
==============================================================================
--- trunk/client/gui-qt/citydlg.cpp (original)
+++ trunk/client/gui-qt/citydlg.cpp Thu Aug 21 19:06:22 2014
@@ -187,7 +187,7 @@
****************************************************************************/
void unit_item::disband()
{
- QMessageBox ask;
+ QMessageBox ask(this);
int ret;
ask.setText(_("Are you sure you want to disband that unit?"));
@@ -1675,7 +1675,7 @@
****************************************************************************/
void city_dialog::dbl_click(QTableWidgetItem *item)
{
- QMessageBox ask;
+ QMessageBox ask(this);
QString s;
QVariant qvar;
char buf[256];
Modified: trunk/client/gui-qt/dialogs.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/dialogs.cpp?rev=25981&r1=25980&r2=25981&view=diff
==============================================================================
--- trunk/client/gui-qt/dialogs.cpp (original)
+++ trunk/client/gui-qt/dialogs.cpp Thu Aug 21 19:06:22 2014
@@ -1361,7 +1361,7 @@
incite_impossible.setText(QString(buf2));
incite_impossible.exec();
} else if (cost <= client_player()->economic.gold) {
- QMessageBox ask;
+ QMessageBox ask(gui()->central_wdg);
fc_snprintf(buf2, ARRAY_SIZE(buf2),
PL_("Incite a revolt for %d gold?\n%s",
@@ -1402,7 +1402,7 @@
**************************************************************************/
void popup_bribe_dialog(struct unit *actor, struct unit *punit, int cost)
{
- QMessageBox ask;
+ QMessageBox ask(gui()->central_wdg);
int ret;
QString str;
char buf[1024];
@@ -1573,7 +1573,7 @@
****************************************************************************/
void popup_disband_dialog(struct unit_list *punits)
{
- QMessageBox ask;
+ QMessageBox ask(gui()->central_wdg);
int ret;
QString str;
@@ -1753,7 +1753,7 @@
void popup_upgrade_dialog(struct unit_list *punits)
{
char buf[512];
- QMessageBox ask;
+ QMessageBox ask(gui()->central_wdg);
int ret;
if (!punits || unit_list_size(punits) == 0) {
Modified: trunk/client/gui-qt/gui_main.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/gui_main.cpp?rev=25981&r1=25980&r2=25981&view=diff
==============================================================================
--- trunk/client/gui-qt/gui_main.cpp (original)
+++ trunk/client/gui-qt/gui_main.cpp Thu Aug 21 19:06:22 2014
@@ -316,13 +316,14 @@
**************************************************************************/
void popup_quit_dialog()
{
- QMessageBox ask;
+ QMessageBox ask(gui()->central_wdg);
int ret;
ask.setText(_("Are you sure you want to quit?"));
ask.setStandardButtons(QMessageBox::Cancel | QMessageBox::Ok);
ask.setDefaultButton(QMessageBox::Cancel);
ask.setIcon(QMessageBox::Warning);
+ ask.setWindowTitle(_("Quit?"));
ret = ask.exec();
switch (ret) {
Modified: trunk/client/gui-qt/menu.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/menu.cpp?rev=25981&r1=25980&r2=25981&view=diff
==============================================================================
--- trunk/client/gui-qt/menu.cpp (original)
+++ trunk/client/gui-qt/menu.cpp Thu Aug 21 19:06:22 2014
@@ -911,7 +911,7 @@
****************************************************************************/
void mr_menu::slot_menu_copying()
{
- QMessageBox info;
+ QMessageBox info(this);
QString s = QString::fromUtf8(_("Freeciv is covered by the GPL. "))
+ QString::fromUtf8(_("See file COPYING distributed with "
"Freeciv for full license text."));
Modified: trunk/client/gui-qt/repodlgs.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/repodlgs.cpp?rev=25981&r1=25980&r2=25981&view=diff
==============================================================================
--- trunk/client/gui-qt/repodlgs.cpp (original)
+++ trunk/client/gui-qt/repodlgs.cpp Thu Aug 21 19:06:22 2014
@@ -661,7 +661,7 @@
struct unit_type *upgrade;
utype = utype_by_number(uid);
int price;
- QMessageBox ask;
+ QMessageBox ask(this);
QString s1, s2;
int ret;
char buf[1024];
@@ -957,7 +957,7 @@
char buf[1024];
QString s;
- QMessageBox ask;
+ QMessageBox ask(this);
int ret;
selected = cid_decode(uid);
struct unit_type *putype = selected.value.utype;
@@ -994,7 +994,7 @@
struct universal selected;
char buf[1024];
QString s;
- QMessageBox ask;
+ QMessageBox ask(this);
int ret;
selected = cid_decode(uid);
struct impr_type *pimprove = selected.value.building;
@@ -1031,7 +1031,7 @@
struct universal selected;
char buf[1024];
QString s;
- QMessageBox ask;
+ QMessageBox ask(this);
int ret;
selected = cid_decode(uid);
struct impr_type *pimprove = selected.value.building;
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
