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

Revert "Use a common definition for modifier-only keybindings array"

Browse source 
This reverts commit ae3014ba3e.
This commit is contained in:
Rui Matos 2013-04-01 20:02:38 +02:00
parent 590a480700
commit 34906dba27
5 changed files with 71 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

27
panels/common/cc-util.c
View file

@ -20,35 +20,10 @@
#include "config.h"
#include <string.h>
#include <glib/gi18n.h>
#include "cc-util.h"
CcInputSwitcherOptions cc_input_switcher_options[] = {
{ "off", N_("Disabled") },
{ "shift-l", N_("Left Shift") },
{ "alt-l", N_("Left Alt") },
{ "ctrl-l", N_("Left Ctrl") },
{ "shift-r", N_("Right Shift") },
{ "alt-r", N_("Right Alt") },
{ "ctrl-r", N_("Right Ctrl") },
{ "alt-shift-l", N_("Left Alt+Shift") },
{ "alt-shift-r", N_("Right Alt+Shift") },
{ "ctrl-shift-l", N_("Left Ctrl+Shift") },
{ "ctrl-shift-r", N_("Right Ctrl+Shift") },
{ "shift-l-shift-r", N_("Left+Right Shift") },
{ "alt-l-alt-r", N_("Left+Right Alt") },
{ "ctrl-l-ctrl-r", N_("Left+Right Ctrl") },
{ "alt-shift", N_("Alt+Shift") },
{ "ctrl-shift", N_("Ctrl+Shift") },
{ "alt-ctrl", N_("Alt+Ctrl") },
{ "caps", N_("Caps") },
{ "shift-caps", N_("Shift+Caps") },
{ "alt-caps", N_("Alt+Caps") },
{ "ctrl-caps", N_("Ctrl+Caps") },
{ NULL, NULL }
};
/* Combining diacritical mark?
* Basic range: [0x0300,0x036F]
* Supplement: [0x1DC0,0x1DFF]

7
panels/common/cc-util.h
View file

@ -23,13 +23,6 @@
#include <glib.h>
typedef struct {
const gchar *value;
const gchar *description;
} CcInputSwitcherOptions;
extern CcInputSwitcherOptions cc_input_switcher_options[];
char *cc_util_normalize_casefold_and_unaccent (const char *str);
#endif

2
panels/keyboard/Makefile.am
View file

@ -23,7 +23,7 @@ libkeyboard_la_SOURCES = \
keyboard-shortcuts.h
libkeyboard_la_CFLAGS = $(PANEL_CFLAGS) $(KEYBOARD_PANEL_CFLAGS) -I$(top_srcdir)/panels/common/
libkeyboard_la_LIBADD = $(PANEL_LIBS) $(KEYBOARD_PANEL_LIBS) $(top_builddir)/panels/common/liblanguage.la
libkeyboard_la_LIBADD = $(PANEL_LIBS) $(KEYBOARD_PANEL_LIBS)
resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/keyboard.gresource.xml)
cc-keyboard-resources.c: keyboard.gresource.xml $(resource_files)

38
panels/keyboard/cc-keyboard-option.c
View file

@ -19,13 +19,11 @@
* 02110-1301, USA.
*/
#include <config.h>
#include <glib/gi18n.h>
#define GNOME_DESKTOP_USE_UNSTABLE_API
#include <libgnome-desktop/gnome-xkb-info.h>
#include "cc-util.h"
#include "cc-keyboard-option.h"
#define CC_TYPE_KEYBOARD_OPTION (cc_keyboard_option_get_type ())
@ -247,6 +245,36 @@ cc_keyboard_option_finalize (GObject *object)
G_OBJECT_CLASS (cc_keyboard_option_parent_class)->finalize (object);
}
static struct
{
const gchar *value;
const gchar *description;
} input_switcher_options[] =
{
{ "off", N_("Disabled") },
{ "shift-l", N_("Left Shift") },
{ "alt-l", N_("Left Alt") },
{ "ctrl-l", N_("Left Ctrl") },
{ "shift-r", N_("Right Shift") },
{ "alt-r", N_("Right Alt") },
{ "ctrl-r", N_("Right Ctrl") },
{ "alt-shift-l", N_("Left Alt+Shift") },
{ "alt-shift-r", N_("Right Alt+Shift") },
{ "ctrl-shift-l", N_("Left Ctrl+Shift") },
{ "ctrl-shift-r", N_("Right Ctrl+Shift") },
{ "shift-l-shift-r", N_("Left+Right Shift") },
{ "alt-l-alt-r", N_("Left+Right Alt") },
{ "ctrl-l-ctrl-r", N_("Left+Right Ctrl") },
{ "alt-shift", N_("Alt+Shift") },
{ "ctrl-shift", N_("Ctrl+Shift") },
{ "alt-ctrl", N_("Alt+Ctrl") },
{ "caps", N_("Caps") },
{ "shift-caps", N_("Shift+Caps") },
{ "alt-caps", N_("Alt+Caps") },
{ "ctrl-caps", N_("Ctrl+Caps") },
{ NULL, NULL }
};
static void
cc_keyboard_option_constructed (GObject *object)
{
@ -296,11 +324,11 @@ cc_keyboard_option_constructed (GObject *object)
else
{
gint i;
for (i = 0; cc_input_switcher_options[i].value; i++)
for (i = 0; input_switcher_options[i].value; i++)
{
gtk_list_store_insert_with_values (self->store, NULL, -1,
XKB_OPTION_DESCRIPTION_COLUMN, _(cc_input_switcher_options[i].description),
XKB_OPTION_ID_COLUMN, cc_input_switcher_options[i].value,
XKB_OPTION_DESCRIPTION_COLUMN, input_switcher_options[i].description,
XKB_OPTION_ID_COLUMN, input_switcher_options[i].value,
-1);
}
}

41
panels/region/cc-input-options.c
View file

@ -20,11 +20,12 @@
* Matthias Clasen
*/
#define _GNU_SOURCE
#include <config.h>
#include "cc-input-options.h"
#include <glib/gi18n.h>
#include "cc-util.h"
#include "cc-input-options.h"
typedef struct {
GtkWidget *dialog;
@ -73,6 +74,36 @@ update_shortcut_label (GtkWidget *widget,
g_free (text);
}
static struct
{
const gchar *value;
const gchar *description;
} input_switcher_options[] =
{
{ "off", N_("Disabled") },
{ "shift-l", N_("Left Shift") },
{ "alt-l", N_("Left Alt") },
{ "ctrl-l", N_("Left Ctrl") },
{ "shift-r", N_("Right Shift") },
{ "alt-r", N_("Right Alt") },
{ "ctrl-r", N_("Right Ctrl") },
{ "alt-shift-l", N_("Left Alt+Shift") },
{ "alt-shift-r", N_("Right Alt+Shift") },
{ "ctrl-shift-l", N_("Left Ctrl+Shift") },
{ "ctrl-shift-r", N_("Right Ctrl+Shift") },
{ "shift-l-shift-r", N_("Left+Right Shift") },
{ "alt-l-alt-r", N_("Left+Right Alt") },
{ "ctrl-l-ctrl-r", N_("Left+Right Ctrl") },
{ "alt-shift", N_("Alt+Shift") },
{ "ctrl-shift", N_("Ctrl+Shift") },
{ "alt-ctrl", N_("Alt+Ctrl") },
{ "caps", N_("Caps") },
{ "shift-caps", N_("Shift+Caps") },
{ "alt-caps", N_("Alt+Caps") },
{ "ctrl-caps", N_("Ctrl+Caps") },
{ NULL, NULL }
};
static void
update_shortcuts (GtkWidget *options)
{
@ -109,9 +140,9 @@ update_shortcuts (GtkWidget *options)
if (strcmp (s, "off") == 0) {
gtk_widget_hide (priv->alt_next_source);
} else {
for (i = 0; cc_input_switcher_options[i].value; i++) {
if (strcmp (s, cc_input_switcher_options[i].value) == 0) {
gtk_label_set_text (GTK_LABEL (priv->alt_next_source), _(cc_input_switcher_options[i].description));
for (i = 0; input_switcher_options[i].value; i++) {
if (strcmp (s, input_switcher_options[i].value) == 0) {
gtk_label_set_text (GTK_LABEL (priv->alt_next_source), _(input_switcher_options[i].description));
break;
}
}