Author: mir3x Date: Thu Jul 28 17:40:56 2016 New Revision: 33354 URL: http://svn.gna.org/viewcvs/freeciv?rev=33354&view=rev Log: Qt client - added splitter in pregame page.
See patch #7508 Modified: trunk/client/gui-qt/fc_client.h trunk/client/gui-qt/pages.cpp Modified: trunk/client/gui-qt/fc_client.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/fc_client.h?rev=33354&r1=33353&r2=33354&view=diff ============================================================================== --- trunk/client/gui-qt/fc_client.h (original) +++ trunk/client/gui-qt/fc_client.h Thu Jul 28 17:40:56 2016 @@ -173,6 +173,8 @@ QPushButton *button; QPushButton *obs_button; + QPushButton *start_button; + QPushButton *nation_button; QDialogButtonBox* button_box; Modified: trunk/client/gui-qt/pages.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/pages.cpp?rev=33354&r1=33353&r2=33354&view=diff ============================================================================== --- trunk/client/gui-qt/pages.cpp (original) +++ trunk/client/gui-qt/pages.cpp Thu Jul 28 17:40:56 2016 @@ -21,6 +21,7 @@ #include <QFileDialog> #include <QHeaderView> #include <QLineEdit> +#include <QSplitter> #include <QTableWidget> #include <QTextEdit> #include <QTreeWidget> @@ -526,8 +527,15 @@ void fc_client::create_start_page() { QPushButton *but; + QSplitter *splitter; + QGridLayout *up_layout; + QGridLayout *down_layout; + QWidget *up_widget; + QWidget *down_widget; QStringList player_widget_list; pages_layout[PAGE_START] = new QGridLayout; + up_layout = new QGridLayout; + down_layout = new QGridLayout; start_players_tree = new QTreeWidget; pr_options = new pregame_options(); chat_line = new QLineEdit; @@ -551,37 +559,46 @@ SIGNAL(customContextMenuRequested(const QPoint&)), SLOT(start_page_menu(QPoint))); - pages_layout[PAGE_START]->addWidget(start_players_tree, 0, 0, 3, 6); - pages_layout[PAGE_START]->addWidget(pr_options, 0, 6, 3, 2); + up_layout->addWidget(start_players_tree, 0, 0, 3, 6); + up_layout->addWidget(pr_options, 0, 6, 3, 2); but = new QPushButton; but->setText(_("Disconnect")); but->setIcon(style()->standardPixmap(QStyle::SP_DialogCancelButton)); QObject::connect(but, SIGNAL(clicked()), this, SLOT(slot_disconnect())); - pages_layout[PAGE_START]->addWidget(but, 5, 4); - but = new QPushButton; - but->setText(_("Pick Nation")); - but->setIcon(fc_icons::instance()->get_icon("flag")); - pages_layout[PAGE_START]->addWidget(but, 5, 5); - QObject::connect(but, SIGNAL(clicked()), this, + down_layout->addWidget(but, 5, 4); + nation_button = new QPushButton; + nation_button->setText(_("Pick Nation")); + nation_button->setIcon(fc_icons::instance()->get_icon("flag")); + down_layout->addWidget(nation_button, 5, 5); + QObject::connect(nation_button, SIGNAL(clicked()), this, SLOT(slot_pick_nation())); obs_button = new QPushButton; obs_button->setText(_("Observe")); obs_button->setIcon(fc_icons::instance()->get_icon("meeting-observer")); - pages_layout[PAGE_START]->addWidget(obs_button, 5, 6); + down_layout->addWidget(obs_button, 5, 6); QObject::connect(obs_button, SIGNAL(clicked()), this, SLOT(slot_pregame_observe())); - but = new QPushButton; - but->setText(_("Start")); - but->setIcon(style()->standardPixmap(QStyle::SP_DialogOkButton)); - pages_layout[PAGE_START]->addWidget(but, 5, 7); - QObject::connect(but, SIGNAL(clicked()), this, + start_button = new QPushButton; + start_button->setText(_("Start")); + start_button->setIcon(style()->standardPixmap(QStyle::SP_DialogOkButton)); + down_layout->addWidget(start_button, 5, 7); + QObject::connect(start_button, SIGNAL(clicked()), this, SLOT(slot_pregame_start())); pre_vote = new pregamevote; - pages_layout[PAGE_START]->addWidget(pre_vote, 4, 0, 1, 4); - pages_layout[PAGE_START]->addWidget(chat_line, 5, 0, 1, 4); - pages_layout[PAGE_START]->addWidget(output_window, 3, 0, 1, 8); + down_layout->addWidget(pre_vote, 4, 0, 1, 4); + down_layout->addWidget(chat_line, 5, 0, 1, 4); + down_layout->addWidget(output_window, 3, 0, 1, 8); + splitter = new QSplitter; + up_widget = new QWidget(); + down_widget = new QWidget(); + up_widget->setLayout(up_layout); + down_widget->setLayout(down_layout); + splitter->addWidget(up_widget); + splitter->addWidget(down_widget); + splitter->setOrientation(Qt::Vertical); + pages_layout[PAGE_START]->addWidget(splitter); connect(chat_line, SIGNAL(returnPressed()), this, SLOT(chat())); } @@ -1454,8 +1471,6 @@ { bool sensitive; QString text; - QLayoutItem *li; - QPushButton *pb; /* Observe button */ if (client_is_observer() || client_is_global_observer()) { @@ -1502,16 +1517,11 @@ sensitive = false; } } - li = pages_layout[PAGE_START]->itemAtPosition(5, 7); - pb = qobject_cast<QPushButton *>(li->widget()); - pb->setEnabled(sensitive); - pb->setText(text); + start_button->setText(text); /* Nation button */ sensitive = game.info.is_new_game && can_client_control(); - li = pages_layout[PAGE_START]->itemAtPosition(5, 5); - pb = qobject_cast<QPushButton *>(li->widget()); - pb->setEnabled(sensitive); + nation_button->setEnabled(sensitive); sensitive = game.info.is_new_game; pr_options->setEnabled(sensitive); _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits