layout fixes

4 files changed, 35 insertions, 11 deletions

diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp
index 4af4a8c..40347cc 100644
--- a/kmicromail/koprefsdialog.cpp
+++ b/kmicromail/koprefsdialog.cpp
@@ -68,16 +68,20 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
 {
 
   setCaption( i18n("Settings - some need a restart (nr)"));
   setupGlobalTab();
   setupMainTab();
   setupMailTab();;
   setupFontsTab();
   readConfig();
+#ifndef DESKTOP_VERSION
+  if ( QApplication::desktop()->height() == 480  )
+      hideButtons();
+#endif
 
 #if 0
 
   setupMainTab();
   setupLocaleTab();
   setupTimeZoneTab();
   setupTimeTab();
   setupLocaleDateTab();
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 92fd59c..3a16fe6 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -3601,31 +3601,37 @@ void CalendarView::showDates(const DateList &selectedDates)
     if ( !mBlockShowDates ) {
         if ( mViewManager->currentView() ) {
             updateView( selectedDates.first(), selectedDates.last() );
         } else {
             mViewManager->showAgendaView();
         }
     }
 
+    QDate date = selectedDates.first();
+    if ( ! date.isValid() ) {
+        topLevelWidget()->setCaption("");
+        return;
+    }
+
     QString selDates;
-    selDates = KGlobal::locale()->formatDate( selectedDates.first(), true);
+    selDates = KGlobal::locale()->formatDate( date, true);
     if  (selectedDates.first() < selectedDates.last() )
         selDates += " - " + KGlobal::locale()->formatDate( selectedDates.last(),true);
     else {
         QString addString;
-        if ( selectedDates.first() == QDateTime::currentDateTime().date() )
+        if ( date == QDateTime::currentDateTime().date() )
             addString = i18n("Today");
-        else if ( selectedDates.first() == QDateTime::currentDateTime().date().addDays(1) )
+        else if (  date == QDateTime::currentDateTime().date().addDays(1) )
             addString = i18n("Tomorrow");
-        else if ( selectedDates.first() == QDateTime::currentDateTime().date().addDays(-1) )
+        else if ( date  == QDateTime::currentDateTime().date().addDays(-1) )
             addString = i18n("Yesterday");
-        else if ( selectedDates.first() == QDateTime::currentDateTime().date().addDays(-2) )
+        else if ( date == QDateTime::currentDateTime().date().addDays(-2) )
             addString = i18n("Day before yesterday");
-        else if ( selectedDates.first() == QDateTime::currentDateTime().date().addDays(2) )
+        else if ( date == QDateTime::currentDateTime().date().addDays(2) )
             addString = i18n("Day after tomorrow");
         if ( !addString.isEmpty() ) {
             topLevelWidget()->setCaption( addString+", " + selDates );
             return;
         }
     }
     topLevelWidget()->setCaption( i18n("Dates: ") + selDates );
   
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 7faf675..7d5cf72 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -136,17 +136,17 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     mClosed = false;
     //QString confFile = KStandardDirs::appDir() + "config/korganizerrc";
     QString confFile = locateLocal("config","korganizerrc");
     QFileInfo finf ( confFile );
     bool showWarning =  !finf.exists();
     setIcon(SmallIcon( "ko24" )  );
     mBlockAtStartup = true;
     mFlagKeyPressed = false;
-    setCaption("KOrganizer/Pi");
+    setCaption("KO/Pi");
     KOPrefs *p = KOPrefs::instance();
     KPimGlobalPrefs::instance()->setGlobalConfig();
     if ( p->mHourSize >  22 )
         p->mHourSize = 22;
     QMainWindow::ToolBarDock tbd;
     if ( p->mToolBarHor ) {
         if ( p->mToolBarUp )
             tbd = Bottom;
@@ -1847,28 +1847,41 @@ void MainWindow::configureToolBar( int item  )
     p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 );
     p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 );
     p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 );
     p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 );
     p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 );
     p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 );
     // initActions();
 }
-
+void MainWindow::setCaption ( const QString & c ) 
+{
+    QString cap = c;
+    cap.replace( QRegExp("\n"), " " );
+    cap = cap.stripWhiteSpace();
+    if ( cap.isEmpty() )
+        cap = "KO/Pi";
+    QWidget::setCaption( cap );
+}
 void MainWindow::setCaptionToDates()
 {
     QString selDates;
-    selDates = KGlobal::locale()->formatDate(mView->startDate(), true);
+    QDate date = mView->startDate();
+    if ( ! date.isValid() ) {
+        setCaption("");
+        return;
+    }
+    selDates = KGlobal::locale()->formatDate( date, true);
     if  (mView->startDate() < mView->endDate() )
         selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true); 
     else {
         QString addString;
-        if ( mView->startDate() == QDateTime::currentDateTime().date() )
+        if ( date == QDateTime::currentDateTime().date() )
             addString = i18n("Today");
-        else if ( mView->startDate() == QDateTime::currentDateTime().date().addDays(1) )
+        else if ( date == QDateTime::currentDateTime().date().addDays(1) )
             addString = i18n("Tomorrow");
         if ( !addString.isEmpty() )
             selDates = addString+", "+selDates ;
     }
     setCaption( i18n("Dates: ") + selDates );
 
 }
 void MainWindow::showConfigureAgenda( )
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 5808700..7604529 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -45,16 +45,17 @@ class MainWindow : public QMainWindow
   public:
     MainWindow( QWidget *parent = 0, const char *name = 0, QString command = "");
     ~MainWindow();
     bool beamReceiveEnabled();
     static  QString defaultFileName();
     static  QString syncFileName();
     static QString resourcePath();
  public  slots:  
+    void setCaption ( const QString & );
     void updateWeekNum(const KCal::DateList &);
     void updateWeek(QDate);
     virtual void showMaximized (); 
      void configureAgenda( int );
     void recieve( const QCString& msg, const QByteArray& data );
  protected slots:  
     void setCaptionToDates();
     void weekAction();