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

List:       kde-commits
Subject:    KDE/kdebase/apps/lib/konq
From:       Nicolas Lécureuil <nlecureuil () mandriva ! com>
Date:       2010-03-30 15:02:52
Message-ID: 20100330150252.62521AC888 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1109099 by nlecureuil:

Add a option on the contextual menu of the trash, to configure it 
Reviewed: http://reviewboard.kde.org/r/3433/ 


 M  +15 -0     konq_popupmenu.cpp  
 M  +1 -0      konq_popupmenu.h  


--- trunk/KDE/kdebase/apps/lib/konq/konq_popupmenu.cpp #1109098:1109099
@@ -97,6 +97,7 @@
     void slotPopupNewDir();
     void slotPopupNewView();
     void slotPopupEmptyTrashBin();
+    void slotConfigTrashBin();
     void slotPopupRestoreTrashedItems();
     void slotPopupAddToBookmark();
     void slotPopupMimeType();
@@ -340,6 +341,15 @@
         QObject::connect(act, SIGNAL(triggered()), q, SLOT(slotPopupEmptyTrashBin()));
         q->addAction(act);
     }
+    if ( isCurrentTrash )
+    {
+	act = new KAction(m_parentWidget);
+	m_ownActions.append(act);
+	act->setIcon( KIcon("trash-empty") );
+	act->setText( i18n( "&Configure Trash Bin" ) );
+	QObject::connect(act, SIGNAL(triggered()), q, SLOT(slotConfigTrashBin()));
+	q->addAction(act);
+    }
 
     // This is used by KHTML, see khtml_popupmenu.rc (copy, selectAll, searchProvider etc.)
     // and by DolphinPart (rename, trash, delete)
@@ -494,6 +504,11 @@
   KonqOperations::emptyTrash(m_parentWidget);
 }
 
+void KonqPopupMenuPrivate::slotConfigTrashBin()
+{
+  KRun::run("kcmshell4 kcmtrash", KUrl::List(), m_parentWidget);
+}
+
 void KonqPopupMenuPrivate::slotPopupRestoreTrashedItems()
 {
   KonqOperations::restoreTrashedItems(m_popupItemProperties.urlList(), m_parentWidget);
--- trunk/KDE/kdebase/apps/lib/konq/konq_popupmenu.h #1109098:1109099
@@ -107,6 +107,7 @@
   Q_PRIVATE_SLOT(d, void slotPopupNewDir())
   Q_PRIVATE_SLOT(d, void slotPopupNewView())
   Q_PRIVATE_SLOT(d, void slotPopupEmptyTrashBin())
+  Q_PRIVATE_SLOT(d, void slotConfigTrashBin())
   Q_PRIVATE_SLOT(d, void slotPopupRestoreTrashedItems())
   Q_PRIVATE_SLOT(d, void slotPopupAddToBookmark())
   Q_PRIVATE_SLOT(d, void slotPopupMimeType())
[prev in list] [next in list] [prev in thread] [next in thread]