Commit graph

186 commits

Author SHA1 Message Date
Jens Granseuer
5998aa90c0 Fix crash when iterating through the tree model
Don't use indices to move through iterators, don't skip the first
section, and verify that we got a new iterator before using it
(bug #591392).
2009-08-11 18:01:55 +02:00
Thomas Wood
5d882a3bdd Automatically generate .gitignore files with git.mk
Add git.mk and include it in all Makefiles to generate .gitignore files
2009-07-16 00:38:51 +01:00
Felix Riemann
9fcae9146b [keybindings] Remove libglade dependency from keybindings capplet 2009-07-10 19:52:36 +02:00
Matthias Clasen
59380c29e4 Make the custom keybinding UI smoother
These changes were proposed in bug 580792:
 - Make the apply button the default
 - Don't let the cancel button grab the default
 - Make both entries activate the default widget
 - Grab the focus to the first entry when presenting the dialog
2009-05-07 20:09:29 -04:00
Jens Granseuer
0f943122ff make activating a section header row expand or collapse the section as
2009-04-02  Jens Granseuer  <jensgr@gmx.net>

	* gnome-keybinding-properties.c: (start_editing_kb_cb): make
	activating a section header row expand or collapse the section as
	expected instead of crashing (bug #577474)

svn path=/trunk/; revision=9400
2009-04-02 16:40:37 +00:00
Jens Granseuer
c57ec2834e fix mnemonics conflict on the custom shortcut window
2009-03-06  Jens Granseuer  <jensgr@gmx.net>

	* gnome-keybinding-properties.glade: fix mnemonics conflict on the
	custom shortcut window

svn path=/trunk/; revision=9322
2009-03-06 19:23:16 +00:00
Jens Granseuer
a84019b447 release 2.25.92
2009-03-02  Jens Granseuer  <jensgr@gmx.net>

	* NEWS:
	* configure.in: release 2.25.92

svn path=/trunk/; revision=9304
2009-03-02 21:57:20 +00:00
Jens Granseuer
1ed76a4387 for shortcuts without a description simply show "<Unknown Action>" instead
2009-02-23  Jens Granseuer  <jensgr@gmx.net>

	* gnome-keybinding-properties.c: (append_keys_to_tree),
	(update_custom_shortcut): for shortcuts without a description simply
	show "<Unknown Action>" instead of (unhelpful) parts of its GConf
	path (bug #572808)

svn path=/trunk/; revision=9285
2009-02-23 18:38:27 +00:00
Thomas Hindoe Paaboel Andersen
bc85298dcb Replace following deprecated gtk symbols: gtk_box_pack_start_defaults, gtk_widget_set_usize, and GTK_CHECK_* Bug #572325
svn path=/trunk/; revision=9284
2009-02-23 18:15:51 +00:00
Jens Granseuer
c9362a670b don't forget to save the shortcut command, too (bug #572501)
2009-02-20  Jens Granseuer  <jensgr@gmx.net>

	* gnome-keybinding-properties.c: (update_custom_shortcut): don't
	forget to save the shortcut command, too (bug #572501)

svn path=/trunk/; revision=9280
2009-02-20 19:51:44 +00:00
Vincent Untz
950c137ea5 post-release bump to 2.25.91
2009-02-04  Vincent Untz  <vuntz@gnome.org>

	* configure.in: post-release bump to 2.25.91

svn path=/trunk/; revision=9237
2009-02-04 22:30:58 +00:00
Bastien Nocera
4be1294945 Make Enter work as expected in the custom key shortcut edit dialogue
2009-01-28  Bastien Nocera  <hadess@hadess.net>

	* gnome-keybinding-properties.c (setup_dialog): Make Enter
	work as expected in the custom key shortcut edit dialogue


svn path=/trunk/; revision=9216
2009-01-28 12:06:38 +00:00
Bastien Nocera
1069e323e8 Only print warnings for non-custom keybindings, Set the GConf key for the
2009-01-28  Bastien Nocera  <hadess@hadess.net>

	* gnome-keybinding-properties.c (append_keys_to_tree),
	(edit_custom_shortcut), (update_custom_shortcut): Only print
	warnings for non-custom keybindings, Set the GConf key for
	the description when editing existing custom key shortcuts,
	Avoid warnings when the description for a custom key shortcut
	is empty


svn path=/trunk/; revision=9215
2009-01-28 12:01:15 +00:00
Bastien Nocera
d6169f8cdb Print a warning when a key doesn't have a schema, so no description, makes
2009-01-28  Bastien Nocera  <hadess@hadess.net>

	* gnome-keybinding-properties.c (append_keys_to_tree):
	Print a warning when a key doesn't have a schema, so no
	description, makes debugging things like:
	https://bugzilla.redhat.com/show_bug.cgi?id=482813
	easier


svn path=/trunk/; revision=9214
2009-01-28 11:35:08 +00:00
Jens Granseuer
70284272a7 fix argument type warnings by casting to appropriate type
2009-01-25  Jens Granseuer  <jensgr@gmx.net>

	* gnome-keybinding-properties.c: (add_custom_shortcut): fix argument
	type warnings by casting to appropriate type

svn path=/trunk/; revision=9209
2009-01-25 11:28:25 +00:00
Bastien Nocera
a4f0969525 upd 2.25.3
2008-12-18  Bastien Nocera  <hadess@hadess.net>

	* NEWS: upd
	* configure.in: 2.25.3


svn path=/trunk/; revision=9178
2008-12-18 19:30:08 +00:00
Rodrigo Moya
8640021f19 prepare for 2.25.2 release.
2008-12-02  Rodrigo Moya <rodrigo@gnome-db.org>

	* NEWS:
	* *ChangeLog: prepare for 2.25.2 release.

svn path=/trunk/; revision=9158
2008-12-02 16:37:29 +00:00
Jens Granseuer
f5c26281b7 Patch by: Maxim Ermilov <zaspire@rambler.ru>
2008-11-20  Jens Granseuer  <jensgr@gmx.net>

	Patch by: Maxim Ermilov <zaspire@rambler.ru>

	capplets/sound/mixer-support.[ch]:
	capplets/appearance/*.[ch]:
	capplets/common/*.[ch]:
	capplets/keybindings/egg*.[ch]:
	capplets/keyboard/gnome-keyboard-properties-a11y.h:
	shell/control-center.c:
	typing-break/*.[ch]:
	only include top-level headers for glib and GTK+ (bug #561562)

svn path=/trunk/; revision=9148
2008-11-20 18:43:38 +00:00
Matthias Clasen
f4efa053da Respect lockdown for keybindings
svn path=/trunk/; revision=9141
2008-11-11 05:14:51 +00:00
Vincent Untz
d35680790c post-release bump to 2.25.2.
2008-11-05  Vincent Untz  <vuntz@gnome.org>

	* configure.in: post-release bump to 2.25.2.

svn path=/trunk/; revision=9134
2008-11-05 14:54:05 +00:00
Søren Sandmann Pedersen
2f4279fc08 +Sun Oct 26 18:06:45 2008 Søren Sandmann <sandmann@redhat.com>
+
+	* gnome-keybinding-properties.c (cb_dialog_response): Make it
+	compile again.
+


svn path=/trunk/; revision=9126
2008-10-26 22:06:47 +00:00
Matthias Clasen
5a4fc137bd >-------Bug 114796 – binding to arbitrary shell commands
2008-10-26  Matthias Clasen  <mclasen@redhat.com>

>-------Bug 114796 – binding to arbitrary shell commands

>-------* gnome-keybinding-properties.c:
>-------* gnome-keybinding-properties.glade: Add UI for adding and
>-------removing named custom shortcuts.


svn path=/trunk/; revision=9124
2008-10-26 18:41:34 +00:00
Søren Sandmann Pedersen
5978fd729c +Fri Oct 24 17:17:47 2008 Søren Sandmann <sandmann@redhat.com>
+
+	* Get rid of a number of unnecessary gnome.h includes
+
+	* capplets/keybindings/gnome-keybinding-properties.c: Use
+	gtk_init() instead of gnome_program_init().
+
+	* A couple of formatting fixes
+


svn path=/trunk/; revision=9098
2008-10-24 21:19:15 +00:00
Søren Sandmann
1616422ded Use gtk_show_uri() instead of gnome_help_display_desktop()
Fri Oct 24 15:42:11 2008  Søren Sandmann  <sandmann@redhat.com>

	* Use gtk_show_uri() instead of gnome_help_display_desktop()


svn path=/trunk/; revision=9094
2008-10-24 19:42:26 +00:00
Matthias Clasen
95d0d2b6ef Bug 556977 – avoid duplicate custom keybindings
2008-10-19  Matthias Clasen  <mclasen@redhat.com>

        Bug 556977 – avoid duplicate custom keybindings

        * capplets/keybindings/gnome-keybinding-properties.c: Filter
        out custom keybindings that are also listed in xml files.


svn path=/trunk/; revision=9083
2008-10-20 00:34:57 +00:00
Matthias Clasen
c2d6ffeeba Bug 556967 – fix editability of group headings
2008-10-19  Matthias Clasen  <mclasen@redhat.com>

        Bug 556967 – fix editability of group headings

        * capplets/keybindings/gnome-keybinding-properties.c
        (description_set_func): Don't let section headings be editable.


svn path=/trunk/; revision=9081
2008-10-19 22:36:40 +00:00
Vincent Untz
1aee7c2ad6 post-release bump to 2.24.1.
2008-09-24  Vincent Untz  <vuntz@gnome.org>

	* configure.in: post-release bump to 2.24.1.

svn path=/trunk/; revision=9001
2008-09-24 16:50:50 +00:00
Jens Granseuer
5151805d25 don't use the term "accelerator" in the UI (bug #547276)
2008-08-23  Jens Granseuer  <jensgr@gmx.net>

	* eggcellrendererkeys.c:
	* gnome-keybinding-properties.glade: don't use the term "accelerator"
	in the UI (bug #547276)

svn path=/trunk/; revision=8880
2008-08-23 12:19:36 +00:00
Jens Granseuer
4a8637592a Based on a patch by: Denis Washington <denisw@svn.gnome.org>
2008-07-26  Jens Granseuer  <jensgr@gmx.net>

	Based on a patch by: Denis Washington <denisw@svn.gnome.org>

	* gnome-keybinding-properties.c: (binding_name), (show_error),
	(accel_edited_callback): when trying to assign a shortcut that is
	already in use, ask the user whether to reassign it instead of
	refusing to do anything (bug #133318)

svn path=/trunk/; revision=8796
2008-07-26 09:13:40 +00:00
Jens Granseuer
d6c6b7362c Patch by: Matthias Clasen <mclasen@redhat.com>
2008-06-21  Jens Granseuer  <jensgr@gmx.net>

	Patch by: Matthias Clasen <mclasen@redhat.com>

	* at-properties.desktop.in.in:
	* main.c: (setup_dialog): use standard icon name from the icon naming
	spec (bug #539336)

2008-06-21  Jens Granseuer  <jensgr@gmx.net>

	Patch by: Matthias Clasen <mclasen@redhat.com>

	* appearance-main.c: (main):
	* data/gnome-appearance-properties.desktop.in.in: use standard icon
	name from the icon naming spec (bug #539339)

2008-06-21  Jens Granseuer  <jensgr@gmx.net>

	Patch by: Matthias Clasen <mclasen@redhat.com>

	* gnome-keybinding-properties.c: (setup_dialog):
	* keybinding.desktop.in.in: update icon name to use what
	gnome-icon-theme uses (bug #539338)

2008-06-21  Jens Granseuer  <jensgr@gmx.net>

	Patch by: Matthias Clasen <mclasen@redhat.com>

	* gnome-keyboard-properties.c: (main):
	* keyboard.desktop.in.in: use standard icon name from the icon naming
	spec (bug #539340)

2008-06-21  Jens Granseuer  <jensgr@gmx.net>

	Patch by: Matthias Clasen <mclasen@redhat.com>

	* gnome-window-properties.c: (main):
	* window-properties.desktop.in.in: update icon name to use what
	gnome-icon-theme uses (bug #539343)

svn path=/trunk/; revision=8767
2008-06-21 10:20:57 +00:00
Jens Granseuer
727f99a6a9 make editing the shortcut action work for custom bindings
2008-06-01  Jens Granseuer  <jensgr@gmx.net>

	* gnome-keybinding-properties.c: (create_dialog), (accel_set_func),
	(description_set_func), (keybinding_key_changed),
	(keybinding_description_changed), (clear_old_model),
	(append_keys_to_tree), (parse_start_tag),
	(append_keys_to_tree_from_file), (append_keys_to_tree_from_gconf),
	(cb_check_for_uniqueness), (accel_edited_callback),
	(accel_cleared_callback), (description_edited_callback),
	(real_start_editing_cb), (start_editing_cb), (setup_dialog):
	make editing the shortcut action work for custom bindings

svn path=/trunk/; revision=8740
2008-06-01 15:00:18 +00:00
Jens Granseuer
c1c3dc2067 add initial support for editing custom shortcuts (bug #114796).
2008-05-31  Jens Granseuer  <jensgr@gmx.net>

	* gnome-keybinding-properties.c: (append_keys_to_tree),
	(parse_start_tag), (append_keys_to_tree_from_file),
	(append_keys_to_tree_from_gconf), (reload_key_entries): add
	initial support for editing custom shortcuts (bug #114796).
	Adding/deleting shortcuts is not yet possible

svn path=/trunk/; revision=8737
2008-05-31 12:54:37 +00:00
William Jon McCann
0b7371155f Don't use deprecated GTK+ symbol.
2008-05-29  William Jon McCann  <jmccann@redhat.com>

	* eggcellrendererkeys.c (egg_cell_renderer_keys_class_init):
	Don't use deprecated GTK+ symbol.


svn path=/trunk/; revision=8733
2008-05-29 22:03:22 +00:00
Vincent Untz
5e14bcf311 post-release bump to 2.23.3
2008-05-17  Vincent Untz  <vuntz@gnome.org>

	* configure.in: post-release bump to 2.23.3

svn path=/trunk/; revision=8716
2008-05-17 16:56:46 +00:00
Jens Granseuer
40ebc083ce get rid of unneeded sort model indirection
2008-04-01  Jens Granseuer  <jensgr@gmx.net>

	* gnome-keybinding-properties.c: (get_real_model), (clear_old_model),
	(append_keys_to_tree), (accel_edited_callback): get rid of unneeded
	sort model indirection

svn path=/trunk/; revision=8624
2008-04-01 19:24:43 +00:00
Bastien Nocera
04d6b6038d Fix Esc and Backspace being bindable when Caps Lock is on (Closes:
2008-03-31  Bastien Nocera  <hadess@hadess.net>

	* eggcellrendererkeys.c (grab_key_callback): Fix Esc and Backspace
	being bindable when Caps Lock is on (Closes: #524813)


svn path=/trunk/; revision=8615
2008-03-31 12:29:49 +00:00
Bastien Nocera
e80c1a853b Fix category headers not appearing properly in the treeview when using a
2008-03-31  Bastien Nocera  <hadess@hadess.net>

        * gnome-keybinding-properties.c (append_keys_to_tree_from_file):
	Fix category headers not appearing properly in the
	treeview when using a non-UTF-8 locale (Closes: #513988)


svn path=/trunk/; revision=8613
2008-03-31 12:20:14 +00:00
Jens Granseuer
111df53db7 sync with gnome-settings-daemon
2008-03-29  Jens Granseuer  <jensgr@gmx.net>

	* eggaccelerators.c: (egg_accelerator_parse_virtual): sync with
	gnome-settings-daemon

svn path=/trunk/; revision=8609
2008-03-29 13:29:57 +00:00
Jens Granseuer
86bfe7a016 fix mismatched modifier mapping between egg and GTK (so that e.g. <Super>
2008-03-29  Jens Granseuer  <jensgr@gmx.net>

	* eggaccelerators.c: (egg_accelerator_parse_virtual),
	(egg_virtual_accelerator_name), (egg_virtual_accelerator_label),
	(egg_keymap_resolve_virtual_modifiers),
	(egg_keymap_virtualize_modifiers), (reload_modmap),
	(egg_keymap_get_modmap):
	* eggaccelerators.h: fix mismatched modifier mapping between egg
	and GTK (so that e.g. <Super> works) and replace some custom
	functionality with stock GTK

svn path=/trunk/; revision=8608
2008-03-29 11:48:06 +00:00
Jens Granseuer
3d19d6f56d stop widget accelerators from activating while the user is entering a new
2008-03-15  Jens Granseuer  <jensgr@gmx.net>

	* gnome-keybinding-properties.c: (accel_edited_callback),
	(accel_cleared_callback), (start_editing_cb),
	(maybe_block_accels), (setup_dialog): stop widget accelerators
	from activating while the user is entering a new shortcut. This
	allows binding shortcuts that are used as accels in the capplet
	dialog, e.g. for the Help and Close buttons (bug #313228)

svn path=/trunk/; revision=8581
2008-03-14 23:23:57 +00:00
Jens Granseuer
c751e9191c remove debugging output
2008-03-14  Jens Granseuer  <jensgr@gmx.net>

	* gnome-keybinding-properties.c: (append_keys_to_tree_from_file):
	remove debugging output

svn path=/trunk/; revision=8580
2008-03-14 20:00:49 +00:00
Luca Ferretti
87a1e2b6ba reviewed by: Jens Granseuer <jensgr@gmx.net>
2008-02-02  Luca Ferretti  <elle.uca@libero.it>

	reviewed by: Jens Granseuer <jensgr@gmx.net>

	* 00-multimedia-key.xml.in:
	* 01-desktop-key.xml.in:
	Move Launch Calculator to Desktop group and sort
	all launch_app keybing together (Closes: #513867)


svn path=/trunk/; revision=8440
2008-02-02 13:39:19 +00:00
Kjartan Maraas
965e2c09f5 Distcheck fixes.
2007-10-31  Kjartan Maraas  <kmaraas@gnome.org>

	* Makefile.am: Distcheck fixes.

svn path=/trunk/; revision=8240
2007-10-31 14:37:33 +00:00
Jens Granseuer
7def256ed5 Based on a patch by: Sebastien Bacher <seb128@debian.org>
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
2007-10-22 18:59:37 +00:00
Jens Granseuer
97f89ca9e1 Patch by: Stephane Loeuillet <leroutier@gmail.com>
2007-10-02  Jens Granseuer  <jensgr@gmx.net>

	Patch by: Stephane Loeuillet <leroutier@gmail.com>

	* capplets/about-me/gnome-about-me.desktop.in.in:
	* capplets/accessibility/at-properties/at-properties.desktop.in.in:
	* capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in:
	* capplets/appearance/data/gnome-appearance-properties.desktop.in.in:
	* capplets/appearance/data/gnome-theme-installer.desktop.in.in:
	* capplets/appearance/theme-save.c:
	* capplets/default-applications/default-applications.desktop.in.in:
	* capplets/default-applications/gnome-at-session.desktop.in.in:
	* capplets/display/display-properties.desktop.in.in:
	* capplets/keybindings/keybinding.desktop.in.in:
	* capplets/keyboard/keyboard.desktop.in.in:
	* capplets/mouse/gnome-settings-mouse.desktop.in.in:
	* capplets/network/gnome-network-preferences.desktop.in.in:
	* capplets/sound/gnome-settings-sound.desktop.in.in:
	* capplets/windows/window-properties.desktop.in.in:
	* shell/gnomecc.desktop.in.in:
	* shell/gnomecc.directory.in:
	* vfs-methods/fontilus/font-method.directory.in:
	* vfs-methods/fontilus/gnome-font-viewer.desktop.in.in:
	* vfs-methods/themus/theme-method.directory.in:
	* vfs-methods/themus/themus-theme-applier.desktop.in.in:
	desktop file fixes: don't use the deprecated Encoding tag, change
	Terminal=0 to Terminal=false, remove empty Categories= (bug #481740)

svn path=/trunk/; revision=8153
2007-10-02 18:01:06 +00:00
Bastien Nocera
314fc15bdd reviewed by: Jens Granseuer <jensgr@gmx.net>
2007-08-05  Bastien Nocera  <hadess@hadess.net>

	reviewed by: Jens Granseuer <jensgr@gmx.net>

	* gnome-keybinding-properties.c: (keyval_is_forbidden),
	(accel_edited_callback): Make the arrows and tabs unbindable
	without a modifier (Closes: #463433)


svn path=/trunk/; revision=7962
2007-08-04 23:11:42 +00:00
Jens Granseuer
0eb282cfa1 fix GConf notification
2007-06-14  Jens Granseuer  <jensgr@gmx.net>

	* gnome-keybinding-properties.c: (setup_dialog): fix GConf
	notification

svn path=/trunk/; revision=7724
2007-06-14 19:47:28 +00:00
Jens Granseuer
bb29ad69ee add g_thread_init as required by glib
2007-05-02  Jens Granseuer  <jensgr@gmx.net>

	* gnome-keybinding-properties.c: (main): add g_thread_init as
	required by glib

svn path=/trunk/; revision=7542
2007-05-02 18:48:25 +00:00
Bastien Nocera
756014edd1 Fix keysdir substitution, as reported by Christian Persch
2007-05-02  Bastien Nocera  <hadess@hadess.net>

	* gnome-keybindings.pc.in: Fix keysdir substitution, as
	reported by Christian Persch <chpe@svn.gnome.org>
	(Closes: #434591)


svn path=/trunk/; revision=7535
2007-05-02 13:18:50 +00:00
Bastien Nocera
a7d9950ae6 Generate a capplets/keybindings/gnome-keybindings.pc from the .in file
2007-04-30  Bastien Nocera  <hadess@hadess.net>

	* configure.in: Generate a capplets/keybindings/gnome-keybindings.pc
	from the .in file

2007-04-30  Bastien Nocera  <hadess@hadess.net>

	* Makefile.am: upd
	* gnome-keybindings.pc.in: add a noarch pkgconfig file to allow
	applications to know where to add their keybindings
	(Closes: #434591)


svn path=/trunk/; revision=7519
2007-04-30 16:12:08 +00:00