rev 4841 - in trunk/packages/kdeutils/debian: . patches

Fathi Boudra fboudra-guest at alioth.debian.org
Thu Nov 2 17:56:07 CET 2006


Author: fboudra-guest
Date: 2006-11-02 17:56:07 +0100 (Thu, 02 Nov 2006)
New Revision: 4841

Added:
   trunk/packages/kdeutils/debian/patches/14_kmilo_actions.diff
Modified:
   trunk/packages/kdeutils/debian/changelog
Log:
Add new actions to kmilo, 1st step to fix #396622 properly

Modified: trunk/packages/kdeutils/debian/changelog
===================================================================
--- trunk/packages/kdeutils/debian/changelog	2006-11-02 14:25:53 UTC (rev 4840)
+++ trunk/packages/kdeutils/debian/changelog	2006-11-02 16:56:07 UTC (rev 4841)
@@ -1,3 +1,11 @@
+kdeutils (4:3.5.5-2) unstable; urgency=low
+
+  * Add 14_kmilo_actions patch, stolen from kubuntu. It adds new actions to the
+    generic kmilo actions (volume up/down and mute). (Closes: #396622)
+    Thanks to Jonathan Riddell.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu,  2 Nov 2006 17:47:53 +0100
+
 kdeutils (4:3.5.5-1) unstable; urgency=low
 
   * New upstream release.

Added: trunk/packages/kdeutils/debian/patches/14_kmilo_actions.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/14_kmilo_actions.diff	2006-11-02 14:25:53 UTC (rev 4840)
+++ trunk/packages/kdeutils/debian/patches/14_kmilo_actions.diff	2006-11-02 16:56:07 UTC (rev 4841)
@@ -0,0 +1,149 @@
+diff -Nur kdeutils-3.5.5/kmilo/generic/generic_monitor.cpp kdeutils-3.5.5.new/kmilo/generic/generic_monitor.cpp
+--- kdeutils-3.5.5/kmilo/generic/generic_monitor.cpp	2006-10-01 19:28:15.000000000 +0200
++++ kdeutils-3.5.5.new/kmilo/generic/generic_monitor.cpp	2006-11-02 17:35:45.000000000 +0100
+@@ -25,6 +25,7 @@
+ 
+ #include <kgenericfactory.h>
+ #include <kdebug.h>
++#include <kprocess.h>
+ 
+ #include <sys/types.h>
+ #include <unistd.h>
+@@ -33,6 +34,7 @@
+ #include "kmilointerface.h"
+ #include <qmessagebox.h>
+ #include <qfile.h>
++#include <qdir.h>
+ 
+ 
+ // FIXME: use DCOPRef where possible instead of hand-rolled DCOP calls.
+@@ -58,7 +60,21 @@
+ 
+ bool GenericMonitor::init()
+ {
++	config = new KConfig("kmilodrc");
++	config->setGroup("kubuntu");
++
+ 	static const ShortcutInfo shortcuts[] = {
++		{ "Search", KShortcut("XF86Search"), SLOT(launchSearch()) },
++		{ "Home Folder", KShortcut("XF86MyComputer"), SLOT(launchHomeFolder()) },
++		{ "Mail", KShortcut("XF86Mail"), SLOT(launchMail()) },
++		{ "Audio Media", KShortcut("XF86AudioMedia"), SLOT(launchMusic()) },
++		{ "Music", KShortcut("XF86Music"), SLOT(launchMusic()) },
++		{ "Browser", KShortcut("XF86WWW"), SLOT(launchBrowser()) },
++		{ "Calculator", KShortcut("XF86Calculator"), SLOT(launchCalculator()) },
++		{ "Terminal", KShortcut("XF86Terminal"), SLOT(launchTerminal()) },
++		{ "Eject", KShortcut("XF86Eject"), SLOT(eject()) },
++		{ "Help", KShortcut("XF86Launch0"), SLOT(launchHelp()) },
++		{ "Light Bulb", KShortcut("XF86LightBulb"), SLOT(lightBulb()) },
+ 		{ "FastVolumeUp", Qt::Key_VolumeUp, SLOT(fastVolumeUp()) },
+ 		{ "FastVolumeDown", Qt::Key_VolumeDown, SLOT(fastVolumeDown()) },
+ 		{ "SlowVolumeUp", Qt::CTRL+Qt::Key_VolumeUp, SLOT(slowVolumeUp()) },
+@@ -249,6 +265,68 @@
+ 	return m_displayType;
+ }
+ 
++void GenericMonitor::launch(QString configKey, QString defaultApplication)
++{
++	QString application = config->readEntry(configKey, defaultApplication);
++	KProcess proc;
++	proc << application;
++	proc.start(KProcess::DontCare);
++}
++
++void GenericMonitor::launchMail()
++{
++	kdDebug() << "launchMail" << endl;
++	kapp->invokeMailer("", "", "", "", "", "", "", "");
++}
++
++void GenericMonitor::launchBrowser()
++{
++	kapp->invokeBrowser("");
++}
++
++void GenericMonitor::launchSearch()
++{
++	launch("search", "kfind");
++}
++
++void GenericMonitor::launchHomeFolder()
++{
++	QString home = QDir::home().path();
++	KProcess proc;
++	proc << "kfmclient" << "exec" << home;
++	proc.start(KProcess::DontCare);
++}
++
++void GenericMonitor::launchMusic()
++{
++	launch("search", "amarok");
++}
++
++void GenericMonitor::launchCalculator()
++{
++	launch("search", "speedcrunch");
++}
++
++void GenericMonitor::launchTerminal()
++{
++	launch("search", "konsole");
++}
++
++void GenericMonitor::launchHelp()
++{
++	launch("search", "khelpcenter");
++}
++
++void GenericMonitor::eject()
++{
++	launch("search", "eject");
++}
++
++void GenericMonitor::lightBulb()
++{
++	kdDebug() << "lightBulb()" << endl;
++	_interface->displayText("Screen Light");
++}
+ 
+ K_EXPORT_COMPONENT_FACTORY(kmilo_generic, KGenericFactory<GenericMonitor>("kmilo_generic"))
+ 
+diff -Nur kdeutils-3.5.5/kmilo/generic/generic_monitor.h kdeutils-3.5.5.new/kmilo/generic/generic_monitor.h
+--- kdeutils-3.5.5/kmilo/generic/generic_monitor.h	2006-01-19 17:49:13.000000000 +0100
++++ kdeutils-3.5.5.new/kmilo/generic/generic_monitor.h	2006-11-02 17:37:42.000000000 +0100
+@@ -29,6 +29,7 @@
+ #include <kglobalaccel.h>
+ #include <dcopref.h>
+ #include <kapplication.h>
++#include <kconfig.h>
+ 
+ #include "kmilod.h"
+ #include "monitor.h"
+@@ -62,6 +63,16 @@
+   void fastVolumeUp();
+   void fastVolumeDown();
+   void mute();
++  void launchMail();
++  void launchBrowser();
++  void launchSearch();
++  void launchHomeFolder();
++  void launchMusic();
++  void launchCalculator();
++  void launchTerminal();
++  void launchHelp();
++  void eject();
++  void lightBulb();
+ 
+ private:
+   void volumeUp(int step);
+@@ -69,8 +80,10 @@
+ 	bool retrieveMute();
+ 	bool retrieveVolume();
+ 	void displayVolume();
++	void launch(QString configKey, QString defaultApplication);
+ 
+ 	KGlobalAccel *ga;
++	KConfig* config;
+ 
+ 	DCOPRef *kmixClient, *kmixWindow;
+ 




More information about the pkg-kde-commits mailing list