svn path=/branches/KDE4/; revision=2127
<default>hdv_1080_50i</default>
</entry>
<default>hdv_1080_50i</default>
</entry>
+ <entry name="profiles_list" type="UInt">
+ <label>active project format.</label>
+ <default></default>
+ </entry>
+
<entry name="showdescriptioncolumn" type="Bool">
<label>Show descriptions in project tree view.</label>
<default>true</default>
<entry name="showdescriptioncolumn" type="Bool">
<label>Show descriptions in project tree view.</label>
<default>true</default>
connect(m_configCapture.kcfg_video4size, SIGNAL(editingFinished()), this, SLOT(rebuildVideo4Commands()));
connect(m_configCapture.kcfg_video4rate, SIGNAL(editingFinished()), this, SLOT(rebuildVideo4Commands()));
connect(m_configCapture.kcfg_video4size, SIGNAL(editingFinished()), this, SLOT(rebuildVideo4Commands()));
connect(m_configCapture.kcfg_video4rate, SIGNAL(editingFinished()), this, SLOT(rebuildVideo4Commands()));
QStringList profilesNames = ProfilesDialog::getProfileNames();
QStringList profilesNames = ProfilesDialog::getProfileNames();
- m_configMisc.profiles_list->addItems(profilesNames);
- m_defaulfProfile = ProfilesDialog::getSettingsFromFile(KdenliveSettings::default_profile()).value("description");
- if (profilesNames.contains(m_defaulfProfile)) m_configMisc.profiles_list->setCurrentItem(m_defaulfProfile);
+ m_configMisc.kcfg_profiles_list->addItems(profilesNames);
+ m_defaultProfile = ProfilesDialog::getSettingsFromFile(KdenliveSettings::default_profile()).value("description");
+ if (profilesNames.contains(m_defaultProfile)) {
+ m_configMisc.kcfg_profiles_list->setCurrentItem(m_defaultProfile);
+ KdenliveSettings::setProfiles_list(profilesNames.indexOf(m_defaultProfile));
+ }
+
- connect(m_configMisc.profiles_list, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateDisplay()));
+
+ connect(m_configMisc.kcfg_profiles_list, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateDisplay()));
}
KdenliveSettingsDialog::~KdenliveSettingsDialog() {}
}
KdenliveSettingsDialog::~KdenliveSettingsDialog() {}
}
bool KdenliveSettingsDialog::hasChanged() {
}
bool KdenliveSettingsDialog::hasChanged() {
- kDebug() << "// // // KCONFIG hasChanged called";
- if (m_configMisc.profiles_list->currentText() != m_defaulfProfile) return true;
+ kDebug() << "// // // KCONFIG hasChanged called: " << m_configMisc.kcfg_profiles_list->currentText() << ", " << m_defaultProfile;
+ if (m_configMisc.kcfg_profiles_list->currentText() != m_defaultProfile) return true;
return KConfigDialog::hasChanged();
}
return KConfigDialog::hasChanged();
}
+void KdenliveSettingsDialog::updateSettings() {
+ kDebug() << "// // // KCONFIG UPDATE called";
+ m_defaultProfile = m_configMisc.kcfg_profiles_list->currentText();
+ KdenliveSettings::setDefault_profile(m_defaultPath);
+ KConfigDialog::updateSettings();
+}
+
void KdenliveSettingsDialog::slotUpdateDisplay() {
void KdenliveSettingsDialog::slotUpdateDisplay() {
- QString currentProfile = m_configMisc.profiles_list->currentText();
+ QString currentProfile = m_configMisc.kcfg_profiles_list->currentText();
QMap< QString, QString > values = ProfilesDialog::getSettingsForProfile(currentProfile);
m_configMisc.p_size->setText(values.value("width") + "x" + values.value("height"));
m_configMisc.p_fps->setText(values.value("frame_rate_num") + "/" + values.value("frame_rate_den"));
QMap< QString, QString > values = ProfilesDialog::getSettingsForProfile(currentProfile);
m_configMisc.p_size->setText(values.value("width") + "x" + values.value("height"));
m_configMisc.p_fps->setText(values.value("frame_rate_num") + "/" + values.value("frame_rate_den"));
m_configMisc.p_display->setText(values.value("display_aspect_num") + "/" + values.value("display_aspect_den"));
if (values.value("progressive").toInt() == 0) m_configMisc.p_progressive->setText(i18n("Interlaced"));
else m_configMisc.p_progressive->setText(i18n("Progressive"));
m_configMisc.p_display->setText(values.value("display_aspect_num") + "/" + values.value("display_aspect_den"));
if (values.value("progressive").toInt() == 0) m_configMisc.p_progressive->setText(i18n("Interlaced"));
else m_configMisc.p_progressive->setText(i18n("Progressive"));
+ m_defaultPath = values.value("path");
protected:
virtual bool hasChanged();
protected:
virtual bool hasChanged();
+ virtual void updateSettings();
private slots:
void slotUpdateDisplay();
private slots:
void slotUpdateDisplay();
QStringList m_mltProfilesList;
QStringList m_customProfilesList;
bool m_isCustomProfile;
QStringList m_mltProfilesList;
QStringList m_customProfilesList;
bool m_isCustomProfile;
- QString m_defaulfProfile;
+ QString m_defaultProfile;
+ QString m_defaultPath;
signals:
void customChanged();
signals:
void customChanged();
for (int i = 0; i < profilesFiles.size(); ++i) {
KConfig confFile(KdenliveSettings::mltpath() + "/" + profilesFiles.at(i));
QMap< QString, QString > values = confFile.entryMap();
for (int i = 0; i < profilesFiles.size(); ++i) {
KConfig confFile(KdenliveSettings::mltpath() + "/" + profilesFiles.at(i));
QMap< QString, QString > values = confFile.entryMap();
- if (values.value("description") == profileName) return values;
+ if (values.value("description") == profileName) {
+ values.insert("path", profilesFiles.at(i));
+ return values;
+ }
}
// List custom profiles
}
// List custom profiles
for (int i = 0; i < profiles.size(); ++i) {
KConfig confFile(customProfiles.at(i) + "/" + profiles.at(i));
QMap< QString, QString > values = confFile.entryMap();
for (int i = 0; i < profiles.size(); ++i) {
KConfig confFile(customProfiles.at(i) + "/" + profiles.at(i));
QMap< QString, QString > values = confFile.entryMap();
- if (values.value("description") == profileName) return values;
+ if (values.value("description") == profileName) {
+ values.insert("path", customProfiles.at(i) + "/" + profiles.at(i));
+ return values;
+ }
}
}
return QMap< QString, QString >();
}
}
return QMap< QString, QString >();
<x>0</x>
<y>0</y>
<width>369</width>
<x>0</x>
<y>0</y>
<width>369</width>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_4" >
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_4" >
</widget>
</item>
<item row="0" column="1" >
</widget>
</item>
<item row="0" column="1" >
- <widget class="KComboBox" name="profiles_list" />
+ <widget class="KComboBox" name="kcfg_profiles_list" />
</item>
<item row="1" column="0" colspan="2" >
<layout class="QGridLayout" name="gridLayout" >
</item>
<item row="1" column="0" colspan="2" >
<layout class="QGridLayout" name="gridLayout" >