Fix cursor color when changing color theme

svn path=/trunk/kdenlive/; revision=4498

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index d151995e48d1b16f31ef583a091ea4eca2039d6b..6e5aa7add10fffa311da7d00f5ec923edb603a0b 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -5988,3 +5988,10 @@ void CustomTrackView::clearSelection()
     emit clipItemSelected(NULL);
 }
 
+void CustomTrackView::updatePalette()
+{
+    QPen pen1 = QPen();
+    pen1.setWidth(1);
+    pen1.setColor(palette().text().color());
+    m_cursorLine->setPen(pen1);
+}

diff --git a/src/customtrackview.h b/src/customtrackview.h
index 504a8874d41d5e2e5afff024f1a4934ed21f2aca..54b27988e52f0eb6cf3525b9cf1e6ff89cdbbe52 100644 (file)
--- a/src/customtrackview.h
+++ b/src/customtrackview.h
@@ -172,6 +172,8 @@ public:
     void editItemDuration();
     void buildGuidesMenu(QMenu *goMenu) const;
     KPixmapCache* pixmapCache;
+    /** update the timeline objects when palette changes */
+    void updatePalette();
 
 public slots:
     void setCursorPos(int pos, bool seek = true);

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 571e20ba50ee61b58a390b18c5a659aae6e954d5..3dac3ce49a7a74b95ecac591e9aa4672be950e31 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -355,6 +355,7 @@ 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->addAction(actionCollection()->action("group_clip"));
@@ -452,7 +453,7 @@ bool MainWindow::queryClose()
     if (m_monitorManager) m_monitorManager->stopActiveMonitor();
     // 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() && !m_activeDocument->url().isEmpty())
         || !m_projectList->documentClipList().isEmpty())) {
         switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document?"))) {
         case KMessageBox::Yes :
@@ -1138,6 +1139,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);
@@ -2958,6 +2963,18 @@ void MainWindow::slotClipInProjectTree()
     }
 }
 
+/*void MainWindow::slotClipToProjectTree()
+{
+    if (m_activeTimeline) {
+       const QList<ClipItem *> 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) {
@@ -3407,6 +3424,7 @@ void MainWindow::slotChangePalette(QAction *action, const QString &themename)
                 ((QWidget*)subchild)->setPalette(plt);
         }
     }
+    m_activeTimeline->projectView()->updatePalette();
 }