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

List:       kde-commits
Subject:    amarok_1_2_branch: kdeextragear-1/amarok
From:       Seb Ruiz <seb100 () optusnet ! com ! au>
Date:       2005-04-22 8:49:07
Message-ID: 20050422084907.98F57663 () office ! kde ! org
[Download RAW message or body]

CVS commit by seb: 

Change queue shortcut to local CTRL-D shortcut


  M +1 -1      ChangeLog   1.593.2.8
  M +0 -2      src/app.cpp   1.488.2.2
  M +1 -0      src/playlist.cpp   1.457.2.2
  M +1 -5      src/playlistwindow.cpp   1.276.2.2
  M +0 -1      src/playlistwindow.h   1.91.2.2


--- kdeextragear-1/amarok/ChangeLog  #1.593.2.7:1.593.2.8
@@ -6,5 +6,5 @@
 VERSION 1.2.4:
   FEATURES:
-    * Queue selected tracks shortcut, Win+Q. (BR 83675)
+    * Queue selected tracks shortcut, Ctrl+D. (BR 83675)
 
   BUGFIXES:

--- kdeextragear-1/amarok/src/app.cpp  #1.488.2.1:1.488.2.2
@@ -320,6 +320,4 @@ void App::initGlobalShortcuts()
     m_pGlobalAccel->insert( "mute", i18n( "Mute Volume" ), 0, KKey("WIN+m"), 0,
                             ec, SLOT( mute() ), true, true );
-    m_pGlobalAccel->insert( "queue", i18n( "Queue Selected" ), 0, KKey("WIN+q"), 0,
-                            m_pPlaylistWindow, SLOT( queueSelected() ), true, true \
);  
     m_pGlobalAccel->setConfigGroup( "Shortcuts" );

--- kdeextragear-1/amarok/src/playlist.cpp  #1.457.2.1:1.457.2.2
@@ -259,4 +259,5 @@ Playlist::Playlist( QWidget *parent )
     new KAction( i18n( "&Goto Current Track" ), "today", CTRL+Key_Enter, this, SLOT( \
                showCurrentTrack() ), ac, "playlist_show" );
     new KAction( i18n( "Remove Duplicates / Missing" ), 0, this, SLOT( \
removeDuplicates() ), ac, "playlist_remove_duplicates" ); +    new KAction( i18n( \
"Queue Selected Tracks"), CTRL+Key_D, this, SLOT( queueSelected() ), ac, \
"queue_selected" );  
     //ensure we update action enabled states when repeat Playlist is toggled

--- kdeextragear-1/amarok/src/playlistwindow.cpp  #1.276.2.1:1.276.2.2
@@ -233,4 +233,5 @@ PlaylistWindow::init()
     //actionCollection()->action("playlist_copy")->plug( playlistMenu );
     playlistMenu->insertSeparator();
+    actionCollection()->action("queue_selected")->plug( playlistMenu );
     actionCollection()->action("playlist_remove_duplicates")->plug( playlistMenu );
     actionCollection()->action("playlist_select_all")->plug( playlistMenu );
@@ -598,9 +599,4 @@ void PlaylistWindow::playAudioCD() //SLO
 }
 
-void PlaylistWindow::queueSelected()
-{
-    Playlist::instance()->queueSelected();
-}
-
 void PlaylistWindow::showScriptSelector() //SLOT
 {

--- kdeextragear-1/amarok/src/playlistwindow.h  #1.91.2.1:1.91.2.2
@@ -50,5 +50,4 @@ class PlaylistWindow : public QWidget, p
 
     public slots:
-        void queueSelected();
         void showHide();
 


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