GNOME.org
 

[gtk/no-more-plus: 2/8] demos: Drop the '+' from GTK

commit 589cb19715194efa170ed70a464d841a09470d8e
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Tue Feb 5 10:19:57 2019 +0100

    demos: Drop the '+' from GTK
    
    The demos have user-visible text that should refer to "GTK", not "GTK+"
    any more.

 demos/gtk-demo/application.c                           | 10 +++++-----
 demos/gtk-demo/changedisplay.c                         |  2 +-
 demos/gtk-demo/colorsel.c                              |  2 +-
 demos/gtk-demo/foreigndrawing.c                        |  4 ++--
 demos/gtk-demo/images.c                                |  2 +-
 demos/gtk-demo/listbox.c                               |  2 +-
 demos/gtk-demo/main.c                                  | 14 +++++++-------
 demos/gtk-demo/main.ui                                 |  2 +-
 demos/gtk-demo/org.gtk.Demo.appdata.xml                | 10 +++++-----
 demos/gtk-demo/org.gtk.Demo.desktop                    |  4 ++--
 demos/gtk-demo/rotated_text.c                          |  2 +-
 demos/gtk-demo/sidebar.c                               |  2 +-
 demos/gtk-demo/textview.c                              |  2 +-
 demos/gtk-demo/theming_style_classes.c                 |  4 ++--
 demos/widget-factory/org.gtk.WidgetFactory.appdata.xml |  6 +++---
 demos/widget-factory/org.gtk.WidgetFactory.desktop     |  2 +-
 demos/widget-factory/widget-factory.c                  | 12 ++++++------
 demos/widget-factory/widget-factory.ui                 |  2 +-
 18 files changed, 42 insertions(+), 42 deletions(-)
---
diff --git a/demos/gtk-demo/application.c b/demos/gtk-demo/application.c
index 02352c1105..767e351d96 100644
--- a/demos/gtk-demo/application.c
+++ b/demos/gtk-demo/application.c
@@ -200,20 +200,20 @@ activate_about (GSimpleAction *action,
   };
 
   gtk_show_about_dialog (GTK_WINDOW (window),
-                         "program-name", "GTK+ Code Demos",
-                         "version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d",
+                         "program-name", "GTK Code Demos",
+                         "version", g_strdup_printf ("%s,\nRunning against GTK %d.%d.%d",
                                                      PACKAGE_VERSION,
                                                      gtk_get_major_version (),
                                                      gtk_get_minor_version (),
                                                      gtk_get_micro_version ()),
-                         "copyright", "(C) 1997-2013 The GTK+ Team",
+                         "copyright", "(C) 1997-2013 The GTK Team",
                          "license-type", GTK_LICENSE_LGPL_2_1,
                          "website", "http://www.gtk.org";,
-                         "comments", "Program to demonstrate GTK+ functions.",
+                         "comments", "Program to demonstrate GTK functions.",
                          "authors", authors,
                          "documenters", documentors,
                          "logo-icon-name", "gtk4-demo",
-                         "title", "About GTK+ Code Demos",
+                         "title", "About GTK Code Demos",
                          NULL);
 }
 
diff --git a/demos/gtk-demo/changedisplay.c b/demos/gtk-demo/changedisplay.c
index 99e8540667..4c36010e7b 100644
--- a/demos/gtk-demo/changedisplay.c
+++ b/demos/gtk-demo/changedisplay.c
@@ -7,7 +7,7 @@
  * computers, as long as there is a network connection to the
  * computer where the application is running.
  *
- * Only some of the windowing systems where GTK+ runs have the
+ * Only some of the windowing systems where GTK runs have the
  * concept of multiple displays. (The X Window System is the
  * main example.) Other windowing systems can only handle one
  * keyboard and mouse, and combine all monitors into
diff --git a/demos/gtk-demo/colorsel.c b/demos/gtk-demo/colorsel.c
index 8b5c2e0ce8..5ebdfd6a12 100644
--- a/demos/gtk-demo/colorsel.c
+++ b/demos/gtk-demo/colorsel.c
@@ -1,7 +1,7 @@
 /* Color Chooser
  *
  * A GtkColorChooser lets the user choose a color. There are several
- * implementations of the GtkColorChooser interface in GTK+. The
+ * implementations of the GtkColorChooser interface in GTK. The
  * GtkColorChooserDialog is a prebuilt dialog containing a
  * GtkColorChooserWidget.
  */
diff --git a/demos/gtk-demo/foreigndrawing.c b/demos/gtk-demo/foreigndrawing.c
index 842696ea61..3f662fde76 100644
--- a/demos/gtk-demo/foreigndrawing.c
+++ b/demos/gtk-demo/foreigndrawing.c
@@ -1,8 +1,8 @@
 /* Foreign drawing
  *
- * Many applications can't use GTK+ widgets, for a variety of reasons,
+ * Many applications can't use GTK widgets, for a variety of reasons,
  * but still want their user interface to appear integrated with the
- * rest of the desktop, and follow GTK+ themes. This demo shows how to
+ * rest of the desktop, and follow GTK themes. This demo shows how to
  * use GtkStyleContext and the gtk_render_ APIs to achieve this.
  *
  * Note that this is a very simple, non-interactive example.
diff --git a/demos/gtk-demo/images.c b/demos/gtk-demo/images.c
index 88edbf4693..c90de20f6d 100644
--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -262,7 +262,7 @@ start_progressive_loading (GtkWidget *picture)
    * pauses in the reading process.
    */
   load_timeout = g_timeout_add (150, progressive_timeout, picture);
-  g_source_set_name_by_id (load_timeout, "[gtk+] progressive_timeout");
+  g_source_set_name_by_id (load_timeout, "[gtk] progressive_timeout");
 }
 
 static void
diff --git a/demos/gtk-demo/listbox.c b/demos/gtk-demo/listbox.c
index ae6c62c4c8..4e70c2f979 100644
--- a/demos/gtk-demo/listbox.c
+++ b/demos/gtk-demo/listbox.c
@@ -361,7 +361,7 @@ do_listbox (GtkWidget *do_widget)
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
       gtk_container_add (GTK_CONTAINER (window), vbox);
-      label = gtk_label_new ("Messages from Gtk+ and friends");
+      label = gtk_label_new ("Messages from GTK and friends");
       gtk_container_add (GTK_CONTAINER (vbox), label);
       scrolled = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, 
GTK_POLICY_AUTOMATIC);
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index ba2f1a25c1..c4ae6312a0 100644
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -42,24 +42,24 @@ activate_about (GSimpleAction *action,
 {
   GtkApplication *app = user_data;
   const gchar *authors[] = {
-    "The GTK+ Team",
+    "The GTK Team",
     NULL
   };
 
   gtk_show_about_dialog (GTK_WINDOW (gtk_application_get_active_window (app)),
-                         "program-name", "GTK+ Demo",
-                         "version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d",
+                         "program-name", "GTK Demo",
+                         "version", g_strdup_printf ("%s,\nRunning against GTK %d.%d.%d",
                                                      PACKAGE_VERSION,
                                                      gtk_get_major_version (),
                                                      gtk_get_minor_version (),
                                                      gtk_get_micro_version ()),
-                         "copyright", "(C) 1997-2013 The GTK+ Team",
+                         "copyright", "(C) 1997-2013 The GTK Team",
                          "license-type", GTK_LICENSE_LGPL_2_1,
                          "website", "http://www.gtk.org";,
-                         "comments", "Program to demonstrate GTK+ widgets",
+                         "comments", "Program to demonstrate GTK widgets",
                          "authors", authors,
-                         "logo-icon-name", "gtk3-demo",
-                         "title", "About GTK+ Demo",
+                         "logo-icon-name", "gtk4-demo",
+                         "title", "About GTK Demo",
                          NULL);
 }
 
diff --git a/demos/gtk-demo/main.ui b/demos/gtk-demo/main.ui
index bb4433d20f..ca72814342 100644
--- a/demos/gtk-demo/main.ui
+++ b/demos/gtk-demo/main.ui
@@ -19,7 +19,7 @@
     <style><class name="devel"/></style>
     <property name="default-width">800</property>
     <property name="default-height">600</property>
-    <property name="title">GTK+ Demo</property>
+    <property name="title">GTK Demo</property>
     <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar">
diff --git a/demos/gtk-demo/org.gtk.Demo.appdata.xml b/demos/gtk-demo/org.gtk.Demo.appdata.xml
index 65902b74c3..7b142498bf 100644
--- a/demos/gtk-demo/org.gtk.Demo.appdata.xml
+++ b/demos/gtk-demo/org.gtk.Demo.appdata.xml
@@ -3,12 +3,12 @@
   <id>org.gtk.Demo.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>LGPL-2.0+</project_license>
-  <name>GTK+ Demo</name>
-  <summary>Program to demonstrate GTK+ functions</summary>
+  <name>GTK Demo</name>
+  <summary>Program to demonstrate GTK functions</summary>
   <description>
     <p>
-      GTK+ Demo is a collection of examples that demonstrate the major
-      features of the GTK+ toolkit.
+      GTK Demo is a collection of examples that demonstrate the major
+      features of the GTK toolkit.
     </p>
   </description>
   <screenshots>
@@ -30,4 +30,4 @@
   <translation type="gettext">gtk-4.0</translation>
   <update_contact>matthias.clasen_at_gmail.com</update_contact>
   <developer_name>Matthias Clasen and others</developer_name>
-</component>
\ No newline at end of file
+</component>
diff --git a/demos/gtk-demo/org.gtk.Demo.desktop b/demos/gtk-demo/org.gtk.Demo.desktop
index 3ccd28d6ab..021a92f710 100644
--- a/demos/gtk-demo/org.gtk.Demo.desktop
+++ b/demos/gtk-demo/org.gtk.Demo.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Name=GTK+ Demo
-Comment=GTK+ code examples and demonstrations
+Name=GTK Demo
+Comment=GTK code examples and demonstrations
 Exec=gtk4-demo
 Icon=gtk4-demo
 Terminal=false
diff --git a/demos/gtk-demo/rotated_text.c b/demos/gtk-demo/rotated_text.c
index de06f55ea0..ce286cbcc9 100644
--- a/demos/gtk-demo/rotated_text.c
+++ b/demos/gtk-demo/rotated_text.c
@@ -12,7 +12,7 @@
 #include <string.h>
 
 #define HEART "♥"
-const char text[] = "I ♥ GTK+";
+const char text[] = "I ♥ GTK";
 
 static void
 fancy_shape_renderer (cairo_t        *cr,
diff --git a/demos/gtk-demo/sidebar.c b/demos/gtk-demo/sidebar.c
index d6a5cb011e..5ec3d16fd0 100644
--- a/demos/gtk-demo/sidebar.c
+++ b/demos/gtk-demo/sidebar.c
@@ -19,7 +19,7 @@ do_sidebar (GtkWidget *do_widget)
   GtkWidget *widget;
   GtkWidget *header;
   const gchar* pages[] = {
-    "Welcome to GTK+",
+    "Welcome to GTK",
     "GtkStackSidebar Widget",
     "Automatic navigation",
     "Consistent appearance",
diff --git a/demos/gtk-demo/textview.c b/demos/gtk-demo/textview.c
index 7da5029506..b1306a0ff3 100644
--- a/demos/gtk-demo/textview.c
+++ b/demos/gtk-demo/textview.c
@@ -280,7 +280,7 @@ insert_text (GtkTextBuffer *buffer)
   gtk_text_buffer_insert (buffer, &iter,
       "This line (and most of the others in this buffer) is word-wrapped, "
       "using the proper Unicode algorithm. Word wrap should work in all "
-      "scripts and languages that GTK+ supports. Let's make this a long "
+      "scripts and languages that GTK supports. Let's make this a long "
       "paragraph to demonstrate: blah blah blah blah blah blah blah blah "
       "blah blah blah blah blah blah blah blah blah blah blah\n\n", -1);
 
diff --git a/demos/gtk-demo/theming_style_classes.c b/demos/gtk-demo/theming_style_classes.c
index 5981a1edaa..30e7f403da 100644
--- a/demos/gtk-demo/theming_style_classes.c
+++ b/demos/gtk-demo/theming_style_classes.c
@@ -1,10 +1,10 @@
 /* Theming/Style Classes
  *
- * GTK+ uses CSS for theming. Style classes can be associated
+ * GTK uses CSS for theming. Style classes can be associated
  * with widgets to inform the theme about intended rendering.
  *
  * This demo shows some common examples where theming features
- * of GTK+ are used for certain effects: primary toolbars,
+ * of GTK are used for certain effects: primary toolbars,
  * inline toolbars and linked buttons.
  */
 
diff --git a/demos/widget-factory/org.gtk.WidgetFactory.appdata.xml 
b/demos/widget-factory/org.gtk.WidgetFactory.appdata.xml
index 2acbc798b0..a780508aa2 100644
--- a/demos/widget-factory/org.gtk.WidgetFactory.appdata.xml
+++ b/demos/widget-factory/org.gtk.WidgetFactory.appdata.xml
@@ -3,11 +3,11 @@
   <id>org.gtk.WidgetFactory.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>LGPL-2.0+</project_license>
-  <name>GTK+ Widget Factory</name>
-  <summary>Program to demonstrate GTK+ functions</summary>
+  <name>GTK Widget Factory</name>
+  <summary>Program to demonstrate GTK functions</summary>
   <description>
     <p>
-      GTK+ Widget Factory is a showcase of GTK+ widgets. It was
+      GTK Widget Factory is a showcase of GTK widgets. It was
       originally created to help theme authors test their creations
       for completeness.
     </p>
diff --git a/demos/widget-factory/org.gtk.WidgetFactory.desktop 
b/demos/widget-factory/org.gtk.WidgetFactory.desktop
index 685ebdc08f..fa7218e593 100644
--- a/demos/widget-factory/org.gtk.WidgetFactory.desktop
+++ b/demos/widget-factory/org.gtk.WidgetFactory.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Widget Factory
-Comment=A showcase for GTK+ widgets, designed for testing themes.
+Comment=A showcase for GTK widgets, designed for testing themes.
 Exec=gtk4-widget-factory
 Icon=gtk4-widget-factory
 Terminal=false
diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c
index dc6a19016e..e9cd3c3a7d 100644
--- a/demos/widget-factory/widget-factory.c
+++ b/demos/widget-factory/widget-factory.c
@@ -212,28 +212,28 @@ activate_about (GSimpleAction *action,
                           glib_major_version,
                           glib_minor_version,
                           glib_micro_version);
-  g_string_append_printf (s, "\tGTK+\t%d.%d.%d\n",
+  g_string_append_printf (s, "\tGTK\t%d.%d.%d\n",
                           gtk_get_major_version (),
                           gtk_get_minor_version (),
                           gtk_get_micro_version ());
   g_string_append_printf (s, "\nA link can apppear here: <http://www.gtk.org>");
 
-  version = g_strdup_printf ("%s\nRunning against GTK+ %d.%d.%d",
+  version = g_strdup_printf ("%s\nRunning against GTK %d.%d.%d",
                              PACKAGE_VERSION,
                              gtk_get_major_version (),
                              gtk_get_minor_version (),
                              gtk_get_micro_version ());
 
   gtk_show_about_dialog (GTK_WINDOW (gtk_application_get_active_window (app)),
-                         "program-name", "GTK+ Widget Factory",
+                         "program-name", "GTK Widget Factory",
                          "version", version,
-                         "copyright", "(C) 1997-2013 The GTK+ Team",
+                         "copyright", "(C) 1997-2013 The GTK Team",
                          "license-type", GTK_LICENSE_LGPL_2_1,
                          "website", "http://www.gtk.org";,
-                         "comments", "Program to demonstrate GTK+ themes and widgets",
+                         "comments", "Program to demonstrate GTK themes and widgets",
                          "authors", authors,
                          "logo-icon-name", "gtk4-widget-factory",
-                         "title", "About GTK+ Widget Factory",
+                         "title", "About GTK Widget Factory",
                          "system-information", s->str,
                          NULL);
 
diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index 565e38d7ae..f9a1691101 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -407,7 +407,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
   </object>
   <object class="GtkApplicationWindow" id="window">
     <style><class name="devel"/></style>
-    <property name="title">GTK+ Widget Factory</property>
+    <property name="title">GTK Widget Factory</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar1">
         <property name="show-title-buttons">1</property>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]