[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [Amarok] 80c6a13: Queue Editor: Add "remove track" button, fix toolt
From:       Andreas Hartmetz <ahartmetz () gmail ! com>
Date:       2010-12-01 3:02:28
Message-ID: 20101201030228.43EFBA60A6 () git ! kde ! org
[Download RAW message or body]

commit 80c6a138713438d1e1c19b93654d254e4ff2c310
branch master
Author: Andreas Hartmetz <ahartmetz@gmail.com>
Date:   Wed Dec 1 04:01:13 2010 +0100

    Queue Editor: Add "remove track" button, fix tooltip capitalization.

diff --git a/src/playlist/PlaylistActions.cpp b/src/playlist/PlaylistActions.cpp
index ecc6d1d..cb07ba7 100644
--- a/src/playlist/PlaylistActions.cpp
+++ b/src/playlist/PlaylistActions.cpp
@@ -367,6 +367,14 @@ Playlist::Actions::queueMoveDown( quint64 id )
 }
 
 void
+Playlist::Actions::dequeue( quint64 id )
+{
+    m_navigator->dequeueId( id ); // has no return value, *shrug*
+    Playlist::ModelStack::instance()->bottom()->emitQueueChanged();
+    return;
+}
+
+void
 Playlist::Actions::queue( QList<int> rows )
 {
     DEBUG_BLOCK
diff --git a/src/playlist/PlaylistActions.h b/src/playlist/PlaylistActions.h
index b5e8cb4..1bf5264 100644
--- a/src/playlist/PlaylistActions.h
+++ b/src/playlist/PlaylistActions.h
@@ -114,6 +114,7 @@ public:
 
     bool queueMoveUp( quint64 id );
     bool queueMoveDown( quint64 id );
+    void dequeue( quint64 id );
 
 public slots:
     void play();
diff --git a/src/playlist/PlaylistQueueEditor.cpp b/src/playlist/PlaylistQueueEditor.cpp
index 0d42b49..36dc77f 100644
--- a/src/playlist/PlaylistQueueEditor.cpp
+++ b/src/playlist/PlaylistQueueEditor.cpp
@@ -36,10 +36,12 @@ PlaylistQueueEditor::PlaylistQueueEditor()
     connect( The::playlist()->qaim(), SIGNAL( queueChanged() ), SLOT( queueChanged() ) );
     m_ui.upButton->setIcon( KIcon( "go-up" ) );
     m_ui.downButton->setIcon( KIcon( "go-down" ) );
+    m_ui.removeTrackButton->setIcon( KIcon( "list-remove" ) );
     m_ui.clearButton->setIcon( KIcon( "edit-clear-list" ) );
     connect( m_ui.upButton, SIGNAL( clicked() ), SLOT( moveUp() ) );
     connect( m_ui.downButton, SIGNAL( clicked() ), SLOT( moveDown() ) );
     connect( m_ui.clearButton, SIGNAL( clicked() ), SLOT( clear() ) );
+    connect( m_ui.removeTrackButton, SIGNAL( clicked() ), SLOT( removeTrack() ) );
     connect( m_ui.buttonBox->buttons().first(), SIGNAL( clicked() ), SLOT( accept() ) );
 }
 
@@ -114,6 +116,15 @@ PlaylistQueueEditor::moveDown()
 }
 
 void
+PlaylistQueueEditor::removeTrack()
+{
+    const quint64 id = currentId();
+    if ( !id )
+        return;
+    The::playlistActions()->dequeue( id );
+}
+
+void
 PlaylistQueueEditor::clear()
 {
     m_blockViewUpdates = true;
diff --git a/src/playlist/PlaylistQueueEditor.h b/src/playlist/PlaylistQueueEditor.h
index 6d7cb72..e494c9f 100644
--- a/src/playlist/PlaylistQueueEditor.h
+++ b/src/playlist/PlaylistQueueEditor.h
@@ -30,6 +30,7 @@ private slots:
     void queueChanged();
     void moveUp();
     void moveDown();
+    void removeTrack();
     void clear();
 
 private:
diff --git a/src/playlist/PlaylistQueueEditor.ui b/src/playlist/PlaylistQueueEditor.ui
index 3e174e0..86e1bb4 100644
--- a/src/playlist/PlaylistQueueEditor.ui
+++ b/src/playlist/PlaylistQueueEditor.ui
@@ -29,7 +29,7 @@
             <bool>true</bool>
            </property>
            <property name="toolTip">
-            <string>Move up</string>
+            <string>Move Up</string>
            </property>
            <property name="iconSize">
             <size>
@@ -45,7 +45,7 @@
             <bool>true</bool>
            </property>
            <property name="toolTip">
-            <string>Move down</string>
+            <string>Move Down</string>
            </property>
            <property name="iconSize">
             <size>
@@ -56,12 +56,22 @@
           </widget>
          </item>
          <item>
+          <widget class="QPushButton" name="removeTrackButton">
+           <property name="toolTip">
+            <string>Remove Track</string>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+         <item>
           <widget class="QPushButton" name="clearButton">
            <property name="enabled">
             <bool>true</bool>
            </property>
            <property name="toolTip">
-            <string>Clear</string>
+            <string>Clear Queue</string>
            </property>
            <property name="iconSize">
             <size>
[prev in list] [next in list] [prev in thread] [next in thread]