Author: mir3x
Date: Fri Nov 11 10:44:38 2016
New Revision: 34486
URL: http://svn.gna.org/viewcvs/freeciv?rev=34486&view=rev
Log:
Qt client - changes to notify goto
See patch #7972
Modified:
branches/S2_6/client/gui-qt/dialogs.cpp
Modified: branches/S2_6/client/gui-qt/dialogs.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/dialogs.cpp?rev=34486&r1=34485&r2=34486&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/dialogs.cpp (original)
+++ branches/S2_6/client/gui-qt/dialogs.cpp Fri Nov 11 10:44:38 2016
@@ -823,25 +823,27 @@
const struct text_tag_list *tags, tile *ptile,
QWidget *parent): QMessageBox(parent)
{
+ QString qlines;
setAttribute(Qt::WA_DeleteOnClose);
goto_but = this->addButton(_("Goto Location"), QMessageBox::ActionRole);
- goto_but->setIcon(style()->standardIcon(
- QStyle::SP_ToolBarHorizontalExtensionButton));
+ goto_but->setIcon(fc_icons::instance()->get_icon("go-up"));
inspect_but = this->addButton(_("Inspect City"), QMessageBox::ActionRole);
- inspect_but->setIcon(style()->standardIcon(QStyle::SP_FileDialogToParent));
+ inspect_but->setIcon(fc_icons::instance()->get_icon("plus"));
close_but = this->addButton(QMessageBox::Close);
gtile = ptile;
if (!gtile) {
- goto_but->setDisabled(true);
- inspect_but->setDisabled(true);
+ goto_but->setVisible(false);
+ inspect_but->setVisible(false);
} else {
struct city *pcity = tile_city(gtile);
- inspect_but->setEnabled(NULL != pcity
+ inspect_but->setVisible(NULL != pcity
&& city_owner(pcity) == client.conn.playing);
}
setWindowTitle(headline);
- setText(lines);
+ qlines = lines;
+ qlines.replace("\n", " ");
+ setText(qlines);
connect(goto_but, SIGNAL(pressed()), SLOT(goto_tile()));
connect(inspect_but, SIGNAL(pressed()), SLOT(inspect_city()));
connect(close_but, SIGNAL(pressed()), SLOT(close()));
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
