Compare commits

..

No commits in common. "0892fe6c6d586d2fefa4b1a03787dcc79d0b9dbe" and "302694578c7373c928301a8c33931aa3d3faa319" have entirely different histories.

6 changed files with 12 additions and 28 deletions

View File

@ -200,10 +200,6 @@ add_custom_command(TARGET ${PROJECT_NAME}
COMMAND ${CMAKE_COMMAND} -E copy_directory COMMAND ${CMAKE_COMMAND} -E copy_directory
${ProjectDIR}/workspace ${ProjectDIR}/workspace
${ProjectDIR}/bin/Release/workspace ${ProjectDIR}/bin/Release/workspace
COMMAND ${CMAKE_COMMAND} -E copy_directory
${ProjectDIR}/src/translations/
${ProjectDIR}/bin/Release/translations
# #
# COMMAND ${CMAKE_COMMAND} -E copy_directory # COMMAND ${CMAKE_COMMAND} -E copy_directory
# ${Thirdparty}/libcef/resources # ${Thirdparty}/libcef/resources

View File

@ -11,7 +11,6 @@
#include <QAction> #include <QAction>
#include "config.h" #include "config.h"
#include "common/SpdLogger.h"
template<> RecourceHelper* Singleton<RecourceHelper>::instance_ = nullptr; template<> RecourceHelper* Singleton<RecourceHelper>::instance_ = nullptr;
RecourceHelper::RecourceHelper(QObject* parent) RecourceHelper::RecourceHelper(QObject* parent)
@ -73,7 +72,7 @@ void RecourceHelper::Init() {
if (fontName.count() > 0) { if (fontName.count() > 0) {
iconFont_ = QFont(fontName.at(0)); iconFont_ = QFont(fontName.at(0));
} else { } else {
LOG_WARN("fontName count <= 0 error"); qDebug() << "fontName count <= 0 error";
} }
const QString appName = QApplication::applicationDisplayName(); const QString appName = QApplication::applicationDisplayName();
@ -84,18 +83,8 @@ void RecourceHelper::Init() {
#endif #endif
qDebug() << transName; qDebug() << transName;
bool success = trans_.load(transName); bool success = trans_.load(transName);
if (success) { if (!success) {
qDebug() << "load translations error";
}
QApplication::installTranslator(&trans_); QApplication::installTranslator(&trans_);
} else {
LOG_WARN("load translations error: {}", transName.toStdString());
}
const QString systemTransName = QString("./translations/qt_%1.qm").arg( QLocale::system().name());
success = systemTrans_.load(systemTransName);
if (success) {
QApplication::installTranslator(&systemTrans_);
} else {
LOG_WARN("load translations error: {}", systemTransName.toStdString());
}
} }

View File

@ -33,5 +33,4 @@ private:
private: private:
QFont iconFont_; QFont iconFont_;
QTranslator trans_; QTranslator trans_;
QTranslator systemTrans_;
}; };

Binary file not shown.

View File

@ -744,7 +744,7 @@
<message> <message>
<location filename="../ui/Menu/PlayManagerMenu.ui" line="14"/> <location filename="../ui/Menu/PlayManagerMenu.ui" line="14"/>
<source>PlayManagerMenu</source> <source>PlayManagerMenu</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/PlayManagerMenu.ui" line="20"/> <location filename="../ui/Menu/PlayManagerMenu.ui" line="20"/>
@ -752,12 +752,12 @@
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="150"/> <location filename="../ui/Menu/PlayManagerMenu.cpp" line="150"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="157"/> <location filename="../ui/Menu/PlayManagerMenu.cpp" line="157"/>
<source>play</source> <source>play</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/PlayManagerMenu.ui" line="27"/> <location filename="../ui/Menu/PlayManagerMenu.ui" line="27"/>
<source>stop</source> <source>stop</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/PlayManagerMenu.ui" line="55"/> <location filename="../ui/Menu/PlayManagerMenu.ui" line="55"/>
@ -777,12 +777,12 @@
<message> <message>
<location filename="../ui/Menu/PlayManagerMenu.ui" line="105"/> <location filename="../ui/Menu/PlayManagerMenu.ui" line="105"/>
<source>up</source> <source>up</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/PlayManagerMenu.ui" line="112"/> <location filename="../ui/Menu/PlayManagerMenu.ui" line="112"/>
<source>down</source> <source>down</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="34"/> <location filename="../ui/Menu/PlayManagerMenu.cpp" line="34"/>
@ -794,7 +794,7 @@
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="99"/> <location filename="../ui/Menu/PlayManagerMenu.cpp" line="99"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="106"/> <location filename="../ui/Menu/PlayManagerMenu.cpp" line="106"/>
<source>question</source> <source>question</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="34"/> <location filename="../ui/Menu/PlayManagerMenu.cpp" line="34"/>
@ -806,14 +806,14 @@
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="99"/> <location filename="../ui/Menu/PlayManagerMenu.cpp" line="99"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="106"/> <location filename="../ui/Menu/PlayManagerMenu.cpp" line="106"/>
<source>has not workspace</source> <source>has not workspace</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="48"/> <location filename="../ui/Menu/PlayManagerMenu.cpp" line="48"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="52"/> <location filename="../ui/Menu/PlayManagerMenu.cpp" line="52"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="147"/> <location filename="../ui/Menu/PlayManagerMenu.cpp" line="147"/>
<source>pause</source> <source>pause</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>

Binary file not shown.