author | zautrix <zautrix> | 2004-10-19 22:13:43 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-19 22:13:43 (UTC) |
commit | 2ab05e776276f02fd688b7041e5ccc5eb4573e50 (patch) (unidiff) | |
tree | b5df81769861183faf4a0198046eb70b8f0df7bb | |
parent | b11fbdc29bf96507c68ee9b6813d76ae37b5fd8f (diff) | |
download | kdepimpi-2ab05e776276f02fd688b7041e5ccc5eb4573e50.zip kdepimpi-2ab05e776276f02fd688b7041e5ccc5eb4573e50.tar.gz kdepimpi-2ab05e776276f02fd688b7041e5ccc5eb4573e50.tar.bz2 |
many small bugfixes
-rw-r--r-- | pwmanager/pwmanager/findwnd_emb.cpp | 6 | ||||
-rw-r--r-- | pwmanager/pwmanager/getmasterpwwnd_emb.cpp | 2 | ||||
-rw-r--r-- | pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp | 11 | ||||
-rw-r--r-- | pwmanager/pwmanager/main.cpp | 7 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwmviewstyle_0.cpp | 4 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwmviewstyle_1.cpp | 4 |
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 | |||
@@ -79,17 +79,17 @@ findWnd::findWnd( QWidget* parent, const char* name ) | |||
79 | launcherRadioButton = new QRadioButton( i18n( "&Launcher" ), buttonGroup1 ); | 79 | launcherRadioButton = new QRadioButton( i18n( "&Launcher" ), buttonGroup1 ); |
80 | descRadioButton->setChecked( TRUE ); | 80 | descRadioButton->setChecked( TRUE ); |
81 | 81 | ||
82 | findLineEdit = new KLineEdit( page ); | 82 | findLineEdit = new KLineEdit( page ); |
83 | QLabel* label = new QLabel( findLineEdit, i18n( "Find:" ), page ); | 83 | // QLabel* label = new QLabel( findLineEdit, i18n( "Find:" ), page ); |
84 | layout->addWidget( label ); | 84 | //layout->addWidget( label ); |
85 | layout->addWidget( findLineEdit ); | 85 | layout->addWidget( findLineEdit ); |
86 | 86 | ||
87 | setButtonText( KDialogBase::Ok, "&Find" ); | 87 | setButtonText( KDialogBase::Ok, "&Find" ); |
88 | setButtonText( KDialogBase::Cancel, "&Close" ); | 88 | setButtonText( KDialogBase::Cancel, "&Close" ); |
89 | 89 | ||
90 | 90 | ||
91 | // resize( QSize(200, 150) ); | 91 | resize( sizeHint() ); |
92 | 92 | ||
93 | 93 | ||
94 | connect( buttonGroup1, SIGNAL( clicked(int) ), this, SLOT( selectionChanged_slot() ) ); | 94 | connect( buttonGroup1, SIGNAL( clicked(int) ), this, SLOT( selectionChanged_slot() ) ); |
95 | connect( findLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( selectionChanged_slot() ) ); | 95 | connect( findLineEdit, SIGNAL( textChanged(const QString&) ), 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 | |||
@@ -98,9 +98,9 @@ getMasterPwWnd::getMasterPwWnd( QWidget* parent, const char* name) | |||
98 | 98 | ||
99 | 99 | ||
100 | pageLayout->addWidget(numberBox); | 100 | pageLayout->addWidget(numberBox); |
101 | 101 | ||
102 | resize( QSize(200, 180) ); | 102 | resize( 200,sizeHint().height() ); |
103 | 103 | ||
104 | connect( p0, SIGNAL( clicked() ), this, SLOT( add0() ) ); | 104 | connect( p0, SIGNAL( clicked() ), this, SLOT( add0() ) ); |
105 | connect( p1, SIGNAL( clicked() ), this, SLOT( add1() ) ); | 105 | connect( p1, SIGNAL( clicked() ), this, SLOT( add1() ) ); |
106 | connect( p2, SIGNAL( clicked() ), this, SLOT( add2() ) ); | 106 | connect( p2, SIGNAL( clicked() ), this, SLOT( add2() ) ); |
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 | |||
@@ -68,17 +68,24 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n | |||
68 | windowStyle->addRadio(i18n("Category on top")); | 68 | windowStyle->addRadio(i18n("Category on top")); |
69 | windowStyle->addRadio(i18n("Category-list left/top")); | 69 | windowStyle->addRadio(i18n("Category-list left/top")); |
70 | windowStyleLayout->addMultiCellWidget( (QWidget*)windowStyle->groupBox(),i,i,0,2); | 70 | windowStyleLayout->addMultiCellWidget( (QWidget*)windowStyle->groupBox(),i,i,0,2); |
71 | ++i; | 71 | ++i; |
72 | |||
73 | QLabel* lab = new QLabel(i18n("<b>Font for Password entries:</b>"), windowStylePage); | ||
74 | windowStyleLayout->addMultiCellWidget( lab,i,i,0,2); | ||
75 | |||
72 | 76 | ||
77 | ++i; | ||
78 | |||
73 | KPrefsWidFont *selEntrFont = | 79 | KPrefsWidFont *selEntrFont = |
74 | addWidFont(i18n("Password"),i18n("Font for Pw entries:"), | 80 | addWidFont(i18n("Password"),i18n("Font:"), |
75 | &(prefs->mEntryFont),windowStylePage); | 81 | &(prefs->mEntryFont),windowStylePage); |
76 | windowStyleLayout->addWidget(selEntrFont->label(),i,0); | 82 | windowStyleLayout->addWidget(selEntrFont->label(),i,0); |
77 | windowStyleLayout->addWidget(selEntrFont->preview(),i,1); | 83 | windowStyleLayout->addWidget(selEntrFont->preview(),i,1); |
78 | windowStyleLayout->addWidget(selEntrFont->button(),i,2); | 84 | windowStyleLayout->addWidget(selEntrFont->button(),i,2); |
79 | ++i; | 85 | ++i; |
80 | 86 | lab = new QLabel(i18n(""), windowStylePage); | |
87 | windowStyleLayout->addMultiCellWidget( lab,i,i,0,2); | ||
81 | 88 | ||
82 | // File page | 89 | // File page |
83 | ////////////////////////////////////////////////////// | 90 | ////////////////////////////////////////////////////// |
84 | QWidget *filePage = new QWidget( this ); | 91 | QWidget *filePage = new QWidget( this ); |
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 | |||
@@ -173,11 +173,12 @@ int main(int argc, char *argv[]) | |||
173 | PwMApplication a(argc, argv); | 173 | PwMApplication a(argc, argv); |
174 | 174 | ||
175 | KGlobal::setAppName( "pwmanager" ); | 175 | KGlobal::setAppName( "pwmanager" ); |
176 | #ifndef DESKTOP_VERSION | 176 | #ifndef DESKTOP_VERSION |
177 | //US if ( QApplication::desktop()->width() > 320 ) | 177 | //qDebug("width %d ",QApplication::desktop()->width() ); |
178 | //US KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/pwmanager/icons22/"); | 178 | if ( QApplication::desktop()->width() > 320 ) |
179 | //US else | 179 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/pwmanager/icons22/"); |
180 | else | ||
180 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/pwmanager/icons16/"); | 181 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/pwmanager/icons16/"); |
181 | #else | 182 | #else |
182 | QString fileName ; | 183 | QString fileName ; |
183 | fileName = qApp->applicationDirPath () + "/kdepim/pwmanager/icons22/"; | 184 | fileName = qApp->applicationDirPath () + "/kdepim/pwmanager/icons22/"; |
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 | |||
@@ -30,9 +30,9 @@ PwMViewStyle_0::PwMViewStyle_0(PwMView *view) | |||
30 | { | 30 | { |
31 | vbox1 = new QVBox(view); | 31 | vbox1 = new QVBox(view); |
32 | vbox1->setSpacing(3); | 32 | vbox1->setSpacing(3); |
33 | hbox1 = new QHBox(vbox1); | 33 | hbox1 = new QHBox(vbox1); |
34 | hbox1->setSpacing(10); | 34 | hbox1->setSpacing(3); |
35 | categoriesTitle = new QLabel(hbox1); | 35 | categoriesTitle = new QLabel(hbox1); |
36 | categoriesTitle->setText(i18n("Categories:")); | 36 | categoriesTitle->setText(i18n("Categories:")); |
37 | categoriesCombo = new QComboBox(hbox1); | 37 | categoriesCombo = new QComboBox(hbox1); |
38 | renCatButton = new QPushButton(i18n("&Rename"), hbox1); | 38 | renCatButton = new QPushButton(i18n("&Rename"), hbox1); |
@@ -41,9 +41,9 @@ PwMViewStyle_0::PwMViewStyle_0(PwMView *view) | |||
41 | splitter1 = new QSplitter(vbox1); | 41 | splitter1 = new QSplitter(vbox1); |
42 | splitter1->setOrientation(Qt::Vertical); | 42 | splitter1->setOrientation(Qt::Vertical); |
43 | #else | 43 | #else |
44 | splitter1 = new KDGanttMinimizeSplitter( Qt::Vertical, vbox1); | 44 | splitter1 = new KDGanttMinimizeSplitter( Qt::Vertical, vbox1); |
45 | splitter1->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); | 45 | splitter1->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); |
46 | 46 | ||
47 | //US topLayout->addWidget(mMiniSplitter ); | 47 | //US topLayout->addWidget(mMiniSplitter ); |
48 | #endif | 48 | #endif |
49 | lv = new ListViewPwM(splitter1); | 49 | lv = new ListViewPwM(splitter1); |
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 | |||
@@ -33,9 +33,9 @@ PwMViewStyle_1::PwMViewStyle_1(PwMView *view) | |||
33 | #ifndef PWM_EMBEDDED | 33 | #ifndef PWM_EMBEDDED |
34 | splitter = new QSplitter(view); | 34 | splitter = new QSplitter(view); |
35 | #else | 35 | #else |
36 | splitter = new KDGanttMinimizeSplitter( Qt::Horizontal, view); | 36 | splitter = new KDGanttMinimizeSplitter( Qt::Horizontal, view); |
37 | splitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); | 37 | splitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Left ); |
38 | 38 | ||
39 | //US topLayout->addWidget(mMiniSplitter ); | 39 | //US topLayout->addWidget(mMiniSplitter ); |
40 | #endif | 40 | #endif |
41 | 41 | ||
@@ -46,9 +46,9 @@ PwMViewStyle_1::PwMViewStyle_1(PwMView *view) | |||
46 | splitter2 = new QSplitter(splitter); | 46 | splitter2 = new QSplitter(splitter); |
47 | splitter2->setOrientation(Qt::Vertical); | 47 | splitter2->setOrientation(Qt::Vertical); |
48 | #else | 48 | #else |
49 | splitter2 = new KDGanttMinimizeSplitter( Qt::Vertical, splitter); | 49 | splitter2 = new KDGanttMinimizeSplitter( Qt::Vertical, splitter); |
50 | splitter2->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); | 50 | splitter2->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); |
51 | 51 | ||
52 | //US topLayout->addWidget(mMiniSplitter ); | 52 | //US topLayout->addWidget(mMiniSplitter ); |
53 | #endif | 53 | #endif |
54 | lv = new ListViewPwM(splitter2); | 54 | lv = new ListViewPwM(splitter2); |