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

List:       kde-commits
Subject:    kdetoys/amor
From:       Gerardo Puga <gpuga () gioia ! ing ! unlp ! edu ! ar>
Date:       2004-03-06 4:04:00
Message-ID: 20040306040400.D27DD9959 () office ! kde ! org
[Download RAW message or body]

CVS commit by gpuga: 


Applied a patch sent by Jakob Schroeter to add a help submenu.
Modified the About dialog.


  M +8 -4      amor.cpp   1.34
  M +1 -1      main.cpp   1.17


--- kdetoys/amor/amor.cpp  #1.33:1.34
@@ -41,4 +41,6 @@
 #include <kwinmodule.h>
 #include <kstandarddirs.h>
+#include <khelpmenu.h>
+#include <kiconloader.h>
 
 #include "amor.h"
@@ -580,10 +582,12 @@ void Amor::slotMouseClicked(const QPoint
     if (!mMenu)
     {
+        KHelpMenu* help = new KHelpMenu(0, KGlobal::instance()->aboutData(), false);
+        KPopupMenu* helpMnu = help->menu();
         mMenu = new KPopupMenu();
         mMenu->insertTitle("Amor"); // I really don't want this i18n'ed
-        mMenu->insertItem(i18n("&Options..."), this, SLOT(slotConfigure()));
-        mMenu->insertItem(i18n("&About"), this, SLOT(slotAbout()));
+        mMenu->insertItem(SmallIcon("configure"), i18n("&Configure..."), this, \
SLOT(slotConfigure()));  mMenu->insertSeparator();
-        mMenu->insertItem(i18n("&Quit"), kapp, SLOT(quit()));
+        mMenu->insertItem(SmallIcon("help"), i18n("&Help"), helpMnu);
+        mMenu->insertItem(SmallIcon("exit"), i18n("&Quit"), kapp, SLOT(quit()));
     }
 

--- kdetoys/amor/main.cpp  #1.16:1.17
@@ -49,5 +49,5 @@ int main(int argc, char *argv[])
         "(c) 1999, Martin R. Jones");
     aboutData.addAuthor("Martin R. Jones",0, "mjones@kde.org");
-    aboutData.addCredit("Gerardo Puga", I18N_NOOP("Current maintainer"), \
"gpuga@gioia.ing.unlp.edu.ar");  +    aboutData.addAuthor("Gerardo Puga", \
I18N_NOOP("Current maintainer"), "gpuga@gioia.ing.unlp.edu.ar");   \
KCmdLineArgs::init( argc, argv, &aboutData );  


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