-rw-r--r-- | korganizer/kodialogmanager.cpp | 3 | ||||
-rw-r--r-- | korganizer/koeditordetails.cpp | 2 | ||||
-rw-r--r-- | korganizer/koeditorgeneral.cpp | 2 | ||||
-rw-r--r-- | korganizer/koprefsdialog.cpp | 50 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 2 | ||||
-rw-r--r-- | korganizer/searchdialog.cpp | 23 | ||||
-rw-r--r-- | korganizer/searchdialog.h | 3 | ||||
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 91 | ||||
-rw-r--r-- | microkde/kcolorbutton.cpp | 2 |
9 files changed, 131 insertions, 47 deletions
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp index 3dfa344..5455098 100644 --- a/korganizer/kodialogmanager.cpp +++ b/korganizer/kodialogmanager.cpp | |||
@@ -104,7 +104,8 @@ void KODialogManager::showOptionsDialog( bool showSync ) | |||
104 | mMainView,SLOT(updateConfig())); | 104 | mMainView,SLOT(updateConfig())); |
105 | } | 105 | } |
106 | mOptionsDialog->readConfig(); | 106 | mOptionsDialog->readConfig(); |
107 | #ifndef DESKTOP_VERSION | 107 | #ifndef DESKTOP_VERSION |
108 | mOptionsDialog->hideButtons(); | ||
108 | mOptionsDialog->showMaximized(); | 109 | mOptionsDialog->showMaximized(); |
109 | #else | 110 | #else |
110 | mOptionsDialog->show(); | 111 | mOptionsDialog->show(); |
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index bdfc637..6ecf978 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp | |||
@@ -87,7 +87,7 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) | |||
87 | mListView->addColumn(i18n("Role"),60); | 87 | mListView->addColumn(i18n("Role"),60); |
88 | mListView->addColumn(i18n("Status"),100); | 88 | mListView->addColumn(i18n("Status"),100); |
89 | mListView->addColumn(i18n("RSVP"),35); | 89 | mListView->addColumn(i18n("RSVP"),35); |
90 | if ( QApplication::desktop()->width() <= 320 ) { | 90 | if ( QApplication::desktop()->width() <= 320 || QApplication::desktop()->height() <= 240) { |
91 | int hei = 80; | 91 | int hei = 80; |
92 | if ( QApplication::desktop()->height() <= 240 ) | 92 | if ( QApplication::desktop()->height() <= 240 ) |
93 | hei = 60; | 93 | hei = 60; |
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index bfe0aec..915c7ec 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp | |||
@@ -100,7 +100,7 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout) | |||
100 | 100 | ||
101 | mLocationEdit = new KOLocationBox(TRUE,parent,10); | 101 | mLocationEdit = new KOLocationBox(TRUE,parent,10); |
102 | mLocationEdit->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::MinimumExpanding ,FALSE) ); | 102 | mLocationEdit->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::MinimumExpanding ,FALSE) ); |
103 | if ( QApplication::desktop()->width() > 320 ) | 103 | if ( QApplication::desktop()->width() > 320 && QApplication::desktop()->height() > 240 ) |
104 | mLocationEdit->setMaximumHeight( hei + 6); | 104 | mLocationEdit->setMaximumHeight( hei + 6); |
105 | 105 | ||
106 | // mLocationEdit = new QLineEdit(parent); | 106 | // mLocationEdit = new QLineEdit(parent); |
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index b782bb1..3ee9a22 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp | |||
@@ -285,6 +285,13 @@ void KOPrefsDialog::setupMainTab() | |||
285 | &(KOPrefs::instance()->mBlockPopupMenu),topFrame); | 285 | &(KOPrefs::instance()->mBlockPopupMenu),topFrame); |
286 | topLayout->addMultiCellWidget( widbool->checkBox(), iii,iii,0,1); | 286 | topLayout->addMultiCellWidget( widbool->checkBox(), iii,iii,0,1); |
287 | ++iii; | 287 | ++iii; |
288 | if ( QApplication::desktop()->height() <= 240 ) { | ||
289 | topFrame = addPage(i18n("General") +" 2",0,0); | ||
290 | topLayout = new QGridLayout(topFrame,4,2); | ||
291 | topLayout->setSpacing(2); | ||
292 | topLayout->setMargin(3); | ||
293 | iii = 0; | ||
294 | } | ||
288 | QHBox *dummy = new QHBox(topFrame); | 295 | QHBox *dummy = new QHBox(topFrame); |
289 | new QLabel(i18n("Days in Next-X-Days:"),dummy); | 296 | new QLabel(i18n("Days in Next-X-Days:"),dummy); |
290 | mNextXDaysSpin = new QSpinBox(2,14,1,dummy); | 297 | mNextXDaysSpin = new QSpinBox(2,14,1,dummy); |
@@ -431,12 +438,19 @@ void KOPrefsDialog::setupTimeTab() | |||
431 | mAlarmTimeCombo = new QComboBox(topFrame); | 438 | mAlarmTimeCombo = new QComboBox(topFrame); |
432 | mAlarmTimeCombo->insertStringList(alarmList); | 439 | mAlarmTimeCombo->insertStringList(alarmList); |
433 | topLayout->addWidget(mAlarmTimeCombo,3,1); | 440 | topLayout->addWidget(mAlarmTimeCombo,3,1); |
434 | 441 | int iii = 4; | |
442 | if ( QApplication::desktop()->height() <= 240 ) { | ||
443 | topFrame = addPage(i18n("Time") +" 2",0,0); | ||
444 | topLayout = new QGridLayout(topFrame,1,2); | ||
445 | topLayout->setSpacing(2); | ||
446 | topLayout->setMargin(3); | ||
447 | iii = 0; | ||
448 | } | ||
435 | 449 | ||
436 | QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal, | 450 | QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal, |
437 | i18n("Working Hours"), | 451 | i18n("Working Hours"), |
438 | topFrame); | 452 | topFrame); |
439 | topLayout->addMultiCellWidget(workingHoursGroup,4,4,0,1); | 453 | topLayout->addMultiCellWidget(workingHoursGroup,iii,iii,0,1); |
440 | workingHoursGroup->layout()->setSpacing( 0 ); | 454 | workingHoursGroup->layout()->setSpacing( 0 ); |
441 | workingHoursGroup->layout()->setMargin( 4 ); | 455 | workingHoursGroup->layout()->setMargin( 4 ); |
442 | QHBox *workStartBox = new QHBox(workingHoursGroup); | 456 | QHBox *workStartBox = new QHBox(workingHoursGroup); |
@@ -702,6 +716,18 @@ void KOPrefsDialog::setupViewsTab() | |||
702 | addWidBool(i18n("Category colors are applied to text"), | 716 | addWidBool(i18n("Category colors are applied to text"), |
703 | &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame); | 717 | &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame); |
704 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 718 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
719 | |||
720 | |||
721 | |||
722 | if ( QApplication::desktop()->height() <= 240 ) { | ||
723 | topFrame = addPage(i18n("Month View") +" 2",0,0); | ||
724 | topLayout = new QGridLayout(topFrame,4,1); | ||
725 | topLayout->setSpacing(2); | ||
726 | topLayout->setMargin(1); | ||
727 | ii = 0; | ||
728 | } | ||
729 | |||
730 | |||
705 | coloredCategoriesInMonthView = | 731 | coloredCategoriesInMonthView = |
706 | addWidBool(i18n("Month view uses day colors"), | 732 | addWidBool(i18n("Month view uses day colors"), |
707 | &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame); | 733 | &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame); |
@@ -901,9 +927,13 @@ dummy = | |||
901 | addWidBool(i18n("Use internal alarm notification"), | 927 | addWidBool(i18n("Use internal alarm notification"), |
902 | &(KOPrefs::instance()->mUseInternalAlarmNotification),topFrame); | 928 | &(KOPrefs::instance()->mUseInternalAlarmNotification),topFrame); |
903 | topLayout->addWidget(dummy->checkBox(),iii++,0); | 929 | topLayout->addWidget(dummy->checkBox(),iii++,0); |
904 | lab = new QLabel( i18n("Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n"), topFrame); | ||
905 | 930 | ||
906 | topLayout->addWidget(lab ,iii++,0); | 931 | if ( QApplication::desktop()->height() > 240 ) { |
932 | |||
933 | lab = new QLabel( i18n("Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n"), topFrame); | ||
934 | |||
935 | topLayout->addWidget(lab ,iii++,0); | ||
936 | } | ||
907 | #ifndef DESKTOP_VERSION | 937 | #ifndef DESKTOP_VERSION |
908 | lab->setAlignment( AlignLeft|WordBreak|AlignTop); | 938 | lab->setAlignment( AlignLeft|WordBreak|AlignTop); |
909 | #else | 939 | #else |
@@ -1164,6 +1194,18 @@ void KOPrefsDialog::setupColorsTab() | |||
1164 | topLayout->addWidget(eventColor->label(),ii,0); | 1194 | topLayout->addWidget(eventColor->label(),ii,0); |
1165 | topLayout->addWidget(eventColor->button(),ii++,1); | 1195 | topLayout->addWidget(eventColor->button(),ii++,1); |
1166 | 1196 | ||
1197 | if ( QApplication::desktop()->height() <= 240 ) { | ||
1198 | topFrame = addPage(i18n("Colors") +" 2",0,0); | ||
1199 | // DesktopIcon("colorize",KIcon::SizeMedium)); | ||
1200 | |||
1201 | topLayout = new QGridLayout(topFrame,5,2); | ||
1202 | // topLayout->setSpacing(mSpacingHint); | ||
1203 | // topLayout->setMargin(mMarginHint); | ||
1204 | |||
1205 | topLayout->setSpacing(2); | ||
1206 | topLayout->setMargin(3); | ||
1207 | } | ||
1208 | |||
1167 | 1209 | ||
1168 | // agenda view background color | 1210 | // agenda view background color |
1169 | KPrefsDialogWidColor *agendaBgColor = | 1211 | KPrefsDialogWidColor *agendaBgColor = |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 2c04852..0cb0bce 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -625,7 +625,7 @@ void MainWindow::initActions() | |||
625 | int pixWid = 22, pixHei = 22; | 625 | int pixWid = 22, pixHei = 22; |
626 | QString pathString = ""; | 626 | QString pathString = ""; |
627 | if ( !p->mToolBarMiniIcons ) { | 627 | if ( !p->mToolBarMiniIcons ) { |
628 | if ( QApplication::desktop()->width() < 480 ) { | 628 | if ( QApplication::desktop()->width() < 480 /*|| QApplication::desktop()->height() < 320*/) { |
629 | pathString += "icons16/"; | 629 | pathString += "icons16/"; |
630 | pixWid = 18; pixHei = 16; | 630 | pixWid = 18; pixHei = 16; |
631 | } | 631 | } |
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index ef2fc1c..7b3b543 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp | |||
@@ -70,6 +70,11 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) | |||
70 | mAddItems = new QCheckBox(i18n("Add items"),topFrame); | 70 | mAddItems = new QCheckBox(i18n("Add items"),topFrame); |
71 | subLayout->addWidget(mAddItems); | 71 | subLayout->addWidget(mAddItems); |
72 | 72 | ||
73 | QPushButton *togButton = new QPushButton( "", topFrame ); | ||
74 | subLayout->addWidget(togButton); | ||
75 | connect(togButton,SIGNAL(clicked()),SLOT(toggleCheckboxes())); | ||
76 | togButton->setPixmap(SmallIcon("1updownarrow")); | ||
77 | togButton->setMinimumWidth( togButton->sizeHint().height() ); | ||
73 | searchEdit->setText("*"); // Find all events by default | 78 | searchEdit->setText("*"); // Find all events by default |
74 | searchEdit->setFocus(); | 79 | searchEdit->setFocus(); |
75 | connect(searchEdit, SIGNAL(textChanged ( const QString & )),this,SLOT(searchTextChanged( const QString & ))); | 80 | connect(searchEdit, SIGNAL(textChanged ( const QString & )),this,SLOT(searchTextChanged( const QString & ))); |
@@ -78,7 +83,7 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) | |||
78 | // QGroupBox *subjectGroup = new QGroupBox(1,Vertical,i18n("Search In"), | 83 | // QGroupBox *subjectGroup = new QGroupBox(1,Vertical,i18n("Search In"), |
79 | // topFrame); | 84 | // topFrame); |
80 | 85 | ||
81 | QHBox *incidenceGroup = new QHBox( topFrame ); | 86 | incidenceGroup = new QHBox( topFrame ); |
82 | layout->addWidget(incidenceGroup); | 87 | layout->addWidget(incidenceGroup); |
83 | 88 | ||
84 | mSearchEvent = new QCheckBox(i18n("Events"),incidenceGroup); | 89 | mSearchEvent = new QCheckBox(i18n("Events"),incidenceGroup); |
@@ -86,7 +91,7 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) | |||
86 | mSearchTodo = new QCheckBox(i18n("Todos"),incidenceGroup); | 91 | mSearchTodo = new QCheckBox(i18n("Todos"),incidenceGroup); |
87 | mSearchJournal = new QCheckBox(i18n("Journals"),incidenceGroup); | 92 | mSearchJournal = new QCheckBox(i18n("Journals"),incidenceGroup); |
88 | 93 | ||
89 | QHBox *subjectGroup = new QHBox( topFrame ); | 94 | subjectGroup = new QHBox( topFrame ); |
90 | layout->addWidget(subjectGroup); | 95 | layout->addWidget(subjectGroup); |
91 | 96 | ||
92 | mSummaryCheck = new QCheckBox(i18n("Summary/Loc."),subjectGroup); | 97 | mSummaryCheck = new QCheckBox(i18n("Summary/Loc."),subjectGroup); |
@@ -94,7 +99,7 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) | |||
94 | mDescriptionCheck = new QCheckBox(i18n("Details"),subjectGroup); | 99 | mDescriptionCheck = new QCheckBox(i18n("Details"),subjectGroup); |
95 | mCategoryCheck = new QCheckBox(i18n("Categories"),subjectGroup); | 100 | mCategoryCheck = new QCheckBox(i18n("Categories"),subjectGroup); |
96 | 101 | ||
97 | QHBox *attendeeGroup = new QHBox( topFrame ); | 102 | attendeeGroup = new QHBox( topFrame ); |
98 | layout->addWidget(attendeeGroup ); | 103 | layout->addWidget(attendeeGroup ); |
99 | new QLabel( i18n("Attendee:"),attendeeGroup ); | 104 | new QLabel( i18n("Attendee:"),attendeeGroup ); |
100 | mSearchAName = new QCheckBox(i18n("Name"),attendeeGroup ); | 105 | mSearchAName = new QCheckBox(i18n("Name"),attendeeGroup ); |
@@ -136,6 +141,18 @@ SearchDialog::~SearchDialog() | |||
136 | { | 141 | { |
137 | 142 | ||
138 | } | 143 | } |
144 | void SearchDialog::toggleCheckboxes() | ||
145 | { | ||
146 | if ( incidenceGroup->isVisible() ) { | ||
147 | incidenceGroup->hide() ; | ||
148 | subjectGroup->hide() ; | ||
149 | attendeeGroup->hide() ; | ||
150 | } else { | ||
151 | incidenceGroup->show() ; | ||
152 | subjectGroup->show() ; | ||
153 | attendeeGroup->show() ; | ||
154 | } | ||
155 | } | ||
139 | void SearchDialog::raiseAndSelect() | 156 | void SearchDialog::raiseAndSelect() |
140 | { | 157 | { |
141 | 158 | ||
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h index 11ad2f0..b345b98 100644 --- a/korganizer/searchdialog.h +++ b/korganizer/searchdialog.h | |||
@@ -60,6 +60,7 @@ class SearchDialog : public QVBox | |||
60 | void accept(); | 60 | void accept(); |
61 | void doSearch(); | 61 | void doSearch(); |
62 | void searchTextChanged( const QString &_text ); | 62 | void searchTextChanged( const QString &_text ); |
63 | void toggleCheckboxes(); | ||
63 | 64 | ||
64 | signals: | 65 | signals: |
65 | void showEventSignal(Event *); | 66 | void showEventSignal(Event *); |
@@ -67,6 +68,8 @@ class SearchDialog : public QVBox | |||
67 | void deleteEventSignal(Event *); | 68 | void deleteEventSignal(Event *); |
68 | 69 | ||
69 | private: | 70 | private: |
71 | |||
72 | QHBox *incidenceGroup ,*subjectGroup ,*attendeeGroup; | ||
70 | void search(const QRegExp &); | 73 | void search(const QRegExp &); |
71 | 74 | ||
72 | Calendar *mCalendar; | 75 | Calendar *mCalendar; |
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index 93538ec..d3797ae 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp | |||
@@ -176,7 +176,8 @@ void KDEPIMConfigWidget::setupStoreTab() | |||
176 | topLayout->addWidget( (QWidget* )holidayColor->button()); | 176 | topLayout->addWidget( (QWidget* )holidayColor->button()); |
177 | 177 | ||
178 | 178 | ||
179 | QVBox *storePage = new QVBox( this ); | 179 | QVBox *storePage = new QVBox( this ); |
180 | if ( QApplication::desktop()->height() > 240 ) | ||
180 | new QLabel( i18n("Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail").arg(KGlobal::dirs()->localkdedir()), storePage ); | 181 | new QLabel( i18n("Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail").arg(KGlobal::dirs()->localkdedir()), storePage ); |
181 | new QLabel( i18n("<b>New data storage dir:</b>"), storePage ); | 182 | new QLabel( i18n("<b>New data storage dir:</b>"), storePage ); |
182 | mStoreUrl = new KURLRequester( storePage ); | 183 | mStoreUrl = new KURLRequester( storePage ); |
@@ -290,32 +291,35 @@ void KDEPIMConfigWidget::setupExternalAppTab() | |||
290 | mParameters = new QLineEdit(mExternalAppGroupBox); | 291 | mParameters = new QLineEdit(mExternalAppGroupBox); |
291 | mParameters->setReadOnly(true); | 292 | mParameters->setReadOnly(true); |
292 | boxLayout->addWidget( mParameters, 4, 1 ); | 293 | boxLayout->addWidget( mParameters, 4, 1 ); |
293 | 294 | lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox); | |
294 | lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox); | 295 | boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 ); |
295 | boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 ); | 296 | |
296 | 297 | ||
297 | 298 | if ( QApplication::desktop()->height() > 240 ) { | |
298 | lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox); | 299 | lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox); |
299 | boxLayout->addWidget( lab, 6, 0 ); | 300 | boxLayout->addWidget( lab, 6, 0 ); |
300 | mMessage2 = new QLineEdit(mExternalAppGroupBox); | 301 | mMessage2 = new QLineEdit(mExternalAppGroupBox); |
301 | mMessage2->setReadOnly(true); | 302 | mMessage2->setReadOnly(true); |
302 | boxLayout->addWidget( mMessage2 , 7, 0); | 303 | boxLayout->addWidget( mMessage2 , 7, 0); |
303 | 304 | ||
304 | lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox); | 305 | lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox); |
305 | boxLayout->addWidget( lab, 6, 1 ); | 306 | boxLayout->addWidget( lab, 6, 1 ); |
306 | mParameters2 = new QLineEdit(mExternalAppGroupBox); | 307 | mParameters2 = new QLineEdit(mExternalAppGroupBox); |
307 | mParameters2->setReadOnly(true); | 308 | mParameters2->setReadOnly(true); |
308 | boxLayout->addWidget( mParameters2, 7, 1 ); | 309 | boxLayout->addWidget( mParameters2, 7, 1 ); |
309 | 310 | ||
310 | lab = new QLabel( i18n("HINT: Emails=%1,Attachments=%2"), mExternalAppGroupBox); | 311 | lab = new QLabel( i18n("HINT: Emails=%1,Attachments=%2"), mExternalAppGroupBox); |
311 | boxLayout->addMultiCellWidget( lab, 8, 8, 0, 1 ); | 312 | boxLayout->addMultiCellWidget( lab, 8, 8, 0, 1 ); |
312 | 313 | connect( mMessage2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); | |
314 | connect( mParameters2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); | ||
315 | } else { | ||
316 | mMessage2 = 0; | ||
317 | mParameters2 = 0; | ||
318 | } | ||
313 | 319 | ||
314 | connect( mChannel, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); | 320 | connect( mChannel, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); |
315 | connect( mMessage, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); | 321 | connect( mMessage, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); |
316 | connect( mParameters, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); | 322 | connect( mParameters, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); |
317 | connect( mMessage2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); | ||
318 | connect( mParameters2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); | ||
319 | 323 | ||
320 | 324 | ||
321 | layout->addWidget( mExternalAppGroupBox ); | 325 | layout->addWidget( mExternalAppGroupBox ); |
@@ -374,12 +378,15 @@ void KDEPIMConfigWidget::setupLocaleDateTab() | |||
374 | lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame); | 378 | lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame); |
375 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); | 379 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); |
376 | ++iii; | 380 | ++iii; |
377 | lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame); | 381 | //qDebug(" QApplication::desktop()->height()xx %d ", QApplication::desktop()->height() ); |
378 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); | 382 | if ( QApplication::desktop()->height() > 240 ) { |
379 | ++iii; | 383 | lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame); |
380 | lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame); | 384 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); |
381 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); | 385 | ++iii; |
382 | ++iii; | 386 | lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame); |
387 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); | ||
388 | ++iii; | ||
389 | } | ||
383 | 390 | ||
384 | connect( mUserDateFormatLong, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); | 391 | connect( mUserDateFormatLong, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); |
385 | connect( mUserDateFormatShort, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); | 392 | connect( mUserDateFormatShort, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); |
@@ -628,8 +635,10 @@ void KDEPIMConfigWidget::saveEditFieldSettings() | |||
628 | mEmailOtherChannel = mChannel->text(); | 635 | mEmailOtherChannel = mChannel->text(); |
629 | mEmailOtherMessage = mMessage->text(); | 636 | mEmailOtherMessage = mMessage->text(); |
630 | mEmailOtherMessageParameters = mParameters->text(); | 637 | mEmailOtherMessageParameters = mParameters->text(); |
631 | mEmailOtherMessage2 = mMessage2->text(); | 638 | if ( mMessage2 ) |
632 | mEmailOtherMessageParameters2 = mParameters2->text(); | 639 | mEmailOtherMessage2 = mMessage2->text(); |
640 | if ( mParameters2 ) | ||
641 | mEmailOtherMessageParameters2 = mParameters2->text(); | ||
633 | } | 642 | } |
634 | else if ((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC)) | 643 | else if ((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC)) |
635 | { | 644 | { |
@@ -693,8 +702,10 @@ void KDEPIMConfigWidget::updateClientWidgets() | |||
693 | //Otherwise take the default data from externalapphandler. | 702 | //Otherwise take the default data from externalapphandler. |
694 | mChannel->setText(dai->_channel); | 703 | mChannel->setText(dai->_channel); |
695 | mMessage->setText(dai->_message); | 704 | mMessage->setText(dai->_message); |
696 | mParameters->setText(dai->_parameters); | 705 | mParameters->setText(dai->_parameters); |
697 | mMessage2->setText(dai->_message2); | 706 | if ( mMessage2 ) |
707 | mMessage2->setText(dai->_message2); | ||
708 | if ( mParameters2 ) | ||
698 | mParameters2->setText(dai->_parameters2); | 709 | mParameters2->setText(dai->_parameters2); |
699 | 710 | ||
700 | 711 | ||
@@ -702,8 +713,10 @@ void KDEPIMConfigWidget::updateClientWidgets() | |||
702 | { | 713 | { |
703 | mChannel->setText(mEmailOtherChannel); | 714 | mChannel->setText(mEmailOtherChannel); |
704 | mMessage->setText(mEmailOtherMessage); | 715 | mMessage->setText(mEmailOtherMessage); |
705 | mParameters->setText(mEmailOtherMessageParameters); | 716 | mParameters->setText(mEmailOtherMessageParameters); |
717 | if ( mMessage2 ) | ||
706 | mMessage2->setText(mEmailOtherMessage2); | 718 | mMessage2->setText(mEmailOtherMessage2); |
719 | if ( mParameters2 ) | ||
707 | mParameters2->setText(mEmailOtherMessageParameters2); | 720 | mParameters2->setText(mEmailOtherMessageParameters2); |
708 | } | 721 | } |
709 | else if ((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC)) | 722 | else if ((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC)) |
@@ -773,14 +786,18 @@ void KDEPIMConfigWidget::updateClientWidgets() | |||
773 | 786 | ||
774 | mChannel->setReadOnly(readonly); | 787 | mChannel->setReadOnly(readonly); |
775 | mMessage->setReadOnly(readonly); | 788 | mMessage->setReadOnly(readonly); |
776 | mParameters->setReadOnly(readonly); | 789 | mParameters->setReadOnly(readonly); |
790 | if ( mMessage2 ) | ||
777 | mMessage2->setReadOnly(readonly); | 791 | mMessage2->setReadOnly(readonly); |
792 | if ( mParameters2 ) | ||
778 | mParameters2->setReadOnly(readonly); | 793 | mParameters2->setReadOnly(readonly); |
779 | 794 | ||
780 | mChannel->setEnabled(enabled); | 795 | mChannel->setEnabled(enabled); |
781 | mMessage->setEnabled(enabled); | 796 | mMessage->setEnabled(enabled); |
782 | mParameters->setEnabled(enabled); | 797 | mParameters->setEnabled(enabled); |
798 | if ( mMessage2 ) | ||
783 | mMessage2->setEnabled(enabled); | 799 | mMessage2->setEnabled(enabled); |
800 | if ( mParameters2 ) | ||
784 | mParameters2->setEnabled(enabled); | 801 | mParameters2->setEnabled(enabled); |
785 | 802 | ||
786 | 803 | ||
@@ -794,12 +811,16 @@ void KDEPIMConfigWidget::updateClientWidgets() | |||
794 | } | 811 | } |
795 | else | 812 | else |
796 | { | 813 | { |
814 | if ( mMessage2 ) | ||
797 | mMessage2->setText( "" ); | 815 | mMessage2->setText( "" ); |
816 | if ( mParameters2 ) | ||
798 | mParameters2->setText( "" ); | 817 | mParameters2->setText( "" ); |
799 | } | 818 | } |
800 | 819 | ||
801 | if (enabled == true) { | 820 | if (enabled == true) { |
821 | if ( mMessage2 ) | ||
802 | mMessage2->setEnabled(mCurrentApp == ExternalAppHandler::EMAIL); | 822 | mMessage2->setEnabled(mCurrentApp == ExternalAppHandler::EMAIL); |
823 | if ( mParameters2 ) | ||
803 | mParameters2->setEnabled(mCurrentApp == ExternalAppHandler::EMAIL); | 824 | mParameters2->setEnabled(mCurrentApp == ExternalAppHandler::EMAIL); |
804 | } | 825 | } |
805 | 826 | ||
diff --git a/microkde/kcolorbutton.cpp b/microkde/kcolorbutton.cpp index c7c6088..96dc256 100644 --- a/microkde/kcolorbutton.cpp +++ b/microkde/kcolorbutton.cpp | |||
@@ -32,7 +32,7 @@ void KColorButton:: edit() | |||
32 | KColorButton::KColorButton( QWidget *p ):QPushButton( p ) | 32 | KColorButton::KColorButton( QWidget *p ):QPushButton( p ) |
33 | { | 33 | { |
34 | int size = 24; | 34 | int size = 24; |
35 | if( QApplication::desktop()->width() < 480 ) | 35 | if( QApplication::desktop()->width() < 480 || QApplication::desktop()->height() <= 320 ) |
36 | size = 18; | 36 | size = 18; |
37 | setFixedSize( size,size ); | 37 | setFixedSize( size,size ); |
38 | connect ( this, SIGNAL( clicked() ), this ,SLOT (edit() )); | 38 | connect ( this, SIGNAL( clicked() ), this ,SLOT (edit() )); |