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
@@ -44,64 +44,68 @@
 
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kfontdialog.h>
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 #include <kcolordialog.h>
 #include <kiconloader.h>
 #include <kemailsettings.h>
 #include <kstandarddirs.h>
 
 #include <klineedit.h>
 
 
 #include "koprefs.h"
 
 #include "koprefsdialog.h"
 //#include <kprefswidget.h>
 
 
 KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
   KPrefsDialog(KOPrefs::instance(),parent,name,true)
 {
 
   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();
   setupFontsTab();
   setupColorsTab();
   setupViewsTab();
   //setupSyncTab();
   //setupSyncAlgTab();
   //setupPrinterTab();
   //setupGroupSchedulingTab();
   //setupGroupAutomationTab();
 #endif
 }
 
 #include "kpimglobalprefs.h"
 
 KOPrefsDialog::~KOPrefsDialog()
 {
 }
 void KOPrefsDialog::setupGlobalTab() 
 {
    QFrame *topFrame = addPage(i18n("Global"),0,0);
    kdelibcfg = new KDEPIMConfigWidget(  KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" );
    QVBoxLayout *topLayout = new QVBoxLayout(topFrame);
    topLayout->addWidget( kdelibcfg );
 
 
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 92fd59c..3a16fe6 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -3577,79 +3577,85 @@ void CalendarView::processIncidenceSelection( Incidence *incidence )
     /*  if  ( incidence && incidence->type() == "Todo" ) {
         emit todoSelected( true );
         } else {
         emit todoSelected( false );
         }*/
 }
 
 
 void CalendarView::checkClipboard()
 {
 #ifndef KORG_NODND
     if (ICalDrag::canDecode(QApplication::clipboard()->data())) {
         emit pasteEnabled(true);
     } else {
         emit pasteEnabled(false);
     }
 #endif
 }
 
 void CalendarView::showDates(const DateList &selectedDates)
 {
     //  kdDebug() << "CalendarView::selectDates()" << endl;
   
 
     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 );
   
 }
 
 QPtrList<CalFilter> CalendarView::filters()
 {
     return mFilters;
 
 }
 void CalendarView::editFilters()
 {
     //  kdDebug() << "CalendarView::editFilters()" << endl;
 
     CalFilter *filter = mFilters.first();
     while(filter) {
         kdDebug() << " Filter: " << filter->name() << endl;
         filter = mFilters.next();
     }
 
     mDialogManager->showFilterEditDialog(&mFilters);
 }
 void CalendarView::toggleFilter()
 {
     showFilter(! mFilterView->isVisible());
 }
 
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 7faf675..7d5cf72 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -112,65 +112,65 @@ class KOex2phonePrefs : public QDialog
         QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this );
         lay->addWidget( ok );
         QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
         lay->addWidget( cancel );
         connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
         connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
         resize( 220, 240 );
         qApp->processEvents();
         int dw = QApplication::desktop()->width();
         int dh = QApplication::desktop()->height();
         move( (dw-width())/2, (dh - height() )/2 );
     }
    
 public:
     QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; 
     QCheckBox* mWriteBackFuture;
     QSpinBox* mWriteBackFutureWeeks;
 };
 
 int globalFlagBlockStartup;
 MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     QMainWindow( parent, name )
 {
 
     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;
         else
             tbd = Top;
     }
     else {
         if ( p->mToolBarUp )
             tbd = Right;
         else
             tbd = Left;
     }
     if ( KOPrefs::instance()->mUseAppColors )
         QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true );
     globalFlagBlockStartup = 1;
     iconToolBar = new QPEToolBar( this );
     addToolBar (iconToolBar , tbd );
     mCalendarModifiedFlag = false;
     QLabel* splash  = new QLabel(i18n("KO/Pi is starting ... "), this );
     splash->setAlignment ( AlignCenter );
     setCentralWidget( splash );
 #ifndef DESKTOP_VERSION
     showMaximized();
 #endif
 
     //qDebug("Mainwidget x %d y %d w %d  h %d",  x(), y(), width(), height ());
     setDefaultPreferences();
@@ -1823,76 +1823,89 @@ void MainWindow::selectFilter( int fil )
     } else {
         mView->selectFilter(  fil-2 );
     }
 }
 void MainWindow::configureToolBar( int item  )
 {
 
     configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) );
     KOPrefs *p = KOPrefs::instance();
     p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 );
     p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 );
     p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 );
     p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 );
     p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 );
     p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 );
     p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 );
     p-> mShowIconDay6= configureToolBarMenu->isItemChecked( 75 );
     p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 );
     p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 );
     p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 );
     p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 );
     p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 );
     p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 );
     p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 );
     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( )
 {
     int iii;
     for ( iii = 1;iii<= 10 ;++iii ){
         configureAgendaMenu->setItemChecked( (iii+1)*2, false );
     }
     configureAgendaMenu->setItemChecked( (KOPrefs::instance()->mHourSize/2)*2, true );
 }
 void MainWindow::configureAgenda( int item )
 {
     if ( KOPrefs::instance()->mHourSize == item )
         return;
     KOPrefs::instance()->mHourSize=item;
     mView->viewManager()->agendaView()->updateConfig();
 }
 
 void  MainWindow::saveCalendar()
 {
     QString fn =  KOPrefs::instance()->mLastSaveFile;
     fn =  KFileDialog::getSaveFileName( fn, i18n("Save backup filename"), this );
 
     if ( fn == "" )
         return;
     QFileInfo info;
     info.setFile( fn );
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 5808700..7604529 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -21,64 +21,65 @@ class KSyncProfile;
 #ifdef DESKTOP_VERSION
 
 #define QPEToolBar QToolBar
 #define QPEMenuBar QMenuBar
 #endif
 class QPEToolBar;
 
 
 namespace KCal {
 class CalendarLocal;
 }
 
 class KOMenuBar : public QMenuBar
 {
   public:
     KOMenuBar(   QWidget *parent=0  ): QMenuBar (parent ) {;}
         QSize sizeHint () const{ qDebug("sizejint ");return QSize ( 40,25 );}
 };
 
 using namespace KCal;
 
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
   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();
     void about(); 
     void licence(); 
     void faq(); 
     void usertrans(); 
     void features(); 
     void synchowto();   
     void kdesynchowto();   
     void multisynchowto();   
     void whatsNew();    
     void keyBindings();
     void aboutAutoSaving();;
     void aboutKnownBugs();
 
     void processIncidenceSelection( Incidence * );
 
     void importQtopia();
     void importBday();
     void importOL();
     void importIcal();
     void importFile( QString, bool );
     void quickImportIcal();
     
     void slotModifiedChanged( bool );