Author: cazfi
Date: Mon Jul 11 20:53:33 2016
New Revision: 33220
URL: http://svn.gna.org/viewcvs/freeciv?rev=33220&view=rev
Log:
Added tech_class statistics display to ruledit.
See patch #7414
Modified:
trunk/tools/ruledit/tab_misc.cpp
Modified: trunk/tools/ruledit/tab_misc.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/tab_misc.cpp?rev=33220&r1=33219&r2=33220&view=diff
==============================================================================
--- trunk/tools/ruledit/tab_misc.cpp (original)
+++ trunk/tools/ruledit/tab_misc.cpp Mon Jul 11 20:53:33 2016
@@ -98,62 +98,66 @@
stats->setItem(1, 0, item);
item = new QTableWidgetItem("-");
stats->setItem(1, 1, item);
+ item = new QTableWidgetItem(QString::fromUtf8(RQ_("?stat:Tech Classes")));
+ stats->setItem(2, 0, item);
+ item = new QTableWidgetItem("-");
+ stats->setItem(2, 1, item);
item = new QTableWidgetItem(QString::fromUtf8(RQ_("?stat:Techs")));
- stats->setItem(2, 0, item);
- item = new QTableWidgetItem("-");
- stats->setItem(2, 1, item);
+ stats->setItem(3, 0, item);
+ item = new QTableWidgetItem("-");
+ stats->setItem(3, 1, item);
item = new QTableWidgetItem(QString::fromUtf8(RQ_("?stat:Unit Classes")));
- stats->setItem(3, 0, item);
- item = new QTableWidgetItem("-");
- stats->setItem(3, 1, item);
+ stats->setItem(4, 0, item);
+ item = new QTableWidgetItem("-");
+ stats->setItem(4, 1, item);
item = new QTableWidgetItem(QString::fromUtf8(RQ_("?stat:Unit Types")));
- stats->setItem(4, 0, item);
- item = new QTableWidgetItem("-");
- stats->setItem(4, 1, item);
+ stats->setItem(5, 0, item);
+ item = new QTableWidgetItem("-");
+ stats->setItem(5, 1, item);
item = new QTableWidgetItem(QString::fromUtf8(RQ_("?stat:Buildings")));
- stats->setItem(5, 0, item);
- item = new QTableWidgetItem("-");
- stats->setItem(5, 1, item);
+ stats->setItem(0, 3, item);
+ item = new QTableWidgetItem("-");
+ stats->setItem(0, 4, item);
item = new QTableWidgetItem(QString::fromUtf8(RQ_("?stat:Nations")));
- stats->setItem(0, 3, item);
- item = new QTableWidgetItem("-");
- stats->setItem(0, 4, item);
+ stats->setItem(1, 3, item);
+ item = new QTableWidgetItem("-");
+ stats->setItem(1, 4, item);
item = new QTableWidgetItem(QString::fromUtf8(RQ_("?stat:Styles")));
- stats->setItem(1, 3, item);
- item = new QTableWidgetItem("-");
- stats->setItem(1, 4, item);
+ stats->setItem(2, 3, item);
+ item = new QTableWidgetItem("-");
+ stats->setItem(2, 4, item);
item = new QTableWidgetItem(QString::fromUtf8(RQ_("?stat:Specialists")));
- stats->setItem(2, 3, item);
- item = new QTableWidgetItem("-");
- stats->setItem(2, 4, item);
+ stats->setItem(3, 3, item);
+ item = new QTableWidgetItem("-");
+ stats->setItem(3, 4, item);
item = new QTableWidgetItem(QString::fromUtf8(RQ_("?stat:Governments")));
- stats->setItem(3, 3, item);
- item = new QTableWidgetItem("-");
- stats->setItem(3, 4, item);
+ stats->setItem(4, 3, item);
+ item = new QTableWidgetItem("-");
+ stats->setItem(4, 4, item);
item = new QTableWidgetItem(QString::fromUtf8(RQ_("?stat:Disasters")));
- stats->setItem(4, 3, item);
- item = new QTableWidgetItem("-");
- stats->setItem(4, 4, item);
+ stats->setItem(5, 3, item);
+ item = new QTableWidgetItem("-");
+ stats->setItem(5, 4, item);
item = new QTableWidgetItem(QString::fromUtf8(RQ_("?stat:Achievements")));
- stats->setItem(5, 3, item);
- item = new QTableWidgetItem("-");
- stats->setItem(5, 4, item);
+ stats->setItem(0, 6, item);
+ item = new QTableWidgetItem("-");
+ stats->setItem(0, 7, item);
item = new QTableWidgetItem(QString::fromUtf8(RQ_("?stat:Extras")));
- stats->setItem(0, 6, item);
- item = new QTableWidgetItem("-");
- stats->setItem(0, 7, item);
+ stats->setItem(1, 6, item);
+ item = new QTableWidgetItem("-");
+ stats->setItem(1, 7, item);
item = new QTableWidgetItem(QString::fromUtf8(RQ_("?stat:Bases")));
- stats->setItem(1, 6, item);
- item = new QTableWidgetItem("-");
- stats->setItem(1, 7, item);
+ stats->setItem(2, 6, item);
+ item = new QTableWidgetItem("-");
+ stats->setItem(2, 7, item);
item = new QTableWidgetItem(QString::fromUtf8(RQ_("?stat:Roads")));
- stats->setItem(2, 6, item);
- item = new QTableWidgetItem("-");
- stats->setItem(2, 7, item);
+ stats->setItem(3, 6, item);
+ item = new QTableWidgetItem("-");
+ stats->setItem(3, 7, item);
item = new QTableWidgetItem(QString::fromUtf8(RQ_("?stat:Goods")));
- stats->setItem(3, 6, item);
- item = new QTableWidgetItem("-");
- stats->setItem(3, 7, item);
+ stats->setItem(4, 6, item);
+ item = new QTableWidgetItem("-");
+ stats->setItem(4, 7, item);
stats->verticalHeader()->setVisible(false);
stats->horizontalHeader()->setVisible(false);
stats->setEditTriggers(QAbstractItemView::NoEditTriggers);
@@ -236,6 +240,12 @@
stats->item(row++,
1)->setText(QString::number(game.control.num_resource_types));
count = 0;
+ tech_class_active_iterate(ptclass) {
+ count++;
+ } tech_class_active_iterate_end;
+ stats->item(row++, 1)->setText(QString::number(count));
+
+ count = 0;
advance_active_iterate(padv) {
count++;
} advance_active_iterate_end;
@@ -249,23 +259,23 @@
} unit_active_type_iterate_end;
stats->item(row++, 1)->setText(QString::number(count));
- count = 0;
- improvement_active_iterate(pimpr) {
- count++;
- } improvement_active_iterate_end;
- stats->item(row++, 1)->setText(QString::number(count));
-
// Second column
row = 0;
+ count = 0;
+ improvement_active_iterate(pimpr) {
+ count++;
+ } improvement_active_iterate_end;
+ stats->item(row++, 4)->setText(QString::number(count));
+
stats->item(row++, 4)->setText(QString::number(game.control.nation_count));
stats->item(row++, 4)->setText(QString::number(game.control.styles_count));
stats->item(row++,
4)->setText(QString::number(game.control.num_specialist_types));
stats->item(row++,
4)->setText(QString::number(game.control.government_count));
stats->item(row++,
4)->setText(QString::number(game.control.num_disaster_types));
- stats->item(row++,
4)->setText(QString::number(game.control.num_achievement_types));
// Third column
row = 0;
+ stats->item(row++,
7)->setText(QString::number(game.control.num_achievement_types));
stats->item(row++,
7)->setText(QString::number(game.control.num_extra_types));
stats->item(row++, 7)->setText(QString::number(game.control.num_base_types));
stats->item(row++, 7)->setText(QString::number(game.control.num_road_types));
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
