Author: mir3x Date: Fri Nov 11 10:42:05 2016 New Revision: 34484 URL: http://svn.gna.org/viewcvs/freeciv?rev=34484&view=rev Log: Qt client - removed unused fc_message_box
See patch #7971 Modified: branches/S2_6/client/gui-qt/menu.cpp branches/S2_6/client/gui-qt/menu.h Modified: branches/S2_6/client/gui-qt/menu.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/menu.cpp?rev=34484&r1=34483&r2=34484&view=diff ============================================================================== --- branches/S2_6/client/gui-qt/menu.cpp (original) +++ branches/S2_6/client/gui-qt/menu.cpp Fri Nov 11 10:42:05 2016 @@ -586,36 +586,6 @@ text = tile_get_info_text(newtile, FALSE, 0); tile_virtual_destroy(newtile); return text; -} - -/************************************************************************** - Displays dialog with scrollbars, like QMessageBox with ok button -**************************************************************************/ -void fc_message_box::info(QWidget *parent, const QString &title, - const QString &message) { - setParent(parent); - setWindowTitle(title); - setWindowFlags(Qt::Window); - QVBoxLayout *vb = new QVBoxLayout; - label = new QLabel; - label->setAlignment(Qt::AlignVCenter | Qt::AlignLeft); - label->setContentsMargins(2, 2, 2, 2); - label->setWordWrap(true); - label->setText(message); - scroll = new QScrollArea(this); - scroll->setWidget(label); - scroll->setWidgetResizable(true); - - ok_button = new QPushButton(this); - connect(ok_button, SIGNAL(clicked()), this, SLOT(close())); - ok_button->setText(_("Roger that")); - - vb->addWidget(scroll); - vb->addWidget(ok_button); - setLayout(vb); - setFixedHeight(400); - setFixedWidth(600); - show(); } Modified: branches/S2_6/client/gui-qt/menu.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/menu.h?rev=34484&r1=34483&r2=34484&view=diff ============================================================================== --- branches/S2_6/client/gui-qt/menu.h (original) +++ branches/S2_6/client/gui-qt/menu.h Fri Nov 11 10:42:05 2016 @@ -214,23 +214,6 @@ }; -/************************************************************************** - Custom dialog to show information -**************************************************************************/ -class fc_message_box : public QDialog -{ - Q_OBJECT - -public: - fc_message_box() {}; - void info(QWidget *parent, const QString &title, const QString &mess); - -private: - QLabel *label; - QScrollArea *scroll; - QPushButton *ok_button; -}; - /**************************************************************************** Instantiable government menu. ****************************************************************************/ _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits