GNOME.org
 

[gtk/matthiasc/for-master] gtk-demo: Tweak window titles

commit d2d7a4bcab94570eb27fd6d4547d78fb688921d0
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Nov 2 11:05:57 2020 -0500

    gtk-demo: Tweak window titles
    
    This is an attempt to improve consistency in the sidebar
    and the window titles.

 demos/gtk-demo/constraints.c           | 5 +++--
 demos/gtk-demo/constraints.ui          | 3 ++-
 demos/gtk-demo/constraints2.c          | 5 +++--
 demos/gtk-demo/constraints3.c          | 3 ++-
 demos/gtk-demo/errorstates.c           | 2 +-
 demos/gtk-demo/fontrendering.c         | 2 +-
 demos/gtk-demo/gltransition.c          | 5 +++--
 demos/gtk-demo/layoutmanager.c         | 2 +-
 demos/gtk-demo/layoutmanager2.c        | 2 +-
 demos/gtk-demo/listbox.c               | 4 ++--
 demos/gtk-demo/paintable.c             | 2 +-
 demos/gtk-demo/paintable_animated.c    | 2 +-
 demos/gtk-demo/paintable_mediastream.c | 2 +-
 demos/gtk-demo/themes.ui               | 1 +
 14 files changed, 23 insertions(+), 17 deletions(-)
---
diff --git a/demos/gtk-demo/constraints.c b/demos/gtk-demo/constraints.c
index 2104948ad5..a295c91d44 100644
--- a/demos/gtk-demo/constraints.c
+++ b/demos/gtk-demo/constraints.c
@@ -1,4 +1,4 @@
-/* Constraints/Simple
+/* Constraints/Simple Constraints
  * #Keywords: GtkLayoutManager
  *
  * GtkConstraintLayout provides a layout manager that uses relations
@@ -263,7 +263,8 @@ do_constraints (GtkWidget *do_widget)
 
      window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window), gtk_widget_get_display (do_widget));
-     gtk_window_set_title (GTK_WINDOW (window), "Constraints");
+     gtk_window_set_title (GTK_WINDOW (window), "Simple Constraints");
+     gtk_window_set_default_size (GTK_WINDOW (window), 260, -1);
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
diff --git a/demos/gtk-demo/constraints.ui b/demos/gtk-demo/constraints.ui
index 5011caf7a5..1766f931c7 100644
--- a/demos/gtk-demo/constraints.ui
+++ b/demos/gtk-demo/constraints.ui
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="title" translatable="yes">Constraints</property>
+    <property name="title" translatable="yes">Constraints — Builder</property>
+    <property name="default-width">260</property>
     <child>
       <object class="ConstraintsGrid">
         <property name="layout-manager">
diff --git a/demos/gtk-demo/constraints2.c b/demos/gtk-demo/constraints2.c
index 124a5e18ef..782ade175b 100644
--- a/demos/gtk-demo/constraints2.c
+++ b/demos/gtk-demo/constraints2.c
@@ -1,4 +1,4 @@
-/* Constraints/Interactive
+/* Constraints/Interactive Constraints
  * #Keywords: GtkConstraintLayout
  *
  * This example shows how constraints can be updated during user interaction.
@@ -215,7 +215,8 @@ do_constraints2 (GtkWidget *do_widget)
 
      window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window), gtk_widget_get_display (do_widget));
-     gtk_window_set_title (GTK_WINDOW (window), "Constraints");
+     gtk_window_set_title (GTK_WINDOW (window), "Interactive Constraints");
+     gtk_window_set_default_size (GTK_WINDOW (window), 260, -1);
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
diff --git a/demos/gtk-demo/constraints3.c b/demos/gtk-demo/constraints3.c
index d702f75430..b0d15dc2ac 100644
--- a/demos/gtk-demo/constraints3.c
+++ b/demos/gtk-demo/constraints3.c
@@ -138,7 +138,8 @@ do_constraints3 (GtkWidget *do_widget)
 
      window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window), gtk_widget_get_display (do_widget));
-     gtk_window_set_title (GTK_WINDOW (window), "Constraints");
+     gtk_window_set_title (GTK_WINDOW (window), "Constraints — VFL");
+     gtk_window_set_default_size (GTK_WINDOW (window), 260, -1);
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
diff --git a/demos/gtk-demo/errorstates.c b/demos/gtk-demo/errorstates.c
index 3dc3b50f3b..5cd35d6467 100644
--- a/demos/gtk-demo/errorstates.c
+++ b/demos/gtk-demo/errorstates.c
@@ -1,4 +1,4 @@
-/* Error states
+/* Error States
  *
  * GtkLabel and GtkEntry can indicate errors if you set the .error
  * style class on them.
diff --git a/demos/gtk-demo/fontrendering.c b/demos/gtk-demo/fontrendering.c
index fc6fb1b1ee..005f3637c6 100644
--- a/demos/gtk-demo/fontrendering.c
+++ b/demos/gtk-demo/fontrendering.c
@@ -1,4 +1,4 @@
-/* Pango/Font rendering
+/* Pango/Font Rendering
  *
  * Demonstrates various aspects of font rendering.
  */
diff --git a/demos/gtk-demo/gltransition.c b/demos/gtk-demo/gltransition.c
index 96ccf9acac..0ad67cc8ec 100644
--- a/demos/gtk-demo/gltransition.c
+++ b/demos/gtk-demo/gltransition.c
@@ -1,4 +1,4 @@
-/* OpenGL/Transitions
+/* OpenGL/Transitions and Effects
  * #Keywords: OpenGL, shader, effect
  *
  * Create transitions between pages using a custom fragment shader.
@@ -282,11 +282,12 @@ create_gltransition_window (GtkWidget *do_widget)
 
   window = gtk_window_new ();
   gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
-  gtk_window_set_title (GTK_WINDOW (window), "Transitions");
+  gtk_window_set_title (GTK_WINDOW (window), "Transitions and Effects");
   headerbar = gtk_header_bar_new ();
   scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, NULL);
   gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE);
   gtk_widget_set_size_request (scale, 100, -1);
+  gtk_widget_set_tooltip_text (scale, "Transition duration");
   gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), scale);
   gtk_window_set_titlebar (GTK_WINDOW (window), headerbar);
   gtk_window_set_default_size (GTK_WINDOW (window), 800, 600);
diff --git a/demos/gtk-demo/layoutmanager.c b/demos/gtk-demo/layoutmanager.c
index b03bc040a1..6af308957d 100644
--- a/demos/gtk-demo/layoutmanager.c
+++ b/demos/gtk-demo/layoutmanager.c
@@ -34,7 +34,7 @@ do_layoutmanager (GtkWidget *parent)
       int i;
 
       window = gtk_window_new ();
-      gtk_window_set_title (GTK_WINDOW (window), "Layout Manager—Transition");
+      gtk_window_set_title (GTK_WINDOW (window), "Layout Manager — Transition");
       gtk_window_set_default_size (GTK_WINDOW (window), 600, 600);
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
diff --git a/demos/gtk-demo/layoutmanager2.c b/demos/gtk-demo/layoutmanager2.c
index 83691c3dfe..cc4b60d653 100644
--- a/demos/gtk-demo/layoutmanager2.c
+++ b/demos/gtk-demo/layoutmanager2.c
@@ -170,7 +170,7 @@ do_layoutmanager2 (GtkWidget *parent)
       int i;
 
       window = gtk_window_new ();
-      gtk_window_set_title (GTK_WINDOW (window), "Layout Manager—Transformation");
+      gtk_window_set_title (GTK_WINDOW (window), "Layout Manager — Transformation");
       gtk_window_set_default_size (GTK_WINDOW (window), 600, 620);
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
diff --git a/demos/gtk-demo/listbox.c b/demos/gtk-demo/listbox.c
index 4905fecd79..3ec47c98e5 100644
--- a/demos/gtk-demo/listbox.c
+++ b/demos/gtk-demo/listbox.c
@@ -1,4 +1,4 @@
-/* List Box/Complex list
+/* List Box/Complex
  *
  * GtkListBox allows lists with complicated layouts, using
  * regular widgets supporting sorting and filtering.
@@ -349,7 +349,7 @@ do_listbox (GtkWidget *do_widget)
       window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "List Box");
+      gtk_window_set_title (GTK_WINDOW (window), "List Box — Complex");
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
diff --git a/demos/gtk-demo/paintable.c b/demos/gtk-demo/paintable.c
index 933e7abd48..8ed5e51dde 100644
--- a/demos/gtk-demo/paintable.c
+++ b/demos/gtk-demo/paintable.c
@@ -1,4 +1,4 @@
-/* Paintable/A simple paintable
+/* Paintable/Simple Paintable
  *
  * GdkPaintable is an interface used by GTK for drawings of any sort
  * that do not require layouting or positioning.
diff --git a/demos/gtk-demo/paintable_animated.c b/demos/gtk-demo/paintable_animated.c
index 93a51d492c..5d72483c96 100644
--- a/demos/gtk-demo/paintable_animated.c
+++ b/demos/gtk-demo/paintable_animated.c
@@ -1,4 +1,4 @@
-/* Paintable/An animated paintable
+/* Paintable/Animated Paintable
  *
  * GdkPaintable also allows paintables to change.
  *
diff --git a/demos/gtk-demo/paintable_mediastream.c b/demos/gtk-demo/paintable_mediastream.c
index 6374087b96..ea1b374b76 100644
--- a/demos/gtk-demo/paintable_mediastream.c
+++ b/demos/gtk-demo/paintable_mediastream.c
@@ -1,4 +1,4 @@
-/* Paintable/A media stream
+/* Paintable/Media Stream
  *
  * GdkPaintable is also used by the GtkMediaStream class.
  *
diff --git a/demos/gtk-demo/themes.ui b/demos/gtk-demo/themes.ui
index c3f6ddbe79..3ccd832e4e 100644
--- a/demos/gtk-demo/themes.ui
+++ b/demos/gtk-demo/themes.ui
@@ -11,6 +11,7 @@
   </object>
   <object class="GtkWindow" id="window">
     <property name="resizable">0</property>
+    <property name="title">Themes</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header">
         <child type="start">
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]