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

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdepim/kmail
From:       Will Stephenson <lists () stevello ! free-online ! co ! uk>
Date:       2004-11-23 20:32:11
Message-ID: 20041123203211.5F74B18B4B () office ! kde ! org
[Download RAW message or body]

CVS commit by wstephens: 

(backport)
There's a bug where KTipDialog appears, but is empty, on kontact start.  This is \
because it's not Kontact showing the tips, with a list of all the components' tips \
files, but KMail, which likes to show its tips when constructing its KMainWidget. \
Since KMail is running in Kontact, its appname is kontact, and kontact/tips does not \
exist -> empty tips dialog.

This moves KMail's startup tips to KMMainWin, which is only used when kmail is \
running standalone.


  M +0 -8      kmmainwidget.cpp   1.250.2.11
  M +0 -2      kmmainwidget.h   1.70.2.3
  M +11 -0     kmmainwin.cpp   1.598.2.5
  M +1 -0      kmmainwin.h   1.170.2.1


--- kdepim/kmail/kmmainwidget.cpp  #1.250.2.10:1.250.2.11
@@ -159,7 +159,4 @@ KMMainWidget::KMMainWidget(QWidget *pare
       this, SLOT(slotChangeCaption(QListViewItem*)));
 
-  if ( kmkernel->firstInstance() )
-    QTimer::singleShot( 200, this, SLOT(slotShowTipOnStart()) );
-
   toggleSystemTray();
 
@@ -3178,9 +3175,4 @@ void KMMainWidget::slotShowStartupFolder
 }
 
-void KMMainWidget::slotShowTipOnStart()
-{
-  KTipDialog::showTip( this );
-}
-
 void KMMainWidget::slotShowTip()
 {

--- kdepim/kmail/kmmainwidget.h  #1.70.2.2:1.70.2.3
@@ -308,6 +308,4 @@ protected slots:
   void slotIntro();
   void slotShowStartupFolder();
-  /** Show tip-of-the-day on startup */
-  void slotShowTipOnStart();
   /** Show tip-of-the-day, forced */
   void slotShowTip();

--- kdepim/kmail/kmmainwin.cpp  #1.598.2.4:1.598.2.5
@@ -20,4 +20,5 @@
 #include <kstringhandler.h>
 #include <kdebug.h>
+#include <ktip.h>
 
 #include "kmmainwin.moc"
@@ -39,4 +40,7 @@ KMMainWin::KMMainWin(QWidget *)
     setInstance( kmkernel->xmlGuiInstance() );
 
+  if ( kmkernel->firstInstance() )
+    QTimer::singleShot( 200, this, SLOT(slotShowTipOnStart()) );
+
   setStandardToolBarMenuEnabled(true);
 
@@ -185,2 +189,9 @@ bool KMMainWin::queryClose()
   return kmkernel->canQueryClose();
 }
+
+void KMMainWin::slotShowTipOnStart()
+{
+  KTipDialog::showTip( this );
+}
+
+

--- kdepim/kmail/kmmainwin.h  #1.170:1.170.2.1
@@ -50,4 +50,5 @@ protected slots:
   void slotQuit();
   void slotConfigChanged();
+  void slotShowTipOnStart();
 
 private:


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