From: <j-...@us...> - 2008-03-27 01:29:18
|
Revision: 2127 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2127&view=rev Author: j-b-m Date: 2008-03-26 17:54:39 -0700 (Wed, 26 Mar 2008) Log Message: ----------- Save default profile Modified Paths: -------------- branches/KDE4/src/kdenlivesettings.kcfg branches/KDE4/src/kdenlivesettingsdialog.cpp branches/KDE4/src/kdenlivesettingsdialog.h branches/KDE4/src/profilesdialog.cpp branches/KDE4/src/widgets/configmisc_ui.ui Modified: branches/KDE4/src/kdenlivesettings.kcfg =================================================================== --- branches/KDE4/src/kdenlivesettings.kcfg 2008-03-26 22:45:42 UTC (rev 2126) +++ branches/KDE4/src/kdenlivesettings.kcfg 2008-03-27 00:54:39 UTC (rev 2127) @@ -178,6 +178,11 @@ <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> Modified: branches/KDE4/src/kdenlivesettingsdialog.cpp =================================================================== --- branches/KDE4/src/kdenlivesettingsdialog.cpp 2008-03-26 22:45:42 UTC (rev 2126) +++ branches/KDE4/src/kdenlivesettingsdialog.cpp 2008-03-27 00:54:39 UTC (rev 2127) @@ -84,12 +84,18 @@ connect(m_configCapture.kcfg_video4size, SIGNAL(editingFinished()), this, SLOT(rebuildVideo4Commands())); connect(m_configCapture.kcfg_video4rate, SIGNAL(editingFinished()), this, SLOT(rebuildVideo4Commands())); + 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)); + } + slotUpdateDisplay(); - 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() {} @@ -135,13 +141,20 @@ } 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(); } +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() { - 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")); @@ -149,6 +162,7 @@ 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"); } Modified: branches/KDE4/src/kdenlivesettingsdialog.h =================================================================== --- branches/KDE4/src/kdenlivesettingsdialog.h 2008-03-26 22:45:42 UTC (rev 2126) +++ branches/KDE4/src/kdenlivesettingsdialog.h 2008-03-27 00:54:39 UTC (rev 2127) @@ -40,6 +40,7 @@ protected: virtual bool hasChanged(); + virtual void updateSettings(); private slots: void slotUpdateDisplay(); @@ -61,7 +62,8 @@ QStringList m_mltProfilesList; QStringList m_customProfilesList; bool m_isCustomProfile; - QString m_defaulfProfile; + QString m_defaultProfile; + QString m_defaultPath; signals: void customChanged(); Modified: branches/KDE4/src/profilesdialog.cpp =================================================================== --- branches/KDE4/src/profilesdialog.cpp 2008-03-26 22:45:42 UTC (rev 2126) +++ branches/KDE4/src/profilesdialog.cpp 2008-03-27 00:54:39 UTC (rev 2127) @@ -192,7 +192,10 @@ 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 @@ -202,7 +205,10 @@ 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 >(); Modified: branches/KDE4/src/widgets/configmisc_ui.ui =================================================================== --- branches/KDE4/src/widgets/configmisc_ui.ui 2008-03-26 22:45:42 UTC (rev 2126) +++ branches/KDE4/src/widgets/configmisc_ui.ui 2008-03-27 00:54:39 UTC (rev 2127) @@ -6,7 +6,7 @@ <x>0</x> <y>0</y> <width>369</width> - <height>241</height> + <height>245</height> </rect> </property> <layout class="QGridLayout" name="gridLayout_4" > @@ -64,7 +64,7 @@ </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" > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |