many stribg fixes

4 files changed, 17 insertions, 11 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
@@ -12,8 +12,9 @@
 #include <qvariant.h>
 #include <qpushbutton.h>
 #include <qframe.h>
 #include <qbuttongroup.h>
+#include <qapplication.h>
 #include <qradiobutton.h>
 #include <qlistbox.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
@@ -106,9 +107,9 @@ FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl )
     layout2->addWidget( mConfidentialCheck );
     mCriteriaFrameLayout->addLayout( layout2 );
     FilterEdit_baseLayout->addWidget( mCriteriaFrame );
     languageChange();
-    resize( QSize(324, 281).expandedTo(minimumSizeHint()) );
+    resize( QSize(300, 200).expandedTo(minimumSizeHint()) );
     clearWState( WState_Polished );
 }
 
 /*
@@ -130,10 +131,16 @@ void FilterEdit_base::languageChange()
     mCatShowCheck->setText( tr( "Include" ) );
     mCatHideCheck->setText( tr( "Exclude" ) );
     mCatEditButton->setText( tr( "Edit Selection..." ) );
     textLabel1->setText( tr( "Exclude" ) );
-    mRecurringCheck->setText( tr( "recurring events" ) );
+    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" ) );
     mJournalCheck->setText( tr( "journals" ) );
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index b73d22f..cf0a458 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -143,9 +143,10 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
   //mRoleCombo->setFixedSize( mRoleCombo->sizeHint () );
 
   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);
       topLayout->addMultiCellWidget(mNameEdit,3,3,1,2);
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index b4fe965..f5eb52e 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -248,11 +248,11 @@ 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()
 {
@@ -276,11 +276,11 @@ void KOEditorGeneral::pickAlarmProgram()
             mAlarmSoundButton->setOn(true);
         }
     }
     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) );
 }
 
 
 QString KOEditorGeneral::getFittingPath( const QString  s ) 
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index ea73fd0..1b24f56 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -715,16 +715,14 @@ void KOPrefsDialog::setupViewsTab()
   topLayout->setMargin(marginHint());
   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"),
                &(KOPrefs::instance()->mMonthDailyRecur),habo);
@@ -737,9 +735,9 @@ void KOPrefsDialog::setupViewsTab()
   ii++;
 
 
   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++;