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

List:       kde-commits
Subject:    extragear/graphics/gwenview
From:       Aurélien Gâteau <aurelien.gateau () free ! fr>
Date:       2005-08-01 20:28:29
Message-ID: 1122928109.544431.26784.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 442169 by gateau:

The context menu which appears when right clicking on the background of a file
view now shows information relative to the current folder, rather than the
current image.


 M  +3 -0      NEWS  
 M  +19 -9     gvcore/fileviewstack.cpp  
 M  +1 -1      gvcore/fileviewstack.h  
 M  +5 -5      gvdirpart/gvdirpart.cpp  


--- trunk/extragear/graphics/gwenview/NEWS #442168:442169
@@ -13,6 +13,9 @@
    filenames, even if the filename is not shown for images.
  - When right clicking on files from the folder KPart, show Konqueror popup
    menu instead of Gwenview.
+ - The context menu which appears when right clicking on the background of a
+   file view now shows information relative to the current folder, rather than
+   the current image.
 
 2005.07.17 - v1.2.91
 - New features:
--- trunk/extragear/graphics/gwenview/gvcore/fileviewstack.cpp #442168:442169
@@ -543,14 +543,24 @@
 // Context menu
 //
 //-----------------------------------------------------------------------
-void FileViewStack::openContextMenu(const QPoint& pos) {
-	int selectionSize=currentFileView()->selectedItems()->count();
+void FileViewStack::openContextMenu(const QPoint& pos, bool onItem) {
+	int selectionSize;
+	ExternalToolContext* externalToolContext;
+	
+	if (onItem) {
+		selectionSize=currentFileView()->selectedItems()->count();
+		externalToolContext=
+			ExternalToolManager::instance()->createContext(
+			this, currentFileView()->selectedItems());
+	} else {
+		selectionSize=0;
+		externalToolContext=
+			ExternalToolManager::instance()->createContext(
+			this, mDirURL);
+	}
 
 	QPopupMenu menu(this);
 
-	ExternalToolContext* externalToolContext=
-		ExternalToolManager::instance()->createContext(
-		this, currentFileView()->selectedItems());
 
 	menu.insertItem(
 		i18n("External Tools"), externalToolContext->popupMenu());
@@ -591,13 +601,13 @@
 }
 
 
-void FileViewStack::openContextMenu(KListView*,QListViewItem*,const QPoint& pos) {
-	openContextMenu(pos);
+void FileViewStack::openContextMenu(KListView*,QListViewItem* item,const QPoint& pos) {
+	openContextMenu(pos, item!=0);
 }
 
 
-void FileViewStack::openContextMenu(QIconViewItem*,const QPoint& pos) {
-	openContextMenu(pos);
+void FileViewStack::openContextMenu(QIconViewItem* item,const QPoint& pos) {
+	openContextMenu(pos, item!=0);
 }
 
 
--- trunk/extragear/graphics/gwenview/gvcore/fileviewstack.h #442168:442169
@@ -176,7 +176,7 @@
 	void sortingChanged();
 
 protected slots:
-	virtual void openContextMenu(const QPoint& pos);
+	virtual void openContextMenu(const QPoint& pos, bool onItem);
 
 private slots:
 	void delayedDirListerCompleted();
--- trunk/extragear/graphics/gwenview/gvdirpart/gvdirpart.cpp #442168:442169
@@ -82,12 +82,12 @@
 	, mBrowserExtension(browserExtension) {}
 
 protected:
-	virtual void openContextMenu(const QPoint& pos) {
-		const KFileItemList* items=currentFileView()->selectedItems();
-		if (items->count()==0) {
+	virtual void openContextMenu(const QPoint& pos, bool onItem) {
+		if (onItem) {
+			const KFileItemList* items=currentFileView()->selectedItems();
+			emit mBrowserExtension->popupMenu(pos, *items);
+		} else {
 			emit mBrowserExtension->popupMenu(pos, dirURL(), 0);
-		} else {
-			emit mBrowserExtension->popupMenu(pos, *items);
 		}
 	}
 
[prev in list] [next in list] [prev in thread] [next in thread]