AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-09 18:30:08 +00:00
Code Issues Projects Releases Wiki Activity

Fix fallout from the show-close-button rename

Browse Source 
I had overlooked ui files. We should really
validate those during build.
This commit is contained in:
Matthias Clasen 2017-12-08 11:29:14 -05:00
parent 276c462553
commit 029a84aa74
13 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/gtk-demo/fishbowl.ui
View File

@ -6,7 +6,7 @@
<child type="titlebar">
<object class="GtkHeaderBar" id="">
<property name="visible">True</property>
<property name="show-close-button">True</property>
<property name="show-title-buttons">True</property>
<child>
<object class="GtkLabel" id="info_label">
<property name="visible">True</property>

2
demos/gtk-demo/main.ui
View File

@ -24,7 +24,7 @@
<child type="titlebar">
<object class="GtkHeaderBar" id="headerbar">
<property name="visible">1</property>
<property name="show-close-button">1</property>
<property name="show-title-buttons">1</property>
<child>
<object class="GtkButton">
<property name="visible">1</property>

2
demos/gtk-demo/modelbutton.ui
View File

@ -5,7 +5,7 @@
<child type="titlebar">
<object class="GtkHeaderBar">
<property name="visible">1</property>
<property name="show-close-button">1</property>
<property name="show-title-buttons">1</property>
<property name="title" translatable="yes">Model Button</property>
</object>
</child>

2
demos/icon-browser/window.ui
View File

@ -15,7 +15,7 @@
<object class="GtkHeaderBar" id="header">
<property name="visible">True</property>
<property name="title" translatable="yes">Icon Browser</property>
<property name="show-close-button">True</property>
<property name="show-title-buttons">True</property>
<child type="title">
<object class="GtkBox">
<property name="visible">True</property>

2
demos/widget-factory/widget-factory.ui
View File

@ -400,7 +400,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<property name="title">GTK+ Widget Factory</property>
<child type="titlebar">
<object class="GtkHeaderBar" id="headerbar1">
<property name="show-close-button">1</property>
<property name="show-title-buttons">1</property>
<child type="title">
<object class="GtkStackSwitcher" id="stack_switcher">
<property name="stack">toplevel_stack</property>

2
examples/application10/window.ui
View File

@ -8,7 +8,7 @@
<child type="titlebar">
<object class="GtkHeaderBar" id="header">
<property name="visible">True</property>
<property name="show-close-button">True</property>
<property name="show-title-buttons">True</property>
<child>
<object class="GtkLabel" id="lines_label">
<property name="visible">False</property>

2
gtk/gtkshortcutswindow.c
View File

@ -875,7 +875,7 @@ gtk_shortcuts_window_init (GtkShortcutsWindow *self)
priv->search_image_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
priv->header_bar = g_object_new (GTK_TYPE_HEADER_BAR,
"show-close-button", TRUE,
"show-title-buttons", TRUE,
NULL);
gtk_window_set_titlebar (GTK_WINDOW (self), GTK_WIDGET (priv->header_bar));

2
gtk/gtkwindow.c
View File

@ -5973,7 +5973,7 @@ create_titlebar (GtkWindow *window)
g_object_set (titlebar,
"title", priv->title ? priv->title : get_default_title (),
"has-subtitle", FALSE,
"show-close-button", TRUE,
"show-title-buttons", TRUE,
NULL);
context = gtk_widget_get_style_context (titlebar);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_TITLEBAR);

2
gtk/inspector/window.ui
View File

@ -14,7 +14,7 @@
<property name="icon">resource:///org/gtk/libgtk/inspector/logo.png</property>
<child type="titlebar">
<object class="GtkHeaderBar">
<property name="show-close-button">1</property>
<property name="show-title-buttons">1</property>
<child>
<object class="GtkStack" id="button_stack">
<property name="visible-child-name" bind-source="top_stack" bind-property="visible-child-name"/>

2
gtk/ui/gtkaboutdialog.ui
View File

@ -7,7 +7,7 @@
<child internal-child="headerbar">
<object class="GtkHeaderBar" id="headerbar1">
<property name="visible">1</property>
<property name="show-close-button">1</property>
<property name="show-title-buttons">1</property>
<child type="title">
<object class="GtkStackSwitcher" id="stack_switcher">
<property name="visible">0</property>

2
gtk/ui/gtkdialog.ui
View File

@ -7,7 +7,7 @@
<signal name="delete-event" handler="gtk_dialog_delete_event_handler" swapped="no"/>
<child type="titlebar">
<object class="GtkHeaderBar" id="headerbar">
<property name="show-close-button">1</property>
<property name="show-title-buttons">1</property>
</object>
</child>
<child>

12
tests/testsplitheaders.c
View File

@ -61,15 +61,15 @@ main (int argc, char *argv[])
entry = (GtkWidget *)gtk_builder_get_object (builder, "layout-entry");
g_object_bind_property (settings, "gtk-decoration-layout",
entry, "text",
G_BINDING_BIDIRECTIONAL|G_BINDING_SYNC_CREATE);
G_BINDING_BIDIRECTIONAL|G_BINDING_SYNC_CREATE);
check = (GtkWidget *)gtk_builder_get_object (builder, "decorations");
header = (GtkWidget *)gtk_builder_get_object (builder, "sidebar-header");
g_object_bind_property (check, "active",
header, "show-close-button",
G_BINDING_DEFAULT);
g_object_bind_property (check, "active",
header, "show-title-buttons",
G_BINDING_DEFAULT);
header = (GtkWidget *)gtk_builder_get_object (builder, "main-header");
g_object_bind_property (check, "active",
header, "show-close-button",
g_object_bind_property (check, "active",
header, "show-title-buttons",
G_BINDING_DEFAULT);
gtk_window_present (GTK_WINDOW (win));

2
tests/testtitlebar.c
View File

@ -148,7 +148,7 @@ activate (GApplication *gapp)
label = gtk_label_new ("Decorations");
gtk_widget_set_halign (label, GTK_ALIGN_END);
check = gtk_check_button_new ();
g_object_bind_property (header, "show-close-button",
g_object_bind_property (header, "show-title-buttons",
check, "active",
G_BINDING_BIDIRECTIONAL|G_BINDING_SYNC_CREATE);
gtk_grid_attach (GTK_GRID (grid), label, 2, 0, 1, 1);