| -rw-r--r-- | microkde/kdeui/klistview.cpp | 2 | ||||
| -rw-r--r-- | pwmanager/pwmanager/globalstuff.h | 4 | ||||
| -rw-r--r-- | pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp | 7 | ||||
| -rw-r--r-- | pwmanager/pwmanager/pwmprefs.h | 4 |
4 files changed, 9 insertions, 8 deletions
diff --git a/microkde/kdeui/klistview.cpp b/microkde/kdeui/klistview.cpp index 6477d11..5b50ba9 100644 --- a/microkde/kdeui/klistview.cpp +++ b/microkde/kdeui/klistview.cpp @@ -1874,13 +1874,13 @@ QListViewItem* KListView::itemAtIndex(int index) } void KListView::emitContextMenu (KListView*, QListViewItem* i) { QPoint p; - qDebug("KListView::emitContextMenu "); + // qDebug("KListView::emitContextMenu "); if (i) p = viewport()->mapToGlobal(itemRect(i).center()); else p = mapToGlobal(rect().center()); diff --git a/pwmanager/pwmanager/globalstuff.h b/pwmanager/pwmanager/globalstuff.h index 4f70f68..090fcda 100644 --- a/pwmanager/pwmanager/globalstuff.h +++ b/pwmanager/pwmanager/globalstuff.h @@ -42,18 +42,18 @@ class QWidget; void no_keycard_support_msg_box(QWidget *parentWidget); #endif // CONFIG_KEYCARD #ifdef PROG_NAME # undef PROG_NAME #endif -#define PROG_NAME "PwManager-MicroKDE" +#define PROG_NAME "PwM/Pi" #ifdef PACKAGE_NAME # undef PACKAGE_NAME #endif -#define PACKAGE_NAME "pwmanager-microkde" +#define PACKAGE_NAME "pwm-pi" #ifdef PACKAGE_VER # undef PACKAGE_VER #endif #define PACKAGE_VER "1.0.1" diff --git a/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp b/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp index 720dfcc..26b9708 100644 --- a/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp +++ b/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp @@ -210,24 +210,25 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n ////////////////////////////////////////////////////// QWidget *miscPage = new QWidget( this ); QGridLayout *miscLayout = new QGridLayout( miscPage, 3, 2); i = 0; + /*US ENH: PWM/Pi has no tray and con be minimized sb = addWidBool(i18n("Show icon in system-tray"),&(prefs->mTray),miscPage); miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1); ++i; - + */ sb = addWidBool(i18n("Open document with passwords unlocked"),&(prefs->mUnlockOnOpen),miscPage); miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1); ++i; + /*US ENH: PWM/Pi has no tray and con be minimized sb = addWidBool(i18n("auto-minimize to tray on startup"),&(prefs->mAutoMinimizeOnStart),miscPage); miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1); - sb->checkBox()->setEnabled (FALSE); ++i; KPrefsWidRadios * minimizeRadio = addWidRadios(i18n("auto-lock on minimize:") ,&(prefs->mMinimizeLock), miscPage); minimizeRadio->addRadio(i18n("don't lock")); minimizeRadio->addRadio(i18n("normal lock")); minimizeRadio->addRadio(i18n("deep-lock")); @@ -238,13 +239,13 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1); ++i; sb = addWidBool(i18n("Close instead Minimize into tray"),&(prefs->mClose),miscPage); miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1); ++i; - + */ tabWidget->addTab( windowStylePage, i18n( "Look && feel" ) ); tabWidget->addTab( filePage, i18n( "File" ) ); tabWidget->addTab( timeoutPage, i18n( "Timeout" ) ); tabWidget->addTab( autostartPage, i18n( "Autostart" ) ); diff --git a/pwmanager/pwmanager/pwmprefs.h b/pwmanager/pwmanager/pwmprefs.h index 1c8b982..5b8f9d8 100644 --- a/pwmanager/pwmanager/pwmprefs.h +++ b/pwmanager/pwmanager/pwmprefs.h @@ -37,26 +37,26 @@ class KConfig; #define CONF_DEFAULT_PWTIMEOUT 10/* 10 sec */ #define CONF_DEFAULT_LOCKTIMEOUT 0/* 0 == disable */ -#define CONF_DEFAULT_TRAY true +#define CONF_DEFAULT_TRAY false #define CONF_DEFAULT_UNLOCKONOPEN true #define CONF_DEFAULT_MAINVIEWSTYLE 1/* Category List Left */ #define CONF_DEFAULT_COMPRESSION 0x01/* gzip */ #define CONF_DEFAULT_CRYPTALGO (0x01 - 1)/* blowfish */ #define CONF_DEFAULT_HASHALGO (0x01 - 1)/* sha1 */ #define CONF_DEFAULT_AUTOMINIMIZE false #define CONF_DEFAULT_BROWSERCOMMAND "" #define CONF_DEFAULT_XTERMCOMMAND "konsole -e" #define CONF_DEFAULT_FILEPERMISSIONS 0600 #define CONF_DEFAULT_MAKEFILEBACKUP false #define CONF_DEFAULT_AUTOSTART_DEEPL true #define CONF_DEFAULT_AUTODEEPLOCK true -#define CONF_DEFAULT_KWALLETEMU true +#define CONF_DEFAULT_KWALLETEMU false #define CONF_DEFAULT_MINIMIZELOCK 2/* deep-lock */ #define CONF_DEFAULT_NEWENTRLOCKSTAT false/* new entries unlocked */ #define CONF_DEFAULT_WNDCLOSE true/* don't minimize to tray */ class PWMPrefs : public KPimPrefs |