applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Based on a patch by: Sebastien Bacher <seb128@debian.org>

Browse source 
2007-10-22  Jens Granseuer  <jensgr@gmx.net>

	Based on a patch by: Sebastien Bacher <seb128@debian.org>

	* capplets/keybindings/00-multimedia-key.xml.in:
	* gnome-settings-daemon/action/acme.h:
	* gnome-settings-daemon/gnome-settings-multimedia-keys.c (do_action):
	* schemas/apps_gnome_settings_daemon_keybindings.schemas.in:
	add support for calculator key

svn path=/trunk/; revision=8187
This commit is contained in:
Jens Granseuer 2007-10-22 18:59:37 +00:00 • committed by Jens Granseuer
parent e3ec418567
commit 7def256ed5
5 changed files with 29 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2007-10-22 Jens Granseuer <jensgr@gmx.net>
Based on a patch by: Sebastian Bacher <seb128@debian.org>
* capplets/keybindings/00-multimedia-key.xml.in:
* gnome-settings-daemon/action/acme.h:
* gnome-settings-daemon/gnome-settings-multimedia-keys.c (do_action):
* schemas/apps_gnome_settings_daemon_keybindings.schemas.in:
add support for calculator key
2007-10-21 Jens Granseuer <jensgr@gmx.net> 2007-10-21 Jens Granseuer <jensgr@gmx.net>
* configure.in: fix bugzilla component * configure.in: fix bugzilla component

3
capplets/keybindings/00-multimedia-key.xml.in
View file

@ -13,6 +13,9 @@
<KeyListEntry <KeyListEntry
name="/apps/gnome_settings_daemon/keybindings/media" /> name="/apps/gnome_settings_daemon/keybindings/media" />
<KeyListEntry
name="/apps/gnome_settings_daemon/keybindings/calculator" />
<KeyListEntry <KeyListEntry
name="/apps/gnome_settings_daemon/keybindings/play" /> name="/apps/gnome_settings_daemon/keybindings/play" />

2
gnome-settings-daemon/actions/acme.h
View file

@ -33,6 +33,7 @@ enum {
EJECT_KEY, EJECT_KEY,
HOME_KEY, HOME_KEY,
MEDIA_KEY, MEDIA_KEY,
CALCULATOR_KEY,
SEARCH_KEY, SEARCH_KEY,
EMAIL_KEY, EMAIL_KEY,
SLEEP_KEY, SLEEP_KEY,
@ -65,6 +66,7 @@ static struct {
{ EJECT_KEY, GCONF_BINDING_DIR "/eject", NULL }, { EJECT_KEY, GCONF_BINDING_DIR "/eject", NULL },
{ HOME_KEY, GCONF_BINDING_DIR "/home", NULL }, { HOME_KEY, GCONF_BINDING_DIR "/home", NULL },
{ MEDIA_KEY, GCONF_BINDING_DIR "/media", NULL }, { MEDIA_KEY, GCONF_BINDING_DIR "/media", NULL },
{ CALCULATOR_KEY, GCONF_BINDING_DIR "/calculator", NULL },
{ SEARCH_KEY, GCONF_BINDING_DIR "/search", NULL }, { SEARCH_KEY, GCONF_BINDING_DIR "/search", NULL },
{ EMAIL_KEY, GCONF_BINDING_DIR "/email", NULL }, { EMAIL_KEY, GCONF_BINDING_DIR "/email", NULL },
{ SLEEP_KEY, GCONF_BINDING_DIR "/sleep", NULL }, { SLEEP_KEY, GCONF_BINDING_DIR "/sleep", NULL },

3
gnome-settings-daemon/gnome-settings-multimedia-keys.c
View file

@ -727,6 +727,9 @@ do_action (Acme *acme, int type)
case MEDIA_KEY: case MEDIA_KEY:
do_media_action (acme); do_media_action (acme);
break; break;
case CALCULATOR_KEY:
execute (acme, "gcalctool", FALSE, FALSE);
break;
case PLAY_KEY: case PLAY_KEY:
return do_multimedia_player_action (acme, "Play"); return do_multimedia_player_action (acme, "Play");
break; break;

11
schemas/apps_gnome_settings_daemon_keybindings.schemas.in
View file

@ -144,6 +144,17 @@
</locale> </locale>
</schema> </schema>
<schema>
<key>/schemas/apps/gnome_settings_daemon/keybindings/calculator</key>
<applyto>/apps/gnome_settings_daemon/keybindings/calculator</applyto>
<type>string</type>
<default>XF86Calculator</default>
<locale name="C">
<short>Launch calculator</short>
<long>Launch calculator's shortcut</long>
</locale>
</schema>
<schema> <schema>
<key>/schemas/apps/gnome_settings_daemon/keybindings/www</key> <key>/schemas/apps/gnome_settings_daemon/keybindings/www</key>