r14228 by jghali - #8542: "windows > arrange pages" doesn't close with the ESC key

scribus-commit scribus-commit at lists.scribus.net
Sun Oct 25 22:10:36 CET 2009


Revision: 14228
Author: jghali
Date: 2009-10-25T17:33:09.229861Z
Commit message: #8542: "windows > arrange pages" doesn't close with the ESC key

Changeset: 
M  /trunk/Scribus/scribus/ui/pagepalette.cpp

Diffs:
Index: scribus/ui/pagepalette.cpp
===================================================================
--- scribus/ui/pagepalette.cpp	(revision 14227)
+++ scribus/ui/pagepalette.cpp	(revision 14228)
@@ -110,6 +110,7 @@
 
 void SeList::keyPressEvent(QKeyEvent * e)
 {
+	bool accepted = false;
 	int k = e->key();
 	if (k == Qt::Key_Delete)
 	{
@@ -122,8 +123,11 @@
 			{
 				emit DelMaster(currentItem()->text());
 			}
+			accepted = true;
 		}
 	}
+	if (!accepted)
+		QListWidget::keyPressEvent(e);
 }
 
 
@@ -381,6 +385,7 @@
 
 void SeView::keyPressEvent(QKeyEvent * e)
 {
+	bool accepted = false;
 	int k = e->key();
 	if (k == Qt::Key_Delete)
 	{
@@ -393,7 +398,10 @@
 			int pageToDelete=GetPage(currentRow(), currentColumn(), &dummy);
 			emit DelPage(pageToDelete);
 		}
+		accepted = true;
 	}
+	if (!accepted)
+		QTableWidget::keyPressEvent(e);
 }
 
 void SeView::ClearPix()




More information about the scribus-commit mailing list