many small bugfixes

6 files changed, 21 insertions, 13 deletions

diff --git a/pwmanager/pwmanager/findwnd_emb.cpp b/pwmanager/pwmanager/findwnd_emb.cpp
index 6db2684..6dcabe8 100644
--- a/pwmanager/pwmanager/findwnd_emb.cpp
+++ b/pwmanager/pwmanager/findwnd_emb.cpp
@@ -59,57 +59,57 @@ findWnd::findWnd( QWidget* parent, const char* name )
     QWidget *page = plainPage();
     QVBoxLayout *layout = new QVBoxLayout( page );
     layout->setMargin( KDialogBase::marginHint() );
     layout->setSpacing( KDialogBase::spacingHint() );
 
     exactCheckBox = new QCheckBox( i18n( "&Exact match" ), page );
     layout->addWidget( exactCheckBox );
 
     caseSensCheckBox = new QCheckBox( i18n( "&Case sensitive" ), page );
     layout->addWidget( caseSensCheckBox );
 
 
     QButtonGroup* buttonGroup1 = new QButtonGroup(1, Qt::Horizontal, i18n( "Search in Column" ), page );
     layout->addWidget( buttonGroup1 );
 
     descRadioButton = new QRadioButton( i18n( "&Description" ), buttonGroup1  );
     pwRadioButton = new QRadioButton( i18n( "&Password" ), buttonGroup1 );
     commentRadioButton = new QRadioButton( i18n( "C&omment" ), buttonGroup1 );
     nameRadioButton = new QRadioButton( i18n( "&Username" ), buttonGroup1 );
     urlRadioButton = new QRadioButton( i18n( "U&RL" ), buttonGroup1 );
     launcherRadioButton = new QRadioButton( i18n( "&Launcher" ), buttonGroup1 );
     descRadioButton->setChecked( TRUE );
 
     findLineEdit = new KLineEdit( page );
-    QLabel* label = new QLabel( findLineEdit, i18n( "Find:" ), page );
-    layout->addWidget( label );
+    // QLabel* label = new QLabel( findLineEdit, i18n( "Find:" ), page );
+    //layout->addWidget( label );
     layout->addWidget( findLineEdit );
     
     setButtonText( KDialogBase::Ok, "&Find" );
     setButtonText( KDialogBase::Cancel, "&Close" );
 
 
-    //    resize( QSize(200, 150) );
+    resize( sizeHint() );
 
 
     connect( buttonGroup1, SIGNAL( clicked(int) ), this, SLOT( selectionChanged_slot() ) );
     connect( findLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( selectionChanged_slot() ) );
     connect( caseSensCheckBox, SIGNAL( stateChanged(int) ), this, SLOT( selectionChanged_slot() ) );
     connect( exactCheckBox, SIGNAL( stateChanged(int) ), this, SLOT( selectionChanged_slot() ) );
 
 }
 
 /*
  *  Destroys the object and frees any allocated resources
  */
 findWnd::~findWnd()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 
 void findWnd::findButton_slot()
 {
     qWarning( "findWnd::findButton_slot(): Not implemented yet" );
 }
 
 void findWnd::selectionChanged_slot()
 {
diff --git a/pwmanager/pwmanager/getmasterpwwnd_emb.cpp b/pwmanager/pwmanager/getmasterpwwnd_emb.cpp
index ff4c28a..7f4ccef 100644
--- a/pwmanager/pwmanager/getmasterpwwnd_emb.cpp
+++ b/pwmanager/pwmanager/getmasterpwwnd_emb.cpp
@@ -78,49 +78,49 @@ getMasterPwWnd::getMasterPwWnd( QWidget* parent, const char* name)
     QPushButton* p3 = new QPushButton( i18n("3"), numberBox );
     numberLayout->addWidget( p3, 0, 2 );
     QPushButton* p4 = new QPushButton( i18n("4"), numberBox );
     numberLayout->addWidget( p4, 1, 0 );
     QPushButton* p5 = new QPushButton( i18n("5"), numberBox );
     numberLayout->addWidget( p5, 1, 1 );
     QPushButton* p6 = new QPushButton( i18n("6"), numberBox );
     numberLayout->addWidget( p6, 1, 2 );
     QPushButton* p7 = new QPushButton( i18n("7"), numberBox );
     numberLayout->addWidget( p7, 2, 0 );
     QPushButton* p8 = new QPushButton( i18n("8"), numberBox );
     numberLayout->addWidget( p8, 2, 1 );
     QPushButton* p9 = new QPushButton( i18n("9"), numberBox );
     numberLayout->addWidget( p9, 2, 2 );
     QPushButton* clear  = new QPushButton( i18n("x"), numberBox );
     numberLayout->addWidget( clear, 3, 0 );
     QPushButton* p0 = new QPushButton( i18n("0"), numberBox );
     numberLayout->addWidget( p0, 3, 1 );
     QPushButton* backspace = new QPushButton( i18n("-"), numberBox );
     numberLayout->addWidget( backspace, 3, 2 );
 
 
     pageLayout->addWidget(numberBox);
 
-    resize( QSize(200, 180) );
+    resize( 200,sizeHint().height() );
 
     connect( p0, SIGNAL( clicked() ), this, SLOT( add0() ) );
     connect( p1, SIGNAL( clicked() ), this, SLOT( add1() ) );
     connect( p2, SIGNAL( clicked() ), this, SLOT( add2() ) );
     connect( p3, SIGNAL( clicked() ), this, SLOT( add3() ) );
     connect( p4, SIGNAL( clicked() ), this, SLOT( add4() ) );
     connect( p5, SIGNAL( clicked() ), this, SLOT( add5() ) );
     connect( p6, SIGNAL( clicked() ), this, SLOT( add6() ) );
     connect( p7, SIGNAL( clicked() ), this, SLOT( add7() ) );
     connect( p8, SIGNAL( clicked() ), this, SLOT( add8() ) );
     connect( p9, SIGNAL( clicked() ), this, SLOT( add9() ) );
     connect( backspace, SIGNAL( clicked() ), this, SLOT( backspace() ) );
     connect( clear, SIGNAL( clicked() ), this, SLOT( clear() ) );
 
 
 
 }
 
 /*
  *  Destroys the object and frees any allocated resources
  */
 getMasterPwWnd::~getMasterPwWnd()
 {
     // no need to delete child widgets, Qt does it all for us
diff --git a/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp b/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp
index 525bdaa..720dfcc 100644
--- a/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp
+++ b/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp
@@ -48,57 +48,64 @@
 
 #include "pwmconfigwidget.h"
 #include "pwmexception.h"
 
 PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *name )
   : KPrefsWidget(prefs,  parent, name )
 {
   QVBoxLayout *topLayout = new QVBoxLayout( this, 0,
                                             KDialog::spacingHint() );
 
   QTabWidget *tabWidget = new QTabWidget( this );
   topLayout->addWidget( tabWidget );
 
   // windowsStyle page
   //////////////////////////////////////////////////////
   QWidget *windowStylePage = new QWidget( this );
   QGridLayout *windowStyleLayout = new QGridLayout( windowStylePage, 3, 3);
   
   int i = 0;
   KPrefsWidRadios * windowStyle = addWidRadios(i18n("Window-style:") ,&(prefs->mMainViewStyle), windowStylePage);
   windowStyle->addRadio(i18n("Category on top"));
   windowStyle->addRadio(i18n("Category-list left/top")); 
   windowStyleLayout->addMultiCellWidget( (QWidget*)windowStyle->groupBox(),i,i,0,2);
    ++i;   
+   
+   QLabel* lab = new QLabel(i18n("<b>Font for Password entries:</b>"), windowStylePage);
+   windowStyleLayout->addMultiCellWidget( lab,i,i,0,2);
+   
 
+   ++i;
+  
   KPrefsWidFont *selEntrFont =
-      addWidFont(i18n("Password"),i18n("Font for Pw entries:"),
+      addWidFont(i18n("Password"),i18n("Font:"),
                  &(prefs->mEntryFont),windowStylePage);
   windowStyleLayout->addWidget(selEntrFont->label(),i,0);
   windowStyleLayout->addWidget(selEntrFont->preview(),i,1);
   windowStyleLayout->addWidget(selEntrFont->button(),i,2);
   ++i;
-
+  lab = new QLabel(i18n(""), windowStylePage);
+   windowStyleLayout->addMultiCellWidget( lab,i,i,0,2);
 
   // File page
   //////////////////////////////////////////////////////
   QWidget *filePage = new QWidget( this );
   QGridLayout *fileLayout = new QGridLayout( filePage, 3, 2);
   
   i = 0;
   QLabel* kcfg_compression_label = new QLabel(i18n("Compression:"), filePage);
   fileLayout->addWidget(kcfg_compression_label,i,0);
   kcfg_compression = new QComboBox(filePage, "kcfg_compression");
   kcfg_compression->insertItem(i18n("None"));
   kcfg_compression->insertItem(i18n("gzip"));
   //US not yet supported:  kcfg_compression->insertItem(i18n("bzip2"));
   fileLayout->addWidget( kcfg_compression,i,1);
   ++i;   
 
   QLabel* kcfg_crypt_label = new QLabel(i18n("Encryption:"), filePage);
   fileLayout->addWidget(kcfg_crypt_label,i,0);
   kcfg_cryptAlgo = new QComboBox(filePage, "kcfg_cryptAlgo");
   kcfg_cryptAlgo->insertItem(i18n("Blowfish (128 bit)"));
 #ifdef CONFIG_PWMANAGER_GCRY
   kcfg_cryptAlgo->insertItem(i18n("AES-128, Rijndael (128 bit)"));
   kcfg_cryptAlgo->insertItem(i18n("AES-192, Rijndael (192 bit)"));
   kcfg_cryptAlgo->insertItem(i18n("AES-256, Rijndael (256 bit)"));
diff --git a/pwmanager/pwmanager/main.cpp b/pwmanager/pwmanager/main.cpp
index 3ae4d55..3f2d055 100644
--- a/pwmanager/pwmanager/main.cpp
+++ b/pwmanager/pwmanager/main.cpp
@@ -153,51 +153,52 @@ int main(int argc, char *argv[])
                 return EXIT_SUCCESS;
         }
         PwMApplication a;
         aboutData.setLicenseTextFile(LICENSE_FILE);
         return a.exec();
 #else
 
   bool exitHelp = false;
   if ( argc > 1 ) {
       QString command = argv[1];
       if (  command == "-help" ){
           printf("PWM/PI command line commands:\n");
           printf("  no command: Start PWM/PI in usual way\n");
           printf("  -help: This output\n");
           printf(" PWM/PI is exiting now. Bye!\n");
           exitHelp = true;
       }
   }
   if ( ! exitHelp ) {
 
     PwMApplication a(argc, argv);
 
     KGlobal::setAppName( "pwmanager" );
 #ifndef DESKTOP_VERSION
-    //US    if ( QApplication::desktop()->width() > 320 )
-    //US        KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/pwmanager/icons22/");
-    //US    else
+    //qDebug("width %d ",QApplication::desktop()->width() );
+    if ( QApplication::desktop()->width() > 320 )
+      KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/pwmanager/icons22/");
+    else
         KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/pwmanager/icons16/");
 #else
       QString fileName ;
       fileName  = qApp->applicationDirPath () + "/kdepim/pwmanager/icons22/";
       KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName));
       QApplication::addLibraryPath ( qApp->applicationDirPath () );
 
 #endif
       KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "pwmanager")));
       KPimGlobalPrefs::instance()->setGlobalConfig();
 
       a.newInstance();
 
       //US       KAddressBookMain m ;
 
       //US      QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
       /*US
 #ifndef DESKTOP_VERSION
        a.showMainWidget( &m );
 #else
       a.setMainWidget( &m );
       m.resize (640, 480 );
       m.show();
 #endif
diff --git a/pwmanager/pwmanager/pwmviewstyle_0.cpp b/pwmanager/pwmanager/pwmviewstyle_0.cpp
index 7262684..1453d03 100644
--- a/pwmanager/pwmanager/pwmviewstyle_0.cpp
+++ b/pwmanager/pwmanager/pwmviewstyle_0.cpp
@@ -10,60 +10,60 @@
  ***************************************************************************/
 
 /***************************************************************************
  * copyright (C) 2004 by Ulf Schenk
  * This file is originaly based on version 1.0.1 of pwmanager
  * and was modified to run on embedded devices that run microkde
  *
  * $Id$
  **************************************************************************/  
 
 #include "pwmviewstyle_0.h"
 #include "pwmview.h"
 #include "listviewpwm.h"
 #include "commentbox.h"
 
 #include <klocale.h>
 #include "pwmprefs.h"
 
 PwMViewStyle_0::PwMViewStyle_0(PwMView *view)
  : QObject()
 {
         vbox1 = new QVBox(view);
         vbox1->setSpacing(3);
         hbox1 = new QHBox(vbox1);
-        hbox1->setSpacing(10);
+        hbox1->setSpacing(3);
         categoriesTitle = new QLabel(hbox1);
         categoriesTitle->setText(i18n("Categories:"));
         categoriesCombo = new QComboBox(hbox1);
         renCatButton = new QPushButton(i18n("&Rename"), hbox1);
         delCatButton = new QPushButton(i18n("&Delete"), hbox1);
 #ifndef PWM_EMBEDDED
         splitter1 = new QSplitter(vbox1);
         splitter1->setOrientation(Qt::Vertical);
 #else
         splitter1 = new KDGanttMinimizeSplitter( Qt::Vertical, vbox1);
-        splitter1->setMinimizeDirection ( KDGanttMinimizeSplitter::Up );
+        splitter1->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
 
         //US  topLayout->addWidget(mMiniSplitter );
 #endif
         lv = new ListViewPwM(splitter1);
         commentBox = new CommentBox(splitter1);
         // set sizes and styles
         commentBox->resize(commentBox->size().width(), 60);
         categoriesTitle->setAlignment(Qt::AlignVCenter | Qt::AlignRight);
         // connections
         connect(categoriesCombo, SIGNAL(activated(int)),
                 view, SLOT(shiftToView()));
         connect(renCatButton, SIGNAL(clicked()),
                 view, SLOT(renCatButton_slot()));
         connect(delCatButton, SIGNAL(clicked()),
                 view, SLOT(delCatButton_slot()));
 }
 
 PwMViewStyle_0::~PwMViewStyle_0()
 {
         delete vbox1;
 }
 
 void PwMViewStyle_0::delCategory(const QString &cat)
 {
diff --git a/pwmanager/pwmanager/pwmviewstyle_1.cpp b/pwmanager/pwmanager/pwmviewstyle_1.cpp
index 374c698..a85cece 100644
--- a/pwmanager/pwmanager/pwmviewstyle_1.cpp
+++ b/pwmanager/pwmanager/pwmviewstyle_1.cpp
@@ -13,62 +13,62 @@
  * copyright (C) 2004 by Ulf Schenk
  * This file is originaly based on version 1.0.1 of pwmanager
  * and was modified to run on embedded devices that run microkde
  *
  * $Id$
  **************************************************************************/  
 
 #include "pwmviewstyle_1.h"
 #include "pwmview.h"
 #include "listviewpwm.h"
 #include "commentbox.h"
 
 #include <klocale.h>
 #include "pwmprefs.h"
 
         #define INITIAL_CATEGORIES_WIDTH100
 
 PwMViewStyle_1::PwMViewStyle_1(PwMView *view)
  : QObject()
 {
 #ifndef PWM_EMBEDDED
         splitter = new QSplitter(view);
 #else
         splitter = new KDGanttMinimizeSplitter( Qt::Horizontal, view);
-        splitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
+        splitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Left );
 
         //US  topLayout->addWidget(mMiniSplitter );
 #endif
 
         vbox1 = new QVBox(splitter);
         categoriesTitle = new QLabel(vbox1);
         categoriesList = new QListBox(vbox1);
 #ifndef PWM_EMBEDDED
         splitter2 = new QSplitter(splitter);
         splitter2->setOrientation(Qt::Vertical);
 #else
         splitter2 = new KDGanttMinimizeSplitter( Qt::Vertical, splitter);
-        splitter2->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
+        splitter2->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
 
         //US  topLayout->addWidget(mMiniSplitter );
 #endif
         lv = new ListViewPwM(splitter2);
         commentBox = new CommentBox(splitter2);
         // set sizes and styles
                 //UScommentBox->resize(commentBox->size().width(), 60);
         QValueList<int> sizes;
 #ifndef PWM_EMBEDDED
         sizes.push_back(INITIAL_CATEGORIES_WIDTH);
         sizes.push_back(view->height() - INITIAL_CATEGORIES_WIDTH);
 #else
         sizes.append(INITIAL_CATEGORIES_WIDTH);
         sizes.append(view->height() - INITIAL_CATEGORIES_WIDTH);
 #endif
                 //USsplitter->setSizes(sizes);
         categoriesTitle->setAlignment(Qt::AlignHCenter);
 #ifndef PWM_EMBEDDED
         categoriesTitle->setFrameShape(QFrame::MenuBarPanel);
 #else
         categoriesTitle->setFrameShape(QFrame::StyledPanel);
 #endif
         categoriesTitle->setText(i18n("Categories:"));
         catCtxMenu = new QPopupMenu(view);