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

List:       kde-commits
Subject:    kdemultimedia/juk
From:       Michael Pyne <michael.pyne () kdemail ! net>
Date:       2004-09-01 6:43:09
Message-ID: 20040901064309.8B61E608C () office ! kde ! org
[Download RAW message or body]

CVS commit by mpyne: 

Add new file removal dialog, with the major feature being that the Delete button is \
no longer the default.

Also, the big warning icon is bigger, with bold text around the "permanently removed" \
part. ;-)

Just for the hell of it I threw in a number of files selected label, after beating my \
head on KDialogBase for 5 hours or so. :-(

Files are still moved to the trash instead of being deleted at this point, as I will \
probably tweak this some more tomorrow.


  A            deletedialog.cpp   1.1 [GPL (v2+)]
  A            deletedialog.h   1.1 [GPL (v2+)]
  A            deletedialogbase.ui   1.1
  M +2 -0      Makefile.am   1.68
  M +2 -1      playlist.cpp   1.249


--- kdemultimedia/juk/playlist.cpp  #1.248:1.249
@@ -55,4 +55,5 @@
 #include "painteater.h"
 #include "upcomingplaylist.h"
+#include "deletedialog.h"
 
 using namespace ActionCollection;
@@ -747,5 +748,5 @@ void Playlist::removeFromDisk(const Play
             message = i18n("Do you really want to move these %1 items to the \
trash?").arg(QString::number(files.count()));  
-        if(KMessageBox::warningContinueCancelList(this, message, files, i18n("Delete \
Items?"), KGuiItem(i18n("&Delete"),"editdelete")) == KMessageBox::Continue) { +       \
                if(DeleteDialog::confirmDeleteList(this, files)) {
             for(PlaylistItemList::ConstIterator it = items.begin(); it != \
items.end(); ++it) {  if(m_playingItem == *it)

--- kdemultimedia/juk/Makefile.am  #1.67:1.68
@@ -8,4 +8,6 @@
         cache.cpp \
         collectionlist.cpp \
+        deletedialog.cpp \
+        deletedialogbase.ui \
         directorylist.cpp \
         directorylistbase.ui \


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