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

List:       kmail-devel
Subject:    Bug#38716: [patch] Fix for bug 38716
From:       Richard Newton <richard.newton9 () ntlworld ! com>
Date:       2002-02-26 23:27:56
[Download RAW message or body]

Hi,

This patch fixes bug 38716 as describe in my original post.  Apply in the 
kmail directory.

Ric.
["bug38716.patch" (text/x-diff)]

Index: kmcomposewin.cpp
===================================================================
RCS file: /home/kde/kdenetwork/kmail/kmcomposewin.cpp,v
retrieving revision 1.471
diff -u -r1.471 kmcomposewin.cpp
--- kmcomposewin.cpp	2002/02/19 08:40:01	1.471
+++ kmcomposewin.cpp	2002/02/26 22:37:45
@@ -2600,13 +2600,16 @@

 void KMComposeWin::slotEditToolbars()
 {
-  KEditToolbar dlg(actionCollection(), "kmcomposerui.rc");
+  KEditToolbar *dlg = new KEditToolbar(actionCollection(), "kmcomposerui.rc");
+  connect( dlg, SIGNAL(newToolbarConfig()), this, SLOT(slotUpdateToolbars()) );
+  dlg->exec();
+  disconnect( dlg, SIGNAL(newToolbarConfig()), this, SLOT(slotUpdateToolbars()) );
+}

-  if (dlg.exec() == true)
-  {
+void KMComposeWin::slotUpdateToolbars()
+{
     createGUI("kmcomposerui.rc");
     toolbarAction->setChecked(!toolBar()->isHidden());
-  }
 }

 void KMComposeWin::slotEditKeys()
Index: kmcomposewin.h
===================================================================
RCS file: /home/kde/kdenetwork/kmail/kmcomposewin.h,v
retrieving revision 1.146
diff -u -r1.146 kmcomposewin.h
--- kmcomposewin.h	2002/01/30 08:36:22	1.146
+++ kmcomposewin.h	2002/02/26 22:37:47
@@ -295,6 +295,7 @@
   void slotToggleToolBar();
   void slotToggleStatusBar();
   void slotEditToolbars();
+  void slotUpdateToolbars();
   void slotEditKeys();
   /**
    * Read settings from app's config file.
Index: kmmainwin.cpp
===================================================================
RCS file: /home/kde/kdenetwork/kmail/kmmainwin.cpp,v
retrieving revision 1.419
diff -u -r1.419 kmmainwin.cpp
--- kmmainwin.cpp	2002/02/24 19:39:04	1.419
+++ kmmainwin.cpp	2002/02/26 22:37:49
@@ -2276,13 +2276,16 @@

 void KMMainWin::slotEditToolbars()
 {
-  KEditToolbar dlg(actionCollection(), "kmmainwin.rc");
+  KEditToolbar *dlg = new KEditToolbar(actionCollection(), "kmmainwin.rc");
+  connect( dlg, SIGNAL(newToolbarConfig()), this, SLOT(slotUpdateToolbars()) );
+  dlg->exec();
+  disconnect( dlg, SIGNAL(newToolbarConfig()), this, SLOT(slotUpdateToolbars()) );
+}

-  if (dlg.exec() == true)
-  {
+void KMMainWin::slotUpdateToolbars()
+{
     createGUI("kmmainwin.rc");
     toolbarAction->setChecked(!toolBar()->isHidden());
-  }
 }

 void KMMainWin::slotEditKeys()
Index: kmmainwin.h
===================================================================
RCS file: /home/kde/kdenetwork/kmail/kmmainwin.h,v
retrieving revision 1.109
diff -u -r1.109 kmmainwin.h
--- kmmainwin.h	2002/01/16 12:49:00	1.109
+++ kmmainwin.h	2002/02/26 22:37:49
@@ -255,6 +255,7 @@
   void slotToggleToolBar();
   void slotToggleStatusBar();
   void slotEditToolbars();
+  void slotUpdateToolbars();
   void slotEditKeys();

 protected:

_______________________________________________
KMail Developers mailing list
kmail@mail.kde.org
http://mail.kde.org/mailman/listinfo/kmail

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