From 4c196ae239d06158e8dc4224b826d4abdb5a26b6 Mon Sep 17 00:00:00 2001 From: Till Theato Date: Wed, 28 Jul 2010 09:39:46 +0000 Subject: [PATCH] - Settings dialog: rename "Display" tab to "Timeline" - update groups in settings file svn path=/trunk/kdenlive/; revision=4660 --- src/CMakeLists.txt | 2 +- src/kdenlivesettings.kcfg | 28 ++++--- src/kdenlivesettingsdialog.cpp | 16 ++-- src/kdenlivesettingsdialog.h | 4 +- src/widgets/configmisc_ui.ui | 15 +--- src/widgets/configtimeline_ui.ui | 132 +++++++++++++++++++++++++++++++ 6 files changed, 166 insertions(+), 31 deletions(-) create mode 100644 src/widgets/configtimeline_ui.ui diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9152782b..dff5a77f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -45,7 +45,7 @@ kde4_add_ui_files(kdenlive_UI widgets/slideshowclip_ui.ui widgets/configmisc_ui.ui widgets/configenv_ui.ui - widgets/configdisplay_ui.ui + widgets/configtimeline_ui.ui widgets/configsdl_ui.ui widgets/configcapture_ui.ui widgets/configtranscode_ui.ui diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg index 21f197d0..27fe7fd1 100644 --- a/src/kdenlivesettings.kcfg +++ b/src/kdenlivesettings.kcfg @@ -1,7 +1,9 @@ + + @@ -37,7 +39,9 @@ 00:00:05:00 + + 3 @@ -52,14 +56,9 @@ - - - - false - - + true @@ -95,9 +94,9 @@ 50 - - - 0 + + + false @@ -107,6 +106,11 @@ 0 + + + 0 + + @@ -268,7 +272,6 @@ - -qscale 1 -ab 224k @@ -398,6 +401,7 @@ capture + @@ -559,14 +563,16 @@ false + 320 + 240 - + diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp index 57989fdb..9ddc792d 100644 --- a/src/kdenlivesettingsdialog.cpp +++ b/src/kdenlivesettingsdialog.cpp @@ -59,8 +59,8 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent) : m_page8 = addPage(p8, i18n("Project Defaults"), "document-new"); QWidget *p3 = new QWidget; - m_configDisplay.setupUi(p3); - m_page3 = addPage(p3, i18n("Display"), "video-display"); + m_configTimeline.setupUi(p3); + m_page3 = addPage(p3, i18n("Timeline"), "video-display"); QWidget *p2 = new QWidget; m_configEnv.setupUi(p2); @@ -186,8 +186,10 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent) : QString rmdpath = KStandardDirs::findExe("recordmydesktop"); KdenliveSettings::setRmd_path(rmdpath); } - if (KdenliveSettings::rmd_path().isEmpty()) m_configCapture.rmd_info->setText(i18n("Recordmydesktop utility not found, please install it for screen grabs")); - else m_configCapture.rmd_info->setText(i18n("Recordmydesktop found at: %1", KdenliveSettings::rmd_path())); + if (KdenliveSettings::rmd_path().isEmpty()) + m_configCapture.rmd_info->setText(i18n("Recordmydesktop utility not found, please install it for screen grabs")); + else + m_configCapture.rmd_info->setText(i18n("Recordmydesktop found at: %1", KdenliveSettings::rmd_path())); } KdenliveSettingsDialog::~KdenliveSettingsDialog() {} @@ -520,8 +522,10 @@ void KdenliveSettingsDialog::slotUpdateDisplay() m_configProject.p_fps->setText(values.value("frame_rate_num") + '/' + values.value("frame_rate_den")); m_configProject.p_aspect->setText(values.value("sample_aspect_num") + '/' + values.value("sample_aspect_den")); m_configProject.p_display->setText(values.value("display_aspect_num") + '/' + values.value("display_aspect_den")); - if (values.value("progressive").toInt() == 0) m_configProject.p_progressive->setText(i18n("Interlaced")); - else m_configProject.p_progressive->setText(i18n("Progressive")); + if (values.value("progressive").toInt() == 0) + m_configProject.p_progressive->setText(i18n("Interlaced")); + else + m_configProject.p_progressive->setText(i18n("Progressive")); m_defaultProfile = m_configProject.kcfg_profiles_list->itemText(m_configProject.kcfg_profiles_list->currentIndex()); m_defaultPath = currentProfile; } diff --git a/src/kdenlivesettingsdialog.h b/src/kdenlivesettingsdialog.h index d167dda0..b41e691d 100644 --- a/src/kdenlivesettingsdialog.h +++ b/src/kdenlivesettingsdialog.h @@ -28,7 +28,7 @@ #include "ui_configmisc_ui.h" #include "ui_configenv_ui.h" -#include "ui_configdisplay_ui.h" +#include "ui_configtimeline_ui.h" #include "ui_configcapture_ui.h" #include "ui_configjogshuttle_ui.h" #include "ui_configsdl_ui.h" @@ -77,7 +77,7 @@ private: KPageWidgetItem *m_page8; Ui::ConfigEnv_UI m_configEnv; Ui::ConfigMisc_UI m_configMisc; - Ui::ConfigDisplay_UI m_configDisplay; + Ui::ConfigTimeline_UI m_configTimeline; Ui::ConfigCapture_UI m_configCapture; Ui::ConfigJogShuttle_UI m_configShuttle; Ui::ConfigSdl_UI m_configSdl; diff --git a/src/widgets/configmisc_ui.ui b/src/widgets/configmisc_ui.ui index b9cfacad..5d43df74 100644 --- a/src/widgets/configmisc_ui.ui +++ b/src/widgets/configmisc_ui.ui @@ -6,8 +6,8 @@ 0 0 - 298 - 220 + 348 + 215 @@ -32,7 +32,7 @@ - + Default Durations @@ -83,7 +83,7 @@ - + Qt::Vertical @@ -103,13 +103,6 @@ - - - - Automatically split audio from video - - - diff --git a/src/widgets/configtimeline_ui.ui b/src/widgets/configtimeline_ui.ui new file mode 100644 index 00000000..d4a5f5c9 --- /dev/null +++ b/src/widgets/configtimeline_ui.ui @@ -0,0 +1,132 @@ + + + ConfigTimeline_UI + + + + 0 + 0 + 398 + 213 + + + + + + + Thumbnails + + + + + + Video + + + + + + + Qt::Horizontal + + + + 96 + 20 + + + + + + + + Audio + + + + + + + Normalise audio for thumbnails + + + + + + + + + + Display clip markers comments + + + + + + + Autoscroll while playing + + + + + + + Track height + + + + + + + 10 + + + 10 + + + + + + + Qt::Horizontal + + + + 166 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 23 + + + + + + + + Zoom using vertical drag in ruler + + + + + + + Automatically split audio and video + + + + + + + + -- 2.39.2