diff --git a/examples/application6/exampleappprefs.c b/examples/application6/exampleappprefs.c index 4bdf6542ca..a5372e602d 100644 --- a/examples/application6/exampleappprefs.c +++ b/examples/application6/exampleappprefs.c @@ -15,18 +15,78 @@ struct _ExampleAppPrefs G_DEFINE_TYPE (ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG) +static gboolean +string_to_font_desc (GValue *value, + GVariant *variant, + gpointer user_data) +{ + const char *s = g_variant_get_string (variant, NULL); + PangoFontDescription *desc; + + desc = pango_font_description_from_string (s); + g_value_take_boxed (value, desc); + + return TRUE; +} + +static GVariant * +font_desc_to_string (const GValue *value, + const GVariantType *expected_type, + gpointer user_data) +{ + PangoFontDescription *desc = g_value_get_boxed (value); + char *s = pango_font_description_to_string (desc); + return g_variant_new_take_string (s); +} + +static gboolean +transition_to_pos (GValue *value, + GVariant *variant, + gpointer user_data) +{ + const char *s = g_variant_get_string (variant, NULL); + if (strcmp (s, "none") == 0) + g_value_set_uint (value, 0); + else if (strcmp (s, "crossfade") == 0) + g_value_set_uint (value, 1); + else + g_value_set_uint (value, 2); + + return TRUE; +} + +static GVariant * +pos_to_transition (const GValue *value, + const GVariantType *expected_type, + gpointer user_data) +{ + switch (g_value_get_uint (value)) + { + case 0: return g_variant_new_string ("none"); + case 1: return g_variant_new_string ("crossfade"); + case 2: return g_variant_new_string ("slide-left-right"); + default: g_assert_not_reached (); + } +} + static void example_app_prefs_init (ExampleAppPrefs *prefs) { gtk_widget_init_template (GTK_WIDGET (prefs)); prefs->settings = g_settings_new ("org.gtk.exampleapp"); - g_settings_bind (prefs->settings, "font", - prefs->font, "font", - G_SETTINGS_BIND_DEFAULT); - g_settings_bind (prefs->settings, "transition", - prefs->transition, "active-id", - G_SETTINGS_BIND_DEFAULT); + g_settings_bind_with_mapping (prefs->settings, "font", + prefs->font, "font-desc", + G_SETTINGS_BIND_DEFAULT, + string_to_font_desc, + font_desc_to_string, + NULL, NULL); + g_settings_bind_with_mapping (prefs->settings, "transition", + prefs->transition, "selected", + G_SETTINGS_BIND_DEFAULT, + transition_to_pos, + pos_to_transition, + NULL, NULL); } static void diff --git a/examples/application6/prefs.ui b/examples/application6/prefs.ui index 04ca33c92d..4d58c291e3 100644 --- a/examples/application6/prefs.ui +++ b/examples/application6/prefs.ui @@ -27,7 +27,10 @@ - + + + + 1 0 @@ -47,12 +50,16 @@ - - - None - Fade - Slide - + + + + + None + Fade + Slide + + + 1 1 diff --git a/examples/application7/exampleappprefs.c b/examples/application7/exampleappprefs.c index 4bdf6542ca..a5372e602d 100644 --- a/examples/application7/exampleappprefs.c +++ b/examples/application7/exampleappprefs.c @@ -15,18 +15,78 @@ struct _ExampleAppPrefs G_DEFINE_TYPE (ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG) +static gboolean +string_to_font_desc (GValue *value, + GVariant *variant, + gpointer user_data) +{ + const char *s = g_variant_get_string (variant, NULL); + PangoFontDescription *desc; + + desc = pango_font_description_from_string (s); + g_value_take_boxed (value, desc); + + return TRUE; +} + +static GVariant * +font_desc_to_string (const GValue *value, + const GVariantType *expected_type, + gpointer user_data) +{ + PangoFontDescription *desc = g_value_get_boxed (value); + char *s = pango_font_description_to_string (desc); + return g_variant_new_take_string (s); +} + +static gboolean +transition_to_pos (GValue *value, + GVariant *variant, + gpointer user_data) +{ + const char *s = g_variant_get_string (variant, NULL); + if (strcmp (s, "none") == 0) + g_value_set_uint (value, 0); + else if (strcmp (s, "crossfade") == 0) + g_value_set_uint (value, 1); + else + g_value_set_uint (value, 2); + + return TRUE; +} + +static GVariant * +pos_to_transition (const GValue *value, + const GVariantType *expected_type, + gpointer user_data) +{ + switch (g_value_get_uint (value)) + { + case 0: return g_variant_new_string ("none"); + case 1: return g_variant_new_string ("crossfade"); + case 2: return g_variant_new_string ("slide-left-right"); + default: g_assert_not_reached (); + } +} + static void example_app_prefs_init (ExampleAppPrefs *prefs) { gtk_widget_init_template (GTK_WIDGET (prefs)); prefs->settings = g_settings_new ("org.gtk.exampleapp"); - g_settings_bind (prefs->settings, "font", - prefs->font, "font", - G_SETTINGS_BIND_DEFAULT); - g_settings_bind (prefs->settings, "transition", - prefs->transition, "active-id", - G_SETTINGS_BIND_DEFAULT); + g_settings_bind_with_mapping (prefs->settings, "font", + prefs->font, "font-desc", + G_SETTINGS_BIND_DEFAULT, + string_to_font_desc, + font_desc_to_string, + NULL, NULL); + g_settings_bind_with_mapping (prefs->settings, "transition", + prefs->transition, "selected", + G_SETTINGS_BIND_DEFAULT, + transition_to_pos, + pos_to_transition, + NULL, NULL); } static void diff --git a/examples/application7/prefs.ui b/examples/application7/prefs.ui index 04ca33c92d..4d58c291e3 100644 --- a/examples/application7/prefs.ui +++ b/examples/application7/prefs.ui @@ -27,7 +27,10 @@ - + + + + 1 0 @@ -47,12 +50,16 @@ - - - None - Fade - Slide - + + + + + None + Fade + Slide + + + 1 1 diff --git a/examples/application8/exampleappprefs.c b/examples/application8/exampleappprefs.c index 4bdf6542ca..a5372e602d 100644 --- a/examples/application8/exampleappprefs.c +++ b/examples/application8/exampleappprefs.c @@ -15,18 +15,78 @@ struct _ExampleAppPrefs G_DEFINE_TYPE (ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG) +static gboolean +string_to_font_desc (GValue *value, + GVariant *variant, + gpointer user_data) +{ + const char *s = g_variant_get_string (variant, NULL); + PangoFontDescription *desc; + + desc = pango_font_description_from_string (s); + g_value_take_boxed (value, desc); + + return TRUE; +} + +static GVariant * +font_desc_to_string (const GValue *value, + const GVariantType *expected_type, + gpointer user_data) +{ + PangoFontDescription *desc = g_value_get_boxed (value); + char *s = pango_font_description_to_string (desc); + return g_variant_new_take_string (s); +} + +static gboolean +transition_to_pos (GValue *value, + GVariant *variant, + gpointer user_data) +{ + const char *s = g_variant_get_string (variant, NULL); + if (strcmp (s, "none") == 0) + g_value_set_uint (value, 0); + else if (strcmp (s, "crossfade") == 0) + g_value_set_uint (value, 1); + else + g_value_set_uint (value, 2); + + return TRUE; +} + +static GVariant * +pos_to_transition (const GValue *value, + const GVariantType *expected_type, + gpointer user_data) +{ + switch (g_value_get_uint (value)) + { + case 0: return g_variant_new_string ("none"); + case 1: return g_variant_new_string ("crossfade"); + case 2: return g_variant_new_string ("slide-left-right"); + default: g_assert_not_reached (); + } +} + static void example_app_prefs_init (ExampleAppPrefs *prefs) { gtk_widget_init_template (GTK_WIDGET (prefs)); prefs->settings = g_settings_new ("org.gtk.exampleapp"); - g_settings_bind (prefs->settings, "font", - prefs->font, "font", - G_SETTINGS_BIND_DEFAULT); - g_settings_bind (prefs->settings, "transition", - prefs->transition, "active-id", - G_SETTINGS_BIND_DEFAULT); + g_settings_bind_with_mapping (prefs->settings, "font", + prefs->font, "font-desc", + G_SETTINGS_BIND_DEFAULT, + string_to_font_desc, + font_desc_to_string, + NULL, NULL); + g_settings_bind_with_mapping (prefs->settings, "transition", + prefs->transition, "selected", + G_SETTINGS_BIND_DEFAULT, + transition_to_pos, + pos_to_transition, + NULL, NULL); } static void diff --git a/examples/application8/prefs.ui b/examples/application8/prefs.ui index 04ca33c92d..4d58c291e3 100644 --- a/examples/application8/prefs.ui +++ b/examples/application8/prefs.ui @@ -27,7 +27,10 @@ - + + + + 1 0 @@ -47,12 +50,16 @@ - - - None - Fade - Slide - + + + + + None + Fade + Slide + + + 1 1 diff --git a/examples/application9/exampleappprefs.c b/examples/application9/exampleappprefs.c index 4bdf6542ca..a5372e602d 100644 --- a/examples/application9/exampleappprefs.c +++ b/examples/application9/exampleappprefs.c @@ -15,18 +15,78 @@ struct _ExampleAppPrefs G_DEFINE_TYPE (ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG) +static gboolean +string_to_font_desc (GValue *value, + GVariant *variant, + gpointer user_data) +{ + const char *s = g_variant_get_string (variant, NULL); + PangoFontDescription *desc; + + desc = pango_font_description_from_string (s); + g_value_take_boxed (value, desc); + + return TRUE; +} + +static GVariant * +font_desc_to_string (const GValue *value, + const GVariantType *expected_type, + gpointer user_data) +{ + PangoFontDescription *desc = g_value_get_boxed (value); + char *s = pango_font_description_to_string (desc); + return g_variant_new_take_string (s); +} + +static gboolean +transition_to_pos (GValue *value, + GVariant *variant, + gpointer user_data) +{ + const char *s = g_variant_get_string (variant, NULL); + if (strcmp (s, "none") == 0) + g_value_set_uint (value, 0); + else if (strcmp (s, "crossfade") == 0) + g_value_set_uint (value, 1); + else + g_value_set_uint (value, 2); + + return TRUE; +} + +static GVariant * +pos_to_transition (const GValue *value, + const GVariantType *expected_type, + gpointer user_data) +{ + switch (g_value_get_uint (value)) + { + case 0: return g_variant_new_string ("none"); + case 1: return g_variant_new_string ("crossfade"); + case 2: return g_variant_new_string ("slide-left-right"); + default: g_assert_not_reached (); + } +} + static void example_app_prefs_init (ExampleAppPrefs *prefs) { gtk_widget_init_template (GTK_WIDGET (prefs)); prefs->settings = g_settings_new ("org.gtk.exampleapp"); - g_settings_bind (prefs->settings, "font", - prefs->font, "font", - G_SETTINGS_BIND_DEFAULT); - g_settings_bind (prefs->settings, "transition", - prefs->transition, "active-id", - G_SETTINGS_BIND_DEFAULT); + g_settings_bind_with_mapping (prefs->settings, "font", + prefs->font, "font-desc", + G_SETTINGS_BIND_DEFAULT, + string_to_font_desc, + font_desc_to_string, + NULL, NULL); + g_settings_bind_with_mapping (prefs->settings, "transition", + prefs->transition, "selected", + G_SETTINGS_BIND_DEFAULT, + transition_to_pos, + pos_to_transition, + NULL, NULL); } static void diff --git a/examples/application9/prefs.ui b/examples/application9/prefs.ui index 04ca33c92d..4d58c291e3 100644 --- a/examples/application9/prefs.ui +++ b/examples/application9/prefs.ui @@ -27,7 +27,10 @@ - + + + + 1 0 @@ -47,12 +50,16 @@ - - - None - Fade - Slide - + + + + + None + Fade + Slide + + + 1 1 diff --git a/examples/bp/bloatpad.c b/examples/bp/bloatpad.c index 78ea8deb2d..d8d7786e95 100644 --- a/examples/bp/bloatpad.c +++ b/examples/bp/bloatpad.c @@ -1,8 +1,6 @@ #include #include -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - typedef struct { GtkApplication parent_instance; @@ -356,8 +354,8 @@ combo_changed (GtkDropDown *combo, GParamSpec *pspec, gpointer user_data) { - GtkDialog *dialog = user_data; GtkEntry *entry = g_object_get_data (user_data, "entry"); + GtkWidget *set_button = g_object_get_data (user_data, "set-button"); const char *action; char **accels; char *str; @@ -372,7 +370,7 @@ combo_changed (GtkDropDown *combo, g_strfreev (accels); gtk_editable_set_text (GTK_EDITABLE (entry), str); - gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_APPLY, FALSE); + gtk_widget_set_sensitive (set_button, FALSE); } static void @@ -380,15 +378,21 @@ entry_changed (GtkEntry *entry, GParamSpec *pspec, gpointer user_data) { - GtkDialog *dialog = user_data; + GtkWidget *set_button = g_object_get_data (user_data, "set-button"); - gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_APPLY, TRUE); + gtk_widget_set_sensitive (set_button, TRUE); } static void -response (GtkDialog *dialog, - guint response_id, - gpointer user_data) +close_clicked (GtkButton *button, + gpointer user_data) +{ + gtk_window_destroy (GTK_WINDOW (user_data)); +} + +static void +set_clicked (GtkButton *button, + gpointer user_data) { GtkEntry *entry = g_object_get_data (user_data, "entry"); GtkDropDown *combo = g_object_get_data (user_data, "combo"); @@ -396,12 +400,6 @@ response (GtkDialog *dialog, const char *str; char **accels; - if (response_id == GTK_RESPONSE_CANCEL) - { - gtk_window_destroy (GTK_WINDOW (dialog)); - return; - } - action = gtk_string_object_get_string (GTK_STRING_OBJECT (gtk_drop_down_get_selected_item (combo))); if (!action) @@ -413,7 +411,7 @@ response (GtkDialog *dialog, gtk_application_set_accels_for_action (gtk_window_get_application (user_data), action, (const char **) accels); g_strfreev (accels); - gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_APPLY, FALSE); + gtk_widget_set_sensitive (GTK_WIDGET (button), FALSE); } static void @@ -424,32 +422,45 @@ edit_accels (GSimpleAction *action, GtkApplication *app = user_data; GtkWidget *combo; GtkWidget *entry; + GtkWidget *header; + GtkWidget *close_button; + GtkWidget *set_button; + GtkWidget *box; char **actions; GtkWidget *dialog; int i; GtkStringList *strings; - dialog = gtk_dialog_new_with_buttons ("Accelerators", - NULL, - GTK_DIALOG_USE_HEADER_BAR, - "Close", GTK_RESPONSE_CANCEL, - "Set", GTK_RESPONSE_APPLY, - NULL); - + dialog = gtk_window_new (); + gtk_window_set_title (GTK_WINDOW (dialog), "Accelerators"); gtk_window_set_application (GTK_WINDOW (dialog), app); actions = gtk_application_list_action_descriptions (app); - strings = gtk_string_list_new (NULL); - combo = gtk_drop_down_new (G_LIST_MODEL (strings), NULL); - g_object_set (gtk_dialog_get_content_area (GTK_DIALOG (dialog)), + header = gtk_header_bar_new (); + gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE); + close_button = gtk_button_new_with_label ("Close"); + g_signal_connect (close_button, "clicked", G_CALLBACK (close_clicked), dialog); + gtk_header_bar_pack_start (GTK_HEADER_BAR (header), close_button); + set_button = gtk_button_new_with_label ("Set"); + g_signal_connect (set_button, "clicked", G_CALLBACK (set_clicked), dialog); + gtk_header_bar_pack_end (GTK_HEADER_BAR (header), set_button); + + gtk_window_set_titlebar (GTK_WINDOW (dialog), header); + + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); + g_object_set (box, "margin-top", 10, "margin-bottom", 10, "margin-start", 10, "margin-end", 10, - "spacing", 10, NULL); + gtk_window_set_child (GTK_WINDOW (dialog), box); + + strings = gtk_string_list_new (NULL); + combo = gtk_drop_down_new (G_LIST_MODEL (strings), NULL); + + gtk_box_append (GTK_BOX (box), combo); - gtk_box_append (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), combo); for (i = 0; actions[i]; i++) gtk_string_list_append (strings, actions[i]); g_signal_connect (combo, "notify::selected", G_CALLBACK (combo_changed), dialog); @@ -458,10 +469,10 @@ edit_accels (GSimpleAction *action, gtk_widget_set_hexpand (entry, TRUE); g_signal_connect (entry, "notify::text", G_CALLBACK (entry_changed), dialog); - gtk_box_append (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), entry); - g_signal_connect (dialog, "response", G_CALLBACK (response), dialog); + gtk_box_append (GTK_BOX (box), entry); g_object_set_data (G_OBJECT (dialog), "combo", combo); g_object_set_data (G_OBJECT (dialog), "entry", entry); + g_object_set_data (G_OBJECT (dialog), "set-button", set_button); gtk_drop_down_set_selected (GTK_DROP_DOWN (combo), 0); diff --git a/examples/meson.build b/examples/meson.build index ae007bc404..2a8e632e45 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -13,8 +13,6 @@ foreach ex : examples example_name = ex == 'builder' ? 'builder_example' : ex executable(example_name, '@0@.c'.format(ex), c_args: [ - '-DGDK_DISABLE_DEPRECATED', - '-DGTK_DISABLE_DEPRECATED', '-DGTK_SRCDIR="@0@"'.format(meson.current_source_dir()), ] + common_cflags, dependencies: libgtk_dep)