Skip to content
Snippets Groups Projects
Commit 93d8b750 authored by SeeLook's avatar SeeLook
Browse files

Removed unused QTranslator load

parent 8f0c03d8
No related branches found
No related tags found
No related merge requests found
......@@ -12,7 +12,7 @@
============================================================================
====== BUGS AND ISSUES ===============================================
- correction on the score has to display name in question style
- result tip with mistakes texts may be too long
MINOR:
- when instrument in new exercise changes:
......@@ -29,11 +29,12 @@ MINOR:
- disable shortcuts (KDE styles) or change text to icon on buttons to select instrument and used string (range settings)
- there is a way to calculate max width of navbar (base settings class) and avoid horizontal scroll bar
- There is unused class TnotePixmap only with default clef - use it or delete
- changing to/from grand staff overrides TscoreNote ambitus - there is no problem as long as ambitus is unused
- selecting read only notes (right and double click) is unused - it is good - but clean a code
- revert to native style under MacOs when Qt5
- check twice deb package Qt dependencies
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@@@@@@@@@@@@ FEATURES FOR FURTHER RELEASES @@@@@@@@@@@@@@@@@@@@@@@
......@@ -45,7 +46,7 @@ MINOR:
- make exam summary pretty
- certificates would have some additional data about melodies
- divide TexamExecutor class !!!!!
- rhythms in score
- dialog to configure generated melody and its rhythms
- rhythms in level and exercise/exam
......
......@@ -57,8 +57,7 @@ bool initCoreLibrary() {
}
void prepareTranslations(QApplication* a, QTranslator& qt, QTranslator& qtBase, QTranslator& noo) {
Q_UNUSED(qtBase) // TODO take it at all
void prepareTranslations(QApplication* a, QTranslator& qt, QTranslator& noo) {
QString ll = "";
if (Tcore::gl())
ll = Tcore::gl()->lang;
......@@ -66,13 +65,10 @@ void prepareTranslations(QApplication* a, QTranslator& qt, QTranslator& qtBase,
ll = QString(std::getenv("LANG"));// QLocale::system().name();
#if defined(Q_OS_LINUX)
qt.load("qt_" + ll, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
// qtBase.load("qtbase_" + ll, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
#else
qt.load("qt_" + ll, Tcore::gl()->path + "lang");
// qtBase.load("qtbase_" + ll, Tcore::gl()->path + "lang");
#endif
a->installTranslator(&qt);
// a->installTranslator(&qtBase);
noo.load("nootka_" + ll, Tcore::gl()->path + "lang");
a->installTranslator(&noo);
......
/***************************************************************************
* Copyright (C) 2014 by Tomasz Bojczuk *
* Copyright (C) 2014-2015 by Tomasz Bojczuk *
* tomaszbojczuk@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
......@@ -55,8 +55,8 @@ private:
NOOTKACORE_EXPORT bool initCoreLibrary();
/** Loads translations files for appropriate language (system or user preferred)
* Translator object has to be created first. */
NOOTKACORE_EXPORT void prepareTranslations(QApplication* a, QTranslator& qt, QTranslator& qtBase, QTranslator& noo);
* Translator object has to be created before. */
NOOTKACORE_EXPORT void prepareTranslations(QApplication* a, QTranslator& qt, QTranslator& noo);
/** Checks nootka.ttf file and loads it. Returns true if successful.
* libNootkaCore has to be initialized first by initCoreLibrary() */
......
/***************************************************************************
* Copyright (C) 2011-2014 by Tomasz Bojczuk *
* Copyright (C) 2011-2015 by Tomasz Bojczuk *
* tomaszbojczuk@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
......@@ -26,6 +26,7 @@
#include <QTranslator>
/** It allows to grab all debug messages into nootka-log.txt file */
void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) {
if (type == QtDebugMsg) {
QFile outFile("nootka-log.txt");
......@@ -44,7 +45,6 @@ int main(int argc, char *argv[])
{
// qInstallMessageHandler(myMessageOutput);
QTranslator qtTranslator;
// QTranslator qtbaseTranslator;
QTranslator nooTranslator;
QPointer<QApplication> a = 0;
MainWindow *w = 0;
......@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
confFile = gl->config->fileName();
if (!initCoreLibrary())
return 110;
prepareTranslations(a, qtTranslator, nooTranslator, nooTranslator); // 2nd argument is unused
prepareTranslations(a, qtTranslator, nooTranslator);
if (!loadNootkaFont(a))
return 111;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment