[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/traverso/dialogs/settings Pages.cpp
From: |
Remon Sijrier |
Subject: |
[Traverso-commit] traverso/src/traverso/dialogs/settings Pages.cpp |
Date: |
Sat, 21 Feb 2009 08:03:53 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 09/02/21 08:03:53
Modified files:
src/traverso/dialogs/settings: Pages.cpp
Log message:
* make the language selector combobox work
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.cpp?cvsroot=traverso&r1=1.47&r2=1.48
Patches:
Index: Pages.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- Pages.cpp 20 Feb 2009 22:18:45 -0000 1.47
+++ Pages.cpp 21 Feb 2009 08:03:53 -0000 1.48
@@ -448,7 +448,6 @@
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",
"LanguageFile", "").toString();
m_configpage->loadLastProjectCheckBox->setChecked(loadLastUsedProject);
m_configpage->numberOfTrackSpinBox->setValue(defaultNumTracks);
@@ -485,7 +484,6 @@
config().set_property("PlayHead", "Scrollmode", 2);
config().set_property("AudioClip", "SyncDuringDrag", false);
config().set_property("AudioClip", "LockByDefault", false);
- config().set_property("Interface", "LanguageFile", "");
load_config();
}
@@ -509,7 +507,7 @@
m_themepage = new ThemeConfigPage(this);
mainLayout->addWidget(m_themepage);
-
+ m_themepage->languageComboBox->addItem(tr("Default Language"), "");
foreach(const QString &lang, find_qm_files()) {
m_themepage->languageComboBox->addItem(language_name_from_qm_file(lang), lang);
}
@@ -538,6 +536,7 @@
config().set_property("Themer", "toolbuttonstyle",
m_themepage->toolbarStyleCombo->currentIndex());
config().set_property("Themer", "supportediconsizes",
supportedIconSizes);
config().set_property("Themer", "transportconsolesize",
m_themepage->transportConsoleCombo->currentText());
+ config().set_property("Interface", "LanguageFile",
m_themepage->languageComboBox->itemData(m_themepage->languageComboBox->currentIndex()));
}
void AppearancePage::load_config()
@@ -569,6 +568,8 @@
bool paintWaveWithLines = config().get_property("Themer",
"paintwavewithoutline", true).toBool();
bool dbGrid = config().get_property("Themer", "drawdbgrid",
false).toBool();
+ QString interfaceLanguage = config().get_property("Interface",
"LanguageFile", "").toString();
+
int index = m_themepage->styleCombo->findText(style);
m_themepage->styleCombo->setCurrentIndex(index);
index = m_themepage->themeSelecterCombo->findText(theme);
@@ -625,6 +626,12 @@
m_themepage->transportConsoleCombo->addItems(iconSizesList);
int trspsizeindex = m_themepage->iconSizeCombo->findText(trspsize);
m_themepage->transportConsoleCombo->setCurrentIndex(trspsizeindex);
+
+
+ int langIndex =
m_themepage->languageComboBox->findData(interfaceLanguage);
+ if (langIndex >= 0) {
+ m_themepage->languageComboBox->setCurrentIndex(langIndex);
+ }
}
void AppearancePage::reset_default_config()
@@ -644,6 +651,7 @@
config().set_property("Themer", "supportediconsizes", "16;22;32;48");
config().set_property("Themer", "iconsize", "22");
config().set_property("Themer", "toolbuttonstyle", 0);
+ config().set_property("Interface", "LanguageFile", "");
load_config();
}
- [Traverso-commit] traverso/src/traverso/dialogs/settings Pages.cpp,
Remon Sijrier <=