Author: cazfi
Date: Fri Jan 9 23:00:21 2015
New Revision: 27598
URL: http://svn.gna.org/viewcvs/freeciv?rev=27598&view=rev
Log:
Properly convert UTF-8 string returned by gettext() to QStrings.
See bug #23138
Modified:
branches/S2_6/tools/ruledit/requirers_dlg.cpp
branches/S2_6/tools/ruledit/ruledit_qt.cpp
branches/S2_6/tools/ruledit/tab_building.cpp
branches/S2_6/tools/ruledit/tab_misc.cpp
branches/S2_6/tools/ruledit/tab_nation.cpp
branches/S2_6/tools/ruledit/tab_tech.cpp
branches/S2_6/tools/ruledit/tab_unit.cpp
Modified: branches/S2_6/tools/ruledit/requirers_dlg.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/tools/ruledit/requirers_dlg.cpp?rev=27598&r1=27597&r2=27598&view=diff
==============================================================================
--- branches/S2_6/tools/ruledit/requirers_dlg.cpp (original)
+++ branches/S2_6/tools/ruledit/requirers_dlg.cpp Fri Jan 9 23:00:21 2015
@@ -40,7 +40,7 @@
area->setReadOnly(true);
main_layout->addWidget(area, row++, 0);
- close_button = new QPushButton(R__("Close"), this);
+ close_button = new QPushButton(QString::fromUtf8(R__("Close")), this);
connect(close_button, SIGNAL(pressed()), this, SLOT(close_now()));
main_layout->addWidget(close_button, row++, 0);
@@ -52,7 +52,7 @@
**************************************************************************/
void requirers_dlg::clear(const char *title)
{
- setWindowTitle(title);
+ setWindowTitle(QString::fromUtf8(title));
area->clear();
}
@@ -67,7 +67,7 @@
* unit type, ... */
fc_snprintf(buffer, sizeof(buffer), R__("Needed by %s"), msg);
- area->append(buffer);
+ area->append(QString::fromUtf8(buffer));
}
/**************************************************************************
Modified: branches/S2_6/tools/ruledit/ruledit_qt.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/tools/ruledit/ruledit_qt.cpp?rev=27598&r1=27597&r2=27598&view=diff
==============================================================================
--- branches/S2_6/tools/ruledit/ruledit_qt.cpp (original)
+++ branches/S2_6/tools/ruledit/ruledit_qt.cpp Fri Jan 9 23:00:21 2015
@@ -57,7 +57,7 @@
{
QMainWindow *main_window;
QWidget *central;
- const QString title = R__("Freeciv Ruleset Editor");
+ const QString title = QString::fromUtf8(R__("Freeciv Ruleset Editor"));
qapp = new QApplication(argc, argv);
main_window = new QMainWindow;
@@ -139,13 +139,13 @@
version_label->setAlignment(Qt::AlignHCenter);
version_label->setParent(central);
preload_layout->addWidget(version_label);
- rs_label = new QLabel(R__("Give ruleset to use as starting point."));
+ rs_label = new QLabel(QString::fromUtf8(R__("Give ruleset to use as starting
point.")));
rs_label->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
preload_layout->addWidget(rs_label);
ruleset_select = new QLineEdit(central);
ruleset_select->setText("classic");
preload_layout->addWidget(ruleset_select);
- ruleset_accept = new QPushButton(R__("Start editing"));
+ ruleset_accept = new QPushButton(QString::fromUtf8(R__("Start editing")));
connect(ruleset_accept, SIGNAL(pressed()), this, SLOT(launch_now()));
preload_layout->addWidget(ruleset_accept);
@@ -155,15 +155,15 @@
stack = new QTabWidget(central);
misc = new tab_misc(this);
- stack->addTab(misc, R__("Misc"));
+ stack->addTab(misc, QString::fromUtf8(R__("Misc")));
tech = new tab_tech(this);
- stack->addTab(tech, R__("Tech"));
+ stack->addTab(tech, QString::fromUtf8(R__("Tech")));
bldg = new tab_building(this);
- stack->addTab(bldg, R__("Buildings"));
+ stack->addTab(bldg, QString::fromUtf8(R__("Buildings")));
unit = new tab_unit(this);
- stack->addTab(unit, R__("Units"));
+ stack->addTab(unit, QString::fromUtf8(R__("Units")));
nation = new tab_nation(this);
- stack->addTab(nation, R__("Nations"));
+ stack->addTab(nation, QString::fromUtf8(R__("Nations")));
edit_layout->addWidget(stack);
@@ -172,7 +172,7 @@
full_layout->addLayout(main_layout);
- msg_dspl = new QLabel(R__("Welcome to freeciv-ruledit"));
+ msg_dspl = new QLabel(QString::fromUtf8(R__("Welcome to freeciv-ruledit")));
msg_dspl->setParent(central);
msg_dspl->setAlignment(Qt::AlignHCenter);
@@ -217,7 +217,7 @@
**************************************************************************/
void ruledit_gui::display_msg(const char *msg)
{
- msg_dspl->setText(msg);
+ msg_dspl->setText(QString::fromUtf8(msg));
}
/**************************************************************************
Modified: branches/S2_6/tools/ruledit/tab_building.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/tools/ruledit/tab_building.cpp?rev=27598&r1=27597&r2=27598&view=diff
==============================================================================
--- branches/S2_6/tools/ruledit/tab_building.cpp (original)
+++ branches/S2_6/tools/ruledit/tab_building.cpp Fri Jan 9 23:00:21 2015
@@ -59,7 +59,7 @@
bldg_layout->setSizeConstraint(QLayout::SetMaximumSize);
- label = new QLabel(R__("Name"));
+ label = new QLabel(QString::fromUtf8(R__("Name")));
label->setParent(this);
name = new QLineEdit(this);
name->setText("None");
@@ -67,7 +67,7 @@
bldg_layout->addWidget(label, 0, 0);
bldg_layout->addWidget(name, 0, 1);
- label = new QLabel(R__("Rule Name"));
+ label = new QLabel(QString::fromUtf8(R__("Rule Name")));
label->setParent(this);
rname = new QLineEdit(this);
rname->setText("None");
@@ -75,12 +75,12 @@
bldg_layout->addWidget(label, 1, 0);
bldg_layout->addWidget(rname, 1, 1);
- add_button = new QPushButton(R__("Add Building"), this);
+ add_button = new QPushButton(QString::fromUtf8(R__("Add Building")), this);
connect(add_button, SIGNAL(pressed()), this, SLOT(add_now2()));
bldg_layout->addWidget(add_button, 5, 0);
show_experimental(add_button);
- delete_button = new QPushButton(R__("Remove this Building"), this);
+ delete_button = new QPushButton(QString::fromUtf8(R__("Remove this
Building")), this);
connect(delete_button, SIGNAL(pressed()), this, SLOT(delete_now()));
bldg_layout->addWidget(delete_button, 5, 1);
show_experimental(delete_button);
@@ -116,8 +116,8 @@
selected = pimpr;
if (selected != 0) {
- name->setText(untranslated_name(&(pimpr->name)));
- rname->setText(improvement_rule_name(pimpr));
+ name->setText(QString::fromUtf8(untranslated_name(&(pimpr->name))));
+ rname->setText(QString::fromUtf8(improvement_rule_name(pimpr)));
} else {
name->setText("None");
rname->setText("None");
Modified: branches/S2_6/tools/ruledit/tab_misc.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/tools/ruledit/tab_misc.cpp?rev=27598&r1=27597&r2=27598&view=diff
==============================================================================
--- branches/S2_6/tools/ruledit/tab_misc.cpp (original)
+++ branches/S2_6/tools/ruledit/tab_misc.cpp Fri Jan 9 23:00:21 2015
@@ -59,87 +59,87 @@
main_layout->setSizeConstraint(QLayout::SetMaximumSize);
- name_label = new QLabel(R__("Ruleset name"));
+ name_label = new QLabel(QString::fromUtf8(R__("Ruleset name")));
name_label->setParent(this);
main_layout->addWidget(name_label, row, 0);
name = new QLineEdit(this);
main_layout->addWidget(name, row++, 1);
- version_label = new QLabel(R__("Ruleset version"));
+ version_label = new QLabel(QString::fromUtf8(R__("Ruleset version")));
version_label->setParent(this);
main_layout->addWidget(version_label, row, 0);
version = new QLineEdit(this);
main_layout->addWidget(version, row++, 1);
- save_label = new QLabel(R__("Save to directory"));
+ save_label = new QLabel(QString::fromUtf8(R__("Save to directory")));
save_label->setParent(this);
main_layout->addWidget(save_label, row, 0);
savedir = new QLineEdit(this);
savedir->setText("ruledit-tmp");
savedir->setFocus();
main_layout->addWidget(savedir, row++, 1);
- save_button = new QPushButton(R__("Save now"), this);
+ save_button = new QPushButton(QString::fromUtf8(R__("Save now")), this);
connect(save_button, SIGNAL(pressed()), this, SLOT(save_now()));
main_layout->addWidget(save_button, row++, 1);
stats = new QTableWidget(this);
stats->setColumnCount(8);
stats->setRowCount(6);
- item = new QTableWidgetItem(R__("Terrains"));
+ item = new QTableWidgetItem(QString::fromUtf8(R__("Terrains")));
stats->setItem(0, 0, item);
item = new QTableWidgetItem("-");
stats->setItem(0, 1, item);
- item = new QTableWidgetItem(R__("Resources"));
+ item = new QTableWidgetItem(QString::fromUtf8(R__("Resources")));
stats->setItem(1, 0, item);
item = new QTableWidgetItem("-");
stats->setItem(1, 1, item);
- item = new QTableWidgetItem(R__("Techs"));
+ item = new QTableWidgetItem(QString::fromUtf8(R__("Techs")));
stats->setItem(2, 0, item);
item = new QTableWidgetItem("-");
stats->setItem(2, 1, item);
- item = new QTableWidgetItem(R__("Unit Classes"));
+ item = new QTableWidgetItem(QString::fromUtf8(R__("Unit Classes")));
stats->setItem(3, 0, item);
item = new QTableWidgetItem("-");
stats->setItem(3, 1, item);
- item = new QTableWidgetItem(R__("Unit Types"));
+ item = new QTableWidgetItem(QString::fromUtf8(R__("Unit Types")));
stats->setItem(4, 0, item);
item = new QTableWidgetItem("-");
stats->setItem(4, 1, item);
- item = new QTableWidgetItem(R__("Buildings"));
+ item = new QTableWidgetItem(QString::fromUtf8(R__("Buildings")));
stats->setItem(5, 0, item);
item = new QTableWidgetItem("-");
stats->setItem(5, 1, item);
- item = new QTableWidgetItem(R__("Nations"));
+ item = new QTableWidgetItem(QString::fromUtf8(R__("Nations")));
stats->setItem(0, 3, item);
item = new QTableWidgetItem("-");
stats->setItem(0, 4, item);
- item = new QTableWidgetItem(R__("Styles"));
+ item = new QTableWidgetItem(QString::fromUtf8(R__("Styles")));
stats->setItem(1, 3, item);
item = new QTableWidgetItem("-");
stats->setItem(1, 4, item);
- item = new QTableWidgetItem(R__("Specialists"));
+ item = new QTableWidgetItem(QString::fromUtf8(R__("Specialists")));
stats->setItem(2, 3, item);
item = new QTableWidgetItem("-");
stats->setItem(2, 4, item);
- item = new QTableWidgetItem(R__("Governments"));
+ item = new QTableWidgetItem(QString::fromUtf8(R__("Governments")));
stats->setItem(3, 3, item);
item = new QTableWidgetItem("-");
stats->setItem(3, 4, item);
- item = new QTableWidgetItem(R__("Disasters"));
+ item = new QTableWidgetItem(QString::fromUtf8(R__("Disasters")));
stats->setItem(4, 3, item);
item = new QTableWidgetItem("-");
stats->setItem(4, 4, item);
- item = new QTableWidgetItem(R__("Achievements"));
+ item = new QTableWidgetItem(QString::fromUtf8(R__("Achievements")));
stats->setItem(5, 3, item);
item = new QTableWidgetItem("-");
stats->setItem(5, 4, item);
- item = new QTableWidgetItem(R__("Extras"));
+ item = new QTableWidgetItem(QString::fromUtf8(R__("Extras")));
stats->setItem(0, 6, item);
item = new QTableWidgetItem("-");
stats->setItem(0, 7, item);
- item = new QTableWidgetItem(R__("Bases"));
+ item = new QTableWidgetItem(QString::fromUtf8(R__("Bases")));
stats->setItem(1, 6, item);
item = new QTableWidgetItem("-");
stats->setItem(1, 7, item);
- item = new QTableWidgetItem(R__("Roads"));
+ item = new QTableWidgetItem(QString::fromUtf8(R__("Roads")));
stats->setItem(2, 6, item);
item = new QTableWidgetItem("-");
stats->setItem(2, 7, item);
@@ -147,7 +147,7 @@
stats->horizontalHeader()->setVisible(false);
stats->setEditTriggers(QAbstractItemView::NoEditTriggers);
main_layout->addWidget(stats, row++, 0, 1, 2);
- refresh_button = new QPushButton(R__("Refresh Stats"), this);
+ refresh_button = new QPushButton(QString::fromUtf8(R__("Refresh Stats")),
this);
connect(refresh_button, SIGNAL(pressed()), this, SLOT(refresh_stats()));
main_layout->addWidget(refresh_button, row++, 0, 1, 2);
Modified: branches/S2_6/tools/ruledit/tab_nation.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/tools/ruledit/tab_nation.cpp?rev=27598&r1=27597&r2=27598&view=diff
==============================================================================
--- branches/S2_6/tools/ruledit/tab_nation.cpp (original)
+++ branches/S2_6/tools/ruledit/tab_nation.cpp Fri Jan 9 23:00:21 2015
@@ -46,11 +46,11 @@
main_layout->setSizeConstraint(QLayout::SetMaximumSize);
- via_include = new QRadioButton(R__("Use nationlist"));
+ via_include = new QRadioButton(QString::fromUtf8(R__("Use nationlist")));
main_layout->addWidget(via_include, row++, 0);
connect(via_include, SIGNAL(toggled(bool)), this,
SLOT(nationlist_toggle(bool)));
- nationlist_label = new QLabel(R__("Nationlist"));
+ nationlist_label = new QLabel(QString::fromUtf8(R__("Nationlist")));
nationlist_label->setParent(this);
main_layout->addWidget(nationlist_label, row, 0);
nationlist = new QLineEdit(this);
Modified: branches/S2_6/tools/ruledit/tab_tech.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/tools/ruledit/tab_tech.cpp?rev=27598&r1=27597&r2=27598&view=diff
==============================================================================
--- branches/S2_6/tools/ruledit/tab_tech.cpp (original)
+++ branches/S2_6/tools/ruledit/tab_tech.cpp Fri Jan 9 23:00:21 2015
@@ -59,7 +59,7 @@
tech_layout->setSizeConstraint(QLayout::SetMaximumSize);
- label = new QLabel(R__("Name"));
+ label = new QLabel(QString::fromUtf8(R__("Name")));
label->setParent(this);
name = new QLineEdit(this);
name->setText("None");
@@ -67,7 +67,7 @@
tech_layout->addWidget(label, 0, 0);
tech_layout->addWidget(name, 0, 1);
- label = new QLabel(R__("Rule Name"));
+ label = new QLabel(QString::fromUtf8(R__("Rule Name")));
label->setParent(this);
rname = new QLineEdit(this);
rname->setText("None");
@@ -75,7 +75,7 @@
tech_layout->addWidget(label, 1, 0);
tech_layout->addWidget(rname, 1, 1);
- label = new QLabel(R__("Req1"));
+ label = new QLabel(QString::fromUtf8(R__("Req1")));
label->setParent(this);
req1_button = new QToolButton();
req1_button->setParent(this);
@@ -84,7 +84,7 @@
tech_layout->addWidget(label, 2, 0);
tech_layout->addWidget(req1_button, 2, 1);
- label = new QLabel(R__("Req2"));
+ label = new QLabel(QString::fromUtf8(R__("Req2")));
label->setParent(this);
req2_button = new QToolButton();
req2 = prepare_req_button(req2_button, AR_TWO);
@@ -92,7 +92,7 @@
tech_layout->addWidget(label, 3, 0);
tech_layout->addWidget(req2_button, 3, 1);
- label = new QLabel(R__("Root Req"));
+ label = new QLabel(QString::fromUtf8(R__("Root Req")));
label->setParent(this);
root_req_button = new QToolButton();
root_req_button->setParent(this);
@@ -101,12 +101,12 @@
tech_layout->addWidget(label, 4, 0);
tech_layout->addWidget(root_req_button, 4, 1);
- add_button = new QPushButton(R__("Add tech"), this);
+ add_button = new QPushButton(QString::fromUtf8(R__("Add tech")), this);
connect(add_button, SIGNAL(pressed()), this, SLOT(add_now()));
tech_layout->addWidget(add_button, 5, 0);
show_experimental(add_button);
- delete_button = new QPushButton(R__("Remove this tech"), this);
+ delete_button = new QPushButton(QString::fromUtf8(R__("Remove this tech")),
this);
connect(delete_button, SIGNAL(pressed()), this, SLOT(delete_now()));
tech_layout->addWidget(delete_button, 5, 1);
show_experimental(delete_button);
@@ -186,10 +186,10 @@
QString tab_tech::tech_name(struct advance *padv)
{
if (padv == A_NEVER) {
- return R__("Never");
- }
-
- return advance_rule_name(padv);
+ return QString::fromUtf8(R__("Never"));
+ }
+
+ return QString::fromUtf8(advance_rule_name(padv));
}
/**************************************************************************
Modified: branches/S2_6/tools/ruledit/tab_unit.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/tools/ruledit/tab_unit.cpp?rev=27598&r1=27597&r2=27598&view=diff
==============================================================================
--- branches/S2_6/tools/ruledit/tab_unit.cpp (original)
+++ branches/S2_6/tools/ruledit/tab_unit.cpp Fri Jan 9 23:00:21 2015
@@ -59,7 +59,7 @@
unit_layout->setSizeConstraint(QLayout::SetMaximumSize);
- label = new QLabel(R__("Name"));
+ label = new QLabel(QString::fromUtf8(R__("Name")));
label->setParent(this);
name = new QLineEdit(this);
name->setText("None");
@@ -67,7 +67,7 @@
unit_layout->addWidget(label, 0, 0);
unit_layout->addWidget(name, 0, 1);
- label = new QLabel(R__("Rule Name"));
+ label = new QLabel(QString::fromUtf8(R__("Rule Name")));
label->setParent(this);
rname = new QLineEdit(this);
rname->setText("None");
@@ -75,12 +75,12 @@
unit_layout->addWidget(label, 1, 0);
unit_layout->addWidget(rname, 1, 1);
- add_button = new QPushButton(R__("Add Unit"), this);
+ add_button = new QPushButton(QString::fromUtf8(R__("Add Unit")), this);
connect(add_button, SIGNAL(pressed()), this, SLOT(add_now()));
unit_layout->addWidget(add_button, 5, 0);
show_experimental(add_button);
- delete_button = new QPushButton(R__("Remove this Unit"), this);
+ delete_button = new QPushButton(QString::fromUtf8(R__("Remove this Unit")),
this);
connect(delete_button, SIGNAL(pressed()), this, SLOT(delete_now()));
unit_layout->addWidget(delete_button, 5, 1);
show_experimental(delete_button);
@@ -116,8 +116,8 @@
selected = ptype;
if (selected != 0) {
- name->setText(untranslated_name(&(ptype->name)));
- rname->setText(utype_rule_name(ptype));
+ name->setText(QString::fromUtf8(untranslated_name(&(ptype->name))));
+ rname->setText(QString::fromUtf8(utype_rule_name(ptype)));
} else {
name->setText("None");
rname->setText("None");
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
