kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Qt4/Qt5 neutral changes:

Browse Source 
+ remove QCoreApplication::UnicodeUTF8/QApplication::UnicodeUTF8
+ remove QCoreApplication::CodecForTr/QApplication::CodecForTr
This commit is contained in:
wmayer
2016-12-12 14:52:09 +01:00
parent 25cfb0bc1e
commit d2cb4e4af9
13 changed files with 95 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mod/Drawing/Gui/Command.cpp
View File

@@ -215,36 +215,32 @@ void CmdDrawingNewPage::languageChange()
int id = (*it)->property("TemplateId").toInt();
QString orientation = (*it)->property("TemplateOrientation").toString();
if (orientation.compare(QLatin1String("landscape"), Qt::CaseInsensitive) == 0)
orientation = QCoreApplication::translate("Drawing_NewPage", "Landscape", 0, QCoreApplication::CodecForTr);
orientation = QCoreApplication::translate("Drawing_NewPage", "Landscape");
else if (orientation.compare(QLatin1String("portrait"), Qt::CaseInsensitive) == 0)
orientation = QCoreApplication::translate("Drawing_NewPage", "Portrait", 0, QCoreApplication::CodecForTr);
orientation = QCoreApplication::translate("Drawing_NewPage", "Portrait");
QString info = (*it)->property("TemplateInfo").toString();
if (info.isEmpty()) {
(*it)->setText(QCoreApplication::translate(
"Drawing_NewPage", "%1%2 %3", 0,
QCoreApplication::CodecForTr)
"Drawing_NewPage", "%1%2 %3")
.arg(paper)
.arg(id)
.arg(orientation));
(*it)->setToolTip(QCoreApplication::translate(
"Drawing_NewPage", "Insert new %1%2 %3 drawing", 0,
QCoreApplication::CodecForTr)
"Drawing_NewPage", "Insert new %1%2 %3 drawing")
.arg(paper)
.arg(id)
.arg(orientation));
}
else {
(*it)->setText(QCoreApplication::translate(
"Drawing_NewPage", "%1%2 %3 (%4)", 0,
QCoreApplication::CodecForTr)
"Drawing_NewPage", "%1%2 %3 (%4)")
.arg(paper)
.arg(id)
.arg(orientation)
.arg(info));
(*it)->setToolTip(QCoreApplication::translate(
"Drawing_NewPage", "Insert new %1%2 %3 (%4) drawing", 0,
QCoreApplication::CodecForTr)
"Drawing_NewPage", "Insert new %1%2 %3 (%4) drawing")
.arg(paper)
.arg(id)
.arg(orientation)

38
src/Mod/Sandbox/Gui/TaskPanelView.cpp
View File

@@ -172,18 +172,18 @@ public:
void retranslateUi(QWidget *MainWindow2)
{
MainWindow2->setWindowTitle(QApplication::translate("MainWindow2", "ActionBox Example", 0, QApplication::UnicodeUTF8));
actionNew->setText(QApplication::translate("MainWindow2", "Create new file", 0, QApplication::UnicodeUTF8));
actionLoad->setText(QApplication::translate("MainWindow2", "Load a file", 0, QApplication::UnicodeUTF8));
actionSave->setText(QApplication::translate("MainWindow2", "Save current file", 0, QApplication::UnicodeUTF8));
actionPrint->setText(QApplication::translate("MainWindow2", "Print file contents", 0, QApplication::UnicodeUTF8));
ActionGroup1->setProperty("headerText", QVariant(QApplication::translate("MainWindow2", "Choose Scheme", 0, QApplication::UnicodeUTF8)));
rbDefaultScheme->setText(QApplication::translate("MainWindow2", "Default", 0, QApplication::UnicodeUTF8));
rbXPBlueScheme->setText(QApplication::translate("MainWindow2", "XP Blue", 0, QApplication::UnicodeUTF8));
rbXPBlue2Scheme->setText(QApplication::translate("MainWindow2", "XP Blue 2", 0, QApplication::UnicodeUTF8));
rbVistaScheme->setText(QApplication::translate("MainWindow2", "Vista", 0, QApplication::UnicodeUTF8));
rbMacScheme->setText(QApplication::translate("MainWindow2", "MacOS", 0, QApplication::UnicodeUTF8));
rbAndroidScheme->setText(QApplication::translate("MainWindow2", "Android", 0, QApplication::UnicodeUTF8));
MainWindow2->setWindowTitle(QApplication::translate("MainWindow2", "ActionBox Example"));
actionNew->setText(QApplication::translate("MainWindow2", "Create new file"));
actionLoad->setText(QApplication::translate("MainWindow2", "Load a file"));
actionSave->setText(QApplication::translate("MainWindow2", "Save current file"));
actionPrint->setText(QApplication::translate("MainWindow2", "Print file contents"));
ActionGroup1->setProperty("headerText", QVariant(QApplication::translate("MainWindow2", "Choose Scheme")));
rbDefaultScheme->setText(QApplication::translate("MainWindow2", "Default"));
rbXPBlueScheme->setText(QApplication::translate("MainWindow2", "XP Blue"));
rbXPBlue2Scheme->setText(QApplication::translate("MainWindow2", "XP Blue 2"));
rbVistaScheme->setText(QApplication::translate("MainWindow2", "Vista"));
rbMacScheme->setText(QApplication::translate("MainWindow2", "MacOS"));
rbAndroidScheme->setText(QApplication::translate("MainWindow2", "Android"));
Q_UNUSED(MainWindow2);
} // retranslateUi
@@ -351,15 +351,15 @@ public:
void retranslateUi(QWidget *MainWindow)
{
MainWindow->setWindowTitle(QApplication::translate("TestTaskBox", "ActionBox Example", 0, QApplication::UnicodeUTF8));
label->setText(QApplication::translate("TestTaskBox", "ActionBoxes", 0, QApplication::UnicodeUTF8));
label_2->setText(QApplication::translate("TestTaskBox", "ActionLabels", 0, QApplication::UnicodeUTF8));
ActionLabel1->setText(QApplication::translate("TestTaskBox", "Simple clickable action", 0, QApplication::UnicodeUTF8));
ActionLabel2->setText(QApplication::translate("TestTaskBox", "Simple clickable action with icon", 0, QApplication::UnicodeUTF8));
MainWindow->setWindowTitle(QApplication::translate("TestTaskBox", "ActionBox Example"));
label->setText(QApplication::translate("TestTaskBox", "ActionBoxes"));
label_2->setText(QApplication::translate("TestTaskBox", "ActionLabels"));
ActionLabel1->setText(QApplication::translate("TestTaskBox", "Simple clickable action"));
ActionLabel2->setText(QApplication::translate("TestTaskBox", "Simple clickable action with icon"));
#ifndef QT_NO_TOOLTIP
ActionLabel3->setToolTip(QApplication::translate("TestTaskBox", "Tooltip of the ActionLabel", 0, QApplication::UnicodeUTF8));
ActionLabel3->setToolTip(QApplication::translate("TestTaskBox", "Tooltip of the ActionLabel"));
#endif // QT_NO_TOOLTIP
ActionLabel3->setText(QApplication::translate("TestTaskBox", "Simple clickable action with icon and tooltip", 0, QApplication::UnicodeUTF8));
ActionLabel3->setText(QApplication::translate("TestTaskBox", "Simple clickable action with icon and tooltip"));
Q_UNUSED(MainWindow);
} // retranslateUi
};