OSDN Git Service
(root)
/
handbrake-jp
/
handbrake-jp-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LinGui: fix a collection of duplicate widget ids in the gtkbuilder xml
[handbrake-jp/handbrake-jp-git.git]
/
gtk
/
src
/
settings.c
diff --git
a/gtk/src/settings.c
b/gtk/src/settings.c
index
5912fba
..
f392bc2
100644
(file)
--- a/
gtk/src/settings.c
+++ b/
gtk/src/settings.c
@@
-170,6
+170,12
@@
ghb_settings_combo_option(const GValue *settings, const gchar *key)
return ghb_lookup_combo_option(key, ghb_settings_get_value(settings, key));
}
return ghb_lookup_combo_option(key, ghb_settings_get_value(settings, key));
}
+const gchar*
+ghb_settings_combo_string(const GValue *settings, const gchar *key)
+{
+ return ghb_lookup_combo_string(key, ghb_settings_get_value(settings, key));
+}
+
// Map widget names to setting keys
// Widgets that map to settings have names
// of this format: s_<setting key>
// Map widget names to setting keys
// Widgets that map to settings have names
// of this format: s_<setting key>
@@
-232,6
+238,13
@@
ghb_widget_value(GtkWidget *widget)
bval = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
value = ghb_boolean_value_new(bval);
}
bval = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
value = ghb_boolean_value_new(bval);
}
+ else if (type == GTK_TYPE_TOGGLE_BUTTON)
+ {
+ g_debug("\ttoggle_button");
+ gboolean bval;
+ bval = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+ value = ghb_boolean_value_new(bval);
+ }
else if (type == GTK_TYPE_TOGGLE_ACTION)
{
g_debug("\ttoggle action");
else if (type == GTK_TYPE_TOGGLE_ACTION)
{
g_debug("\ttoggle action");
@@
-309,6
+322,13
@@
ghb_widget_value(GtkWidget *widget)
value = ghb_int_value_new(dval);
}
}
value = ghb_int_value_new(dval);
}
}
+ else if (type == GTK_TYPE_SCALE_BUTTON)
+ {
+ gdouble dval;
+
+ dval = gtk_scale_button_get_value(GTK_SCALE_BUTTON(widget));
+ value = ghb_double_value_new(dval);
+ }
else if (type == GTK_TYPE_TEXT_VIEW)
{
GtkTextBuffer *buffer;
else if (type == GTK_TYPE_TEXT_VIEW)
{
GtkTextBuffer *buffer;
@@
-456,6
+476,11
@@
update_widget(GtkWidget *widget, const GValue *value)
g_debug("check button");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), ival);
}
g_debug("check button");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), ival);
}
+ else if (type == GTK_TYPE_TOGGLE_BUTTON)
+ {
+ g_debug("toggle button");
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), ival);
+ }
else if (type == GTK_TYPE_TOGGLE_ACTION)
{
g_debug("toggle action");
else if (type == GTK_TYPE_TOGGLE_ACTION)
{
g_debug("toggle action");
@@
-570,6
+595,11
@@
update_widget(GtkWidget *widget, const GValue *value)
g_debug("hscale");
gtk_range_set_value(GTK_RANGE(widget), dval);
}
g_debug("hscale");
gtk_range_set_value(GTK_RANGE(widget), dval);
}
+ else if (type == GTK_TYPE_SCALE_BUTTON)
+ {
+ g_debug("scale_button");
+ gtk_scale_button_set_value(GTK_SCALE_BUTTON(widget), dval);
+ }
else if (type == GTK_TYPE_TEXT_VIEW)
{
g_debug("textview (%s)", str);
else if (type == GTK_TYPE_TEXT_VIEW)
{
g_debug("textview (%s)", str);