region: keyboard_dialog -> region_dialog
gnome-keyboard-properties -> gnome-region-panel has-separator is gone
This commit is contained in:
parent
f5f5aac5c0
commit
628e280243
11 changed files with 16 additions and 19 deletions
|
@ -9,7 +9,6 @@
|
|||
<property name="default_width">670</property>
|
||||
<property name="default_height">350</property>
|
||||
<property name="type_hint">dialog</property>
|
||||
<property name="has_separator">False</property>
|
||||
<child internal-child="vbox">
|
||||
<object class="GtkVBox" id="dialog-vbox3">
|
||||
<property name="visible">True</property>
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
<property name="default_width">450</property>
|
||||
<property name="default_height">400</property>
|
||||
<property name="type_hint">dialog</property>
|
||||
<property name="has_separator">False</property>
|
||||
<child internal-child="vbox">
|
||||
<object class="GtkVBox" id="dialog-vbox2">
|
||||
<property name="visible">True</property>
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
<property name="default_width">550</property>
|
||||
<property name="default_height">400</property>
|
||||
<property name="type_hint">dialog</property>
|
||||
<property name="has_separator">False</property>
|
||||
<child internal-child="vbox">
|
||||
<object class="GtkVBox" id="dialog-vbox4">
|
||||
<property name="visible">True</property>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* gnome-keyboard-properties-xkb.c
|
||||
/* gnome-region-panel-xkb.c
|
||||
* Copyright (C) 2003-2007 Sergey V. Udaltsov
|
||||
*
|
||||
* Written by: Sergey V. Udaltsov <svu@gnome.org>
|
||||
|
@ -225,7 +225,7 @@ setup_xkb_tabs (GtkBuilder * dialog)
|
|||
xkb_layouts_register_conf_listener (dialog);
|
||||
xkb_options_register_conf_listener (dialog);
|
||||
|
||||
g_signal_connect (G_OBJECT (WID ("keyboard_dialog")),
|
||||
g_signal_connect (G_OBJECT (WID ("region_dialog")),
|
||||
"destroy", G_CALLBACK (cleanup_xkb_tabs),
|
||||
dialog);
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* gnome-keyboard-properties-xkb.h
|
||||
/* gnome-region-panel-xkb.h
|
||||
* Copyright (C) 2003-2007 Sergey V Udaltsov
|
||||
*
|
||||
* Written by Sergey V. Udaltsov <svu@gnome.org>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* gnome-keyboard-properties-xkblt.c
|
||||
/* gnome-region-panel-xkblt.c
|
||||
* Copyright (C) 2003-2007 Sergey V. Udaltsov
|
||||
*
|
||||
* Written by: Sergey V. Udaltsov <svu@gnome.org>
|
||||
|
@ -341,7 +341,7 @@ show_selected_layout (GtkWidget * button, GtkBuilder * dialog)
|
|||
gchar **layouts_list = xkb_layouts_get_selected_list ();
|
||||
const gchar *id = layouts_list[idx];
|
||||
char *descr = xkb_layout_description_utf8 (id);
|
||||
GtkWidget *parent = WID ("keyboard_dialog");
|
||||
GtkWidget *parent = WID ("region_dialog");
|
||||
GtkWidget *popup =
|
||||
gkbd_keyboard_drawing_new_dialog (idx, descr);
|
||||
gtk_widget_set_parent (popup, parent);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* gnome-keyboard-properties-xkbltadd.c
|
||||
/* gnome-region-panel-xkbltadd.c
|
||||
* Copyright (C) 2007 Sergey V. Udaltsov
|
||||
*
|
||||
* Written by: Sergey V. Udaltsov <svu@gnome.org>
|
||||
|
@ -443,7 +443,7 @@ xkb_layout_choose (GtkBuilder * dialog)
|
|||
|
||||
chooser_dialog = gtk_builder_new ();
|
||||
gtk_builder_add_from_file (chooser_dialog, GNOMECC_UI_DIR
|
||||
"/gnome-keyboard-properties-layout-chooser.ui",
|
||||
"/gnome-region-panel-layout-chooser.ui",
|
||||
NULL);
|
||||
GtkWidget *chooser = CWID ("xkb_layout_chooser");
|
||||
GtkWidget *lang_chooser = CWID ("xkb_languages_available");
|
||||
|
@ -453,7 +453,7 @@ xkb_layout_choose (GtkBuilder * dialog)
|
|||
|
||||
gtk_window_set_transient_for (GTK_WINDOW (chooser),
|
||||
GTK_WINDOW (WID
|
||||
("keyboard_dialog")));
|
||||
("region_dialog")));
|
||||
|
||||
xkb_layout_chooser_available_layouts_fill (chooser_dialog,
|
||||
"xkb_countries_available",
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* gnome-keyboard-properties-xkbmc.c
|
||||
/* gnome-region-panel-xkbmc.c
|
||||
* Copyright (C) 2003-2007 Sergey V. Udaltsov
|
||||
*
|
||||
* Written by: Sergey V. Udaltsov <svu@gnome.org>
|
||||
|
@ -309,12 +309,12 @@ choose_model (GtkBuilder * dialog)
|
|||
|
||||
chooser_dialog = gtk_builder_new ();
|
||||
gtk_builder_add_from_file (chooser_dialog, GNOMECC_UI_DIR
|
||||
"/gnome-keyboard-properties-model-chooser.ui",
|
||||
"/gnome-region-panel-model-chooser.ui",
|
||||
NULL);
|
||||
chooser = CWID ("xkb_model_chooser");
|
||||
gtk_window_set_transient_for (GTK_WINDOW (chooser),
|
||||
GTK_WINDOW (WID
|
||||
("keyboard_dialog")));
|
||||
("region_dialog")));
|
||||
current_model_name = g_settings_get_string (xkb_keyboard_settings, GKBD_KEYBOARD_CONFIG_KEY_MODEL);
|
||||
|
||||
prepare_vendors_list (chooser_dialog);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* gnome-keyboard-properties-xkbot.c
|
||||
/* gnome-region-panel-xkbot.c
|
||||
* Copyright (C) 2003-2007 Sergey V. Udaltsov
|
||||
*
|
||||
* Written by: Sergey V. Udaltsov <svu@gnome.org>
|
||||
|
@ -438,13 +438,13 @@ xkb_options_popup_dialog (GtkBuilder * dialog)
|
|||
|
||||
chooser_dialog = gtk_builder_new ();
|
||||
gtk_builder_add_from_file (chooser_dialog, GNOMECC_UI_DIR
|
||||
"/gnome-keyboard-properties-options-dialog.ui",
|
||||
"/gnome-region-panel-options-dialog.ui",
|
||||
NULL);
|
||||
|
||||
chooser = CWID ("xkb_options_dialog");
|
||||
gtk_window_set_transient_for (GTK_WINDOW (chooser),
|
||||
GTK_WINDOW (WID
|
||||
("keyboard_dialog")));
|
||||
("region_dialog")));
|
||||
xkb_options_load_options (chooser_dialog);
|
||||
|
||||
g_signal_connect (chooser, "response",
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* gnome-keyboard-properties-xkbpv.c
|
||||
/* gnome-region-panel-xkbpv.c
|
||||
* Copyright (C) 2003-2007 Sergey V. Udaltsov
|
||||
*
|
||||
* Written by: Sergey V. Udaltsov <svu@gnome.org>
|
||||
|
|
|
@ -70,7 +70,7 @@ gnome_region_properties_init (GtkBuilder * dialog)
|
|||
create_dialog (dialog);
|
||||
if (dialog) {
|
||||
setup_dialog (dialog);
|
||||
dialog_win = WID ("keyboard_dialog");
|
||||
dialog_win = WID ("region_dialog");
|
||||
/* g_signal_connect (dialog_win, "response",
|
||||
G_CALLBACK (dialog_response_cb), NULL); */
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue