[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdeutils/kwallet
From: George Staikos <staikos () kde ! org>
Date: 2004-11-02 23:29:36
Message-ID: 20041102232936.4F77A16B8E () office ! kde ! org
[Download RAW message or body]
CVS commit by staikos:
fix formatting, and add DocPath
CCBUG: 90949
M +15 -14 kwalletmanager.cpp 1.46
M +1 -0 kwalletmanager.desktop 1.52
--- kdeutils/kwallet/kwalletmanager.cpp #1.45:1.46
@@ -106,11 +106,13 @@ KWalletManager::KWalletManager(QWidget *
0, this, SLOT(setupWallet()), actionCollection(),
"wallet_settings");
- if ( _tray )
+ if (_tray) {
act->plug(_tray->contextMenu());
+ }
act = new KAction(i18n("Close &All Wallets"), 0, 0, this,
SLOT(closeAllWallets()), actionCollection(),
"close_all_wallets");
- if ( _tray )
+ if (_tray) {
act->plug(_tray->contextMenu());
+ }
KStdAction::quit(this, SLOT(shuttingDown()), actionCollection());
KStdAction::keyBindings(guiFactory(), SLOT(configureShortcuts()),
@@ -123,8 +125,9 @@ actionCollection());
this, SLOT(deleteWallet()));
- if ( _tray )
+ if (_tray) {
_tray->show();
- else
+ } else {
show();
+ }
}
@@ -138,8 +141,9 @@ KWalletManager::~KWalletManager() {
bool KWalletManager::queryClose() {
if (!_shuttingDown && !kapp->sessionSaving()) {
- if ( !_tray )
+ if (!_tray) {
kapp->quit();
- else
+ } else {
hide();
+ }
return false;
}
@@ -148,5 +152,5 @@ bool KWalletManager::queryClose() {
void KWalletManager::aWalletWasOpened() {
- if ( _tray ) {
+ if (_tray) {
_tray->setPixmap(loadSystemTrayIcon("wallet_open"));
QToolTip::remove(_tray);
@@ -243,12 +247,10 @@ void KWalletManager::openWalletFile(cons
-void KWalletManager::openWallet()
-{
+void KWalletManager::openWallet() {
QIconViewItem *item = _iconView->currentItem();
openWallet(item);
}
-void KWalletManager::deleteWallet()
-{
+void KWalletManager::deleteWallet() {
QIconViewItem *item = _iconView->currentItem();
if (item) {
@@ -370,6 +372,5 @@ void KWalletManager::closeAllWallets() {
}
-QPixmap KWalletManager::loadSystemTrayIcon(const QString &icon)
-{
+QPixmap KWalletManager::loadSystemTrayIcon(const QString &icon) {
#if KDE_IS_VERSION(3, 1, 90)
return KSystemTray::loadIcon(icon);
--- kdeutils/kwallet/kwalletmanager.desktop #1.51:1.52
@@ -48,2 +48,3 @@
X-KDE-StartupNotify=false
Categories=Qt;KDE;Settings;
+DocPath=kwallet/index.html
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic