removed some debugoutput.

removed configsettings for some unneeded operations in pwmanager config

3 files changed, 8 insertions, 7 deletions

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
@@ -45,12 +45,12 @@ void no_keycard_support_msg_box(QWidget *parentWidget);
 #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
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
@@ -213,18 +213,19 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
 
   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);
@@ -241,7 +242,7 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   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" ) );
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
@@ -40,7 +40,7 @@ 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 */
@@ -53,7 +53,7 @@ class KConfig;
 #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 */