[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/pim/mailody/src
From:       Tom Albers <tomalbers () kde ! nl>
Date:       2008-08-17 12:00:02
Message-ID: 1218974402.426921.8776.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 848318 by toma:

Sort out the statusbar. Probably not the right way, but I've no idea how to solve it differently.


 M  +1 -0      CMakeLists.txt  
 M  +2 -2      main.cpp  
 M  +19 -17    mainwindow.cpp  
 M  +1 -0      mainwindow.h  


--- trunk/extragear/pim/mailody/src/CMakeLists.txt #848317:848318
@@ -35,6 +35,7 @@
 mailodybaselistview.cpp
 mainwindow.cpp
 systemtray.cpp
+import/pimapplication.cpp
 )
 
 QT4_ADD_DBUS_ADAPTOR( mailody_SRCS
--- trunk/extragear/pim/mailody/src/main.cpp #848317:848318
@@ -23,12 +23,12 @@
 #include <QDBusInterface>
 #include <KStartupInfo>
 #include <KDebug>
-#include <KUniqueApplication>
 #include <KCmdLineArgs>
 #include <KAboutData>
 
 #include "aboutdata.h"
 #include "mailodymain.h"
+#include "import/pimapplication.h"
 
 /**
  * @class MailodyApplication
@@ -37,7 +37,7 @@
  * the reason that it is reimplemented is so mailto's will work
  * even when mailody is already running.
  */
-class MailodyApplication : public KUniqueApplication
+class MailodyApplication : public KPIM::PimApplication 
 {
 public:
     /**
--- trunk/extragear/pim/mailody/src/mainwindow.cpp #848317:848318
@@ -88,6 +88,9 @@
         : QWidget( parent ), m_idlePossible( false ), m_online( false )
 {
     actionCollection = collection;
+
+    KMainWindow* mainWindow = qobject_cast<KMainWindow*>(parent);
+    m_statusBar = mainWindow->statusBar();
     
     Akonadi::Control::start();
     QProcess::startDetached( "akonaditray" );
@@ -479,18 +482,19 @@
 
     // -------------- statusbar ------------------------------------//
 
-    m_statusText = new KSqueezedTextLabel( this );
-    m_statusText->setMargin( 1 );
-    m_statusText->setText( i18n( "Ready" ) );
-    /* TODO:
-    statusBar()->addWidget( m_statusText,10 );
-    statusBar()->insertItem( i18n( "Quick Reply" ), 2, 2 );
-    statusBar()->insertItem( i18n( "Plain" ), 3, 1 );
-    statusBar()->insertItem( i18nc( "Short for no ext. images",
+    if ( standAlone ) {
+        m_statusText = new KSqueezedTextLabel( this );
+        m_statusText->setMargin( 1 );
+        m_statusText->setText( i18n( "Ready" ) );
+        m_statusBar->addWidget( m_statusText,10 );
+    }
+    
+    m_statusBar->insertItem( i18n( "Quick Reply" ), 2, 2 );
+    m_statusBar->insertItem( i18n( "Plain" ), 3, 1 );
+    m_statusBar->insertItem( i18nc( "Short for no ext. images",
                                     "No ext." ), 4, 1 );
-    connect( statusBar(), SIGNAL( pressed( int ) ),
+    connect( m_statusBar, SIGNAL( pressed( int ) ),
              SLOT( slotStatusBarClicked( int ) ) );
-    */
 
     m_statusTimer = new QTimer( this );
     m_statusTimer->setSingleShot( true );
@@ -498,7 +502,7 @@
 
     KStatusBarOfflineIndicator *nsi =
         new KStatusBarOfflineIndicator( this );
-    // TODO: statusBar()->addWidget( nsi );
+    m_statusBar->addWidget( nsi );
 
     // -------- set the actions according to the settings ----------//
 
@@ -1542,18 +1546,16 @@
 
 void MainWindow::setStatusBarStates()
 {
-/* TODO
     if ( m_plainTextAction->isChecked() )
-        statusBar()->changeItem( i18nc( "Short for text-mode", "Plain" ), 3 );
+        m_statusBar->changeItem( i18nc( "Short for text-mode", "Plain" ), 3 );
     else
-        statusBar()->changeItem( i18nc( "Short for html-mode", "HTML" ), 3 );
+        m_statusBar->changeItem( i18nc( "Short for html-mode", "HTML" ), 3 );
 
 
     if ( m_externalImageAction->isChecked() )
-        statusBar()->changeItem( i18nc( "Short for external images", "Ext." ), 4 );
+        m_statusBar->changeItem( i18nc( "Short for external images", "Ext." ), 4 );
     else
-        statusBar()->changeItem( i18nc( "Short for no ext. images", "No ext." ), 4 );
-*/
+        m_statusBar->changeItem( i18nc( "Short for no ext. images", "No ext." ), 4 );
 }
 
 void MainWindow::slotUpdateStatusBar( const QString &text )
--- trunk/extragear/pim/mailody/src/mainwindow.h #848317:848318
@@ -149,6 +149,7 @@
     HeaderWidget                        *m_headerWidget;
 
     ToolTip                             *m_tooltip;
+    KStatusBar                          *m_statusBar;
 
     // Tab Actions
     KAction                             *m_closeAction;
[prev in list] [next in list] [prev in thread] [next in thread]