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

List:       kde-multimedia
Subject:    Re: [PATCH] Help Menu in aKtion
From:       Chris Howells <chris () chrishowells ! co ! uk>
Date:       2001-12-19 9:48:58
[Download RAW message or body]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Tuesday 18 December 2001 6:46 pm, Chris Howells wrote:

<snip>

Here's a patch which is somewhat cleaner. Please review.

- -- 
Cheers, Chris Howells -- chris@chrishowells.co.uk, howells@kde.org
Web: http://chrishowells.co.uk, PGP key: http://chrishowells.co.uk/pgp.txt
KDE: http://www.koffice.org, http://edu.kde.org, http://usability.kde.org

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD8DBQE8IGKKF8Iu1zN5WiwRAoxYAJ0cdgeyR6Gyh/zypb4Ckhbx+6wg8QCeJ5gP
FTRe0PhTUrmIwEoq6x3SYBI=
=zUi/
-----END PGP SIGNATURE-----

["aktion.diff" (text/x-diff)]

? aktion.diff
Index: principal.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/aktion/principal.cpp,v
retrieving revision 1.27
diff -u -3 -p -r1.27 principal.cpp
--- principal.cpp	2001/12/11 23:35:22	1.27
+++ principal.cpp	2001/12/19 09:47:36
@@ -14,6 +14,9 @@
 #include <kstddirs.h>
 #include <kseparator.h>
 
+#include <kpopupmenu.h>
+#include <khelpmenu.h>
+
 #include <qtoolbutton.h>
 #include <qiconset.h>
 #include <qlabel.h>
@@ -130,18 +133,23 @@ Principal::Principal( const char *name)
         retroceder->setAutoRepeat( true );
 	QToolTip::add(retroceder,i18n("Backward"));
 
+	KHelpMenu *mHelpMenu = new KHelpMenu(this, KGlobal::instance()->aboutData(), false);
+
+
 	ayuda = new QToolButton(mainwidget, "ayuda");
 	ayuda->setIconSet(MainBarIconSet("help"));
+	ayuda->setPopup(mHelpMenu->menu());
+	ayuda->setPopupDelay(0);
 	QToolTip::add(ayuda,i18n("Help"));
 
 	configB = new QToolButton(mainwidget, "Setup");
 	configB->setIconSet(MainBarIconSet("configure"));
 	QToolTip::add(configB,i18n("Setup"));
 
+        connect(ayuda,SIGNAL(clicked()),
+		 this,SLOT(open_help()) );
         connect(abrir,SIGNAL(clicked()),
 		 this,SLOT(click_open()) );
-        connect(ayuda,SIGNAL(clicked()),
-		 this,SLOT(click_ayuda()) );
         connect(configB,SIGNAL(clicked()),
 	        this,SLOT(click_config()) );
         connect(tocar,SIGNAL(clicked()),
@@ -306,6 +314,11 @@ bool Principal::queryExit()
            return true;
 }
 
+void Principal::open_help()
+{
+	kapp->invokeHelp();
+}
+
 void Principal::click_open()
 {
     /* the idea behind this method is not very simple:
@@ -430,11 +443,6 @@ void Principal::dropEvent( QDropEvent *e
     }
 }
 
-void Principal::click_ayuda()
-{
-    kapp->invokeHelp();
-}
-
 void Principal::click_play()
 {
     /* maube do we need to resize the whole application? */
@@ -581,7 +589,6 @@ void Principal::keyPressEvent( QKeyEvent
                           video->volumeDecrement();
                        }
                        break;
-      case Key_F1    : click_ayuda(); break;
       case Key_Escape: this->close(); break;
       case Key_C     : theCapturer.captureWidget(video); break;
       default        : if (inFullScreen)
Index: principal.h
===================================================================
RCS file: /home/kde/kdemultimedia/aktion/principal.h,v
retrieving revision 1.12
diff -u -3 -p -r1.12 principal.h
--- principal.h	2000/10/01 21:35:01	1.12
+++ principal.h	2001/12/19 09:47:37
@@ -24,6 +24,9 @@ class KConfig;
 class KIconLoader;
 class KWin;
 
+class KPopupMenu;
+class KHelpMenu;
+
 class aktionVm;
 class capture;
 
@@ -42,8 +45,8 @@ private:
 	QToolButton *abrir;
 	QToolButton *avanzar;
 	QToolButton *retroceder;
-        QToolButton *ayuda;
-        QToolButton *configB;
+	QToolButton *ayuda;
+	QToolButton *configB;
         QFrame *line;
         QLabel *logoWidget;
         KXAnim *video;
@@ -55,6 +58,7 @@ private:
         int whatToDo;
         int menuItemFullScreen;
         KConfig *config;
+	KHelpMenu *mHelpMenu;
         void changeSize(float);
         void changeInitialSize();
         void setParameters();
@@ -87,12 +91,12 @@ protected:
         virtual void dropEvent( QDropEvent *);
 signals:
 public slots:
+        void open_help();
         void click_open();
         void click_play();
         void click_stop();
         void click_forward();
         void click_backward();
-        void click_ayuda();
         void click_config();
         void click_info();
         void click_original();

_______________________________________________
kde-multimedia mailing list
kde-multimedia@mail.kde.org
http://mail.kde.org/mailman/listinfo/kde-multimedia

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