| -rw-r--r-- | korganizer/filteredit_base.cpp | 13 | ||||
| -rw-r--r-- | korganizer/koeditordetails.cpp | 3 | ||||
| -rw-r--r-- | korganizer/koeditorgeneral.cpp | 8 | ||||
| -rw-r--r-- | korganizer/koprefsdialog.cpp | 6 |
4 files changed, 18 insertions, 12 deletions
diff --git a/korganizer/filteredit_base.cpp b/korganizer/filteredit_base.cpp index 15a4aaa..505edf6 100644 --- a/korganizer/filteredit_base.cpp +++ b/korganizer/filteredit_base.cpp @@ -13,6 +13,7 @@ #include <qpushbutton.h> #include <qframe.h> #include <qbuttongroup.h> +#include <qapplication.h> #include <qradiobutton.h> #include <qlistbox.h> #include <qlabel.h> @@ -107,7 +108,7 @@ FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl ) mCriteriaFrameLayout->addLayout( layout2 ); FilterEdit_baseLayout->addWidget( mCriteriaFrame ); languageChange(); - resize( QSize(324, 281).expandedTo(minimumSizeHint()) ); + resize( QSize(300, 200).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } @@ -131,8 +132,14 @@ void FilterEdit_base::languageChange() mCatHideCheck->setText( tr( "Exclude" ) ); mCatEditButton->setText( tr( "Edit Selection..." ) ); textLabel1->setText( tr( "Exclude" ) ); - mRecurringCheck->setText( tr( "recurring events" ) ); - mCompletedCheck->setText( tr( "completed to-dos" ) ); + if (QApplication::desktop()->width() > 480 ) { + mCompletedCheck->setText( tr( "completed to-dos" ) ); + mRecurringCheck->setText( tr( "recurring events" ) ); + } + else { + mCompletedCheck->setText( tr( "compl.todos" ) ); + mRecurringCheck->setText( tr( "recurr. events" ) ); + } textLabel1_2->setText( tr( "Exclude" ) ); mEventCheck->setText( tr( "events" ) ); mTodoCheck->setText( tr( "todos" ) ); diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index b73d22f..cf0a458 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp @@ -144,7 +144,8 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) if (qApp->desktop()->width() < 640 ) { if ( qApp->desktop()->width() < 300 ) - mListView->setFixedHeight(80); + topLayout->setSpacing(1); + ;//mListView->setFixedHeight(80); topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,3); topLayout->addMultiCellWidget(mListView,1,1,0,3); topLayout->addWidget(attendeeLabel,3,0); diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index b4fe965..f5eb52e 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp @@ -249,9 +249,9 @@ void KOEditorGeneral::pickAlarmSound() } if (mAlarmProgramButton->isOn()) - ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + mAlarmProgram ); + ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) ); if ( mAlarmSoundButton->isOn()) - ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio.Al.: ") + mAlarmSound ); + ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio.Al.: ") + getFittingPath(mAlarmSound) ); } void KOEditorGeneral::pickAlarmProgram() @@ -277,9 +277,9 @@ void KOEditorGeneral::pickAlarmProgram() } } if (mAlarmProgramButton->isOn()) - ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + mAlarmProgram ); + ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) ); if ( mAlarmSoundButton->isOn()) - ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Sound.Al.: ") + mAlarmSound ); + ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Sound.Al.: ") + getFittingPath(mAlarmSound) ); } diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index ea73fd0..1b24f56 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -716,14 +716,12 @@ void KOPrefsDialog::setupViewsTab() ii = 0; QLabel *lab; QHBox *habo = new QHBox( topFrame ); - if ( QApplication::desktop()->width() < 320 ) { + if ( QApplication::desktop()->width() <= 480 ) { lab = new QLabel ( i18n("Show events that recur "), topFrame ); topLayout->addMultiCellWidget(lab,ii, ii,0,1); ii++; - } else { new QLabel ( i18n("Show events that recur "), habo ); - } dailyRecur = addWidBool(i18n("daily"), @@ -738,7 +736,7 @@ void KOPrefsDialog::setupViewsTab() habo = new QHBox( topFrame ); - if ( QApplication::desktop()->width() < 320 ) { + if ( QApplication::desktop()->width() <= 480 ) { lab = new QLabel (i18n("Show in every cell ") , topFrame ); topLayout->addMultiCellWidget(lab,ii, ii,0,1); ii++; |