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

List:       kde-commits
Subject:    KDE/kdepim/akonadi/tray
From:       Tom Albers <toma () kde ! org>
Date:       2009-05-31 16:04:20
Message-ID: 1243785860.974441.24236.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 976001 by toma:

Set tooltips and use showMessage().


 M  +16 -8     dock.cpp  


--- trunk/KDE/kdepim/akonadi/tray/dock.cpp #976000:976001
@@ -102,8 +102,8 @@
 {
     updateMenu( true );
     if ( m_explicitStart ) {
-      KPassivePopup::message( i18n( "Akonadi available" ),
-                              i18n( "The Akonadi server has been started and can be \
used now." ), m_parentWidget ); +      showMessage( i18n( "Akonadi available" ),
+                   i18n( "The Akonadi server has been started and can be used now." \
), "akonadi" );  m_explicitStart = false;
     }
 }
@@ -111,19 +111,19 @@
 void Dock::slotServerStopped()
 {
     updateMenu( false );
-    KPassivePopup::message( i18n( "Akonadi not available" ),
-                            i18n( "The Akonadi server has been stopped, Akonadi \
related applications can no longer be used." ), m_parentWidget  ); +    showMessage( \
i18n( "Akonadi not available" ), +                 i18n( "The Akonadi server has been \
stopped, Akonadi related applications can no longer be used." ), "akonadi" );  }
 
 void Dock::slotStopAkonadi()
 {
-    Akonadi::Control::stop( m_parentWidget  );
+    Akonadi::Control::stop( m_parentWidget );
 }
 
 void Dock::slotStartAkonadi()
 {
     m_explicitStart = true;
-    Akonadi::Control::start( m_parentWidget  );
+    Akonadi::Control::start( m_parentWidget );
 }
 
 void Dock::slotActivated()
@@ -136,7 +136,7 @@
     bool registered = ServerManager::isRunning();
     Q_ASSERT( registered );
 
-    QPointer<BackupAssistant> backup = new BackupAssistant( m_parentWidget  );
+    QPointer<BackupAssistant> backup = new BackupAssistant( m_parentWidget );
     backup->exec();
     delete backup;
 }
@@ -146,13 +146,21 @@
     bool registered = ServerManager::isRunning();
     Q_ASSERT( registered );
 
-    QPointer<RestoreAssistant> restore = new RestoreAssistant( m_parentWidget  );
+    QPointer<RestoreAssistant> restore = new RestoreAssistant( m_parentWidget );
     restore->exec();
     delete restore;
 }
 
 void Dock::updateMenu( bool registered )
 {
+    if ( registered ) {
+          setToolTip( "akonadi", i18n( "Akonadi available" ),
+                                 i18n( "The Akonadi server has been started and can \
be used now." ) ); +    } else {
+          setToolTip( "akonadi", i18n( "Akonadi not available" ),
+                                 i18n( "The Akonadi server has been stopped, Akonadi \
related applications can no longer be used." ) ); +    }
+
     /* kdelibs... */
     QToolButton *button = static_cast<QToolButton*>(( static_cast<QWidgetAction*>( \
m_title ) )->defaultWidget() );  QAction* action = button->defaultAction();


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