summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/filteredit_base.cpp13
-rw-r--r--korganizer/koeditordetails.cpp3
-rw-r--r--korganizer/koeditorgeneral.cpp8
-rw-r--r--korganizer/koprefsdialog.cpp6
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
@@ -15,2 +15,3 @@
#include <qbuttongroup.h>
+#include <qapplication.h>
#include <qradiobutton.h>
@@ -109,3 +110,3 @@ FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl )
languageChange();
- resize( QSize(324, 281).expandedTo(minimumSizeHint()) );
+ resize( QSize(300, 200).expandedTo(minimumSizeHint()) );
clearWState( WState_Polished );
@@ -133,4 +134,10 @@ void FilterEdit_base::languageChange()
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" ) );
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index b73d22f..cf0a458 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -146,3 +146,4 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
if ( qApp->desktop()->width() < 300 )
- mListView->setFixedHeight(80);
+ topLayout->setSpacing(1);
+ ;//mListView->setFixedHeight(80);
topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,3);
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index b4fe965..f5eb52e 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -251,5 +251,5 @@ 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) );
}
@@ -279,5 +279,5 @@ 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
@@ -718,3 +718,3 @@ void KOPrefsDialog::setupViewsTab()
QHBox *habo = new QHBox( topFrame );
- if ( QApplication::desktop()->width() < 320 ) {
+ if ( QApplication::desktop()->width() <= 480 ) {
lab = new QLabel ( i18n("Show events that recur "), topFrame );
@@ -722,6 +722,4 @@ void KOPrefsDialog::setupViewsTab()
ii++;
-
} else {
new QLabel ( i18n("Show events that recur "), habo );
-
}
@@ -740,3 +738,3 @@ 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 );