Commit 808b0c2f authored by Victor Ananjevsky's avatar Victor Ananjevsky

replace underscores with hyphens in schema key names

parent cbaea1a1
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<default>5</default> <default>5</default>
<_summary>Borders around dialog</_summary> <_summary>Borders around dialog</_summary>
</key> </key>
<key name="combo_always_editable" type="b"> <key name="combo-always-editable" type="b">
<default>false</default> <default>false</default>
<_summary>Combo-box in entry dialog is always editable</_summary> <_summary>Combo-box in entry dialog is always editable</_summary>
</key> </key>
...@@ -20,23 +20,23 @@ ...@@ -20,23 +20,23 @@
<default>'xterm -e "%s"'</default> <default>'xterm -e "%s"'</default>
<_summary>Default terminal command (use %s for arguments placeholder)</_summary> <_summary>Default terminal command (use %s for arguments placeholder)</_summary>
</key> </key>
<key name="open_command" type="s"> <key name="open-command" type="s">
<default>'xdg-open "%s"'</default> <default>'xdg-open "%s"'</default>
<_summary>Default open command (use %s for arguments placeholder)</_summary> <_summary>Default open command (use %s for arguments placeholder)</_summary>
</key> </key>
<key name="date_format" type="s"> <key name="date-format" type="s">
<default>'%x'</default> <default>'%x'</default>
<_summary>Default date format (see strftime(3) for details)</_summary> <_summary>Default date format (see strftime(3) for details)</_summary>
</key> </key>
<key name="uri_color" type="s"> <key name="uri-color" type="s">
<default>'blue'</default> <default>'blue'</default>
<_summary>Default color for URI in text-info dialog</_summary> <_summary>Default color for URI in text-info dialog</_summary>
</key> </key>
<key name="ignore_unknown_options" type="b"> <key name="ignore-unknown-options" type="b">
<default>true</default> <default>true</default>
<_summary>Ignore unknown command-line options</_summary> <_summary>Ignore unknown command-line options</_summary>
</key> </key>
<key name="max_tab" type="i"> <key name="max-tab" type="i">
<default>100</default> <default>100</default>
<_summary>Maximum number of tabs in notebook dialog</_summary> <_summary>Maximum number of tabs in notebook dialog</_summary>
</key> </key>
......
...@@ -188,7 +188,7 @@ entry_create_widget (GtkWidget * dlg) ...@@ -188,7 +188,7 @@ entry_create_widget (GtkWidget * dlg)
{ {
gint active, i; gint active, i;
if (options.common_data.editable || g_settings_get_boolean (settings, "combo_always_editable")) if (options.common_data.editable || g_settings_get_boolean (settings, "combo-always-editable"))
{ {
c = gtk_combo_box_text_new_with_entry (); c = gtk_combo_box_text_new_with_entry ();
gtk_widget_set_name (c, "yad-entry-edit-combo"); gtk_widget_set_name (c, "yad-entry-edit-combo");
......
...@@ -346,7 +346,7 @@ parse_desktop_file (gchar * filename) ...@@ -346,7 +346,7 @@ parse_desktop_file (gchar * filename)
gchar *url = g_key_file_get_string (kf, "Desktop Entry", "URL", NULL); gchar *url = g_key_file_get_string (kf, "Desktop Entry", "URL", NULL);
if (url) if (url)
{ {
ent->command = g_strdup_printf (g_settings_get_string (settings, "open_command"), url); ent->command = g_strdup_printf (g_settings_get_string (settings, "open-command"), url);
g_free (url); g_free (url);
} }
} }
......
...@@ -120,7 +120,7 @@ timeout_cb (gpointer data) ...@@ -120,7 +120,7 @@ timeout_cb (gpointer data)
{ {
gdouble percent = ((gdouble) options.data.timeout - count) / (gdouble) options.data.timeout; gdouble percent = ((gdouble) options.data.timeout - count) / (gdouble) options.data.timeout;
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (w), percent); gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (w), percent);
if (g_settings_get_boolean (settings, "show_remain")) if (g_settings_get_boolean (settings, "show-remain"))
{ {
gchar *lbl = g_strdup_printf (_("%d sec"), options.data.timeout - count); gchar *lbl = g_strdup_printf (_("%d sec"), options.data.timeout - count);
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (w), lbl); gtk_progress_bar_set_text (GTK_PROGRESS_BAR (w), lbl);
...@@ -394,7 +394,7 @@ create_dialog (void) ...@@ -394,7 +394,7 @@ create_dialog (void)
gtk_box_pack_end (GTK_BOX (cbox), topb, FALSE, FALSE, 2); gtk_box_pack_end (GTK_BOX (cbox), topb, FALSE, FALSE, 2);
} }
if (g_settings_get_boolean (settings, "show_remain")) if (g_settings_get_boolean (settings, "show-remain"))
{ {
gchar *lbl = g_strdup_printf (_("%d sec"), options.data.timeout); gchar *lbl = g_strdup_printf (_("%d sec"), options.data.timeout);
gtk_progress_bar_set_show_text (GTK_PROGRESS_BAR (topb), TRUE); gtk_progress_bar_set_show_text (GTK_PROGRESS_BAR (topb), TRUE);
......
...@@ -1491,7 +1491,7 @@ yad_options_init (void) ...@@ -1491,7 +1491,7 @@ yad_options_init (void)
options.common_data.editable = FALSE; options.common_data.editable = FALSE;
options.common_data.tail = FALSE; options.common_data.tail = FALSE;
options.common_data.command = NULL; options.common_data.command = NULL;
options.common_data.date_format = g_settings_get_string (settings, "date_format"); options.common_data.date_format = g_settings_get_string (settings, "date-format");
options.common_data.float_precision = 3; options.common_data.float_precision = 3;
options.common_data.vertical = FALSE; options.common_data.vertical = FALSE;
options.common_data.align = 0.0; options.common_data.align = 0.0;
...@@ -1680,7 +1680,7 @@ yad_options_init (void) ...@@ -1680,7 +1680,7 @@ yad_options_init (void)
options.text_data.justify = GTK_JUSTIFY_LEFT; options.text_data.justify = GTK_JUSTIFY_LEFT;
options.text_data.margins = 0; options.text_data.margins = 0;
options.text_data.hide_cursor = TRUE; options.text_data.hide_cursor = TRUE;
options.text_data.uri_color = g_settings_get_string (settings, "uri_color"); options.text_data.uri_color = g_settings_get_string (settings, "uri-color");
options.text_data.formatted = FALSE; options.text_data.formatted = FALSE;
#ifdef HAVE_SOURCEVIEW #ifdef HAVE_SOURCEVIEW
...@@ -1856,7 +1856,7 @@ yad_create_context (void) ...@@ -1856,7 +1856,7 @@ yad_create_context (void)
g_option_context_add_group (tmp_ctx, a_group); g_option_context_add_group (tmp_ctx, a_group);
g_option_context_set_help_enabled (tmp_ctx, TRUE); g_option_context_set_help_enabled (tmp_ctx, TRUE);
g_option_context_set_ignore_unknown_options (tmp_ctx, g_settings_get_boolean (settings, "ignore_unknown_options")); g_option_context_set_ignore_unknown_options (tmp_ctx, g_settings_get_boolean (settings, "ignore-unknown-options"));
return tmp_ctx; return tmp_ctx;
} }
...@@ -240,7 +240,7 @@ get_tabs (key_t key, gboolean create) ...@@ -240,7 +240,7 @@ get_tabs (key_t key, gboolean create)
int shmid, i, max_tab; int shmid, i, max_tab;
/* get shared memory */ /* get shared memory */
max_tab = g_settings_get_int (settings, "max_tab") + 1; max_tab = g_settings_get_int (settings, "max-tab") + 1;
if (create) if (create)
{ {
if ((shmid = shmget (key, max_tab * sizeof (YadNTabs), IPC_CREAT | IPC_EXCL | 0644)) == -1) if ((shmid = shmget (key, max_tab * sizeof (YadNTabs), IPC_CREAT | IPC_EXCL | 0644)) == -1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment