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
@@ -77,21 +77,21 @@ findWnd::findWnd( QWidget* parent, const char* name )
     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() ) );
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
@@ -96,13 +96,13 @@ getMasterPwWnd::getMasterPwWnd( QWidget* parent, const char* name)
     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() ) );
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
@@ -66,21 +66,28 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   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);
   
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
@@ -171,15 +171,16 @@ int main(int argc, char *argv[])
   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 () );
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
@@ -28,24 +28,24 @@
 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
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
@@ -31,26 +31,26 @@ 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