summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-06-10 13:54:08 (UTC)
committer zautrix <zautrix>2005-06-10 13:54:08 (UTC)
commit31fed261955dcb25d06052a8154ac4cc630b0f7d (patch) (unidiff)
treeef2b4fe35255f9bf387407b6756c112a67088ad6
parentd2f00fc2034450bc9a3cd1d2c3510bef1758d3bc (diff)
downloadkdepimpi-31fed261955dcb25d06052a8154ac4cc630b0f7d.zip
kdepimpi-31fed261955dcb25d06052a8154ac4cc630b0f7d.tar.gz
kdepimpi-31fed261955dcb25d06052a8154ac4cc630b0f7d.tar.bz2
fixxx
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/kodialogmanager.cpp3
-rw-r--r--korganizer/koeditordetails.cpp2
-rw-r--r--korganizer/koeditorgeneral.cpp2
-rw-r--r--korganizer/koprefsdialog.cpp50
-rw-r--r--korganizer/mainwindow.cpp2
-rw-r--r--korganizer/searchdialog.cpp23
-rw-r--r--korganizer/searchdialog.h3
-rw-r--r--libkdepim/kcmconfigs/kdepimconfigwidget.cpp91
-rw-r--r--microkde/kcolorbutton.cpp2
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
@@ -106,3 +106,4 @@ void KODialogManager::showOptionsDialog( bool showSync )
106 mOptionsDialog->readConfig(); 106 mOptionsDialog->readConfig();
107#ifndef DESKTOP_VERSION 107#ifndef DESKTOP_VERSION
108 mOptionsDialog->hideButtons();
108 mOptionsDialog->showMaximized(); 109 mOptionsDialog->showMaximized();
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index bdfc637..6ecf978 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -89,3 +89,3 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
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;
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index bfe0aec..915c7ec 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -102,3 +102,3 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout)
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);
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index b782bb1..3ee9a22 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -287,2 +287,9 @@ void KOPrefsDialog::setupMainTab()
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);
@@ -433,3 +440,10 @@ void KOPrefsDialog::setupTimeTab()
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
@@ -438,3 +452,3 @@ void KOPrefsDialog::setupTimeTab()
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 );
@@ -704,2 +718,14 @@ void KOPrefsDialog::setupViewsTab()
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 =
@@ -903,5 +929,9 @@ dummy =
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
@@ -1166,2 +1196,14 @@ void KOPrefsDialog::setupColorsTab()
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
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 2c04852..0cb0bce 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -627,3 +627,3 @@ void MainWindow::initActions()
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/";
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index ef2fc1c..7b3b543 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -72,2 +72,7 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
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
@@ -80,3 +85,3 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
80 85
81 QHBox *incidenceGroup = new QHBox( topFrame ); 86 incidenceGroup = new QHBox( topFrame );
82 layout->addWidget(incidenceGroup); 87 layout->addWidget(incidenceGroup);
@@ -88,3 +93,3 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
88 93
89 QHBox *subjectGroup = new QHBox( topFrame ); 94 subjectGroup = new QHBox( topFrame );
90 layout->addWidget(subjectGroup); 95 layout->addWidget(subjectGroup);
@@ -96,3 +101,3 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
96 101
97 QHBox *attendeeGroup = new QHBox( topFrame ); 102 attendeeGroup = new QHBox( topFrame );
98 layout->addWidget(attendeeGroup ); 103 layout->addWidget(attendeeGroup );
@@ -138,2 +143,14 @@ SearchDialog::~SearchDialog()
138} 143}
144void 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}
139void SearchDialog::raiseAndSelect() 156void SearchDialog::raiseAndSelect()
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index 11ad2f0..b345b98 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -62,2 +62,3 @@ class SearchDialog : public QVBox
62 void searchTextChanged( const QString &_text ); 62 void searchTextChanged( const QString &_text );
63 void toggleCheckboxes();
63 64
@@ -69,2 +70,4 @@ class SearchDialog : public QVBox
69 private: 70 private:
71
72 QHBox *incidenceGroup ,*subjectGroup ,*attendeeGroup;
70 void search(const QRegExp &); 73 void search(const QRegExp &);
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
@@ -178,3 +178,4 @@ void KDEPIMConfigWidget::setupStoreTab()
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 );
@@ -292,22 +293,27 @@ void KDEPIMConfigWidget::setupExternalAppTab()
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
@@ -316,4 +322,2 @@ void KDEPIMConfigWidget::setupExternalAppTab()
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
@@ -376,8 +380,11 @@ void KDEPIMConfigWidget::setupLocaleDateTab()
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
@@ -630,4 +637,6 @@ void KDEPIMConfigWidget::saveEditFieldSettings()
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 }
@@ -695,4 +704,6 @@ void KDEPIMConfigWidget::updateClientWidgets()
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);
@@ -704,4 +715,6 @@ void KDEPIMConfigWidget::updateClientWidgets()
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);
@@ -775,4 +788,6 @@ void KDEPIMConfigWidget::updateClientWidgets()
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);
@@ -782,3 +797,5 @@ void KDEPIMConfigWidget::updateClientWidgets()
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);
@@ -796,3 +813,5 @@ void KDEPIMConfigWidget::updateClientWidgets()
796 { 813 {
814 if ( mMessage2 )
797 mMessage2->setText( "" ); 815 mMessage2->setText( "" );
816 if ( mParameters2 )
798 mParameters2->setText( "" ); 817 mParameters2->setText( "" );
@@ -801,3 +820,5 @@ void KDEPIMConfigWidget::updateClientWidgets()
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);
diff --git a/microkde/kcolorbutton.cpp b/microkde/kcolorbutton.cpp
index c7c6088..96dc256 100644
--- a/microkde/kcolorbutton.cpp
+++ b/microkde/kcolorbutton.cpp
@@ -34,3 +34,3 @@ KColorButton::KColorButton( QWidget *p ):QPushButton( p )
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;