X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=11b87847377ec34e3e6a319d1928e7f82c91af37;hb=f77746744a2b7c21dadfcc4fc364d41a9ee10d81;hp=13aa01b4c8ccb7f0fe01ddd98dd502ccab4307ee;hpb=2de6a4383d1837c573e064307cd7f8d82eec6b6b;p=kdenlive diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 13aa01b4..11b87847 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -52,13 +52,19 @@ #include "kdenlive-config.h" #include "cliptranscode.h" #include "ui_templateclip_ui.h" +#include "vectorscope.h" +#include "waveform.h" +#include "rgbparade.h" +#include "histogram.h" #include #include #include #include #include +#include #include +#include #include #include #include @@ -138,6 +144,8 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent m_timelineArea = new KTabWidget(this); m_timelineArea->setTabReorderingEnabled(true); m_timelineArea->setTabBarHidden(true); + m_timelineArea->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred); + m_timelineArea->setMinimumHeight(200); QToolButton *closeTabButton = new QToolButton; connect(closeTabButton, SIGNAL(clicked()), this, SLOT(closeCurrentDocument())); @@ -156,23 +164,18 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent m_monitorManager = new MonitorManager(); + m_shortcutRemoveFocus = new QShortcut(QKeySequence("Esc"), this); + connect(m_shortcutRemoveFocus, SIGNAL(activated()), this, SLOT(slotRemoveFocus())); + + + /// Add Widgets /// + m_projectListDock = new QDockWidget(i18n("Project Tree"), this); m_projectListDock->setObjectName("project_tree"); m_projectList = new ProjectList(this); m_projectListDock->setWidget(m_projectList); addDockWidget(Qt::TopDockWidgetArea, m_projectListDock); - m_shortcutRemoveFocus = new QShortcut(QKeySequence("Esc"), this); - connect(m_shortcutRemoveFocus, SIGNAL(activated()), this, SLOT(slotRemoveFocus())); - - m_effectListDock = new QDockWidget(i18n("Effect List"), this); - m_effectListDock->setObjectName("effect_list"); - m_effectList = new EffectsListView(); - - //m_effectList = new KListWidget(this); - m_effectListDock->setWidget(m_effectList); - addDockWidget(Qt::TopDockWidgetArea, m_effectListDock); - m_effectStackDock = new QDockWidget(i18n("Effect Stack"), this); m_effectStackDock->setObjectName("effect_stack"); m_effectStack = new EffectStackView(this); @@ -185,20 +188,11 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent m_transitionConfigDock->setWidget(m_transitionConfig); addDockWidget(Qt::TopDockWidgetArea, m_transitionConfigDock); - KdenliveSettings::setCurrent_profile(KdenliveSettings::default_profile()); - m_fileOpenRecent = KStandardAction::openRecent(this, SLOT(openFile(const KUrl &)), actionCollection()); - readOptions(); - m_fileRevert = KStandardAction::revert(this, SLOT(slotRevert()), actionCollection()); - m_fileRevert->setEnabled(false); - - //slotDetectAudioDriver(); - m_clipMonitorDock = new QDockWidget(i18n("Clip Monitor"), this); m_clipMonitorDock->setObjectName("clip_monitor"); m_clipMonitor = new Monitor("clip", m_monitorManager, QString(), this); m_clipMonitorDock->setWidget(m_clipMonitor); addDockWidget(Qt::TopDockWidgetArea, m_clipMonitorDock); - //m_clipMonitor->stop(); m_projectMonitorDock = new QDockWidget(i18n("Project Monitor"), this); m_projectMonitorDock->setObjectName("project_monitor"); @@ -212,11 +206,41 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent m_recMonitor = new RecMonitor("record", this); m_recMonitorDock->setWidget(m_recMonitor); addDockWidget(Qt::TopDockWidgetArea, m_recMonitorDock); - connect(m_recMonitor, SIGNAL(addProjectClip(KUrl)), this, SLOT(slotAddProjectClip(KUrl))); connect(m_recMonitor, SIGNAL(showConfigDialog(int, int)), this, SLOT(slotPreferences(int, int))); #endif + m_effectListDock = new QDockWidget(i18n("Effect List"), this); + m_effectListDock->setObjectName("effect_list"); + m_effectList = new EffectsListView(); + m_effectListDock->setWidget(m_effectList); + addDockWidget(Qt::TopDockWidgetArea, m_effectListDock); + + m_vectorscope = new Vectorscope(m_projectMonitor, m_clipMonitor, this); + m_vectorscopeDock = new QDockWidget(i18n("Vectorscope"), this); + m_vectorscopeDock->setObjectName(m_vectorscope->widgetName()); + m_vectorscopeDock->setWidget(m_vectorscope); + addDockWidget(Qt::TopDockWidgetArea, m_vectorscopeDock); + + m_waveform = new Waveform(m_projectMonitor, m_clipMonitor, this); + m_waveformDock = new QDockWidget(i18n("Waveform"), this); + m_waveformDock->setObjectName(m_waveform->widgetName()); + m_waveformDock->setWidget(m_waveform); + addDockWidget(Qt::TopDockWidgetArea, m_waveformDock); + + m_RGBParade = new RGBParade(m_projectMonitor, m_clipMonitor, this); + m_RGBParadeDock = new QDockWidget(i18n("RGB Parade"), this); + m_RGBParadeDock->setObjectName(m_RGBParade->widgetName()); + m_RGBParadeDock->setWidget(m_RGBParade); + addDockWidget(Qt::TopDockWidgetArea, m_RGBParadeDock); + + m_histogram = new Histogram(m_projectMonitor, m_clipMonitor, this); + m_histogramDock = new QDockWidget(i18n("Histogram"), this); + m_histogramDock->setObjectName(m_histogram->widgetName()); + m_histogramDock->setWidget(m_histogram); + addDockWidget(Qt::TopDockWidgetArea, m_histogramDock); + + m_undoViewDock = new QDockWidget(i18n("Undo History"), this); m_undoViewDock->setObjectName("undo_history"); m_undoView = new QUndoView(this); @@ -232,20 +256,39 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent //overviewDock->setWidget(m_overView); //addDockWidget(Qt::TopDockWidgetArea, overviewDock); + setupActions(); - //tabifyDockWidget(projectListDock, effectListDock); + + /// Tabify Widgets /// tabifyDockWidget(m_projectListDock, m_effectStackDock); tabifyDockWidget(m_projectListDock, m_transitionConfigDock); - //tabifyDockWidget(projectListDock, undoViewDock); tabifyDockWidget(m_clipMonitorDock, m_projectMonitorDock); #ifndef Q_WS_MAC tabifyDockWidget(m_clipMonitorDock, m_recMonitorDock); #endif + + tabifyDockWidget(m_vectorscopeDock, m_waveformDock); + tabifyDockWidget(m_vectorscopeDock, m_RGBParadeDock); + tabifyDockWidget(m_vectorscopeDock, m_histogramDock); + tabifyDockWidget(m_vectorscopeDock, m_undoViewDock); + tabifyDockWidget(m_vectorscopeDock, m_effectListDock); + + setCentralWidget(m_timelineArea); + + + KdenliveSettings::setCurrent_profile(KdenliveSettings::default_profile()); + m_fileOpenRecent = KStandardAction::openRecent(this, SLOT(openFile(const KUrl &)), actionCollection()); + readOptions(); + m_fileRevert = KStandardAction::revert(this, SLOT(slotRevert()), actionCollection()); + m_fileRevert->setEnabled(false); + + setupGUI(); + // Find QDockWidget tab bars and show / hide widget title bars on right click QList tabs = findChildren(); for (int i = 0; i < tabs.count(); i++) { @@ -355,17 +398,22 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent m_timelineContextMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Paste))); m_timelineContextClipMenu->addAction(actionCollection()->action("clip_in_project_tree")); + //m_timelineContextClipMenu->addAction(actionCollection()->action("clip_to_project_tree")); m_timelineContextClipMenu->addAction(actionCollection()->action("edit_item_duration")); m_timelineContextClipMenu->addAction(actionCollection()->action("delete_item")); + m_timelineContextClipMenu->addSeparator(); m_timelineContextClipMenu->addAction(actionCollection()->action("group_clip")); m_timelineContextClipMenu->addAction(actionCollection()->action("ungroup_clip")); + m_timelineContextClipMenu->addAction(actionCollection()->action("split_audio")); + m_timelineContextClipMenu->addSeparator(); m_timelineContextClipMenu->addAction(actionCollection()->action("cut_timeline_clip")); m_timelineContextClipMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Copy))); m_timelineContextClipMenu->addAction(actionCollection()->action("paste_effects")); - m_timelineContextClipMenu->addAction(actionCollection()->action("split_audio")); + m_timelineContextClipMenu->addSeparator(); QMenu *markersMenu = (QMenu*)(factory()->container("marker_menu", this)); m_timelineContextClipMenu->addMenu(markersMenu); + m_timelineContextClipMenu->addSeparator(); m_timelineContextClipMenu->addMenu(m_transitionsMenu); m_timelineContextClipMenu->addMenu(m_videoEffectsMenu); m_timelineContextClipMenu->addMenu(m_audioEffectsMenu); @@ -382,6 +430,10 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent connect(m_clipMonitorDock, SIGNAL(visibilityChanged(bool)), m_clipMonitor, SLOT(refreshMonitor(bool))); //connect(m_monitorManager, SIGNAL(connectMonitors()), this, SLOT(slotConnectMonitors())); connect(m_monitorManager, SIGNAL(raiseClipMonitor(bool)), this, SLOT(slotRaiseMonitor(bool))); + connect(m_monitorManager, SIGNAL(raiseClipMonitor(bool)), m_vectorscope, SLOT(slotActiveMonitorChanged(bool))); + connect(m_monitorManager, SIGNAL(raiseClipMonitor(bool)), m_waveform, SLOT(slotActiveMonitorChanged(bool))); + connect(m_monitorManager, SIGNAL(raiseClipMonitor(bool)), m_RGBParade, SLOT(slotActiveMonitorChanged(bool))); + connect(m_monitorManager, SIGNAL(raiseClipMonitor(bool)), m_histogram, SLOT(slotActiveMonitorChanged(bool))); connect(m_effectList, SIGNAL(addEffect(const QDomElement)), this, SLOT(slotAddEffect(const QDomElement))); connect(m_effectList, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects())); @@ -450,8 +502,16 @@ bool MainWindow::queryClose() } saveOptions(); if (m_monitorManager) m_monitorManager->stopActiveMonitor(); - if (m_activeDocument && m_activeDocument->isModified()) { - switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document?"))) { + // warn the user to save if document is modified and we have clips in our project list + if (m_activeDocument && m_activeDocument->isModified() && + ((m_projectList->documentClipList().isEmpty() && !m_activeDocument->url().isEmpty()) || + !m_projectList->documentClipList().isEmpty())) { + QString message; + if (m_activeDocument->url().fileName().isEmpty()) + message = i18n("Save changes to document?"); + else + message = i18n("The project \"%1\" has been changed.\nDo you want to save your changes?").arg(m_activeDocument->url().fileName()); + switch (KMessageBox::warningYesNoCancel(this, message)) { case KMessageBox::Yes : // save document here. If saving fails, return false; return saveFile(); @@ -466,29 +526,36 @@ bool MainWindow::queryClose() return true; } - void MainWindow::loadPlugins() { - foreach(QObject *plugin, QPluginLoader::staticInstances()) - populateMenus(plugin); + foreach(QObject *plugin, QPluginLoader::staticInstances()) { + populateMenus(plugin); + } QStringList directories = KGlobal::dirs()->findDirs("module", QString()); QStringList filters; filters << "libkdenlive*"; foreach(const QString &folder, directories) { - kDebug() << "// PARSING FIOLER: " << folder; + kDebug() << "Parsing plugin folder: " << folder; QDir pluginsDir(folder); - foreach(const QString &fileName, pluginsDir.entryList(filters, QDir::Files)) { - kDebug() << "// FOUND PLUGIN: " << fileName << "= " << pluginsDir.absoluteFilePath(fileName); - QPluginLoader loader(pluginsDir.absoluteFilePath(fileName)); - QObject *plugin = loader.instance(); - if (plugin) { - populateMenus(plugin); - m_pluginFileNames += fileName; - } else kDebug() << "// ERROR LOADING PLUGIN: " << fileName << ", " << loader.errorString(); + foreach(const QString &fileName, + pluginsDir.entryList(filters, QDir::Files)) { + /* + * Avoid loading the same plugin twice when there is more than one + * installation. + */ + if (!m_pluginFileNames.contains(fileName)) { + kDebug() << "Found plugin: " << fileName; + QPluginLoader loader(pluginsDir.absoluteFilePath(fileName)); + QObject *plugin = loader.instance(); + if (plugin) { + populateMenus(plugin); + m_pluginFileNames += fileName; + } else + kDebug() << "Error loading plugin: " << fileName << ", " << loader.errorString(); + } } } - //exit(1); } void MainWindow::populateMenus(QObject *plugin) @@ -560,15 +627,14 @@ void MainWindow::slotReloadEffects() QAction *action; QStringList effectInfo; QMap effectsList; - for (int ix = 0; ix < customEffects.count(); ix++) { effectInfo = customEffects.effectIdInfo(ix); effectsList.insert(effectInfo.at(0).toLower(), effectInfo); } - if (effectsList.isEmpty()) { + if (effectsList.isEmpty()) m_customEffectsMenu->setEnabled(false); - return; - } else m_customEffectsMenu->setEnabled(true); + else + m_customEffectsMenu->setEnabled(true); foreach(const QStringList &value, effectsList) { action = new QAction(value.at(0), this); @@ -851,6 +917,13 @@ void MainWindow::setupActions() toolbar->addSeparator(); + //create automatic audio split button + m_buttonAutomaticSplitAudio = new KAction(KIcon("kdenlive-split-audio"), i18n("Split audio and video automatically"), this); + toolbar->addAction(m_buttonAutomaticSplitAudio); + m_buttonAutomaticSplitAudio->setCheckable(true); + m_buttonAutomaticSplitAudio->setChecked(KdenliveSettings::splitaudio()); + connect(m_buttonAutomaticSplitAudio, SIGNAL(triggered()), this, SLOT(slotSwitchSplitAudio())); + m_buttonVideoThumbs = new KAction(KIcon("kdenlive-show-videothumb"), i18n("Show video thumbnails"), this); toolbar->addAction(m_buttonVideoThumbs); m_buttonVideoThumbs->setCheckable(true); @@ -875,6 +948,10 @@ void MainWindow::setupActions() m_buttonSnap->setChecked(KdenliveSettings::snaptopoints()); connect(m_buttonSnap, SIGNAL(triggered()), this, SLOT(slotSwitchSnap())); + actionWidget = toolbar->widgetForAction(m_buttonAutomaticSplitAudio); + actionWidget->setMaximumWidth(max); + actionWidget->setMaximumHeight(max - 4); + actionWidget = toolbar->widgetForAction(m_buttonVideoThumbs); actionWidget->setMaximumWidth(max); actionWidget->setMaximumHeight(max - 4); @@ -908,6 +985,7 @@ void MainWindow::setupActions() collection->addAction("razor_tool", m_buttonRazorTool); collection->addAction("spacer_tool", m_buttonSpacerTool); + collection->addAction("automatic_split_audio", m_buttonAutomaticSplitAudio); collection->addAction("show_video_thumbs", m_buttonVideoThumbs); collection->addAction("show_audio_thumbs", m_buttonAudioThumbs); collection->addAction("show_markers", m_buttonShowMarkers); @@ -931,13 +1009,10 @@ void MainWindow::setupActions() collection->addAction("manage_profiles", profilesAction); connect(profilesAction, SIGNAL(triggered(bool)), this, SLOT(slotEditProfiles())); - KNS3::standardAction(i18n("Download New Wipes..."), this, SLOT(slotGetNewLumaStuff()), actionCollection(), "get_new_lumas"); - - KNS3::standardAction(i18n("Download New Render Profiles..."), this, SLOT(slotGetNewRenderStuff()), actionCollection(), "get_new_profiles"); - + KNS3::standardAction(i18n("Download New Wipes..."), this, SLOT(slotGetNewLumaStuff()), actionCollection(), "get_new_lumas"); + KNS3::standardAction(i18n("Download New Render Profiles..."), this, SLOT(slotGetNewRenderStuff()), actionCollection(), "get_new_profiles"); KNS3::standardAction(i18n("Download New Project Profiles..."), this, SLOT(slotGetNewMltProfileStuff()), actionCollection(), "get_new_mlt_profiles"); - - KNS3::standardAction(i18n("Download New Title Templates..."), this, SLOT(slotGetNewTitleStuff()), actionCollection(), "get_new_titles"); + KNS3::standardAction(i18n("Download New Title Templates..."), this, SLOT(slotGetNewTitleStuff()), actionCollection(), "get_new_titles"); KAction* wizAction = new KAction(KIcon("configure"), i18n("Run Config Wizard"), this); collection->addAction("run_wizard", wizAction); @@ -1123,6 +1198,10 @@ void MainWindow::setupActions() collection->addAction("clip_in_project_tree", clipInProjectTree); connect(clipInProjectTree, SIGNAL(triggered(bool)), this, SLOT(slotClipInProjectTree())); + /*KAction* clipToProjectTree = new KAction(KIcon("go-jump-definition"), i18n("Add Clip to Project Tree"), this); + collection->addAction("clip_to_project_tree", clipToProjectTree); + connect(clipToProjectTree, SIGNAL(triggered(bool)), this, SLOT(slotClipToProjectTree()));*/ + KAction* insertOvertwrite = new KAction(KIcon(), i18n("Insert Clip Zone in Timeline (Overwrite)"), this); insertOvertwrite->setShortcut(Qt::Key_V); collection->addAction("overwrite_to_in_point", insertOvertwrite); @@ -1221,9 +1300,9 @@ void MainWindow::setupActions() collection->addAction("delete_track", deleteTrack); connect(deleteTrack, SIGNAL(triggered()), this, SLOT(slotDeleteTrack())); - KAction *changeTrack = new KAction(KIcon(), i18n("Change Track"), this); - collection->addAction("change_track", changeTrack); - connect(changeTrack, SIGNAL(triggered()), this, SLOT(slotChangeTrack())); + KAction *configTracks = new KAction(KIcon("configure"), i18n("Configure Tracks"), this); + collection->addAction("config_tracks", configTracks); + connect(configTracks, SIGNAL(triggered()), this, SLOT(slotConfigTrack())); KAction *addGuide = new KAction(KIcon("document-new"), i18n("Add Guide"), this); collection->addAction("add_guide", addGuide); @@ -1265,26 +1344,19 @@ void MainWindow::setupActions() maxCurrent->setChecked(false); connect(maxCurrent, SIGNAL(triggered(bool)), this, SLOT(slotMaximizeCurrent(bool)));*/ - - m_closeAction = KStandardAction::close(this, SLOT(closeCurrentDocument()), collection); - - KStandardAction::quit(this, SLOT(queryQuit()), collection); - - KStandardAction::open(this, SLOT(openFile()), collection); - - m_saveAction = KStandardAction::save(this, SLOT(saveFile()), collection); - - KStandardAction::saveAs(this, SLOT(saveFileAs()), collection); - - KStandardAction::openNew(this, SLOT(newFile()), collection); - - KStandardAction::preferences(this, SLOT(slotPreferences()), collection); - - KStandardAction::configureNotifications(this , SLOT(configureNotifications()), collection); - - KStandardAction::copy(this, SLOT(slotCopy()), collection); - - KStandardAction::paste(this, SLOT(slotPaste()), collection); + m_closeAction = KStandardAction::close(this, SLOT(closeCurrentDocument()), collection); + KStandardAction::quit(this, SLOT(queryQuit()), collection); + KStandardAction::open(this, SLOT(openFile()), collection); + m_saveAction = KStandardAction::save(this, SLOT(saveFile()), collection); + KStandardAction::saveAs(this, SLOT(saveFileAs()), collection); + KStandardAction::openNew(this, SLOT(newFile()), collection); + // TODO: make the following connection to slotEditKeys work + KStandardAction::keyBindings(this, SLOT(slotEditKeys()), collection); + KStandardAction::preferences(this, SLOT(slotPreferences()), collection); + KStandardAction::configureNotifications(this, SLOT(configureNotifications()), collection); + KStandardAction::copy(this, SLOT(slotCopy()), collection); + KStandardAction::paste(this, SLOT(slotPaste()), collection); + KStandardAction::fullScreen(this, SLOT(slotFullScreen()), this, collection); KAction *undo = KStandardAction::undo(m_commandStack, SLOT(undo()), collection); undo->setEnabled(false); @@ -1294,8 +1366,6 @@ void MainWindow::setupActions() redo->setEnabled(false); connect(m_commandStack, SIGNAL(canRedoChanged(bool)), redo, SLOT(setEnabled(bool))); - KStandardAction::fullScreen(this, SLOT(slotFullScreen()), this, collection); - /* //TODO: Add status tooltip to actions ? connect(collection, SIGNAL(actionHovered(QAction*)), @@ -1365,38 +1435,48 @@ void MainWindow::setupActions() m_projectList->setupMenu(addClips, addClip); // Setup effects and transitions actions. + m_effectsActionCollection = new KActionCollection(this, KGlobal::mainComponent()); + //KActionCategory *videoEffectActions = new KActionCategory(i18n("Video Effects"), m_effectsActionCollection); + KActionCategory *videoEffectActions = new KActionCategory(i18n("Video Effects"), collection); m_videoEffects = new KAction*[videoEffects.count()]; for (int i = 0; i < videoEffects.count(); ++i) { QStringList effectInfo = videoEffects.effectIdInfo(i); m_videoEffects[i] = new KAction(KIcon("kdenlive-show-video"), effectInfo.at(0), this); m_videoEffects[i]->setData(effectInfo); m_videoEffects[i]->setIconVisibleInMenu(false); - collection->addAction("video_effect_" + effectInfo.at(0), m_videoEffects[i]); + videoEffectActions->addAction("video_effect_" + effectInfo.at(0), m_videoEffects[i]); } + //KActionCategory *audioEffectActions = new KActionCategory(i18n("Audio Effects"), m_effectsActionCollection); + KActionCategory *audioEffectActions = new KActionCategory(i18n("Audio Effects"), collection); m_audioEffects = new KAction*[audioEffects.count()]; for (int i = 0; i < audioEffects.count(); ++i) { QStringList effectInfo = audioEffects.effectIdInfo(i); m_audioEffects[i] = new KAction(KIcon("kdenlive-show-audio"), effectInfo.at(0), this); m_audioEffects[i]->setData(effectInfo); m_audioEffects[i]->setIconVisibleInMenu(false); - collection->addAction("audio_effect_" + effectInfo.at(0), m_audioEffects[i]); + audioEffectActions->addAction("audio_effect_" + effectInfo.at(0), m_audioEffects[i]); } + //KActionCategory *customEffectActions = new KActionCategory(i18n("Custom Effects"), m_effectsActionCollection); + KActionCategory *customEffectActions = new KActionCategory(i18n("Custom Effects"), collection); m_customEffects = new KAction*[customEffects.count()]; for (int i = 0; i < customEffects.count(); ++i) { QStringList effectInfo = customEffects.effectIdInfo(i); m_customEffects[i] = new KAction(KIcon("kdenlive-custom-effect"), effectInfo.at(0), this); m_customEffects[i]->setData(effectInfo); m_customEffects[i]->setIconVisibleInMenu(false); - collection->addAction("custom_effect_" + effectInfo.at(0), m_customEffects[i]); + customEffectActions->addAction("custom_effect_" + effectInfo.at(0), m_customEffects[i]); } + //KActionCategory *transitionActions = new KActionCategory(i18n("Transitions"), m_effectsActionCollection); + KActionCategory *transitionActions = new KActionCategory(i18n("Transitions"), collection); m_transitions = new KAction*[transitions.count()]; for (int i = 0; i < transitions.count(); i++) { QStringList effectInfo = transitions.effectIdInfo(i); m_transitions[i] = new KAction(effectInfo.at(0), this); m_transitions[i]->setData(effectInfo); m_transitions[i]->setIconVisibleInMenu(false); - collection->addAction("transition_" + effectInfo.at(0), m_transitions[i]); + transitionActions->addAction("transition_" + effectInfo.at(0), m_transitions[i]); } + m_effectsActionCollection->readSettings(); //connect(collection, SIGNAL( clearStatusText() ), //statusBar(), SLOT( clear() ) ); @@ -1530,7 +1610,12 @@ void MainWindow::closeCurrentDocument(bool saveChanges) TrackView *tabToClose = (TrackView *) w; KdenliveDoc *docToClose = tabToClose->document(); if (docToClose && docToClose->isModified() && saveChanges) { - switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document?"))) { + QString message; + if (m_activeDocument->url().fileName().isEmpty()) + message = i18n("Save changes to document?"); + else + message = i18n("The project \"%1\" has been changed.\nDo you want to save your changes?").arg(m_activeDocument->url().fileName()); + switch (KMessageBox::warningYesNoCancel(this, message)) { case KMessageBox::Yes : // save document here. If saving fails, return false; if (saveFile() == false) return; @@ -1553,11 +1638,15 @@ void MainWindow::closeCurrentDocument(bool saveChanges) m_activeDocument = NULL; m_effectStack->clear(); m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false); - } else delete docToClose; + } else { + delete docToClose; + } if (w == m_activeTimeline) { delete m_activeTimeline; m_activeTimeline = NULL; - } else delete w; + } else { + delete w; + } } bool MainWindow::saveFileAs(const QString &outputFileName) @@ -1592,8 +1681,10 @@ bool MainWindow::saveFileAs(const QString &outputFileName) bool MainWindow::saveFileAs() { - QString outputFile = KFileDialog::getSaveFileName(KUrl(), getMimeType()); - if (outputFile.isEmpty()) return false; + QString outputFile = KFileDialog::getSaveFileName(m_activeDocument->projectFolder(), getMimeType()); + if (outputFile.isEmpty()) { + return false; + } if (QFile::exists(outputFile)) { // Show the file dialog again if the user does not want to overwrite the file if (KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it?")) == KMessageBox::No) @@ -1740,9 +1831,8 @@ void MainWindow::parseProfiles(const QString &mltPath) KdenliveSettings::setRendererpath(mltPath + "/bin/melt"); } - if (KdenliveSettings::mltpath().isEmpty()) { + if (KdenliveSettings::mltpath().isEmpty()) KdenliveSettings::setMltpath(QString(MLT_PREFIX) + QString("/share/mlt/profiles/")); - } if (KdenliveSettings::rendererpath().isEmpty() || KdenliveSettings::rendererpath().endsWith("inigo")) { QString meltPath = QString(MLT_PREFIX) + QString("/bin/melt"); @@ -1897,29 +1987,35 @@ void MainWindow::slotRenderProject() m_renderWidget->setDocumentPath(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash)); m_renderWidget->setRenderProfile(m_activeDocument->getDocumentProperty("renderdestination"), m_activeDocument->getDocumentProperty("rendercategory"), m_activeDocument->getDocumentProperty("renderprofile"), m_activeDocument->getDocumentProperty("renderurl")); } + if (m_activeTimeline) connect(m_activeTimeline, SIGNAL(projectHasAudio(bool)), m_renderWidget, SLOT(slotEnableAudio(bool))); } slotCheckRenderStatus(); - /*TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); - if (currentTab) m_renderWidget->setTimeline(currentTab); - m_renderWidget->setDocument(m_activeDocument);*/ m_renderWidget->show(); m_renderWidget->showNormal(); + + // What are the following lines supposed to do? + //m_activeTimeline->tracksNumber(); + //m_renderWidget->enableAudio(false); + //m_renderWidget->export_audio; } void MainWindow::slotCheckRenderStatus() { // Make sure there are no missing clips - if (m_renderWidget) m_renderWidget->missingClips(m_projectList->hasMissingClips()); + if (m_renderWidget) + m_renderWidget->missingClips(m_projectList->hasMissingClips()); } void MainWindow::setRenderingProgress(const QString &url, int progress) { - if (m_renderWidget) m_renderWidget->setRenderJob(url, progress); + if (m_renderWidget) + m_renderWidget->setRenderJob(url, progress); } void MainWindow::setRenderingFinished(const QString &url, int status, const QString &error) { - if (m_renderWidget) m_renderWidget->setRenderStatus(url, status, error); + if (m_renderWidget) + m_renderWidget->setRenderStatus(url, status, error); } void MainWindow::slotCleanProject() @@ -1974,6 +2070,8 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha disconnect(m_projectMonitor, SIGNAL(renderPosition(int)), m_activeTimeline, SLOT(moveCursorPos(int))); disconnect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), m_activeTimeline, SLOT(slotSetZone(QPoint))); disconnect(m_projectMonitor, SIGNAL(durationChanged(int)), m_activeTimeline, SLOT(setDuration(int))); + disconnect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), m_activeDocument, SLOT(setModified())); + disconnect(m_clipMonitor, SIGNAL(zoneUpdated(QPoint)), m_activeDocument, SLOT(setModified())); disconnect(m_projectList, SIGNAL(projectModified()), m_activeDocument, SLOT(setModified())); disconnect(m_projectMonitor->render, SIGNAL(refreshDocumentProducers()), m_activeDocument, SLOT(checkProjectClips())); @@ -1994,7 +2092,6 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha disconnect(m_activeTimeline, SIGNAL(cursorMoved()), m_projectMonitor, SLOT(activateMonitor())); disconnect(m_activeTimeline, SIGNAL(insertTrack(int)), this, SLOT(slotInsertTrack(int))); disconnect(m_activeTimeline, SIGNAL(deleteTrack(int)), this, SLOT(slotDeleteTrack(int))); - disconnect(m_activeTimeline, SIGNAL(changeTrack(int)), this, SLOT(slotChangeTrack(int))); disconnect(m_activeTimeline, SIGNAL(configTrack(int)), this, SLOT(slotConfigTrack(int))); disconnect(m_activeDocument, SIGNAL(docModified(bool)), this, SLOT(slotUpdateDocumentState(bool))); disconnect(m_effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), m_activeTimeline->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int))); @@ -2037,13 +2134,14 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha connect(trackView, SIGNAL(cursorMoved()), m_projectMonitor, SLOT(activateMonitor())); connect(trackView, SIGNAL(insertTrack(int)), this, SLOT(slotInsertTrack(int))); connect(trackView, SIGNAL(deleteTrack(int)), this, SLOT(slotDeleteTrack(int))); - connect(trackView, SIGNAL(changeTrack(int)), this, SLOT(slotChangeTrack(int))); connect(trackView, SIGNAL(configTrack(int)), this, SLOT(slotConfigTrack(int))); connect(trackView, SIGNAL(updateTracksInfo()), this, SLOT(slotUpdateTrackInfo())); connect(trackView, SIGNAL(mousePosition(int)), this, SLOT(slotUpdateMousePosition(int))); connect(m_projectMonitor, SIGNAL(renderPosition(int)), trackView, SLOT(moveCursorPos(int))); connect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), trackView, SLOT(slotSetZone(QPoint))); connect(m_clipMonitor, SIGNAL(zoneUpdated(QPoint)), m_projectList, SLOT(slotUpdateClipCut(QPoint))); + connect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), doc, SLOT(setModified())); + connect(m_clipMonitor, SIGNAL(zoneUpdated(QPoint)), doc, SLOT(setModified())); connect(m_projectMonitor, SIGNAL(durationChanged(int)), trackView, SLOT(setDuration(int))); connect(m_projectMonitor->render, SIGNAL(refreshDocumentProducers()), doc, SLOT(checkProjectClips())); @@ -2075,6 +2173,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha connect(m_effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), trackView->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int))); + connect(m_effectStack, SIGNAL(updateClipRegion(ClipItem*, int, QString)), trackView->projectView(), SLOT(slotUpdateClipRegion(ClipItem*, int, QString))); connect(m_effectStack, SIGNAL(removeEffect(ClipItem*, QDomElement)), trackView->projectView(), SLOT(slotDeleteEffect(ClipItem*, QDomElement))); connect(m_effectStack, SIGNAL(changeEffectState(ClipItem*, int, bool)), trackView->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, bool))); connect(m_effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), trackView->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int))); @@ -2092,6 +2191,9 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu, m_clipTypeGroup, (QMenu*)(factory()->container("marker_menu", this))); + if (m_renderWidget) { + if (m_activeTimeline) disconnect(m_activeTimeline, SIGNAL(projectHasAudio(bool)), m_renderWidget, SLOT(slotEnableAudio(bool))); + } m_activeTimeline = trackView; if (m_renderWidget) { slotCheckRenderStatus(); @@ -2099,6 +2201,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha m_renderWidget->setGuides(doc->guidesXml(), doc->projectDuration()); m_renderWidget->setDocumentPath(doc->projectFolder().path(KUrl::AddTrailingSlash)); m_renderWidget->setRenderProfile(doc->getDocumentProperty("renderdestination"), doc->getDocumentProperty("rendercategory"), doc->getDocumentProperty("renderprofile"), doc->getDocumentProperty("renderurl")); + connect(m_activeTimeline, SIGNAL(projectHasAudio(bool)), m_renderWidget, SLOT(slotEnableAudio(bool))); } //doc->setRenderer(m_projectMonitor->render); m_commandStack->setActiveStack(doc->commandStack()); @@ -2130,7 +2233,16 @@ void MainWindow::slotZoneMoved(int start, int end) void MainWindow::slotGuidesUpdated() { - if (m_renderWidget) m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration()); + if (m_renderWidget) + m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration()); +} + +void MainWindow::slotEditKeys() +{ + KShortcutsDialog dialog(KShortcutsEditor::AllActions, KShortcutsEditor::LetterShortcutsAllowed, this); + dialog.addCollection(actionCollection(), i18nc("general keyboard shortcuts", "General")); + dialog.addCollection(m_effectsActionCollection, i18nc("effects and transitions keyboard shortcuts", "Effects & Transitions")); + dialog.configure(); } void MainWindow::slotPreferences(int page, int option) @@ -2174,10 +2286,12 @@ void MainWindow::updateConfiguration() m_activeTimeline->refresh(); m_activeTimeline->projectView()->checkAutoScroll(); m_activeTimeline->projectView()->checkTrackHeight(); - if (m_activeDocument) m_activeDocument->clipManager()->checkAudioThumbs(); + if (m_activeDocument) + m_activeDocument->clipManager()->checkAudioThumbs(); } m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails()); m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails()); + m_buttonAutomaticSplitAudio->setChecked(KdenliveSettings::splitaudio()); // Update list of transcoding profiles loadTranscoders(); @@ -2187,13 +2301,17 @@ void MainWindow::updateConfiguration() } +void MainWindow::slotSwitchSplitAudio() +{ + KdenliveSettings::setSplitaudio(!KdenliveSettings::splitaudio()); + m_buttonAutomaticSplitAudio->setChecked(KdenliveSettings::splitaudio()); +} void MainWindow::slotSwitchVideoThumbs() { KdenliveSettings::setVideothumbnails(!KdenliveSettings::videothumbnails()); - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->slotUpdateAllThumbs(); - } m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails()); } @@ -2203,7 +2321,8 @@ void MainWindow::slotSwitchAudioThumbs() if (m_activeTimeline) { m_activeTimeline->refresh(); m_activeTimeline->projectView()->checkAutoScroll(); - if (m_activeDocument) m_activeDocument->clipManager()->checkAudioThumbs(); + if (m_activeDocument) + m_activeDocument->clipManager()->checkAudioThumbs(); } m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails()); } @@ -2211,9 +2330,8 @@ void MainWindow::slotSwitchAudioThumbs() void MainWindow::slotSwitchMarkersComments() { KdenliveSettings::setShowmarkers(!KdenliveSettings::showmarkers()); - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->refresh(); - } m_buttonShowMarkers->setChecked(KdenliveSettings::showmarkers()); } @@ -2226,10 +2344,10 @@ void MainWindow::slotSwitchSnap() void MainWindow::slotDeleteItem() { - if (QApplication::focusWidget() - && QApplication::focusWidget()->parentWidget() - && QApplication::focusWidget()->parentWidget()->parentWidget() - && QApplication::focusWidget()->parentWidget()->parentWidget() == m_projectListDock) { + if (QApplication::focusWidget() && + QApplication::focusWidget()->parentWidget() && + QApplication::focusWidget()->parentWidget()->parentWidget() && + QApplication::focusWidget()->parentWidget()->parentWidget() == m_projectListDock) { m_projectList->slotRemoveClip(); } else { @@ -2250,7 +2368,8 @@ void MainWindow::slotDeleteItem() void MainWindow::slotUpdateClipMarkers(DocClipBase *clip) { - if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay(); + if (m_clipMonitor->isActive()) + m_clipMonitor->checkOverlay(); m_clipMonitor->updateMarkers(clip); } @@ -2277,9 +2396,8 @@ void MainWindow::slotAddClipMarker() QString id = clip->getId(); CommentedTime marker(pos, i18n("Marker")); MarkerDialog d(clip, marker, m_activeDocument->timecode(), i18n("Add Marker"), this); - if (d.exec() == QDialog::Accepted) { + if (d.exec() == QDialog::Accepted) m_activeTimeline->projectView()->slotAddClipMarker(id, d.newMarker().time(), d.newMarker().comment()); - } } void MainWindow::slotDeleteClipMarker() @@ -2407,13 +2525,6 @@ void MainWindow::slotDeleteTrack(int ix) m_transitionConfig->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode(), m_activeDocument->tracksList()); } -void MainWindow::slotChangeTrack(int ix) -{ - m_projectMonitor->activateMonitor(); - if (m_activeTimeline) - m_activeTimeline->projectView()->slotChangeTrack(ix); -} - void MainWindow::slotConfigTrack(int ix) { m_projectMonitor->activateMonitor(); @@ -2443,9 +2554,8 @@ void MainWindow::slotDeleteAllGuides() void MainWindow::slotCutTimelineClip() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->cutSelectedClips(); - } } void MainWindow::slotInsertClipOverwrite() @@ -2458,65 +2568,56 @@ void MainWindow::slotInsertClipOverwrite() void MainWindow::slotSelectTimelineClip() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->selectClip(true); - } } void MainWindow::slotSelectTimelineTransition() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->selectTransition(true); - } } void MainWindow::slotDeselectTimelineClip() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->selectClip(false, true); - } } void MainWindow::slotDeselectTimelineTransition() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->selectTransition(false, true); - } } void MainWindow::slotSelectAddTimelineClip() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->selectClip(true, true); - } } void MainWindow::slotSelectAddTimelineTransition() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->selectTransition(true, true); - } } void MainWindow::slotGroupClips() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->groupClips(); - } } void MainWindow::slotUnGroupClips() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->groupClips(false); - } } void MainWindow::slotEditItemDuration() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->editItemDuration(); - } } void MainWindow::slotAddProjectClip(KUrl url) @@ -2577,9 +2678,8 @@ void MainWindow::slotZoomOut() void MainWindow::slotFitZoom() { - if (m_activeTimeline) { + if (m_activeTimeline) m_zoomSlider->setValue(m_activeTimeline->fitZoom()); - } } void MainWindow::slotSetZoom(int value) @@ -2616,10 +2716,12 @@ void MainWindow::slotGotProgressInfo(const QString &message, int progress) { m_statusProgressBar->setValue(progress); if (progress >= 0) { - if (!message.isEmpty()) m_messageLabel->setMessage(message, InformationMessage);//statusLabel->setText(message); + if (!message.isEmpty()) + m_messageLabel->setMessage(message, InformationMessage);//statusLabel->setText(message); m_statusProgressBar->setVisible(true); } else if (progress == -2) { - if (!message.isEmpty()) m_messageLabel->setMessage(message, ErrorMessage); + if (!message.isEmpty()) + m_messageLabel->setMessage(message, ErrorMessage); m_statusProgressBar->setVisible(false); } else { m_messageLabel->setMessage(QString(), DefaultMessage); @@ -2735,17 +2837,15 @@ void MainWindow::slotShowClipProperties(QList cliplist, QMapgetId(), clip->properties(), dia.properties(), true, command); } m_activeDocument->commandStack()->push(command); - for (int i = 0; i < cliplist.count(); i++) { + for (int i = 0; i < cliplist.count(); i++) m_activeTimeline->projectView()->slotUpdateClip(cliplist.at(i)->getId(), dia.needsTimelineReload()); - } } } void MainWindow::customEvent(QEvent* e) { - if (e->type() == QEvent::User) { + if (e->type() == QEvent::User) m_messageLabel->setMessage(static_cast (e)->message(), MltError); - } } void MainWindow::slotActivateEffectStackView() { @@ -2754,7 +2854,8 @@ void MainWindow::slotActivateEffectStackView() void MainWindow::slotActivateTransitionView(Transition *t) { - if (t) m_transitionConfig->raiseWindow(m_transitionConfigDock); + if (t) + m_transitionConfig->raiseWindow(m_transitionConfigDock); } void MainWindow::slotSnapRewind() @@ -2762,7 +2863,9 @@ void MainWindow::slotSnapRewind() if (m_projectMonitor->isActive()) { if (m_activeTimeline) m_activeTimeline->projectView()->slotSeekToPreviousSnap(); - } else m_clipMonitor->slotSeekToPreviousSnap(); + } else { + m_clipMonitor->slotSeekToPreviousSnap(); + } } void MainWindow::slotSnapForward() @@ -2770,7 +2873,9 @@ void MainWindow::slotSnapForward() if (m_projectMonitor->isActive()) { if (m_activeTimeline) m_activeTimeline->projectView()->slotSeekToNextSnap(); - } else m_clipMonitor->slotSeekToNextSnap(); + } else { + m_clipMonitor->slotSeekToNextSnap(); + } } void MainWindow::slotClipStart() @@ -2791,29 +2896,41 @@ void MainWindow::slotClipEnd() void MainWindow::slotZoneStart() { - if (m_projectMonitor->isActive()) m_projectMonitor->slotZoneStart(); - else m_clipMonitor->slotZoneStart(); + if (m_projectMonitor->isActive()) + m_projectMonitor->slotZoneStart(); + else + m_clipMonitor->slotZoneStart(); } void MainWindow::slotZoneEnd() { - if (m_projectMonitor->isActive()) m_projectMonitor->slotZoneEnd(); - else m_clipMonitor->slotZoneEnd(); + if (m_projectMonitor->isActive()) + m_projectMonitor->slotZoneEnd(); + else + m_clipMonitor->slotZoneEnd(); } void MainWindow::slotChangeTool(QAction * action) { - if (action == m_buttonSelectTool) slotSetTool(SELECTTOOL); - else if (action == m_buttonRazorTool) slotSetTool(RAZORTOOL); - else if (action == m_buttonSpacerTool) slotSetTool(SPACERTOOL); + if (action == m_buttonSelectTool) + slotSetTool(SELECTTOOL); + else if (action == m_buttonRazorTool) + slotSetTool(RAZORTOOL); + else if (action == m_buttonSpacerTool) + slotSetTool(SPACERTOOL); } void MainWindow::slotChangeEdit(QAction * action) { - if (!m_activeTimeline) return; - if (action == m_overwriteEditTool) m_activeTimeline->projectView()->setEditMode(OVERWRITEEDIT); - else if (action == m_insertEditTool) m_activeTimeline->projectView()->setEditMode(INSERTEDIT); - else m_activeTimeline->projectView()->setEditMode(NORMALEDIT); + if (!m_activeTimeline) + return; + + if (action == m_overwriteEditTool) + m_activeTimeline->projectView()->setEditMode(OVERWRITEEDIT); + else if (action == m_insertEditTool) + m_activeTimeline->projectView()->setEditMode(INSERTEDIT); + else + m_activeTimeline->projectView()->setEditMode(NORMALEDIT); } void MainWindow::slotSetTool(PROJECTTOOL tool) @@ -2839,20 +2956,20 @@ void MainWindow::slotSetTool(PROJECTTOOL tool) void MainWindow::slotCopy() { - if (!m_activeDocument || !m_activeTimeline) return; - m_activeTimeline->projectView()->copyClip(); + if (m_activeDocument && m_activeTimeline) + m_activeTimeline->projectView()->copyClip(); } void MainWindow::slotPaste() { - if (!m_activeDocument || !m_activeTimeline) return; - m_activeTimeline->projectView()->pasteClip(); + if (m_activeDocument && m_activeTimeline) + m_activeTimeline->projectView()->pasteClip(); } void MainWindow::slotPasteEffects() { - if (!m_activeDocument || !m_activeTimeline) return; - m_activeTimeline->projectView()->pasteClipEffects(); + if (m_activeDocument && m_activeTimeline) + m_activeTimeline->projectView()->pasteClipEffects(); } void MainWindow::slotFind() @@ -2869,11 +2986,10 @@ void MainWindow::slotFind() void MainWindow::slotFindNext() { - if (m_activeTimeline && m_activeTimeline->projectView()->findNextString(m_findString)) { + if (m_activeTimeline && m_activeTimeline->projectView()->findNextString(m_findString)) statusBar()->showMessage(i18n("Found: %1", m_findString)); - } else { + else statusBar()->showMessage(i18n("Reached end of project")); - } m_findTimer.start(4000); } @@ -2921,7 +3037,6 @@ void MainWindow::slotClipInTimeline(const QString &clipId) j++; } actionList.insert(j, a); - } inTimelineMenu->addActions(actionList); @@ -2936,16 +3051,28 @@ void MainWindow::slotClipInProjectTree() { if (m_activeTimeline) { const QStringList &clipIds = m_activeTimeline->projectView()->selectedClips(); - if (clipIds.isEmpty()) return; + if (clipIds.isEmpty()) + return; m_projectListDock->raise(); - for (int i = 0; i < clipIds.count(); i++) { + for (int i = 0; i < clipIds.count(); i++) m_projectList->selectItemById(clipIds.at(i)); - } if (m_projectMonitor->isActive()) slotSwitchMonitors(); } } +/*void MainWindow::slotClipToProjectTree() +{ + if (m_activeTimeline) { + const QList clips = m_activeTimeline->projectView()->selectedClipItems(); + if (clips.isEmpty()) return; + for (int i = 0; i < clips.count(); i++) { + m_projectList->slotAddXmlClip(clips.at(i)->itemXml()); + } + //m_projectList->selectItemById(clipIds.at(i)); + } +}*/ + void MainWindow::slotSelectClipInTimeline() { if (m_activeTimeline) { @@ -2961,11 +3088,10 @@ void MainWindow::keyPressEvent(QKeyEvent *ke) if (ke->key() == Qt::Key_Backspace) { m_findString = m_findString.left(m_findString.length() - 1); - if (!m_findString.isEmpty()) { + if (!m_findString.isEmpty()) findAhead(); - } else { + else findTimeout(); - } m_findTimer.start(4000); ke->accept(); @@ -2983,7 +3109,9 @@ void MainWindow::keyPressEvent(QKeyEvent *ke) ke->accept(); return; } - } else KXmlGuiWindow::keyPressEvent(ke); + } else { + KXmlGuiWindow::keyPressEvent(ke); + } } @@ -3003,7 +3131,9 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *event) if (ke->text().trimmed().isEmpty()) return false; ke->accept(); return true; - } else return false; + } else { + return false; + } } else { // pass the event on to the parent class return QMainWindow::eventFilter(obj, event); @@ -3033,34 +3163,39 @@ void MainWindow::slotSaveZone(Render *render, QPoint zone) vbox->addWidget(url); vbox->addWidget(label2); vbox->addWidget(edit); - if (dialog->exec() == QDialog::Accepted) render->saveZone(url->url(), edit->text(), zone); + if (dialog->exec() == QDialog::Accepted) + render->saveZone(url->url(), edit->text(), zone); } void MainWindow::slotSetInPoint() { - if (m_clipMonitor->isActive()) { + if (m_clipMonitor->isActive()) m_clipMonitor->slotSetZoneStart(); - } else m_projectMonitor->slotSetZoneStart(); + else + m_projectMonitor->slotSetZoneStart(); //else m_activeTimeline->projectView()->setInPoint(); } void MainWindow::slotSetOutPoint() { - if (m_clipMonitor->isActive()) { + if (m_clipMonitor->isActive()) m_clipMonitor->slotSetZoneEnd(); - } else m_projectMonitor->slotSetZoneEnd(); + else + m_projectMonitor->slotSetZoneEnd(); // else m_activeTimeline->projectView()->setOutPoint(); } void MainWindow::slotResizeItemStart() { - if (m_activeTimeline) m_activeTimeline->projectView()->setInPoint(); + if (m_activeTimeline) + m_activeTimeline->projectView()->setInPoint(); } void MainWindow::slotResizeItemEnd() { - if (m_activeTimeline) m_activeTimeline->projectView()->setOutPoint(); + if (m_activeTimeline) + m_activeTimeline->projectView()->setOutPoint(); } int MainWindow::getNewStuff(const QString &configFile) @@ -3119,12 +3254,14 @@ void MainWindow::slotGetNewMltProfileStuff() void MainWindow::slotAutoTransition() { - if (m_activeTimeline) m_activeTimeline->projectView()->autoTransition(); + if (m_activeTimeline) + m_activeTimeline->projectView()->autoTransition(); } void MainWindow::slotSplitAudio() { - if (m_activeTimeline) m_activeTimeline->projectView()->splitAudio(); + if (m_activeTimeline) + m_activeTimeline->projectView()->splitAudio(); } void MainWindow::slotUpdateClipType(QAction *action) @@ -3164,9 +3301,8 @@ void MainWindow::slotMaximizeCurrent(bool /*show*/) { m_timelineState = saveState(); QWidget *par = focusWidget()->parentWidget(); - while (par->parentWidget() && par->parentWidget() != this) { + while (par->parentWidget() && par->parentWidget() != this) par = par->parentWidget(); - } kDebug() << "CURRENT WIDGET: " << par->objectName(); } /*else { @@ -3190,9 +3326,8 @@ void MainWindow::loadTranscoders() QStringList data = i.value().split(";", QString::SkipEmptyParts); QAction *a = transMenu->addAction(i.key()); a->setData(data); - if (data.count() > 1) { + if (data.count() > 1) a->setToolTip(data.at(1)); - } connect(a, SIGNAL(triggered()), this, SLOT(slotTranscode())); } } @@ -3395,6 +3530,8 @@ void MainWindow::slotChangePalette(QAction *action, const QString &themename) ((QWidget*)subchild)->setPalette(plt); } } + if (m_activeTimeline) + m_activeTimeline->projectView()->updatePalette(); } @@ -3487,17 +3624,49 @@ void MainWindow::slotShowTitleBars(bool show) m_transitionConfigDock->setTitleBarWidget(0); m_projectListDock->setTitleBarWidget(0); m_undoViewDock->setTitleBarWidget(0); + m_vectorscopeDock->setTitleBarWidget(0); + m_waveformDock->setTitleBarWidget(0); + m_RGBParadeDock->setTitleBarWidget(0); + m_histogramDock->setTitleBarWidget(0); } else { - if (!m_effectStackDock->isFloating()) m_effectStackDock->setTitleBarWidget(new QWidget(this)); - if (!m_clipMonitorDock->isFloating()) m_clipMonitorDock->setTitleBarWidget(new QWidget(this)); - if (!m_projectMonitorDock->isFloating()) m_projectMonitorDock->setTitleBarWidget(new QWidget(this)); + if (!m_effectStackDock->isFloating()) { + m_effectStackDock->setTitleBarWidget(new QWidget); + } + if (!m_clipMonitorDock->isFloating()) { + m_clipMonitorDock->setTitleBarWidget(new QWidget); + } + if (!m_projectMonitorDock->isFloating()) { + m_projectMonitorDock->setTitleBarWidget(new QWidget); + } #ifndef Q_WS_MAC - if (!m_recMonitorDock->isFloating()) m_recMonitorDock->setTitleBarWidget(new QWidget(this)); + if (!m_recMonitorDock->isFloating()) { + m_recMonitorDock->setTitleBarWidget(new QWidget); + } #endif - if (!m_effectListDock->isFloating()) m_effectListDock->setTitleBarWidget(new QWidget(this)); - if (!m_transitionConfigDock->isFloating()) m_transitionConfigDock->setTitleBarWidget(new QWidget(this)); - if (!m_projectListDock->isFloating()) m_projectListDock->setTitleBarWidget(new QWidget(this)); - if (!m_undoViewDock->isFloating()) m_undoViewDock->setTitleBarWidget(new QWidget(this)); + if (!m_effectListDock->isFloating()) { + m_effectListDock->setTitleBarWidget(new QWidget); + } + if (!m_transitionConfigDock->isFloating()) { + m_transitionConfigDock->setTitleBarWidget(new QWidget); + } + if (!m_projectListDock->isFloating()) { + m_projectListDock->setTitleBarWidget(new QWidget); + } + if (!m_undoViewDock->isFloating()) { + m_undoViewDock->setTitleBarWidget(new QWidget); + } + if (!m_vectorscopeDock->isFloating()) { + m_vectorscopeDock->setTitleBarWidget(new QWidget); + } + if (!m_waveformDock->isFloating()) { + m_waveformDock->setTitleBarWidget(new QWidget); + } + if (!m_RGBParadeDock->isFloating()) { + m_RGBParadeDock->setTitleBarWidget(new QWidget(this)); + } + if (!m_histogramDock->isFloating()) { + m_histogramDock->setTitleBarWidget(new QWidget(this)); + } } KdenliveSettings::setShowtitlebars(show); }