[Traverso-commit] traverso/src/traverso dialogs/settings/Pages.cp...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       09/02/09 18:53:13

Modified files:
        src/traverso/dialogs/settings: Pages.cpp 
        src/traverso   : Main.cpp 

Log message:
        * language file selection improvements, now you can point traverso to 
the .qm file to be used.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.cpp?cvsroot=traverso&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Main.cpp?cvsroot=traverso&r1=1.13&r2=1.14

Patches:
Index: dialogs/settings/Pages.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- dialogs/settings/Pages.cpp  6 Feb 2009 14:39:22 -0000       1.45
+++ dialogs/settings/Pages.cpp  9 Feb 2009 18:53:12 -0000       1.46
@@ -492,7 +492,7 @@
        int scrollMode = config().get_property("PlayHead", "Scrollmode", 
2).toInt();
        bool resyncAudio = config().get_property("AudioClip", "SyncDuringDrag", 
false).toBool();
        bool lockClips = config().get_property("AudioClip", "LockByDefault", 
false).toBool();
-       QString interfaceLanguage = config().get_property("Interface", 
"language", "System Locale").toString();
+       QString interfaceLanguage = config().get_property("Interface", 
"LanguageFile", "").toString();
        
        m_configpage->loadLastProjectCheckBox->setChecked(loadLastUsedProject);
        m_configpage->numberOfTrackSpinBox->setValue(defaultNumTracks);
@@ -529,7 +529,7 @@
        config().set_property("PlayHead", "Scrollmode", 2);
        config().set_property("AudioClip", "SyncDuringDrag", false);
        config().set_property("AudioClip", "LockByDefault", false);
-       config().set_property("Interface", "language", "System Locale");
+       config().set_property("Interface", "LanguageFile", "");
        
        load_config();
 }

Index: Main.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Main.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- Main.cpp    7 Feb 2009 22:58:41 -0000       1.13
+++ Main.cpp    9 Feb 2009 18:53:12 -0000       1.14
@@ -117,11 +117,11 @@
        
        QTranslator traversoTranslator;
        QString systemLanguage = QLocale::system().name();
-       QString userLanguage = config().get_property("Interface", "Language", 
"").toString();
+       QString userLanguage = config().get_property("Interface", 
"LanguageFile", "").toString();
        if (userLanguage.isEmpty() || userLanguage.isNull()) {
                traversoTranslator.load(":/translations/traverso_" + 
systemLanguage );
        } else {
-               traversoTranslator.load(":/translations/traverso_" + 
userLanguage );
+               traversoTranslator.load(userLanguage);
        }
        traverso->installTranslator(&traversoTranslator);