Author: mir3x
Date: Wed Oct 1 09:36:31 2014
New Revision: 26640
URL: http://svn.gna.org/viewcvs/freeciv?rev=26640&view=rev
Log:
Added few icons to start page and city dialog
See patch #5289
Modified:
trunk/client/gui-qt/citydlg.cpp
trunk/client/gui-qt/fc_client.cpp
trunk/client/gui-qt/fc_client.h
trunk/client/gui-qt/pages.cpp
Modified: trunk/client/gui-qt/citydlg.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/citydlg.cpp?rev=26640&r1=26639&r2=26640&view=diff
==============================================================================
--- trunk/client/gui-qt/citydlg.cpp (original)
+++ trunk/client/gui-qt/citydlg.cpp Wed Oct 1 09:36:31 2014
@@ -719,7 +719,7 @@
connect(production_combo, SIGNAL(clicked()), SLOT(show_targets()));
buy_button = new QPushButton();
- buy_button->setIcon(style()->standardIcon(QStyle::SP_CommandLink));
+ buy_button->setIcon(fc_icons::instance()->get_icon("help-donate"));
connect(lcity_name, SIGNAL(clicked()), SLOT(city_rename()));
connect(buy_button, SIGNAL(clicked()), SLOT(buy()));
item_button = new QPushButton();
@@ -805,15 +805,14 @@
QGridLayout *qgrid = new QGridLayout;
QPushButton *but2 = new QPushButton;
QHBoxLayout *work_but_layout = new QHBoxLayout;
- work_next_but = new QPushButton(style()->
- standardIcon(QStyle::SP_ArrowDown), "");
- work_prev_but = new QPushButton(style()->
- standardIcon(QStyle::SP_ArrowUp), "");
- work_add_but = new QPushButton();
- work_add_but->setIcon(QIcon(*(get_arrow_sprite(tileset,
- ARROW_PLUS)->pm)));
- work_rem_but = new QPushButton(style()->standardIcon(
- QStyle::SP_DialogDiscardButton), "");
+ work_next_but = new QPushButton(fc_icons::instance()->get_icon(
+ "go-down"), "");
+ work_prev_but = new QPushButton(fc_icons::instance()->get_icon(
+ "go-up"), "");
+ work_add_but = new QPushButton(fc_icons::instance()->get_icon(
+ "list-add"), "");
+ work_rem_but = new QPushButton(fc_icons::instance()->get_icon(
+ "edit-delete"), "");
work_but_layout->addWidget(work_add_but);
work_but_layout->addWidget(work_next_but);
work_but_layout->addWidget(work_prev_but);
@@ -835,6 +834,7 @@
production_combo_p->setToolTip(_("Click to change worklist production"));
p_table_p = new QTableWidget;
buy_button_p = new QPushButton(parent);
+ buy_button_p->setIcon(fc_icons::instance()->get_icon("help-donate"));
future_targets_p = new QCheckBox;
future_targets_p->setChecked(false);
show_units_p = new QCheckBox;
Modified: trunk/client/gui-qt/fc_client.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/fc_client.cpp?rev=26640&r1=26639&r2=26640&view=diff
==============================================================================
--- trunk/client/gui-qt/fc_client.cpp (original)
+++ trunk/client/gui-qt/fc_client.cpp Wed Oct 1 09:36:31 2014
@@ -37,7 +37,7 @@
extern QApplication *qapp;
-
+fc_icons* fc_icons::m_instance = 0;
/****************************************************************************
Constructor
****************************************************************************/
@@ -682,12 +682,64 @@
font_map.insert(name,qf);
}
+/****************************************************************************
+ Game tab widget constructor
+****************************************************************************/
fc_game_tab_widget::fc_game_tab_widget(): QTabWidget()
{
connect(this, SIGNAL(currentChanged(int)), SLOT(restore_label_color(int)));
}
/****************************************************************************
+ Icon provider constructor
+****************************************************************************/
+fc_icons::fc_icons()
+{
+}
+
+/****************************************************************************
+ Returns instance of fc_icons
+****************************************************************************/
+fc_icons *fc_icons::instance()
+{
+ if (!m_instance)
+ m_instance = new fc_icons;
+ return m_instance;
+}
+
+/****************************************************************************
+ Deletes fc_icons instance
+****************************************************************************/
+void fc_icons::drop()
+{
+ if (m_instance) {
+ delete m_instance;
+ m_instance = 0;
+ }
+}
+
+/****************************************************************************
+ Returns icon by given name
+****************************************************************************/
+QIcon fc_icons::get_icon(const QString &id)
+{
+ return QIcon(fileinfoname(get_data_dirs(),
+ QString("themes/gui-qt/oxygen/"
+ + id + ".png").toLocal8Bit().data()));
+}
+
+/****************************************************************************
+ Returns path for icon
+****************************************************************************/
+QString fc_icons::get_path(const QString &id)
+{
+ return fileinfoname(get_data_dirs(),
+ QString("themes/gui-qt/oxygen/"
+ + id + ".png").toLocal8Bit().data());
+}
+
+
+/****************************************************************************
Restores black color of label
****************************************************************************/
void fc_game_tab_widget::restore_label_color(int index)
Modified: trunk/client/gui-qt/fc_client.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/fc_client.h?rev=26640&r1=26639&r2=26640&view=diff
==============================================================================
--- trunk/client/gui-qt/fc_client.h (original)
+++ trunk/client/gui-qt/fc_client.h Wed Oct 1 09:36:31 2014
@@ -79,6 +79,22 @@
class QTreeWidget;
class QStatusBar;
class QMainWindow;
+
+class fc_icons
+{
+ Q_DISABLE_COPY(fc_icons);
+
+private:
+ explicit fc_icons();
+ static fc_icons* m_instance;
+
+public:
+ static fc_icons* instance();
+ static void drop();
+ QIcon get_icon(const QString& id);
+ QString get_path(const QString& id);
+};
+
class fc_game_tab_widget: public QTabWidget
{
Modified: trunk/client/gui-qt/pages.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/pages.cpp?rev=26640&r1=26639&r2=26640&view=diff
==============================================================================
--- trunk/client/gui-qt/pages.cpp (original)
+++ trunk/client/gui-qt/pages.cpp Wed Oct 1 09:36:31 2014
@@ -534,32 +534,37 @@
QPushButton *but;
but = new QPushButton;
but->setText(_("More Game Options"));
+ but->setIcon(fc_icons::instance()->get_icon("preferences-other"));
pages_layout[PAGE_START]->addWidget(but, 5, 3);
QObject::connect(but, SIGNAL(clicked()), this,
SLOT(popup_server_options()));
pages_layout[PAGE_START]->addWidget(start_players_tree, 0, 0, 2, 8);
but = new QPushButton;
but->setText(_("Disconnect"));
+ but->setIcon(fc_icons::instance()->get_icon("network-disconnect"));
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,
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);
QObject::connect(obs_button, SIGNAL(clicked()), this,
SLOT(slot_pregame_observe()));
but = new QPushButton;
but->setText(_("Start"));
+ but->setIcon(fc_icons::instance()->get_icon("fork"));
pages_layout[PAGE_START]->addWidget(but, 5, 7);
QObject::connect(but, 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, 3);
pages_layout[PAGE_START]->addWidget(output_window, 3, 0, 1, 8);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
