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

List:       kde-commits
Subject:    KDE/kdeutils/kgpg
From:       Rolf Eike Beer <kde () opensource ! sf-tec ! de>
Date:       2011-06-02 15:46:16
Message-ID: 20110602154616.C9202AC782 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1234835 by dakon:

fix some actions showing up for toolbars not having a text

CCBUG:272619

 M  +12 -10    keysmanager.cpp  
 M  +12 -0     keytreeview.cpp  
 M  +2 -0      keytreeview.h  


--- trunk/KDE/kdeutils/kgpg/keysmanager.cpp #1234834:1234835
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2002 Jean-Baptiste Mardelle <bj@altern.org>
- * Copyright (C) 2007,2008,2009,2010 Rolf Eike Beer <kde@opensource.sf-tec.de>
+ * Copyright (C) 2007,2008,2009,2010,2011 Rolf Eike Beer <kde@opensource.sf-tec.de>
  */
 
 /***************************************************************************
@@ -159,12 +159,8 @@
 	if (showTipOfDay)
 		installEventFilter(this);
 
-	KAction *action = 0;
+	KAction *action;
 
-	action = actionCollection()->addAction( QLatin1String( "default" ) );
-	connect(action, SIGNAL(triggered(bool)), SLOT(slotDefaultAction()));
-	action->setShortcut(QKeySequence(Qt::Key_Return));
-
 	action =  actionCollection()->addAction( QLatin1String( "help_tipofday" ));
 	action->setIcon( KIcon( QLatin1String( "help-hint" )) );
 	action->setText( i18n("Tip of the &Day") );
@@ -248,6 +244,7 @@
 	deleteKey->setIcon(KIcon( QLatin1String( "edit-delete" )));
 	connect(deleteKey, SIGNAL(triggered(bool)), SLOT(confirmdeletekey()));
 	deleteKey->setShortcut(QKeySequence(Qt::Key_Delete));
+	deleteKey->setEnabled(false);
 
 	setDefaultKey = actionCollection()->addAction(QLatin1String( "key_default" ));
 	setDefaultKey->setText(i18n("Set as De&fault Key"));
@@ -288,6 +285,7 @@
 	delSignKey = actionCollection()->addAction(QLatin1String( "key_delsign" ));
 	delSignKey->setIcon(KIcon( QLatin1String( "edit-delete" )));
 	connect(delSignKey, SIGNAL(triggered(bool)), SLOT(delsignkey()));
+	delSignKey->setEnabled(false);
 
 	importAllSignKeys = actionCollection()->addAction(QLatin1String( \
"key_importallsign" ));  importAllSignKeys->setIcon(KIcon( QLatin1String( \
"document-import" ))); @@ -361,6 +359,8 @@
 	iview->setContextMenuPolicy(Qt::CustomContextMenu);
 	connect(iview->selectionModel(), SIGNAL(selectionChanged(const QItemSelection &, \
const QItemSelection &)), this, SLOT(checkList()));  
+	connect (iview, SIGNAL(returnPressed()), SLOT(slotDefaultAction()));
+
 	int psize = KGpgSettings::photoProperties();
 	photoProps->setCurrentItem(psize);
 	slotSetPhotoSize(psize);
@@ -500,6 +500,7 @@
 	connect(m_netnote, SIGNAL(shouldDisconnect()), SLOT(slotNetworkDown()));
 
 	toggleNetworkActions(Solid::Networking::status() == Solid::Networking::Unknown || \
Solid::Networking::status() == Solid::Networking::Connected); \
+	importSignatureKey->setEnabled(false);  
 	QTimer::singleShot(0, this, SLOT(refreshkey()));
 }
@@ -1334,6 +1335,9 @@
 	createGroup->setText(i18np("&Create Group with Selected Key...", "&Create Group \
with Selected Keys...", cnt));  signKey->setText(i18np("&Sign Key...", "&Sign \
Keys...", cnt));  delUid->setText(i18np("&Delete User ID", "&Delete User IDs", cnt));
+	delSignKey->setText(i18np("Delete Sign&ature", "Delete Sign&atures", cnt));
+	importSignatureKey->setText(i18np("Import Key From Keyserver", "Import Keys From \
Keyserver", cnt)); +	deleteKey->setText(i18np("&Delete Key", "&Delete Keys", cnt));
 }
 
 void
@@ -1380,9 +1384,7 @@
 		}
 
 		importSignatureKey->setEnabled(allunksig && m_online);
-		importSignatureKey->setText(i18np("Import Key From Keyserver", "Import Keys From \
Keyserver", cnt));  delSignKey->setEnabled( (cnt == 1) );
-		delSignKey->setText(i18np("Delete Sign&ature", "Delete Sign&atures", cnt));
 		m_popupsig->exec(globpos);
 	} else if (itype == ITYPE_UID) {
 		if (cnt == 1) {
@@ -1404,7 +1406,6 @@
 	} else if (!(itype & ~(ITYPE_PAIR | ITYPE_GROUP))) {
 		signKey->setEnabled(!(itype & ITYPE_GROUP));
 		deleteKey->setEnabled(!(itype & ITYPE_GROUP));
-		deleteKey->setText(i18np("&Delete Key", "&Delete Keys", cnt));
 		setDefaultKey->setEnabled( (cnt == 1) );
 		m_popuppub->exec(globpos);
 	} else if (!(itype & ~(ITYPE_UID | ITYPE_PAIR | ITYPE_UAT))) {
@@ -2283,7 +2284,8 @@
 void KeysManager::delsignkey()
 {
 	KGpgNode *nd = iview->selectedNode();
-	Q_ASSERT(nd != NULL);
+	if (nd == NULL)
+		return;
 
 	QString uid;
 	QString parentKey;
--- trunk/KDE/kdeutils/kgpg/keytreeview.cpp #1234834:1234835
@@ -210,4 +210,16 @@
 		resizeColumnToContents(i);
 }
 
+void
+KeyTreeView::keyPressEvent(QKeyEvent *event)
+{
+	if (event->key() == Qt::Key_Return) {
+		if (!event->isAutoRepeat())
+			emit returnPressed();
+
+		return;
+	}
+	QTreeView::keyPressEvent(event);
+}
+
 #include "keytreeview.moc"
--- trunk/KDE/kdeutils/kgpg/keytreeview.h #1234834:1234835
@@ -49,6 +49,7 @@
 
 signals:
 	void importDrop(const KUrl::List &urls);
+	void returnPressed();
 
 public slots:
 	void selectNode(KGpgNode *nd);
@@ -58,6 +59,7 @@
 	virtual void contentsDragMoveEvent(QDragMoveEvent *e);
 	virtual void contentsDropEvent(QDropEvent *e);
 	virtual void startDrag(Qt::DropActions);
+	virtual void keyPressEvent(QKeyEvent *event);
 };
 
 #endif


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