diff options
author | Matthias Clasen <mclasen@redhat.com> | 2020-11-18 18:35:56 -0500 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2020-11-18 18:58:45 -0500 |
commit | 09fd2d61c47a1e70b4b1f1dd9474dfd2262175e1 (patch) | |
tree | 78eba50d195b3e05e65129bdcb3ba6434a54ad5a | |
parent | 86d7ab7c50191201f498413676a5c71c7cf4b90a (diff) | |
download | gtk+-09fd2d61c47a1e70b4b1f1dd9474dfd2262175e1.tar.gz |
gtk-demo: Rename some demos
This is just to make it easier for myself to
find the right sources.
-rw-r--r-- | demos/gtk-demo/constraints_builder.c (renamed from demos/gtk-demo/constraints4.c) | 4 | ||||
-rw-r--r-- | demos/gtk-demo/constraints_builder.ui (renamed from demos/gtk-demo/constraints.ui) | 0 | ||||
-rw-r--r-- | demos/gtk-demo/constraints_interactive.c (renamed from demos/gtk-demo/constraints2.c) | 2 | ||||
-rw-r--r-- | demos/gtk-demo/constraints_vfl.c (renamed from demos/gtk-demo/constraints3.c) | 2 | ||||
-rw-r--r-- | demos/gtk-demo/demo.gresource.xml | 18 | ||||
-rw-r--r-- | demos/gtk-demo/listbox_controls.c (renamed from demos/gtk-demo/listbox2.c) | 4 | ||||
-rw-r--r-- | demos/gtk-demo/listbox_controls.ui (renamed from demos/gtk-demo/listbox2.ui) | 0 | ||||
-rw-r--r-- | demos/gtk-demo/meson.build | 10 | ||||
-rw-r--r-- | demos/gtk-demo/overlay_decorative.c (renamed from demos/gtk-demo/overlay2.c) | 2 |
9 files changed, 21 insertions, 21 deletions
diff --git a/demos/gtk-demo/constraints4.c b/demos/gtk-demo/constraints_builder.c index 4b4ca49643..1233adaed1 100644 --- a/demos/gtk-demo/constraints4.c +++ b/demos/gtk-demo/constraints_builder.c @@ -43,7 +43,7 @@ constraints_grid_class_init (ConstraintsGridClass *klass) } GtkWidget * -do_constraints4 (GtkWidget *do_widget) +do_constraints_builder (GtkWidget *do_widget) { static GtkWidget *window; @@ -53,7 +53,7 @@ do_constraints4 (GtkWidget *do_widget) g_type_ensure (constraints_grid_get_type ()); - builder = gtk_builder_new_from_resource ("/constraints4/constraints.ui"); + builder = gtk_builder_new_from_resource ("/constraints_builder/constraints_builder.ui"); window = GTK_WIDGET (gtk_builder_get_object (builder, "window1")); gtk_window_set_display (GTK_WINDOW (window), diff --git a/demos/gtk-demo/constraints.ui b/demos/gtk-demo/constraints_builder.ui index 1766f931c7..1766f931c7 100644 --- a/demos/gtk-demo/constraints.ui +++ b/demos/gtk-demo/constraints_builder.ui diff --git a/demos/gtk-demo/constraints2.c b/demos/gtk-demo/constraints_interactive.c index 782ade175b..90262552f6 100644 --- a/demos/gtk-demo/constraints2.c +++ b/demos/gtk-demo/constraints_interactive.c @@ -205,7 +205,7 @@ interactive_grid_init (InteractiveGrid *self) } GtkWidget * -do_constraints2 (GtkWidget *do_widget) +do_constraints_interactive (GtkWidget *do_widget) { static GtkWidget *window; diff --git a/demos/gtk-demo/constraints3.c b/demos/gtk-demo/constraints_vfl.c index b0d15dc2ac..08016f0b48 100644 --- a/demos/gtk-demo/constraints3.c +++ b/demos/gtk-demo/constraints_vfl.c @@ -128,7 +128,7 @@ vfl_grid_init (VflGrid *self) } GtkWidget * -do_constraints3 (GtkWidget *do_widget) +do_constraints_vfl (GtkWidget *do_widget) { static GtkWidget *window; diff --git a/demos/gtk-demo/demo.gresource.xml b/demos/gtk-demo/demo.gresource.xml index 72933ebef6..a0ccb783d9 100644 --- a/demos/gtk-demo/demo.gresource.xml +++ b/demos/gtk-demo/demo.gresource.xml @@ -18,8 +18,8 @@ <file>demoimage.c</file> <file>demoimage.h</file> </gresource> - <gresource prefix="/constraints4"> - <file>constraints.ui</file> + <gresource prefix="/constraints_builder"> + <file>constraints_builder.ui</file> </gresource> <gresource prefix="/css_accordion"> <file>css_accordion.css</file> @@ -253,9 +253,9 @@ <file>clipboard.c</file> <file>combobox.c</file> <file>constraints.c</file> - <file>constraints2.c</file> - <file>constraints3.c</file> - <file>constraints4.c</file> + <file>constraints_interactive.c</file> + <file>constraints_vfl.c</file> + <file>constraints_builder.c</file> <file>css_accordion.c</file> <file>css_basics.c</file> <file>css_blendmodes.c</file> @@ -294,7 +294,7 @@ <file>layoutmanager2.c</file> <file>links.c</file> <file>listbox.c</file> - <file>listbox2.c</file> + <file>listbox_controls.c</file> <file>listview_applauncher.c</file> <file>listview_colors.c</file> <file>listview_clocks.c</file> @@ -309,7 +309,7 @@ <file>markup.c</file> <file>menu.c</file> <file>overlay.c</file> - <file>overlay2.c</file> + <file>overlay_decorative.c</file> <file>paint.c</file> <file>pagesetup.c</file> <file>paintable.c</file> @@ -359,8 +359,8 @@ <file>messages.txt</file> <file>apple-red.png</file> </gresource> - <gresource prefix="/listbox2"> - <file>listbox2.ui</file> + <gresource prefix="/listbox_controls"> + <file>listbox_controls.ui</file> </gresource> <gresource prefix="/glarea"> <file>glarea-gl.fs.glsl</file> diff --git a/demos/gtk-demo/listbox2.c b/demos/gtk-demo/listbox_controls.c index 17a79df741..5a72622d22 100644 --- a/demos/gtk-demo/listbox2.c +++ b/demos/gtk-demo/listbox_controls.c @@ -34,7 +34,7 @@ row_activated (GtkListBox *list, } GtkWidget * -do_listbox2 (GtkWidget *do_widget) +do_listbox_controls (GtkWidget *do_widget) { if (!window) { @@ -47,7 +47,7 @@ do_listbox2 (GtkWidget *do_widget) builder = gtk_builder_new (); gtk_builder_set_scope (builder, scope); - gtk_builder_add_from_resource (builder, "/listbox2/listbox2.ui", NULL); + gtk_builder_add_from_resource (builder, "/listbox_controls/listbox_controls.ui", NULL); window = GTK_WIDGET (gtk_builder_get_object (builder, "window")); gtk_window_set_display (GTK_WINDOW (window), diff --git a/demos/gtk-demo/listbox2.ui b/demos/gtk-demo/listbox_controls.ui index c2c8a1f1cf..c2c8a1f1cf 100644 --- a/demos/gtk-demo/listbox2.ui +++ b/demos/gtk-demo/listbox_controls.ui diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build index 93a78c9fca..9076c05383 100644 --- a/demos/gtk-demo/meson.build +++ b/demos/gtk-demo/meson.build @@ -7,9 +7,9 @@ demos = files([ 'clipboard.c', 'combobox.c', 'constraints.c', - 'constraints2.c', - 'constraints3.c', - 'constraints4.c', + 'constraints_interactive.c', + 'constraints_vfl.c', + 'constraints_builder.c', 'css_accordion.c', 'css_basics.c', 'css_blendmodes.c', @@ -44,7 +44,7 @@ demos = files([ 'layoutmanager2.c', 'links.c', 'listbox.c', - 'listbox2.c', + 'listbox_controls.c', 'menu.c', 'flowbox.c', 'list_store.c', @@ -60,7 +60,7 @@ demos = files([ 'listview_words.c', 'markup.c', 'overlay.c', - 'overlay2.c', + 'overlay_decorative.c', 'paint.c', 'paintable.c', 'paintable_animated.c', diff --git a/demos/gtk-demo/overlay2.c b/demos/gtk-demo/overlay_decorative.c index 11f2e2a243..8306f52fb1 100644 --- a/demos/gtk-demo/overlay2.c +++ b/demos/gtk-demo/overlay_decorative.c @@ -21,7 +21,7 @@ margin_changed (GtkAdjustment *adjustment, } GtkWidget * -do_overlay2 (GtkWidget *do_widget) +do_overlay_decorative (GtkWidget *do_widget) { static GtkWidget *window = NULL; |