From 0f24fddaf716fff1ebffc3e2014d8eecafa611a0 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 5 Feb 2019 10:14:31 +0100 Subject: [PATCH 1/8] docs: Drop the '+' from GTK We need to adapt to both the change in the name of the project, and to the name change in the pkg-config file. --- docs/CODING-STYLE | 22 ++--- docs/RELEASE-HOWTO.md | 10 +- docs/developers.txt | 4 +- docs/dnd_internals.txt | 4 +- docs/iconcache.txt | 4 +- docs/reference/gtk/broadway.xml | 14 +-- docs/reference/gtk/building.sgml | 82 ++++++++-------- docs/reference/gtk/compiling.sgml | 34 +++---- docs/reference/gtk/css-overview.xml | 42 ++++---- docs/reference/gtk/css-properties.xml | 14 +-- docs/reference/gtk/drawing-model.xml | 36 +++---- docs/reference/gtk/getting_started.xml.in | 68 ++++++------- docs/reference/gtk/glossary.xml | 12 +-- docs/reference/gtk/gtk4-broadwayd.xml | 4 +- docs/reference/gtk/gtk4-builder-tool.xml | 2 +- docs/reference/gtk/gtk4-demo-application.xml | 2 +- docs/reference/gtk/gtk4-demo.xml | 6 +- docs/reference/gtk/gtk4-docs.xml | 24 ++--- .../gtk/gtk4-encode-symbolic-svg.xml | 4 +- docs/reference/gtk/gtk4-icon-browser.xml | 2 +- docs/reference/gtk/gtk4-launch.xml | 2 +- docs/reference/gtk/gtk4-query-settings.xml | 2 +- docs/reference/gtk/gtk4-update-icon-cache.xml | 4 +- docs/reference/gtk/gtk4-widget-factory.xml | 8 +- docs/reference/gtk/images/README | 2 +- docs/reference/gtk/input-handling.xml | 28 +++--- docs/reference/gtk/migrating-2to4.xml | 6 +- docs/reference/gtk/migrating-3to4.xml | 98 +++++++++---------- docs/reference/gtk/osx.sgml | 16 +-- docs/reference/gtk/other_software.sgml | 22 ++--- docs/reference/gtk/overview.xml | 16 +-- docs/reference/gtk/question_index.sgml | 52 +++++----- docs/reference/gtk/resources.sgml | 38 +++---- docs/reference/gtk/running.sgml | 82 ++++++++-------- docs/reference/gtk/text_widget.sgml | 6 +- docs/reference/gtk/tree_widget.sgml | 6 +- docs/reference/gtk/wayland.xml | 10 +- docs/reference/gtk/windows.sgml | 22 ++--- docs/reference/gtk/x11.sgml | 12 +-- docs/tools/README.shooter | 4 +- docs/tools/widgets.c | 8 +- docs/widget_system.txt | 4 +- 42 files changed, 419 insertions(+), 419 deletions(-) diff --git a/docs/CODING-STYLE b/docs/CODING-STYLE index 6cb3fabe1b..a3910c90ac 100644 --- a/docs/CODING-STYLE +++ b/docs/CODING-STYLE @@ -1,8 +1,8 @@ -GTK+ Coding Style +GTK Coding Style ------------------------------------------------------------------------------- This document is intended to be a short description of the preferred -coding style to be used for the GTK+ source code. It was strongly +coding style to be used for the GTK source code. It was strongly inspired by Clutter's CODING_STYLE. Coding style is a matter of consistency, readability and maintainance; @@ -12,7 +12,7 @@ and consistent answers to common questions regarding the coding style, and will also try to identify the allowed exceptions. The examples will show the preferred coding style; the negative examples -will be clearly identified. Please, don't submit code to GTK+ that +will be clearly identified. Please, don't submit code to GTK that looks like any of these. Part of the rationales for these coding style rules are available either @@ -38,10 +38,10 @@ using tab characters alone, or using a combination of spaces and tabs. Do not change the editor's configuration to change the meaning of a tab character (see below); code using tabs to indent will not be accepted -into GTK+. +into GTK. Even if two spaces for each indentation level allows deeper nesting than -8 spaces, GTK+ favours self-documenting function names that can take +8 spaces, GTK favours self-documenting function names that can take quite some space. For this reason you should avoid deeply nested code. + Tab characters @@ -399,7 +399,7 @@ patch or commit. Never use empty lines at the beginning or at the end of a file. Do enable the default git pre-commit hook that detect trailing -whitespace for you and help you to avoid corrupting GTK+'s tree with +whitespace for you and help you to avoid corrupting GTK's tree with it. Do that as follows: chmod a+x .git/hooks/pre-commit @@ -410,7 +410,7 @@ duplicate blank lines. + Headers -Headers are special, for GTK+, in that they don't have to obey the +Headers are special, for GTK, in that they don't have to obey the 80 characters limit. The only major rule for headers is that the function definitions should be vertically aligned in three columns: @@ -479,7 +479,7 @@ Additionally, public headers should use C++ guards around their declarations: + Includes -GTK+ source files must never include the global gtk.h header; instead, it +GTK source files must never include the global gtk.h header; instead, it should include the individual headers that are needed. Every source file must include config.h first, followed by the header matching @@ -658,7 +658,7 @@ after the license header: * @Short_Description: Height-for-width geometry management * @Title: GtkSizeRequest * - * The GtkSizeRequest interface is GTK+'s height-for-width (and + * The GtkSizeRequest interface is GTK's height-for-width (and * width-for-height) geometry management system. * ... */ @@ -672,8 +672,8 @@ get_type function needs to listed in gtk3.types. + Old code -New code that is being added to GTK+ should adhere to the style -explained above. Existing GTK+ code does largely follow these +New code that is being added to GTK should adhere to the style +explained above. Existing GTK code does largely follow these conventions, but there are some differences, e.g. occurrences of tabs, etc. diff --git a/docs/RELEASE-HOWTO.md b/docs/RELEASE-HOWTO.md index 716eac60b9..3419828022 100644 --- a/docs/RELEASE-HOWTO.md +++ b/docs/RELEASE-HOWTO.md @@ -1,5 +1,5 @@ -How to do a GTK+ release? -========================= +How to do a GTK release? +======================== ## Before we begin @@ -91,7 +91,7 @@ $ ninja -C _build gtk40-properties-pot 12. Tag the release. The git command for doing that looks like: ```sh -$ git tag -m "GTK+ 4.2.0" 4.2.0 +$ git tag -m "GTK 4.2.0" 4.2.0 ``` 13. Bump the version number in `meson.build` and commit the change. @@ -110,8 +110,8 @@ $ git push origin 4.2.0 this looks like: ```sh -$ scp gtk+-4.2.0.tar.xz matthiasc@master.gnome.org: -$ ssh matthiasc@master.gnome.org ftpadmin install gtk+-4.2.0.tar.xz +$ scp gtk-4.2.0.tar.xz matthiasc@master.gnome.org: +$ ssh matthiasc@master.gnome.org ftpadmin install gtk-4.2.0.tar.xz ``` 16. Go to the gnome-announce list archives, find the last announce message, diff --git a/docs/developers.txt b/docs/developers.txt index be81ec1a41..82c569bac1 100644 --- a/docs/developers.txt +++ b/docs/developers.txt @@ -1,5 +1,5 @@ -Things to care about when using/programing for GTK+ -=================================================== +Things to care about when using/programing for GTK +================================================== This file is meant to collect some frequently triggered failures when programming for/with Gtk, having the spirit of a developers FAQ. diff --git a/docs/dnd_internals.txt b/docs/dnd_internals.txt index eb4cde2a84..d9dd45c13e 100644 --- a/docs/dnd_internals.txt +++ b/docs/dnd_internals.txt @@ -57,7 +57,7 @@ The GDK API =========== It is expect that the GDK DND API will never be -used by anything other than the DND code in GTK+. +used by anything other than the DND code in GTK. /* Drag and Drop */ @@ -159,7 +159,7 @@ the taskbar. Internally, when the outer drag enters a proxy dest site, a new source drag is created, with SourceInfo and GdkDragContext. From the GDK side, it looks much like a -normal source drag; on the GTK+ side, most of the code is +normal source drag; on the GTK side, most of the code is disjoint. The need to pass in a specific target window is the reason why the GDK DND API splits gdk_drag_find_window() and gdk_drag_motion(). diff --git a/docs/iconcache.txt b/docs/iconcache.txt index b2d8f8f80f..34a3ec81f8 100644 --- a/docs/iconcache.txt +++ b/docs/iconcache.txt @@ -1,4 +1,4 @@ -Information about the icon theme cache format used by GTK+ +Information about the icon theme cache format used by GTK for more information, see the mailing list threads at http://mail.gnome.org/archives/gtk-devel-list/2004-April/msg00065.html @@ -30,7 +30,7 @@ We would like to propose the cache file format as an appendix to the icon theme specification. One thing which still needs to be investigated is caching of the actual image data; the file format is has an IMAGE_DATA_OFFSET member to allow adding that compatibly. An -implementation of the caching scheme for GTK+ can be found at [2]. The +implementation of the caching scheme for GTK can be found at [2]. The cache generator which is included in the patch depends only on glib, and it may be a good idea to move it to freedesktop.org as well. diff --git a/docs/reference/gtk/broadway.xml b/docs/reference/gtk/broadway.xml index 709d03a272..4195e0e4ec 100644 --- a/docs/reference/gtk/broadway.xml +++ b/docs/reference/gtk/broadway.xml @@ -4,23 +4,23 @@ ]> -Using GTK+ with Broadway +Using GTK with Broadway 3 GTK Library -Using GTK+ with Broadway +Using GTK with Broadway -HTML-specific aspects of using GTK+ +HTML-specific aspects of using GTK -Using GTK+ with Broadway +Using GTK with Broadway -The GDK Broadway backend provides support for displaying GTK+ +The GDK Broadway backend provides support for displaying GTK applications in a web browser, using HTML5 and web sockets. To run your application in this way, select the Broadway backend by setting GDK_BACKEND=broadway. Then you can make @@ -36,9 +36,9 @@ port that you want to use. -It is also possible to use multiple GTK+ applications in the same +It is also possible to use multiple GTK applications in the same web browser window, by using the Broadway server, -broadwayd, that ships with GTK+. +broadwayd, that ships with GTK. To use broadwayd, start it like this: broadwayd :5 diff --git a/docs/reference/gtk/building.sgml b/docs/reference/gtk/building.sgml index caed302e15..ccdd787210 100644 --- a/docs/reference/gtk/building.sgml +++ b/docs/reference/gtk/building.sgml @@ -4,31 +4,31 @@ ]> -Compiling the GTK+ libraries +Compiling the GTK libraries 3 GTK Library -Compiling the GTK+ Libraries +Compiling the GTK Libraries -How to compile GTK+ itself +How to compile GTK itself - Building GTK+ + Building GTK - Before we get into the details of how to compile GTK+, we should - mention that in many cases, binary packages of GTK+ prebuilt for + Before we get into the details of how to compile GTK, we should + mention that in many cases, binary packages of GTK prebuilt for your operating system will be available, either from your operating system vendor or from independent sources. If such a set of packages is available, installing it will get you - programming with GTK+ much faster than building it yourself. In - fact, you may well already have GTK+ installed on your system + programming with GTK much faster than building it yourself. In + fact, you may well already have GTK installed on your system already. - In order to build GTK+, you will need meson + In order to build GTK, you will need meson installed on your system. On Linux, and other UNIX-like operating systems, you will also need ninja. This guide does not cover how to install these two requirements, but you @@ -38,11 +38,11 @@ How to compile GTK+ itself refer to it in the examples. - If you are building GTK+ from a source distribution or from a Git + If you are building GTK from a source distribution or from a Git clone, you will need to use meson to configure the project. The most commonly useful argument is the --prefix one, which determines where the - files will go once installed. To install GTK+ under a prefix + files will go once installed. To install GTK under a prefix like /opt/gtk you would run Meson as: @@ -83,7 +83,7 @@ How to compile GTK+ itself PKG_CONFIG_PATH environment variable contains a search path that pkg-config (see below) uses when looking for files describing how to compile - programs using different libraries. If you were installing GTK+ + programs using different libraries. If you were installing GTK and it's dependencies into /opt/gtk, you might want to set these variables as: @@ -109,26 +109,26 @@ How to compile GTK+ itself Dependencies - Before you can compile the GTK+ widget toolkit, you need to have + Before you can compile the GTK widget toolkit, you need to have various other tools and libraries installed on your - system. Dependencies of GTK+ have their own build systems, so + system. Dependencies of GTK have their own build systems, so you will need to refer to their own installation instructions. - A particular important tool used by GTK+ to find its dependencies + A particular important tool used by GTK to find its dependencies is pkg-config. pkg-config is a tool for tracking the compilation flags needed for - libraries that are used by the GTK+ libraries. (For each + libraries that are used by the GTK libraries. (For each library, a small .pc text file is installed in a standard location that contains the compilation flags needed for that library along with version number information.) - Some of the libraries that GTK+ depends on are maintained by - by the GTK+ team: GLib, GdkPixbuf, Pango, ATK and GObject Introspection. + Some of the libraries that GTK depends on are maintained by + by the GTK team: GLib, GdkPixbuf, Pango, ATK and GObject Introspection. Other libraries are maintained separately. @@ -196,7 +196,7 @@ How to compile GTK+ itself The libraries from the X window system are needed to build - Pango and GTK+. You should already have these installed on + Pango and GTK. You should already have these installed on your system, but it's possible that you'll need to install the development environment for these libraries that your operating system vendor provides. @@ -213,14 +213,14 @@ How to compile GTK+ itself Cairo is a graphics library that supports vector graphics and image - compositing. Both Pango and GTK+ use Cairo for drawing. + compositing. Both Pango and GTK use Cairo for drawing. libepoxy is a library that abstracts the differences between different - OpenGL libraries. GTK+ uses it for cross-platform GL support + OpenGL libraries. GTK uses it for cross-platform GL support and for its own drawing. @@ -228,20 +228,20 @@ How to compile GTK+ itself Graphene is a library that provides vector and matrix types for 2D and - 3D transformations. GTK+ uses it internally for drawing. + 3D transformations. GTK uses it internally for drawing. The Wayland libraries - are needed to build GTK+ with the Wayland backend. + are needed to build GTK with the Wayland backend. The shared-mime-info - package is not a hard dependency of GTK+, but it contains definitions - for mime types that are used by GIO and, indirectly, by GTK+. + package is not a hard dependency of GTK, but it contains definitions + for mime types that are used by GIO and, indirectly, by GTK. gdk-pixbuf will use GIO for mime type detection if possible. For this to work, shared-mime-info needs to be installed and XDG_DATA_DIRS set accordingly at configure time. @@ -251,7 +251,7 @@ How to compile GTK+ itself - Building and testing GTK+ + Building and testing GTK First make sure that you have the necessary external dependencies installed: pkg-config, Meson, Ninja, @@ -263,16 +263,16 @@ How to compile GTK+ itself accessible through your operating system package repositories. - Then build and install the GTK+ libraries in the order: - GLib, Cairo, Pango, ATK, then GTK+. For each library, follow the + Then build and install the GTK libraries in the order: + GLib, Cairo, Pango, ATK, then GTK. For each library, follow the instructions they provide, and make sure to share common settings - between them and the GTK+ build; if you are using a separate prefix - for GTK+, for instance, you will need to use the same prefix for all + between them and the GTK build; if you are using a separate prefix + for GTK, for instance, you will need to use the same prefix for all its dependencies you build. If you're lucky, this will all go smoothly, and you'll be ready to start compiling - your own GTK+ applications. You can test your GTK+ installation + your own GTK applications. You can test your GTK installation by running the gtk4-demo program that - GTK+ installs. + GTK installs. If one of the projects you're configuring or building fails, look @@ -287,7 +287,7 @@ How to compile GTK+ itself Extra Configuration Options - In addition to the normal options provided by Meson, GTK+ defines + In addition to the normal options provided by Meson, GTK defines various arguments that modify what should be built. @@ -375,7 +375,7 @@ How to compile GTK+ itself <systemitem>xinerama</systemitem> - By default GTK+ will try to link against the Xinerama libraries + By default GTK will try to link against the Xinerama libraries if they are found. This options can be used to explicitly control whether Xinerama should be used. @@ -388,16 +388,16 @@ How to compile GTK+ itself The gtk-doc package is used to generate the reference documentation included - with GTK+. By default support for gtk-doc + with GTK. By default support for gtk-doc is disabled because it requires various extra dependencies to be installed. If you have gtk-doc installed and - are modifying GTK+, you may want to enable + are modifying GTK, you may want to enable gtk-doc support by passing in documentation. - Additionally, some tools provided by GTK+ have their own + Additionally, some tools provided by GTK have their own manual pages generated using a similar set of dependencies; if you have xsltproc then you can generate manual pages by passing man-pages @@ -409,7 +409,7 @@ How to compile GTK+ itself <systemitem>print-backends</systemitem> - By default, GTK+ will try to build various print backends if + By default, GTK will try to build various print backends if their dependencies are found. This option can be used to explicitly control which print backends should be built. @@ -439,7 +439,7 @@ How to compile GTK+ itself Allows to disable building introspection support. This is option is mainly useful for shortening turnaround times on developer - systems. Installed builds of GTK+ should always have introspection + systems. Installed builds of GTK should always have introspection support. @@ -450,9 +450,9 @@ How to compile GTK+ itself demos - By default, GTK+ will build quite a few tests and demos. + By default, GTK will build quite a few tests and demos. While these are useful on a developer system, they are not - needed when GTK+ is built e.g. for a flatpak runtime. These + needed when GTK is built e.g. for a flatpak runtime. These options allow to disable building tests and demos. diff --git a/docs/reference/gtk/compiling.sgml b/docs/reference/gtk/compiling.sgml index 89856f3be8..25ea551120 100644 --- a/docs/reference/gtk/compiling.sgml +++ b/docs/reference/gtk/compiling.sgml @@ -4,24 +4,24 @@ ]> -Compiling GTK+ Applications +Compiling GTK Applications 3 GTK Library -Compiling GTK+ Applications +Compiling GTK Applications -How to compile your GTK+ application +How to compile your GTK application -Compiling GTK+ Applications on UNIX +Compiling GTK Applications on UNIX -To compile a GTK+ application, you need to tell the compiler where to -find the GTK+ header files and libraries. This is done with the +To compile a GTK application, you need to tell the compiler where to +find the GTK header files and libraries. This is done with the pkg-config utility. @@ -29,9 +29,9 @@ The following interactive shell session demonstrates how pkg-config is used (the actual output on your system may be different): -$ pkg-config --cflags gtk+-4.0 +$ pkg-config --cflags gtk4 -pthread -I/usr/include/gtk-4.0 -I/usr/lib64/gtk-4.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -$ pkg-config --libs gtk+-4.0 +$ pkg-config --libs gtk4 -pthread -lgtk-4 -lgdk-4 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 @@ -40,14 +40,14 @@ The simplest way to compile a program is to use the "backticks" feature of the shell. If you enclose a command in backticks (not single quotes), then its output will be substituted into the command line before execution. So to compile -a GTK+ Hello, World, you would type the following: +a GTK Hello, World, you would type the following: -$ cc `pkg-config --cflags gtk+-4.0` hello.c -o hello `pkg-config --libs gtk+-4.0` +$ cc `pkg-config --cflags gtk4` hello.c -o hello `pkg-config --libs gtk4` -Deprecated GTK+ functions are annotated to make the compiler +Deprecated GTK functions are annotated to make the compiler emit warnings when they are used (e.g. with gcc, you need to use the -Wdeprecated-declarations option). If these warnings are problematic, they can be turned off by defining the preprocessor @@ -56,26 +56,26 @@ option -DGDK_DISABLE_DEPRECATION_WARNINGS -GTK+ deprecation annotations are versioned; by defining the +GTK deprecation annotations are versioned; by defining the macros %GDK_VERSION_MIN_REQUIRED and %GDK_VERSION_MAX_ALLOWED, -you can specify the range of GTK+ versions whose API you want +you can specify the range of GTK versions whose API you want to use. APIs that were deprecated before or introduced after this range will trigger compiler warnings. Here is how you would compile hello.c if you want to allow it -to use symbols that were not deprecated in 3.2: +to use symbols that were not deprecated in 4.2: -$ cc `pkg-config --cflags gtk+-4.0` -DGDK_VERSION_MIN_REQIRED=GDK_VERSION_3_2 hello.c -o hello `pkg-config --libs gtk+-4.0` +$ cc `pkg-config --cflags gtk4` -DGDK_VERSION_MIN_REQIRED=GDK_VERSION_4_2 hello.c -o hello `pkg-config --libs gtk4` And here is how you would compile hello.c if you don't want -it to use any symbols that were introduced after 3.4: +it to use any symbols that were introduced after 4.2: -$ cc `pkg-config --cflags gtk+-4.0` -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_4 hello.c -o hello `pkg-config --libs gtk+-4.0` +$ cc `pkg-config --cflags gtk4` -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_4_2 hello.c -o hello `pkg-config --libs gtk4` diff --git a/docs/reference/gtk/css-overview.xml b/docs/reference/gtk/css-overview.xml index 0dc73a750f..f53cd00e40 100644 --- a/docs/reference/gtk/css-overview.xml +++ b/docs/reference/gtk/css-overview.xml @@ -4,15 +4,15 @@ ]> -GTK+ CSS Overview +GTK CSS Overview 3 GTK Library -GTK+ CSS Overview +GTK CSS Overview -Overview of CSS in GTK+ +Overview of CSS in GTK @@ -31,10 +31,10 @@ We use for syntax productions, and each line is put in a --> - Overview of CSS in GTK+ + Overview of CSS in GTK - This chapter describes in detail how GTK+ uses CSS for styling + This chapter describes in detail how GTK uses CSS for styling and layout. @@ -61,7 +61,7 @@ We use for syntax productions, and each line is put in a CSS nodes - GTK+ applies the style information found in style sheets by matching + GTK applies the style information found in style sheets by matching the selectors against a tree of nodes. Each node in the tree has a name, a state and possibly style classes. The children of each node are linearly ordered. @@ -99,7 +99,7 @@ scale[.fine-tune] Style sheets - The basic structure of the style sheets understood by GTK+ is + The basic structure of the style sheets understood by GTK is a series of statements, which are either rule sets or “@-rules”, separated by whitespace. @@ -128,7 +128,7 @@ button, entry { Importing style sheets - GTK+ supports the CSS @import rule, in order to load another + GTK supports the CSS @import rule, in order to load another style sheet in addition to the currently parsed one. @@ -339,8 +339,8 @@ checkbutton:indeterminate { - The full syntax for selectors understood by GTK+ can be found in the - table below. The main difference to CSS is that GTK+ does not currently + The full syntax for selectors understood by GTK can be found in the + table below. The main difference to CSS is that GTK does not currently support attribute selectors. @@ -373,7 +373,7 @@ checkbutton:indeterminate { E#id any E node with the given ID CSS - GTK+ uses the widget name as ID + GTK uses the widget name as ID E:nth-child(〈nth-child〉) @@ -543,7 +543,7 @@ checkbutton:indeterminate { - GTK+ adds several additional ways to specify colors. + GTK adds several additional ways to specify colors. 〈gtk color〉 = 〈symbolic color〉 | 〈color expression〉 | 〈win32 color〉 @@ -576,7 +576,7 @@ checkbutton:indeterminate { - GTK+ also supports color expressions, which allow colors to be transformed + GTK also supports color expressions, which allow colors to be transformed to new ones and can be nested, providing a rich language to define colors. Color expressions resemble functions, taking 1 or more colors and in some cases a number as arguments. @@ -595,7 +595,7 @@ checkbutton:indeterminate { - On Windows, GTK+ allows to refer to system colors, as follows: + On Windows, GTK allows to refer to system colors, as follows: 〈win32 color〉 = -gtk-win32-color( 〈name〉, 〈integer〉 ) @@ -632,7 +632,7 @@ checkbutton:indeterminate { The simplest way to specify an image in CSS is to load an image file from a URL. CSS does not specify anything about supported file - formats; within GTK+, you can expect at least PNG, JPEG and SVG to + formats; within GTK, you can expect at least PNG, JPEG and SVG to work. The full list of supported image formats is determined by the available gdk-pixbuf image loaders and may vary between systems. @@ -734,14 +734,14 @@ label { - GTK+ extends the CSS syntax for images and also uses it for specifying icons. + GTK extends the CSS syntax for images and also uses it for specifying icons. 〈gtk image〉 = 〈themed icon〉 | 〈scaled image〉 | 〈recolored image〉 | 〈win32 theme part〉 - GTK+ has extensive support for loading icons from icon themes. It is + GTK has extensive support for loading icons from icon themes. It is accessible from CSS with the -gtk-icontheme syntax. @@ -770,7 +770,7 @@ arrow.fancy { - GTK+ supports scaled rendering on hi-resolution displays. This works + GTK supports scaled rendering on hi-resolution displays. This works best if images can specify normal and hi-resolution variants. From CSS, this can be done with the -gtk-scaled syntax. @@ -816,7 +816,7 @@ arrow { ]]> - On Windows, GTK+ allows to refer to system theme parts as images, as follows: + On Windows, GTK allows to refer to system theme parts as images, as follows: 〈win32 theme part〉 = -gtk-win32-theme-part( 〈name〉, 〈integer〉 〈integer〉 @@ -830,7 +830,7 @@ arrow { CSS defines a mechanism by which changes in CSS property values can - be made to take effect gradually, instead of all at once. GTK+ supports + be made to take effect gradually, instead of all at once. GTK supports these transitions as well. @@ -911,7 +911,7 @@ spinner { In order to extend key bindings affecting different widgets, - GTK+ supports the @binding-set rule to parse a set of bind/unbind + GTK supports the @binding-set rule to parse a set of bind/unbind directives. Note that in order to take effect, the binding sets defined in this way must be associated with rule sets by setting the -gtk-key-bindings property. diff --git a/docs/reference/gtk/css-properties.xml b/docs/reference/gtk/css-properties.xml index b6b77fe6be..c53cbbf730 100644 --- a/docs/reference/gtk/css-properties.xml +++ b/docs/reference/gtk/css-properties.xml @@ -4,15 +4,15 @@ ]> -GTK+ CSS Properties +GTK CSS Properties 3 GTK Library -GTK+ CSS Properties +GTK CSS Properties -CSS Properties in GTK+ +CSS Properties in GTK @@ -34,9 +34,9 @@ We use for syntax productions, and each line is put in a Supported CSS Properties - GTK+ supports CSS properties and shorthands as far as they can be applied + GTK supports CSS properties and shorthands as far as they can be applied in the context of widgets, and adds its own properties only when needed. - All GTK+-specific properties have a -gtk prefix. + All GTK-specific properties have a -gtk prefix. @@ -66,7 +66,7 @@ We use for syntax productions, and each line is put in a - Whereever a number is allowed, GTK+ also accepts a Windows-specific + Whereever a number is allowed, GTK also accepts a Windows-specific theme size: @@ -1159,7 +1159,7 @@ We use for syntax productions, and each line is put in a - GTK+ uses the CSS outline properties to render the 'focus rectangle'. + GTK uses the CSS outline properties to render the 'focus rectangle'. diff --git a/docs/reference/gtk/drawing-model.xml b/docs/reference/gtk/drawing-model.xml index c19fffc2b6..57a7533fe8 100644 --- a/docs/reference/gtk/drawing-model.xml +++ b/docs/reference/gtk/drawing-model.xml @@ -4,15 +4,15 @@ ]> -The GTK+ Drawing Model +The GTK Drawing Model 3 GTK Library -The GTK+ Drawing Model +The GTK Drawing Model - The GTK+ drawing model in detail + The GTK drawing model in detail @@ -21,12 +21,12 @@ Overview of the drawing model - This chapter describes the GTK+ drawing model in detail. If you - are interested in the procedure which GTK+ follows to draw its + This chapter describes the GTK drawing model in detail. If you + are interested in the procedure which GTK follows to draw its widgets and windows, you should read this chapter; this will be useful to know if you decide to implement your own widgets. This chapter will also clarify the reasons behind the ways certain - things are done in GTK+; for example, why you cannot change the + things are done in GTK; for example, why you cannot change the background color of all widgets with the same method. @@ -52,7 +52,7 @@ clipping", instead of "toplevel application windows". Most windowing systems support nested windows, where the contents of child windows get clipped by the boundaries of their parents. - Although GTK+ and GDK in particular may run on a windowing + Although GTK and GDK in particular may run on a windowing system with no such notion of nested windows, GDK presents the illusion of being under such a system. A toplevel window may contain many subwindows and sub-subwindows, for example, one for @@ -63,16 +63,16 @@ - In practice, most windows in modern GTK+ application are client-side + In practice, most windows in modern GTK application are client-side constructs. Only few windows (in particular toplevel windows) are native, which means that they represent a - window from the underlying windowing system on which GTK+ is running. + window from the underlying windowing system on which GTK is running. For example, on X11 it corresponds to a Window; on Win32, it corresponds to a HANDLE. - Generally, the drawing cycle begins when GTK+ receives an + Generally, the drawing cycle begins when GTK receives an exposure event from the underlying windowing system: if the user drags a window over another one, the windowing system will tell the underlying window that it needs to repaint itself. The @@ -80,7 +80,7 @@ that it needs to update its display. For example, when the user types a character in a GtkEntry - widget, the entry asks GTK+ to queue a redraw operation for + widget, the entry asks GTK to queue a redraw operation for itself. @@ -95,7 +95,7 @@ - The following sections describe how GTK+ decides which widgets + The following sections describe how GTK decides which widgets need to be repainted in response to such events, and how widgets work internally in terms of the resources they use from the windowing system. @@ -106,10 +106,10 @@ The frame clock - All GTK+ applications are mainloop-driven, which means that most + All GTK applications are mainloop-driven, which means that most of the time the app is idle inside a loop that just waits for something to happen and then calls out to the right place when - it does. On top of this GTK+ has a frame clock that gives a + it does. On top of this GTK has a frame clock that gives a “pulse” to the application. This clock beats at a steady rate, which is tied to the framerate of the output (this is synced to the monitor via the window manager/compositor). The clock has @@ -215,7 +215,7 @@ Most widgets, including those that create their own GdkSurfaces have a transparent background, so they draw on top of whatever widgets - are below them. This was not the case in GTK+ 2 where the theme set + are below them. This was not the case in GTK 2 where the theme set the background of most widgets to the default background color. (In fact, transparent GdkSurfaces used to be impossible.) @@ -233,7 +233,7 @@ Scrolling - Traditionally, GTK+ has used self-copy operations to implement + Traditionally, GTK has used self-copy operations to implement scrolling with native windows. With transparent backgrounds, this no longer works. Instead, we just mark the entire affected area for repainting when these operations are used. This allows (partially) @@ -253,7 +253,7 @@ draw handler were sent directly to the windowing system, flicker could result. This is because areas may get redrawn repeatedly: the background, then decorative frames, then text - labels, etc. To avoid flicker, GTK+ employs a double + labels, etc. To avoid flicker, GTK employs a double buffering system at the GDK level. Widgets normally don't know that they are drawing to an off-screen buffer; they just issue their normal drawing commands, and the buffer gets sent to the windowing system @@ -284,7 +284,7 @@ - To make this easier, GTK+ normally calls + To make this easier, GTK normally calls gdk_surface_begin_paint_region() before emitting the #GtkWidget::draw signal, and then it calls gdk_surface_end_paint() diff --git a/docs/reference/gtk/getting_started.xml.in b/docs/reference/gtk/getting_started.xml.in index 0a6f99ca55..1c0c3ab052 100644 --- a/docs/reference/gtk/getting_started.xml.in +++ b/docs/reference/gtk/getting_started.xml.in @@ -3,11 +3,11 @@ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ ]> - Getting Started with GTK+ + Getting Started with GTK - GTK+ is a + GTK is a widget toolkit. Each user interface created by - GTK+ consists of widgets. This is implemented in C using + GTK consists of widgets. This is implemented in C using GObject, an object-oriented framework for C. Widgets are organized in a hierachy. The window widget is the main container. The user interface is then built by adding buttons, drop-down menus, input @@ -17,14 +17,14 @@ assembling the interface manually. You can also use a visual user interface editor, like Glade. - GTK+ is event-driven. The toolkit listens for events such as + GTK is event-driven. The toolkit listens for events such as a click on a button, and passes the event to your application. This chapter contains some tutorial information to get you - started with GTK+ programming. It assumes that you have GTK+, its + started with GTK programming. It assumes that you have GTK, its dependencies and a C compiler installed and ready to use. If you - need to build GTK+ itself first, refer to the - Compiling the GTK+ libraries + need to build GTK itself first, refer to the + Compiling the GTK libraries section in this reference.
@@ -50,24 +50,24 @@ You can compile the program above with GCC using: - gcc `pkg-config --cflags gtk+-4.0` -o example-0 example-0.c `pkg-config --libs gtk+-4.0` + gcc `pkg-config --cflags gtk4` -o example-0 example-0.c `pkg-config --libs gtk4` - For more information on how to compile a GTK+ application, please - refer to the Compiling GTK+ Applications + For more information on how to compile a GTK application, please + refer to the Compiling GTK Applications section in this reference. - All GTK+ applications will, of course, include + All GTK applications will, of course, include gtk/gtk.h, which declares functions, types and - macros required by GTK+ applications. + macros required by GTK applications. - Even if GTK+ installs multiple header files, only the + Even if GTK installs multiple header files, only the top-level gtk/gtk.h header can be directly included by third party code. The compiler will abort with an error if any other header is directly included. - In a GTK+ application, the purpose of the main() function is to + In a GTK application, the purpose of the main() function is to create a #GtkApplication object and run it. In this example a #GtkApplication pointer named app is called and then initialized using gtk_application_new(). @@ -89,8 +89,8 @@ when your application is launched with g_application_run() on the line below. The gtk_application_run() also takes as arguments the pointers to the command line arguments - counter and string array; this allows GTK+ to parse specific command line - arguments that control the behavior of GTK+ itself. The parsed arguments + counter and string array; this allows GTK to parse specific command line + arguments that control the behavior of GTK itself. The parsed arguments will be removed from the array, leaving the unrecognized ones for your application to parse. @@ -128,16 +128,16 @@ #GtkApplication object is freed from memory with g_object_unref(). Finally the status integer is returned and the GTK application exits. - While the program is running, GTK+ is receiving + While the program is running, GTK is receiving events. These are typically input events caused by the user interacting with your program, but also things like messages from - the window manager or other applications. GTK+ processes these and as a + the window manager or other applications. GTK processes these and as a result, signals may be emitted on your widgets. Connecting handlers for these signals is how you normally make your program do something in response to user input. The following example is slightly more complex, and tries to - showcase some of the capabilities of GTK+. + showcase some of the capabilities of GTK. In the long tradition of programming languages and libraries, it is called Hello, World. @@ -151,7 +151,7 @@ - Hello World in GTK+ + Hello World in GTK Create a new file with the following content named example-1.c. MISSING XINCLUDE CONTENT @@ -160,7 +160,7 @@ You can compile the program above with GCC using: - gcc `pkg-config --cflags gtk+-4.0` -o example-1 example-1.c `pkg-config --libs gtk+-4.0` + gcc `pkg-config --cflags gtk4` -o example-1 example-1.c `pkg-config --libs gtk4`
@@ -169,7 +169,7 @@ button to our window, with the label "Hello World". Two new GtkWidget pointers are declared to accomplish this, button and button_box. The button_box variable is created to store a - #GtkButtonBox which is GTK+'s way of controlling the size and layout of buttons. + #GtkButtonBox which is GTK's way of controlling the size and layout of buttons. The #GtkButtonBox is created and assigned to gtk_button_box_new() which takes a #GtkOrientation enum as parameter. The buttons which this box will contain can either be stored horizontally or vertically but this does not matter in this @@ -215,7 +215,7 @@ it becomes important to control how each widget is positioned and sized. This is where packing comes in. - GTK+ comes with a large variety of layout containers + GTK comes with a large variety of layout containers whose purpose it is to control the layout of the child widgets that are added to them. See for an overview. @@ -238,7 +238,7 @@ You can compile the program above with GCC using: - gcc `pkg-config --cflags gtk+-4.0` -o example-2 example-2.c `pkg-config --libs gtk+-4.0` + gcc `pkg-config --cflags gtk4` -o example-2 example-2.c `pkg-config --libs gtk4` @@ -250,7 +250,7 @@ or hundreds of widgets, doing all the setup work in C code is cumbersome, and making changes becomes next to impossible. - Thankfully, GTK+ supports the separation of user interface + Thankfully, GTK supports the separation of user interface layout from your business logic, by using UI descriptions in an XML format that can be parsed by the #GtkBuilder class. @@ -264,7 +264,7 @@ You can compile the program above with GCC using: - gcc `pkg-config --cflags gtk+-4.0` -o example-3 example-3.c `pkg-config --libs gtk+-4.0` + gcc `pkg-config --cflags gtk4` -o example-3 example-3.c `pkg-config --libs gtk4` @@ -324,7 +324,7 @@ - GTK+ includes application support that is built on top of + GTK includes application support that is built on top of #GApplication. In this tutorial we'll build a simple application by starting from scratch, adding more and more pieces over time. Along the way, we'll learn about #GtkApplication, templates, resources, @@ -332,8 +332,8 @@ #GtkListBox, and more. The full, buildable sources for these examples can be found - in the examples/ directory of the GTK+ source distribution, or - online in the GTK+ git repository. + in the examples/ directory of the GTK source distribution, or + online in the GTK git repository. You can build each example separately by using make with the Makefile.example file. For more information, see the README included in the examples directory. @@ -368,7 +368,7 @@ Another important class that is part of the application support - in GTK+ is #GtkApplicationWindow. It is typically subclassed as well. + in GTK is #GtkApplicationWindow. It is typically subclassed as well. Our subclass does not do anything yet, so we will just get an empty window. @@ -797,7 +797,7 @@ preferences_activated (GSimpleAction *action, Adding a search bar We continue to flesh out the functionality of our application. - For now, we add search. GTK+ supports this with #GtkSearchEntry and + For now, we add search. GTK supports this with #GtkSearchEntry and #GtkSearchBar. The search bar is a widget that can slide in from the top to present a search entry. @@ -1007,7 +1007,7 @@ example_app_window_init (ExampleAppWindow *win) Our application already uses a GtkHeaderBar, but so far it still gets a 'normal' window titlebar on top of that. This is a - bit redundant, and we will now tell GTK+ to use the header bar + bit redundant, and we will now tell GTK to use the header bar as replacement for the titlebar. To do so, we move it around to be a direct child of the window, and set its type to be titlebar. @@ -1048,7 +1048,7 @@ example_app_window_init (ExampleAppWindow *win) e.g. when another window is moved and uncovers part of the widget, or when the window containing it is resized. It is also possible to explicitly cause part or all of the widget to be redrawn, by calling - gtk_widget_queue_draw() or its variants. GTK+ takes care of most of the + gtk_widget_queue_draw() or its variants. GTK takes care of most of the details by providing a ready-to-use cairo context to the ::draw signal handler. @@ -1073,7 +1073,7 @@ example_app_window_init (ExampleAppWindow *win) You can compile the program above with GCC using: - gcc `pkg-config --cflags gtk+-4.0` -o example-4 example-4.c `pkg-config --libs gtk+-4.0` + gcc `pkg-config --cflags gtk4` -o example-4 example-4.c `pkg-config --libs gtk4` diff --git a/docs/reference/gtk/glossary.xml b/docs/reference/gtk/glossary.xml index 5e4754755f..cb68f6f95c 100644 --- a/docs/reference/gtk/glossary.xml +++ b/docs/reference/gtk/glossary.xml @@ -51,11 +51,11 @@ column - GTK+ contains several widgets which display data in columns, + GTK contains several widgets which display data in columns, e.g. the #GtkTreeView. These view columns in the tree view are represented by #GtkTreeViewColumn - objects inside GTK+. They should not be confused with + objects inside GTK. They should not be confused with model columns which are used to organize the data in tree models. @@ -114,7 +114,7 @@ event - Events are the way in which GDK informs GTK+ about external events + Events are the way in which GDK informs GTK about external events like pointer motion, button clicks, key presses, etc. @@ -177,7 +177,7 @@ These widgets follow the well-known model-view pattern, which separates the data (the model) to be displayed from the component which does the - actual visualization (the view). Examples of this pattern in GTK+ are + actual visualization (the view). Examples of this pattern in GTK are the #GtkTreeView/#GtkTreeModel and #GtkTextView/#GtkTextBuffer @@ -281,7 +281,7 @@ style - A style encapsulates what GTK+ needs to know in order to draw + A style encapsulates what GTK needs to know in order to draw a widget. Styles can be modified with resource files. @@ -294,7 +294,7 @@ A widget that does not require a parent container. - The only toplevel widgets in GTK+ are #GtkWindow and widgets derived from it. + The only toplevel widgets in GTK are #GtkWindow and widgets derived from it. container diff --git a/docs/reference/gtk/gtk4-broadwayd.xml b/docs/reference/gtk/gtk4-broadwayd.xml index dfc97905dc..1848040028 100644 --- a/docs/reference/gtk/gtk4-broadwayd.xml +++ b/docs/reference/gtk/gtk4-broadwayd.xml @@ -6,7 +6,7 @@ gtk4-broadwayd - GTK+ + GTK Developer @@ -40,7 +40,7 @@ Description gtk4-broadwayd is a display server for the Broadway -GDK backend. It allows multiple GTK+ applications to display their +GDK backend. It allows multiple GTK applications to display their windows in the same web browser, by connecting to gtk4-broadwayd. diff --git a/docs/reference/gtk/gtk4-builder-tool.xml b/docs/reference/gtk/gtk4-builder-tool.xml index 843b6ae8fb..e9f497599e 100644 --- a/docs/reference/gtk/gtk4-builder-tool.xml +++ b/docs/reference/gtk/gtk4-builder-tool.xml @@ -6,7 +6,7 @@ gtk4-builder-tool - GTK+ + GTK Developer diff --git a/docs/reference/gtk/gtk4-demo-application.xml b/docs/reference/gtk/gtk4-demo-application.xml index 2dc72c5c7a..4b7b51972d 100644 --- a/docs/reference/gtk/gtk4-demo-application.xml +++ b/docs/reference/gtk/gtk4-demo-application.xml @@ -6,7 +6,7 @@ gtk4-demo-application - GTK+ + GTK Developer diff --git a/docs/reference/gtk/gtk4-demo.xml b/docs/reference/gtk/gtk4-demo.xml index 93791ea8a4..396c218bb0 100644 --- a/docs/reference/gtk/gtk4-demo.xml +++ b/docs/reference/gtk/gtk4-demo.xml @@ -6,7 +6,7 @@ gtk4-demo - GTK+ + GTK Developer @@ -24,7 +24,7 @@ gtk4-demo - Demonstrate GTK+ widgets + Demonstrate GTK widgets @@ -40,7 +40,7 @@ Description gtk4-demo is a collection of examples. -Its purpose is to demonstrate many GTK+ widgets in a form +Its purpose is to demonstrate many GTK widgets in a form that is useful to application developers. diff --git a/docs/reference/gtk/gtk4-docs.xml b/docs/reference/gtk/gtk4-docs.xml index a07512291e..902dc96a06 100644 --- a/docs/reference/gtk/gtk4-docs.xml +++ b/docs/reference/gtk/gtk4-docs.xml @@ -8,18 +8,18 @@ ]> - GTK+ 4 Reference Manual + GTK 4 Reference Manual - This document is for the GTK+ 4 library, version &version;. + This document is for the GTK 4 library, version &version;. The latest versions can be found online at https://developer.gnome.org/gtk4/. - If you are looking for the older GTK+ 3 series of libraries, + If you are looking for the older GTK 3 series of libraries, see https://developer.gnome.org/gtk3/. - GTK+ Overview + GTK Overview @@ -29,7 +29,7 @@ - GTK+ Widgets and Objects + GTK Widgets and Objects Object Hierarchy @@ -330,7 +330,7 @@ - GTK+ Core Reference + GTK Core Reference @@ -345,7 +345,7 @@ - Theming in GTK+ + Theming in GTK @@ -356,15 +356,15 @@ - Migrating from Previous Versions of GTK+ + Migrating from Previous Versions of GTK This part describes what you need to change in programs use - older versions of GTK+ so that they can use the new features. + older versions of GTK so that they can use the new features. It also mentions how to convert applications using widgets found in the libgnomeui library to use their counterparts - in GTK+. + in GTK. @@ -373,7 +373,7 @@ - GTK+ Tools + GTK Tools @@ -387,7 +387,7 @@ - GTK+ Platform Support + GTK Platform Support diff --git a/docs/reference/gtk/gtk4-encode-symbolic-svg.xml b/docs/reference/gtk/gtk4-encode-symbolic-svg.xml index 3bf22456d2..230f4af6d7 100644 --- a/docs/reference/gtk/gtk4-encode-symbolic-svg.xml +++ b/docs/reference/gtk/gtk4-encode-symbolic-svg.xml @@ -6,7 +6,7 @@ gtk4-encode-symbolic-svg - GTK+ + GTK Developer @@ -39,7 +39,7 @@ Description gtk4-encode-symbolic-svg converts symbolic svg icons into - specially prepared png files. GTK+ can load and recolor these pngs, just like + specially prepared png files. GTK can load and recolor these pngs, just like original svgs, but loading them is much faster. diff --git a/docs/reference/gtk/gtk4-icon-browser.xml b/docs/reference/gtk/gtk4-icon-browser.xml index 83a8aebe80..ee37d55352 100644 --- a/docs/reference/gtk/gtk4-icon-browser.xml +++ b/docs/reference/gtk/gtk4-icon-browser.xml @@ -6,7 +6,7 @@ gtk4-icon-browser - GTK+ + GTK Developer diff --git a/docs/reference/gtk/gtk4-launch.xml b/docs/reference/gtk/gtk4-launch.xml index 6bfc0a149d..aeb5e8dca1 100644 --- a/docs/reference/gtk/gtk4-launch.xml +++ b/docs/reference/gtk/gtk4-launch.xml @@ -6,7 +6,7 @@ gtk4-launch - GTK+ + GTK Developer diff --git a/docs/reference/gtk/gtk4-query-settings.xml b/docs/reference/gtk/gtk4-query-settings.xml index 1702bcd3fb..881e88180a 100644 --- a/docs/reference/gtk/gtk4-query-settings.xml +++ b/docs/reference/gtk/gtk4-query-settings.xml @@ -6,7 +6,7 @@ gtk4-query-settings - GTK+ + GTK Developer diff --git a/docs/reference/gtk/gtk4-update-icon-cache.xml b/docs/reference/gtk/gtk4-update-icon-cache.xml index 8f6409ed46..430af75a19 100644 --- a/docs/reference/gtk/gtk4-update-icon-cache.xml +++ b/docs/reference/gtk/gtk4-update-icon-cache.xml @@ -6,7 +6,7 @@ gtk4-update-icon-cache - GTK+ + GTK Developer @@ -56,7 +56,7 @@ the icons in the directory tree below the given directory. - GTK+ can use the cache files created by gtk4-update-icon-cache + GTK can use the cache files created by gtk4-update-icon-cache to avoid a lot of system call and disk seek overhead when the application starts. Since the format of the cache files allows them to be mmaped shared between multiple applications, the overall memory consumption is diff --git a/docs/reference/gtk/gtk4-widget-factory.xml b/docs/reference/gtk/gtk4-widget-factory.xml index 00ae8a8a35..c74fd1dffd 100644 --- a/docs/reference/gtk/gtk4-widget-factory.xml +++ b/docs/reference/gtk/gtk4-widget-factory.xml @@ -6,7 +6,7 @@ gtk4-widget-factory - GTK+ + GTK Developer @@ -24,7 +24,7 @@ gtk4-widget-factory - Demonstrate GTK+ widgets + Demonstrate GTK widgets @@ -37,8 +37,8 @@ Description gtk4-widget-factory is a collection of examples. -Its purpose is to demonstrate many GTK+ widgets in a form -that is useful to GTK+ theme developers. +Its purpose is to demonstrate many GTK widgets in a form +that is useful to GTK theme developers. The application shows widgets in different, typical combinations diff --git a/docs/reference/gtk/images/README b/docs/reference/gtk/images/README index 241f2c21ca..6987129511 100644 --- a/docs/reference/gtk/images/README +++ b/docs/reference/gtk/images/README @@ -1,5 +1,5 @@ This directory contains a collection of images of various widgets. -They are created via the shooter command in gtk+/docs/tools/, and are +They are created via the shooter command in gtk/docs/tools/, and are updated semi-regularly. The images are used in both the headers of individual widgets as well as the visual index of widgets. diff --git a/docs/reference/gtk/input-handling.xml b/docs/reference/gtk/input-handling.xml index 5281d35dc8..d3d926e406 100644 --- a/docs/reference/gtk/input-handling.xml +++ b/docs/reference/gtk/input-handling.xml @@ -4,26 +4,26 @@ ]> -The GTK+ Input and Event Handling Model +The GTK Input and Event Handling Model 3 GTK Library -The GTK+ Input and Event Handling Model +The GTK Input and Event Handling Model - GTK+ input and event handling in detail + GTK input and event handling in detail - Overview of GTK+ input and event handling + Overview of GTK input and event handling - This chapter describes in detail how GTK+ handles input. If you are interested + This chapter describes in detail how GTK handles input. If you are interested in what happens to translate a key press or mouse motion of the users into a - change of a GTK+ widget, you should read this chapter. This knowledge will also + change of a GTK widget, you should read this chapter. This knowledge will also be useful if you decide to implement your own widgets. @@ -33,13 +33,13 @@ The most basic input devices that every computer user has interacted with are - keyboards and mice; beyond these, GTK+ supports touchpads, touchscreens and - more exotic input devices such as graphics tablets. Inside GTK+, every such + keyboards and mice; beyond these, GTK supports touchpads, touchscreens and + more exotic input devices such as graphics tablets. Inside GTK, every such input device is represented by a #GdkDevice object. - To simplify dealing with the variability between these input devices, GTK+ + To simplify dealing with the variability between these input devices, GTK has a concept of master and slave devices. The concrete physical devices that have many different characteristics (mice may have 2 or 3 or 8 buttons, keyboards have different layouts and may or may not have a separate number @@ -48,14 +48,14 @@ pointer/keyboard pairs - you can think of such a pair as a 'seat'. - GTK+ widgets generally deal with the master devices, and thus can be used + GTK widgets generally deal with the master devices, and thus can be used with any pointing device or keyboard. When a user interacts with an input device (e.g. moves a mouse or presses - a key on the keyboard), GTK+ receives events from the windowing system. + a key on the keyboard), GTK receives events from the windowing system. These are typically directed at a specific window - for pointer events, the window under the pointer (grabs complicate this), for keyboard events, the window with the keyboard focus. @@ -81,7 +81,7 @@ - When GTK+ is initialized, it sets up an event handler function with + When GTK is initialized, it sets up an event handler function with gdk_event_handler_set(), which receives all of these input events (as well as others, for instance window management related events). @@ -152,7 +152,7 @@ Next, the #GtkWidget::event signal is emitted. - Handling these signals was the primary way to handle input in GTK+ widgets + Handling these signals was the primary way to handle input in GTK widgets before gestures were introduced. The signal is emitted from the target widget up to the top-level, as part of the “bubble” phase. @@ -193,7 +193,7 @@ by granting a “pointer emulating” hint to one of the currently interacting touch sequences, which will be reported on every #GdkEventTouch event from that sequence. By default, if a widget didn't request touch events by setting %GDK_TOUCH_MASK on its - event mask and didn't override #GtkWidget::touch-event, GTK+ will transform these + event mask and didn't override #GtkWidget::touch-event, GTK will transform these “pointer emulating” events into semantically similar #GdkEventButton and #GdkEventMotion events. Depending on %GDK_TOUCH_MASK being in the event mask or not, non-pointer-emulating sequences could still trigger gestures or just get filtered out, regardless of the widget diff --git a/docs/reference/gtk/migrating-2to4.xml b/docs/reference/gtk/migrating-2to4.xml index 12e6814d58..9b071acd44 100644 --- a/docs/reference/gtk/migrating-2to4.xml +++ b/docs/reference/gtk/migrating-2to4.xml @@ -4,11 +4,11 @@ ]> - Migrating from GTK+ 2.x to GTK+ 4 + Migrating from GTK 2.x to GTK 4 - If your application is still using GTK+ 2, you should first convert it to - GTK+ 3, by following the migration guide in the GTK+ 3 + If your application is still using GTK 2, you should first convert it to + GTK 3, by following the migration guide in the GTK 3 documentation, and then follow . diff --git a/docs/reference/gtk/migrating-3to4.xml b/docs/reference/gtk/migrating-3to4.xml index 111f6f6975..b599421d68 100644 --- a/docs/reference/gtk/migrating-3to4.xml +++ b/docs/reference/gtk/migrating-3to4.xml @@ -4,26 +4,26 @@ ]> - Migrating from GTK+ 3.x to GTK+ 4 + Migrating from GTK 3.x to GTK 4 - GTK+ 4 is a major new version of GTK+ that breaks both API and ABI - compared to GTK+ 3.x. Thankfully, most of the changes are not hard + GTK 4 is a major new version of GTK that breaks both API and ABI + compared to GTK 3.x. Thankfully, most of the changes are not hard to adapt to and there are a number of steps that you can take to - prepare your GTK+ 3.x application for the switch to GTK+ 4. After + prepare your GTK 3.x application for the switch to GTK 4. After that, there's a small number of adjustments that you may have to do - when you actually switch your application to build against GTK+ 4. + when you actually switch your application to build against GTK 4.
- Preparation in GTK+ 3.x + Preparation in GTK 3.x The steps outlined in the following sections assume that your - application is working with GTK+ 3.24, which is the final stable - release of GTK+ 3.x. It includes all the necessary APIs and tools - to help you port your application to GTK+ 4. If you are still using - an older version of GTK+ 3.x, you should first get your application + application is working with GTK 3.24, which is the final stable + release of GTK 3.x. It includes all the necessary APIs and tools + to help you port your application to GTK 4. If you are still using + an older version of GTK 3.x, you should first get your application to build and work with the latest minor release in the 3.24 series. @@ -33,7 +33,7 @@ Over the years, a number of functions, and in some cases, entire widgets have been deprecated. These deprecations are clearly spelled out in the API reference, with hints about the recommended replacements. - The API reference for GTK+ 3 also includes an + The API reference for GTK 3 also includes an index of all deprecated symbols. @@ -70,7 +70,7 @@
Do not use widget style properties - Style properties do not exist in GTK+ 4. You should stop using them in + Style properties do not exist in GTK 4. You should stop using them in your custom CSS and in your code.
@@ -78,18 +78,18 @@
Review your window creation flags - GTK+ 4 removes the GDK_WA_CURSOR flag. Instead, just use + GTK 4 removes the GDK_WA_CURSOR flag. Instead, just use gdk_window_set_cursor() to set a cursor on the window after creating it. - GTK+ 4 also removes the GDK_WA_VISUAL flag, and always uses + GTK 4 also removes the GDK_WA_VISUAL flag, and always uses an RGBA visual for windows. To prepare your code for this, use gdk_window_set_visual (gdk_screen_get_rgba_visual ()) after creating your window. - GTK+ 4 also removes the GDK_WA_WMCLASS flag. If you need this + GTK 4 also removes the GDK_WA_WMCLASS flag. If you need this X11-specific functionality, use XSetClassHint() directly.
@@ -97,12 +97,12 @@
Stop using non-RGBA visuals - GTK+ 4 always uses RGBA visuals for its windows; you should make + GTK 4 always uses RGBA visuals for its windows; you should make sure that your code works with that. At the same time, you should stop using GdkVisual APIs, this object - not longer exist in GTK+ 4. Most of its APIs are deprecated already + not longer exist in GTK 4. Most of its APIs are deprecated already and not useful when dealing with RGBA visuals.
@@ -110,7 +110,7 @@
Stop using GtkBox:padding, GtkBox:fill and GtkBox:expand - GTK+4 removes these #GtkBox child properties, so you should not use them. + GTK4 removes these #GtkBox child properties, so you should not use them. You can replace GtkBox:padding using the #GtkWidget:margin properties on your #GtkBox child widgets. @@ -152,7 +152,7 @@
Stop using gdk_pixbuf_get_from_window() and gdk_cairo_set_source_surface() - These functions are not supported in GTK+ 4. Instead, either use backend-specific + These functions are not supported in GTK 4. Instead, either use backend-specific APIs, or render your widgets using gtk_widget_render().
@@ -162,7 +162,7 @@ The functions and properties related to automatically add a GtkImage to a GtkButton, and using a GtkSetting to control its visibility, are - not supported in GTK+ 4. Instead, you can just pack a GtkImage inside + not supported in GTK 4. Instead, you can just pack a GtkImage inside a GtkButton, and control its visibility like you would for any other widget. If you only want to add a named icon to a GtkButton, you can use gtk_button_set_icon_name(). @@ -172,24 +172,24 @@
Stop using GtkWidget event signals - Event controllers and #GtkGestures replace event signals in GTK+ 4. They - have been backported to GTK+ 3.x so you can prepare for this change. + Event controllers and #GtkGestures replace event signals in GTK 4. They + have been backported to GTK 3.x so you can prepare for this change.
Set a proper app_id - In GTK+4 we want the application's #GApplication + In GTK4 we want the application's #GApplication 'application-id' (and therefore the D-Bus name), the desktop file basename and Wayland's xdg-shell app_id to match. In - order to achieve this with GTK+3 call g_set_prgname() with the same + order to achieve this with GTK3 call g_set_prgname() with the same application id you passed to #GtkApplication. Rename your desktop files to match the application id if needed. The call to g_set_prgname() can be removed once you fully migrated - to GTK+4. + to GTK4.
@@ -197,7 +197,7 @@ Stop using GtkBox's pack-type child property In order to improve performance and simplify the widget, GtkBox lost its - 'pack-type' child property. In GTK+4, every GtkBox instance has a simple + 'pack-type' child property. In GTK4, every GtkBox instance has a simple list of child widgets that it allocates from start to end. The old behavior of pack-type=END can be emulated by simply making the box child in the center hexpand and right-align the ones at the end. @@ -212,15 +212,15 @@ This section outlines porting tasks that you need to tackle when you get to the point that you actually build your application against - GTK+ 4. Making it possible to prepare for these in GTK+ 3 would + GTK 4. Making it possible to prepare for these in GTK 3 would have been either impossible or impractical.
Stop using GdkScreen - The GdkScreen object has been removed in GTK+ 4. Most of its APIs already - had replacements in GTK+ 3 and were deprecated, a few remaining replacements + The GdkScreen object has been removed in GTK 4. Most of its APIs already + had replacements in GTK 3 and were deprecated, a few remaining replacements have been added to GdkDisplay.
@@ -238,7 +238,7 @@
Stop using GdkVisual - This object is not useful with current GTK+ drawing APIs and has been removed + This object is not useful with current GTK drawing APIs and has been removed without replacement.
@@ -246,8 +246,8 @@
Stop using GdkDeviceManager - The GdkDeviceManager object has been removed in GTK+ 4. Most of its APIs already - had replacements in GTK+ 3 and were deprecated in favor of GdkSeat. + The GdkDeviceManager object has been removed in GTK 4. Most of its APIs already + had replacements in GTK 3 and were deprecated in favor of GdkSeat.
@@ -275,9 +275,9 @@
Stop accessing GdkEvent fields - Direct access to GdkEvent structs is no longer possible in GTK+ 4. Some - frequently-used fields already had accessors in GTK+ 3, and the remaining - fields have gained accessors in GTK+ 4. + Direct access to GdkEvent structs is no longer possible in GTK 4. Some + frequently-used fields already had accessors in GTK 3, and the remaining + fields have gained accessors in GTK 4.
@@ -328,7 +328,7 @@
Adapt to GtkCssProvider API changes - In GTK+ 4, the various #GtkCssProvider load functions have lost + In GTK 4, the various #GtkCssProvider load functions have lost their #GError argument. If you want to handle CSS loading errors, use the #GtkCssProvider::parsing-error signal instead. @@ -337,7 +337,7 @@
Stop using GtkContainer::border-width - GTK+ 4 has removed the #GtkContainer::border-width property. + GTK 4 has removed the #GtkContainer::border-width property. Use other means to influence the spacing of your containers, such as the CSS margin and padding properties on child widgets. @@ -346,9 +346,9 @@
Adapt to GtkWidget's size request changes - GTK+ 3 used five different virtual functions in GtkWidget to + GTK 3 used five different virtual functions in GtkWidget to implement size requisition, namely the gtk_widget_get_preferred_width() - family of functions. To simplify widget implementations, GTK+4 uses + family of functions. To simplify widget implementations, GTK4 uses only one virtual function, GtkWidgetClass::measure() that widgets have to implement. @@ -366,7 +366,7 @@
Switch to GtkWidget's children APIs - Instead of the GtkContainer subclass, in GTK+ 4, any widget can + Instead of the GtkContainer subclass, in GTK 4, any widget can have children, and there is new API to navigate the widget tree: gtk_widget_get_first_child(), gtk_widget_get_last_child(), gtk_widget_get_next_sibling(), gtk_widget_get_prev_sibling(). @@ -378,7 +378,7 @@
Don't use -gtk-gradient in your CSS - GTK+ now supports standard CSS syntax for both linear and radial + GTK now supports standard CSS syntax for both linear and radial gradients, just use those.
@@ -386,7 +386,7 @@
Don't use -gtk-icon-effect in your CSS - GTK+ now supports a more versatile -gtk-icon-filter instead. Replace + GTK now supports a more versatile -gtk-icon-filter instead. Replace -gtk-icon-effect: dim; with -gtk-icon-filter: opacity(0.5); and -gtk-icon-effect: hilight; with -gtk-icon-filter: brightness(1.2);. @@ -403,8 +403,8 @@
Adapt to drawing model changes - This area has seen the most radical changes in the transition from GTK+ 3 - to GTK+ 4. Widgets no longer use a draw() function to render their contents + This area has seen the most radical changes in the transition from GTK 3 + to GTK 4. Widgets no longer use a draw() function to render their contents to a cairo surface. Instead, they have a snapshot() function that creates one or more GskRenderNodes to represent their content. Third-party widgets that use a draw() function or a #GtkWidget::draw signal handler for custom @@ -434,7 +434,7 @@
Widgets are now visible by default - The default value of #GtkWidget::visible in GTK+ 4 is %TRUE, so you no + The default value of #GtkWidget::visible in GTK 4 is %TRUE, so you no longer need to explicitly show all your widgets. On the flip side, you need to hide widgets that are not meant to be visible from the start. @@ -445,7 +445,7 @@ The function gtk_widget_show_all(), the #GtkWidget::no-show-all property - and its getter and setter have been removed in GTK+ 4, so you should stop using them. + and its getter and setter have been removed in GTK 4, so you should stop using them.
@@ -487,8 +487,8 @@
GtkWidget event signals are removed - Event controllers and #GtkGestures have already been introduced in GTK+ 3 to handle - input for many cases. In GTK+ 4, the traditional widget signals for handling input, + Event controllers and #GtkGestures have already been introduced in GTK 3 to handle + input for many cases. In GTK 4, the traditional widget signals for handling input, such as #GtkWidget::motion-event or #GtkWidget::event have been removed.
@@ -544,7 +544,7 @@
Adapt to icon size API changes - Instead of the existing extensible set of symbolic icon sizes, GTK+ now only + Instead of the existing extensible set of symbolic icon sizes, GTK now only supports normal and large icons with the #GtkIconSize enumeration. The actual sizes can be defined by themes via the CSS property -gtk-icon-size. diff --git a/docs/reference/gtk/osx.sgml b/docs/reference/gtk/osx.sgml index 25be23bb06..306f5fe6f3 100644 --- a/docs/reference/gtk/osx.sgml +++ b/docs/reference/gtk/osx.sgml @@ -4,34 +4,34 @@ ]> -Using GTK+ on Mac OS X +Using GTK on Apple macOS 3 GTK Library -Using GTK+ on Mac OS X +Using GTK on Apple macOS -OS X-specific aspects of using GTK+ +MacOS-specific aspects of using GTK -Using GTK+ on Mac OS X +Using GTK on Apple macOS -The Mac OS X port of GTK+ is an implementation of GDK (and therefore GTK+) -on top of the Quarz API. +The Apple macOS port of GTK is an implementation of GDK (and therefore GTK) +on top of the Quartz API. -Currently, the Mac OS X port does not use any additional commandline options +Currently, the macOS port does not use any additional commandline options or environment variables. For up-to-date information about the current status of this port, see the -project page. +project page. diff --git a/docs/reference/gtk/other_software.sgml b/docs/reference/gtk/other_software.sgml index dde4295e6b..fc10327e5d 100644 --- a/docs/reference/gtk/other_software.sgml +++ b/docs/reference/gtk/other_software.sgml @@ -4,15 +4,15 @@ ]> -Mixing GTK+ with other software +Mixing GTK with other software 3 -Mixing GTK+ with other software +Mixing GTK with other software -Mixing GTK+ with other software +Mixing GTK with other software -How to combine GTK+ with other code and event loops +How to combine GTK with other code and event loops @@ -20,9 +20,9 @@ How to combine GTK+ with other code and event loops Overview -Often people want to use GTK+ in combination with another library or existing -body of code that is not GTK+-aware. The general problem people encounter -is that the control flow of the other code does not return to GTK+, so +Often people want to use GTK in combination with another library or existing +body of code that is not GTK-aware. The general problem people encounter +is that the control flow of the other code does not return to GTK, so widgets do not repaint, mouse and keyboard events are ignored, and so forth. @@ -35,10 +35,10 @@ targetting, and your own familiarity with each approach. -Periodically yield to GTK+ main loop +Periodically yield to GTK main loop -This is the simplest method, but requires you to modify the non-GTK+ code. +This is the simplest method, but requires you to modify the non-GTK code. Say you have a function that does some kind of lengthy task: @@ -99,7 +99,7 @@ lengthy task. -Run the other code as a slave of the GTK+ main loop +Run the other code as a slave of the GTK main loop As a slightly cleaner solution, you can ask the main loop to run a small part of your @@ -190,7 +190,7 @@ your needs. -Integrate the GTK+ main loop with another main loop +Integrate the GTK main loop with another main loop diff --git a/docs/reference/gtk/overview.xml b/docs/reference/gtk/overview.xml index ab84b379f8..5c70182ec9 100644 --- a/docs/reference/gtk/overview.xml +++ b/docs/reference/gtk/overview.xml @@ -4,17 +4,17 @@ ]> -GTK+ is a library for creating graphical user interfaces. It +GTK is a library for creating graphical user interfaces. It works on many UNIX-like platforms, Windows, and OS X. -GTK+ is released under the GNU Library General Public License +GTK is released under the GNU Library General Public License (GNU LGPL), which allows for flexible licensing of client -applications. GTK+ has a C-based object-oriented architecture that +applications. GTK has a C-based object-oriented architecture that allows for maximum flexibility. Bindings for many other languages have been written, including C++, Objective-C, Guile/Scheme, Perl, Python, TOM, Ada95, Free Pascal, and Eiffel. -GTK+ depends on the following libraries: +GTK depends on the following libraries: @@ -64,7 +64,7 @@ other widgets that display text. ATK is the Accessibility Toolkit. It provides a set of generic interfaces allowing accessibility technologies to interact with a graphical user interface. For example, a screen reader uses ATK to -discover the text in an interface and read it to blind users. GTK+ +discover the text in an interface and read it to blind users. GTK widgets have built-in support for accessibility using the ATK framework. @@ -82,16 +82,16 @@ Use a GdkPixbuf in combination with GtkImage to display images. GDK -GDK is the abstraction layer that allows GTK+ to support multiple +GDK is the abstraction layer that allows GTK to support multiple windowing systems. GDK provides window system facilities on X11, Windows, and OS X. -GTK+ +GTK -The GTK+ library itself contains widgets, +The GTK library itself contains widgets, that is, GUI components such as GtkButton or GtkTextView. diff --git a/docs/reference/gtk/question_index.sgml b/docs/reference/gtk/question_index.sgml index 9f8af36241..d22d3ec214 100644 --- a/docs/reference/gtk/question_index.sgml +++ b/docs/reference/gtk/question_index.sgml @@ -12,7 +12,7 @@ Common Questions -Find answers to common questions in the GTK+ manual +Find answers to common questions in the GTK manual @@ -31,13 +31,13 @@ the question you have, this list is a good place to start. -How do I get started with GTK+? +How do I get started with GTK? -The GTK+ website offers some +The GTK website offers some tutorials and other -documentation (most of it about GTK+ 2.x, but mostly still applicable). +documentation (most of it about GTK 2.x, but mostly still applicable). More documentation ranging from whitepapers to online books can be found at the GNOME developer's site. After studying these materials you should be well prepared to come back to @@ -47,7 +47,7 @@ this reference manual for details. -Where can I get help with GTK+, submit a bug report, or make a feature +Where can I get help with GTK, submit a bug report, or make a feature request? @@ -63,7 +63,7 @@ See the documentation on this topic. -How do I port from one GTK+ +How do I port from one GTK version to another? @@ -88,7 +88,7 @@ against the documentation. -How does memory management work in GTK+? Should I free data returned +How does memory management work in GTK? Should I free data returned from functions? @@ -135,7 +135,7 @@ reference counting, not floating reference counting. To get this, you must acquire a reference to the widget and drop the -floating reference (ref and sink in GTK+ parlance) after +floating reference (ref and sink in GTK parlance) after creating it: foo = gtk_foo_new (); @@ -158,7 +158,7 @@ to get rid of the widget. -How do I use GTK+ with threads? +How do I use GTK with threads? @@ -175,7 +175,7 @@ documentation for portable threading primitives. -How do I internationalize a GTK+ program? +How do I internationalize a GTK program? @@ -257,13 +257,13 @@ the following convenience: -How do I use non-ASCII characters in GTK+ programs ? +How do I use non-ASCII characters in GTK programs ? -GTK+ uses Unicode (more exactly +GTK uses Unicode (more exactly UTF-8) for all text. UTF-8 encodes each Unicode codepoint as a sequence of one to six bytes and has a number of nice properties which make it a good choice for working with Unicode text in C programs: @@ -288,7 +288,7 @@ encodings, see g_locale_to_utf8() and g_convert(). Text coming from external sources (e.g. files or user input), has to be -converted to UTF-8 before being handed over to GTK+. The following example +converted to UTF-8 before being handed over to GTK. The following example writes the content of a IS0-8859-1 encoded text file to stdout: @@ -368,24 +368,24 @@ returned in UTF-8 encoding. -How do I use GTK+ with C++? +How do I use GTK with C++? -There are two ways to approach this. The GTK+ header files use the subset -of C that's also valid C++, so you can simply use the normal GTK+ API +There are two ways to approach this. The GTK header files use the subset +of C that's also valid C++, so you can simply use the normal GTK API in a C++ program. Alternatively, you can use a "C++ binding" such as gtkmm which provides a native C++ API. -When using GTK+ directly, keep in mind that only functions can be +When using GTK directly, keep in mind that only functions can be connected to signals, not methods. So you will need to use global functions or "static" class functions for signal connections. -Another common issue when using GTK+ directly is that +Another common issue when using GTK directly is that C++ will not implicitly convert an integer to an enumeration. This comes up when using bitfields; in C you can write the following code: @@ -410,7 +410,7 @@ There are very few functions that require this cast, however. -How do I use GTK+ with other non-C languages? +How do I use GTK with other non-C languages? @@ -620,7 +620,7 @@ single-line text entry, see #GtkEntry. -#GtkImage can display images in just about any format GTK+ understands. +#GtkImage can display images in just about any format GTK understands. You can also use #GtkDrawingArea if you need to do something more complex, such as draw text or graphics over the top of the image. @@ -635,7 +635,7 @@ would use a combo box? -With GTK+, a #GtkComboBox is the recommended widget to use for this use case. +With GTK, a #GtkComboBox is the recommended widget to use for this use case. This widget looks like either a combo box or the current option menu, depending on the current theme. If you need an editable text entry, use the #GtkComboBox:has-entry property. @@ -707,7 +707,7 @@ How do I disable/ghost/desensitize a widget? -In GTK+ a disabled widget is termed "insensitive." +In GTK a disabled widget is termed "insensitive." See gtk_widget_set_sensitive(). @@ -931,11 +931,11 @@ See gtk_tree_view_set_expander_column() and gtk_tree_view_column_set_visible(). -Using cairo with GTK+ +Using cairo with GTK -How do I use cairo to draw in GTK+ applications ? +How do I use cairo to draw in GTK applications ? @@ -943,7 +943,7 @@ The #GtkWidget::draw signal gets a ready-to-use cairo context as parameter that you should use. -All drawing in GTK+ is normally done in a draw handler, and GTK+ +All drawing in GTK is normally done in a draw handler, and GTK creates a temporary pixmap for double-buffering the drawing. It is possible to turn off double-buffering, with gtk_widget_set_double_buffered(), but this is not ideal, @@ -961,7 +961,7 @@ Glitz or GL backend of cairo ? No. The GDK X11 backend uses the cairo X backend (and the other GDK backends use their respective native cairo backends). The -GTK+ developers believe that the best way to improving the GDK +GTK developers believe that the best way to improving the GDK drawing performance is to optimize the cairo X backend and the relevant code paths in the X server that is uses (mostly the Render extension). diff --git a/docs/reference/gtk/resources.sgml b/docs/reference/gtk/resources.sgml index 9a129a7994..f935011f27 100644 --- a/docs/reference/gtk/resources.sgml +++ b/docs/reference/gtk/resources.sgml @@ -12,7 +12,7 @@ Mailing lists and bug reports -Getting help with GTK+ +Getting help with GTK @@ -20,7 +20,7 @@ Getting help with GTK+ Opening a bug or feature request -If you encounter a bug, misfeature, or missing feature in GTK+, please +If you encounter a bug, misfeature, or missing feature in GTK, please file a bug report on our GitLab project. You should also file issues if the documentation is out of date with the @@ -36,27 +36,27 @@ discussed, we'll add a note to that effect in the report. The bug tracker should definitely be used for feature requests, it's -not only for bugs. We track all GTK+ development in GitLab, to ensure +not only for bugs. We track all GTK development in GitLab, to ensure that nothing gets lost. -Working on GTK+ +Working on GTK -If you develop a bugfix or enhancement for GTK+, please open a merge +If you develop a bugfix or enhancement for GTK, please open a merge request in GitLab as well. You should not attach patches to an issue, or describe the fix as a comment. Merge requests allow us to build -GTK+ with your code applied, and run the test suite, on multiple platforms +GTK with your code applied, and run the test suite, on multiple platforms and architectures, and verify that nothing breaks. They also allow us to do proper code reviews, so we can iterate over the changes. You should follow the contribution guide -for GTK+, available on GitLab. +for GTK, available on GitLab. @@ -72,8 +72,8 @@ get lost, or forgotten. Always open a merge request. Mailing lists -There are several mailing lists dedicated to GTK+ and related -libraries. Discussion of GLib, Pango, and ATK in addition to GTK+ +There are several mailing lists dedicated to GTK and related +libraries. Discussion of GLib, Pango, and ATK in addition to GTK proper is welcome on these lists. You can subscribe or view the archives of these lists on http://mail.gnome.org. @@ -88,28 +88,28 @@ some days to happen. gtk-list@gnome.org -gtk-list covers general GTK+ topics; questions about using GTK+ in programs, -GTK+ from a user standpoint, announcements of GTK+-related projects -such as themes or GTK+ modules would all be on-topic. The bulk of the -traffic consists of GTK+ programming questions. +gtk-list covers general GTK topics; questions about using GTK in programs, +GTK from a user standpoint, announcements of GTK-related projects +such as themes or GTK modules would all be on-topic. The bulk of the +traffic consists of GTK programming questions. gtk-app-devel-list@gnome.org -gtk-app-devel-list covers writing applications in GTK+. It's narrower +gtk-app-devel-list covers writing applications in GTK. It's narrower in scope than gtk-list, but the two lists overlap quite a -bit. gtk-app-devel-list is a good place to ask questions about GTK+ +bit. gtk-app-devel-list is a good place to ask questions about GTK programming. gtk-devel-list@gnome.org -gtk-devel-list is for discussion of work on GTK+ itself, it is +gtk-devel-list is for discussion of work on GTK itself, it is not for -asking questions about how to use GTK+ in applications. gtk-devel-list +asking questions about how to use GTK in applications. gtk-devel-list is appropriate for discussion of patches, bugs, proposed features, and so on. @@ -118,7 +118,7 @@ and so on. gtk-i18n-list@gnome.org -gtk-i18n-list is for discussion of internationalization in GTK+; +gtk-i18n-list is for discussion of internationalization in GTK; Pango is the main focus of the list. Questions about the details of using Pango, and discussion of proposed Pango patches or features, are all on topic. @@ -129,7 +129,7 @@ all on topic. gtk-doc-list@gnome.org gtk-doc-list is for discussion of the gtk-doc -documentation system (used to document GTK+), and for work on the GTK+ +documentation system (used to document GTK), and for work on the GTK documentation. diff --git a/docs/reference/gtk/running.sgml b/docs/reference/gtk/running.sgml index 08a925dab1..ae17857ce5 100644 --- a/docs/reference/gtk/running.sgml +++ b/docs/reference/gtk/running.sgml @@ -4,26 +4,26 @@ ]> -Running GTK+ Applications +Running GTK Applications 3 GTK Library -Running GTK+ Applications +Running GTK Applications -How to run and debug your GTK+ application +How to run and debug your GTK application -Running and debugging GTK+ Applications +Running and debugging GTK Applications Environment variables -GTK+ inspects a number of environment variables in addition to standard +GTK inspects a number of environment variables in addition to standard variables like LANG, PATH, HOME or DISPLAY; mostly to determine paths to look for certain files. The X11, @@ -36,8 +36,8 @@ additional environment variables. <envar>GTK_DEBUG</envar> - Unless GTK+ has been configured with , - this variable can be set to a list of debug options, which cause GTK+ + Unless GTK has been configured with , + this variable can be set to a list of debug options, which cause GTK to print out different types of debugging information. @@ -126,45 +126,45 @@ additional environment variables. <envar>GTK_PATH</envar> - Specifies a list of directories to search when GTK+ is looking for + Specifies a list of directories to search when GTK is looking for dynamically loaded objects such as input method modules and print backends. If the path to the dynamically loaded object is given as an absolute path name, - then GTK+ loads it directly. - Otherwise, GTK+ goes in turn through the directories in GTK_PATH, + then GTK loads it directly. + Otherwise, GTK goes in turn through the directories in GTK_PATH, followed by the directory .gtk-4.0 in the user's home directory, followed by the system default directory, which is libdir/gtk-4.0/modules. (If GTK_EXE_PREFIX is defined, libdir is $GTK_EXE_PREFIX/lib. Otherwise it is the libdir - specified when GTK+ was configured, usually + specified when GTK was configured, usually /usr/lib, or /usr/local/lib.) - For each directory in this list, GTK+ actually looks in a + For each directory in this list, GTK actually looks in a subdirectory directory/version/host/type Where version is derived from the - version of GTK+ (use pkg-config - --variable=gtk_binary_version gtk+-3.0 to determine this from a + version of GTK (use pkg-config + --variable=gtk_binary_version gtk4 to determine this from a script), host is the architecture on - which GTK+ was built. (use pkg-config - --variable=gtk_host gtk+-3.0 to determine this from a + which GTK was built. (use pkg-config + --variable=gtk_host gtk4 to determine this from a script), and type is a directory specific to the type of modules; currently it can be modules, engines, immodules, filesystems or printbackends, corresponding to the types of modules mentioned above. Either version, - host, or both may be omitted. GTK+ looks + host, or both may be omitted. GTK looks first in the most specific directory, then in directories with fewer components. The components of GTK_PATH are separated by the ':' character on Linux and Unix, and the ';' character on Windows. - Note that this environment variable is read by GTK+ 2.x and GTK+ 3.x too, + Note that this environment variable is read by GTK 2.x and GTK 3.x too, which makes it unsuitable for setting it system-wide (or session-wide), - since doing so will cause applications using different GTK+ versions + since doing so will cause applications using different GTK versions to see incompatible modules. @@ -179,7 +179,7 @@ additional environment variables. Gtk/IMModule, that will be used for the default IM module. This also can be a colon-separated list of input-methods, which - GTK+ will try in turn until it finds one available on the system. + GTK will try in turn until it finds one available on the system. @@ -187,8 +187,8 @@ additional environment variables. <envar>GTK_EXE_PREFIX</envar> - If set, GTK+ uses $GTK_EXE_PREFIX/lib instead of - the libdir configured when GTK+ was compiled. + If set, GTK uses $GTK_EXE_PREFIX/lib instead of + the libdir configured when GTK was compiled. @@ -196,8 +196,8 @@ additional environment variables. <envar>GTK_DATA_PREFIX</envar> - If set, makes GTK+ use $GTK_DATA_PREFIX - instead of the prefix configured when GTK+ was compiled. + If set, makes GTK use $GTK_DATA_PREFIX + instead of the prefix configured when GTK was compiled. @@ -205,7 +205,7 @@ additional environment variables. <envar>GTK_THEME</envar> - If set, makes GTK+ use the named theme instead of the theme + If set, makes GTK use the named theme instead of the theme that is specified by the gtk-theme-name setting. This is intended mainly for easy debugging of theme issues. @@ -217,7 +217,7 @@ additional environment variables. The following environment variables are used by GdkPixbuf, GDK or -Pango, not by GTK+ itself, but we list them here for completeness +Pango, not by GTK itself, but we list them here for completeness nevertheless. @@ -229,7 +229,7 @@ nevertheless. This environment variable overrides the default value libdir/gtk-4.0/4.0.0/loaders.cache (libdir is the sysconfdir specified when - GTK+ was configured, usually /usr/local/lib.) + GTK was configured, usually /usr/local/lib.) The loaders.cache file is generated by the @@ -241,7 +241,7 @@ nevertheless. <envar>GDK_DEBUG</envar> - If GTK+ has been configured with , + If GTK has been configured with , this variable can be set to a list of debug options, which cause GDK to print out different types of debugging information. @@ -331,7 +331,7 @@ nevertheless. <envar>GSK_DEBUG</envar> - If GTK+ has been configured with , + If GTK has been configured with , this variable can be set to a list of debug options, which cause GSK to print out different types of debugging information. @@ -406,7 +406,7 @@ nevertheless. If set, selects the GDK backend to use. Selecting a backend requires that - GTK+ is compiled with support for that backend. The following backends can + GTK is compiled with support for that backend. The following backends can be selected, provided they are included in the GDK libraries you are using: @@ -498,7 +498,7 @@ nevertheless. The default value of this environment variable is 1. If changed to 0, this - disables the default use of client-side decorations on GTK+ windows, thus + disables the default use of client-side decorations on GTK windows, thus making the window manager responsible for drawing the decorations of windows that do not have a custom titlebar widget. @@ -512,7 +512,7 @@ nevertheless. <envar>XDG_DATA_HOME</envar>, <envar>XDG_DATA_DIRS</envar> - GTK+ uses these environment variables to locate icon themes + GTK uses these environment variables to locate icon themes and MIME information. For more information, see Icon Theme Specification, the Shared MIME-info Database @@ -524,9 +524,9 @@ nevertheless. <envar>DESKTOP_STARTUP_ID</envar> - GTK+ uses this environment variable to provide startup notification + GTK uses this environment variable to provide startup notification according to the Startup Notification Spec. - Following the specification, GTK+ unsets this variable after reading + Following the specification, GTK unsets this variable after reading it (to keep it from leaking to child processes). So, if you need its value for your own purposes, you have to read it before calling gtk_init(). @@ -541,20 +541,20 @@ nevertheless. - GTK+ includes an interactive debugger, called the GTK+ Inspector, which - lets you explore the widget tree of any GTK+ application at runtime, as + GTK includes an interactive debugger, called the GTK Inspector, which + lets you explore the widget tree of any GTK application at runtime, as well as tweak the theme and trigger visual debugging aids. You can easily try out changes at runtime before putting them into the code. - Note that the GTK+ inspector can only show GTK+ internals. It can not - understand the application-specific logic of a GTK+ application. Also, - the fact that the GTK+ inspector is running in the application process + Note that the GTK inspector can only show GTK internals. It can not + understand the application-specific logic of a GTK application. Also, + the fact that the GTK inspector is running in the application process limits what it can do. It is meant as a complement to full-blown debuggers and system tracing facilities such as DTrace, not as a replacement. - To enable the GTK+ inspector, you can use the Control-Shift-I or + To enable the GTK inspector, you can use the Control-Shift-I or Control-Shift-D keyboard shortcuts, or set the GTK_DEBUG=interactive environment variable. @@ -567,7 +567,7 @@ nevertheless. In some situations, it may be inappropriate to give users access to the - GTK+ inspector. The keyboard shortcuts can be disabled with the + GTK inspector. The keyboard shortcuts can be disabled with the `enable-inspector-keybinding` key in the `org.gtk.Settings.Debug` GSettings schema. diff --git a/docs/reference/gtk/text_widget.sgml b/docs/reference/gtk/text_widget.sgml index 884758db09..06caf7386f 100644 --- a/docs/reference/gtk/text_widget.sgml +++ b/docs/reference/gtk/text_widget.sgml @@ -18,14 +18,14 @@ Conceptual Overview -GTK+ has an extremely powerful framework for multiline text editing. The +GTK has an extremely powerful framework for multiline text editing. The primary objects involved in the process are #GtkTextBuffer, which represents the text being edited, and #GtkTextView, a widget which can display a #GtkTextBuffer. Each buffer can be displayed by any number of views. -One of the important things to remember about text in GTK+ is that it's in the +One of the important things to remember about text in GTK is that it's in the UTF-8 encoding. This means that one character can be encoded as multiple bytes. Character counts are usually referred to as offsets, while byte counts are called @@ -197,7 +197,7 @@ foreground color — use CSS to override their default values. The gtk-demo application that comes with -GTK+ contains more example code for #GtkTextView. +GTK contains more example code for #GtkTextView. diff --git a/docs/reference/gtk/tree_widget.sgml b/docs/reference/gtk/tree_widget.sgml index aa661b4412..1789b42bd3 100644 --- a/docs/reference/gtk/tree_widget.sgml +++ b/docs/reference/gtk/tree_widget.sgml @@ -17,7 +17,7 @@ Overview - To create a tree or list in GTK+, use the #GtkTreeModel interface in + To create a tree or list in GTK, use the #GtkTreeModel interface in conjunction with the #GtkTreeView widget. This widget is designed around a Model/View/Controller design and consists of four major parts: @@ -46,7 +46,7 @@ Creating a model - GTK+ provides two simple models that can be used: the #GtkListStore + GTK provides two simple models that can be used: the #GtkListStore and the #GtkTreeStore. GtkListStore is used to model list widgets, while the GtkTreeStore models trees. It is possible to develop a new type of model, but the existing models should be satisfactory for all @@ -164,7 +164,7 @@ tree = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); Cell renderers are used to draw the data in the tree model in a - way. There are a number of cell renderers that come with GTK+, + way. There are a number of cell renderers that come with GTK, including the #GtkCellRendererText, #GtkCellRendererPixbuf and the #GtkCellRendererToggle. It is relatively easy to write a custom renderer. diff --git a/docs/reference/gtk/wayland.xml b/docs/reference/gtk/wayland.xml index c3ddf15363..caa6d1c4ff 100644 --- a/docs/reference/gtk/wayland.xml +++ b/docs/reference/gtk/wayland.xml @@ -4,23 +4,23 @@ ]> -Using GTK+ with Wayland +Using GTK with Wayland 3 GTK Library -Using GTK+ with Wayland +Using GTK with Wayland -Wayland-specific aspects of using GTK+ +Wayland-specific aspects of using GTK -Using GTK+ with Wayland +Using GTK with Wayland -The GDK Wayland backend provides support for running GTK+ applications +The GDK Wayland backend provides support for running GTK applications under the Wayland display server. To run your application in this way, select the Wayland backend by setting GDK_BACKEND=wayland. diff --git a/docs/reference/gtk/windows.sgml b/docs/reference/gtk/windows.sgml index e00bdbbe74..b936dbc2da 100644 --- a/docs/reference/gtk/windows.sgml +++ b/docs/reference/gtk/windows.sgml @@ -4,24 +4,24 @@ ]> -Using GTK+ on Windows +Using GTK on Windows 3 GTK Library -Using GTK+ on Windows +Using GTK on Windows -Windows-specific aspects of using GTK+ +Windows-specific aspects of using GTK -Using GTK+ on Windows +Using GTK on Windows -The Windows port of GTK+ is an implementation of GDK (and therefore GTK+) -on top of the Win32 API. When compiling GTK+ on Windows, this backend is +The Windows port of GTK is an implementation of GDK (and therefore GTK) +on top of the Win32 API. When compiling GTK on Windows, this backend is the default. @@ -82,7 +82,7 @@ additional environment variables. <envar>GDK_IGNORE_WINTAB</envar> -If this variable is set, GTK+ doesn't use +If this variable is set, GTK doesn't use the Wintab API for tablet support. @@ -91,7 +91,7 @@ the Wintab API for tablet support. <envar>GDK_USE_WINTAB</envar> -If this variable is set, GTK+ uses the Wintab API for +If this variable is set, GTK uses the Wintab API for tablet support. This is the default. @@ -120,7 +120,7 @@ When any other cursor theme is used, GTK will prefer cursors from that theme, falling back to Windows cursors and built-in X cursors. -Theme can be changed by setting gtk-cursor-theme-name GTK+ setting. Users can override GTK+ settings in the settings.ini file or at runtime in the GTK+ Inspector. +Theme can be changed by setting gtk-cursor-theme-name GTK setting. Users can override GTK settings in the settings.ini file or at runtime in the GTK Inspector. Themes are loaded from normal Windows variants of the XDG locations: @@ -135,9 +135,9 @@ The gtk-cursor-theme-size setting is ignored, GTK will use th -More information about GTK+ on Windows, including detailed build +More information about GTK on Windows, including detailed build instructions, binary downloads, etc, can be found -online. +online. diff --git a/docs/reference/gtk/x11.sgml b/docs/reference/gtk/x11.sgml index b986683a95..8af4dfdecc 100644 --- a/docs/reference/gtk/x11.sgml +++ b/docs/reference/gtk/x11.sgml @@ -4,23 +4,23 @@ ]> -Using GTK+ on the X Window System +Using GTK on the X Window System 3 GTK Library -Using GTK+ on the X Window System +Using GTK on the X Window System -X11-specific aspects of using GTK+ +X11-specific aspects of using GTK -GTK+ for the X Window System +GTK for the X Window System -On UNIX, the X backend is the default build for GTK+. +On UNIX, the X backend is the default build for GTK. So you don't need to do anything special when compiling it, and everything should "just work." @@ -145,7 +145,7 @@ url="http://www.freedesktop.org/standards/">convention. -GTK+ has functions for asking the window manager to do various things; +GTK has functions for asking the window manager to do various things; see for example gtk_window_iconify() or gtk_window_maximize() or Date: Tue, 5 Feb 2019 10:19:57 +0100 Subject: [PATCH 2/8] 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 ++-- .../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 @@ 800 600 - GTK+ Demo + GTK Demo 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 @@ org.gtk.Demo.desktop CC0-1.0 LGPL-2.0+ - GTK+ Demo - Program to demonstrate GTK+ functions + GTK Demo + Program to demonstrate GTK functions

- 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.

@@ -30,4 +30,4 @@ gtk-4.0 matthias.clasen_at_gmail.com Matthias Clasen and others - \ No newline at end of file + 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 #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 @@ org.gtk.WidgetFactory.desktop CC0-1.0 LGPL-2.0+ - GTK+ Widget Factory - Program to demonstrate GTK+ functions + GTK Widget Factory + Program to demonstrate GTK functions

- 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.

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: "); - 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. - GTK+ Widget Factory + GTK Widget Factory 1 From 803ae6a62f894560945f1c1cc7fe3505ca2387b8 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 5 Feb 2019 10:27:57 +0100 Subject: [PATCH 3/8] examples: Rename the pkg-config file for GTK 4 We dropped the '+' and the major.minor version from the pkg-config file name. --- examples/README | 4 ++-- examples/application1/Makefile.example | 4 ++-- examples/application10/Makefile.example | 4 ++-- examples/application2/Makefile.example | 4 ++-- examples/application3/Makefile.example | 4 ++-- examples/application4/Makefile.example | 4 ++-- examples/application5/Makefile.example | 4 ++-- examples/application6/Makefile.example | 4 ++-- examples/application7/Makefile.example | 4 ++-- examples/application8/Makefile.example | 4 ++-- examples/application9/Makefile.example | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/examples/README b/examples/README index a12c126043..ab70ec382c 100644 --- a/examples/README +++ b/examples/README @@ -2,10 +2,10 @@ == Building the examples == -The examples in this directory are built alongside the rest of GTK+. +The examples in this directory are built alongside the rest of GTK. The examples under the `application[1-10]` directories are also included in -the GTK+ API reference documentation, and can be built independently, using +the GTK API reference documentation, and can be built independently, using the system libraries, by doing: $ cd application1 diff --git a/examples/application1/Makefile.example b/examples/application1/Makefile.example index 52746a0945..e978edd351 100644 --- a/examples/application1/Makefile.example +++ b/examples/application1/Makefile.example @@ -1,7 +1,7 @@ CC ?= gcc PKGCONFIG = $(shell which pkg-config) -CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk4) +LIBS = $(shell $(PKGCONFIG) --libs gtk4) SRC = main.c exampleapp.c exampleappwin.c diff --git a/examples/application10/Makefile.example b/examples/application10/Makefile.example index 03ddb9a874..4c8396568f 100644 --- a/examples/application10/Makefile.example +++ b/examples/application10/Makefile.example @@ -1,7 +1,7 @@ CC ?= gcc PKGCONFIG = $(shell which pkg-config) -CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk4) +LIBS = $(shell $(PKGCONFIG) --libs gtk4) GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0) GLIB_COMPILE_SCHEMAS = $(shell $(PKGCONFIG) --variable=glib_compile_schemas gio-2.0) diff --git a/examples/application2/Makefile.example b/examples/application2/Makefile.example index c0eb251560..5b81fedf07 100644 --- a/examples/application2/Makefile.example +++ b/examples/application2/Makefile.example @@ -1,7 +1,7 @@ CC ?= gcc PKGCONFIG = $(shell which pkg-config) -CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk4) +LIBS = $(shell $(PKGCONFIG) --libs gtk4) GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0) SRC = exampleapp.c exampleappwin.c main.c diff --git a/examples/application3/Makefile.example b/examples/application3/Makefile.example index c0eb251560..5b81fedf07 100644 --- a/examples/application3/Makefile.example +++ b/examples/application3/Makefile.example @@ -1,7 +1,7 @@ CC ?= gcc PKGCONFIG = $(shell which pkg-config) -CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk4) +LIBS = $(shell $(PKGCONFIG) --libs gtk4) GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0) SRC = exampleapp.c exampleappwin.c main.c diff --git a/examples/application4/Makefile.example b/examples/application4/Makefile.example index 2714a1decb..97af3fca29 100644 --- a/examples/application4/Makefile.example +++ b/examples/application4/Makefile.example @@ -1,7 +1,7 @@ CC ?= gcc PKGCONFIG = $(shell which pkg-config) -CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk4) +LIBS = $(shell $(PKGCONFIG) --libs gtk4) GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0) SRC = exampleapp.c exampleappwin.c main.c diff --git a/examples/application5/Makefile.example b/examples/application5/Makefile.example index b86eef3378..ac7ae85bd3 100644 --- a/examples/application5/Makefile.example +++ b/examples/application5/Makefile.example @@ -1,7 +1,7 @@ CC ?= gcc PKGCONFIG = $(shell which pkg-config) -CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk4) +LIBS = $(shell $(PKGCONFIG) --libs gtk4) GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0) GLIB_COMPILE_SCHEMAS = $(shell $(PKGCONFIG) --variable=glib_compile_schemas gio-2.0) diff --git a/examples/application6/Makefile.example b/examples/application6/Makefile.example index 7c8762ec29..0a8a3db355 100644 --- a/examples/application6/Makefile.example +++ b/examples/application6/Makefile.example @@ -1,7 +1,7 @@ CC ?= gcc PKGCONFIG = $(shell which pkg-config) -CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk4) +LIBS = $(shell $(PKGCONFIG) --libs gtk4) GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0) GLIB_COMPILE_SCHEMAS = $(shell $(PKGCONFIG) --variable=glib_compile_schemas gio-2.0) diff --git a/examples/application7/Makefile.example b/examples/application7/Makefile.example index 03ddb9a874..4c8396568f 100644 --- a/examples/application7/Makefile.example +++ b/examples/application7/Makefile.example @@ -1,7 +1,7 @@ CC ?= gcc PKGCONFIG = $(shell which pkg-config) -CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk4) +LIBS = $(shell $(PKGCONFIG) --libs gtk4) GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0) GLIB_COMPILE_SCHEMAS = $(shell $(PKGCONFIG) --variable=glib_compile_schemas gio-2.0) diff --git a/examples/application8/Makefile.example b/examples/application8/Makefile.example index 03ddb9a874..4c8396568f 100644 --- a/examples/application8/Makefile.example +++ b/examples/application8/Makefile.example @@ -1,7 +1,7 @@ CC ?= gcc PKGCONFIG = $(shell which pkg-config) -CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk4) +LIBS = $(shell $(PKGCONFIG) --libs gtk4) GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0) GLIB_COMPILE_SCHEMAS = $(shell $(PKGCONFIG) --variable=glib_compile_schemas gio-2.0) diff --git a/examples/application9/Makefile.example b/examples/application9/Makefile.example index 03ddb9a874..4c8396568f 100644 --- a/examples/application9/Makefile.example +++ b/examples/application9/Makefile.example @@ -1,7 +1,7 @@ CC ?= gcc PKGCONFIG = $(shell which pkg-config) -CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0) -LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0) +CFLAGS = $(shell $(PKGCONFIG) --cflags gtk4) +LIBS = $(shell $(PKGCONFIG) --libs gtk4) GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0) GLIB_COMPILE_SCHEMAS = $(shell $(PKGCONFIG) --variable=glib_compile_schemas gio-2.0) From 1b6734346c524b4421ecd8ee5778e00210e04ffa Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 5 Feb 2019 10:30:33 +0100 Subject: [PATCH 4/8] modules: Drop the plus Use 'GTK' consistently. --- modules/printbackends/gtkprintbackendcups.c | 16 ++++++++-------- modules/printbackends/meson.build | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/printbackends/gtkprintbackendcups.c b/modules/printbackends/gtkprintbackendcups.c index f530c0506e..e9f7470ac0 100644 --- a/modules/printbackends/gtkprintbackendcups.c +++ b/modules/printbackends/gtkprintbackendcups.c @@ -1636,7 +1636,7 @@ cups_request_execute (GtkPrintBackendCups *print_backend, dispatch = (GtkPrintCupsDispatchWatch *) g_source_new (&_cups_dispatch_watch_funcs, sizeof (GtkPrintCupsDispatchWatch)); - g_source_set_name (&dispatch->source, "GTK+ CUPS backend"); + g_source_set_name (&dispatch->source, "GTK CUPS backend"); GTK_NOTE (PRINTING, g_print ("CUPS Backend: %s - Executing cups request on server '%s' and resource '%s'\n", G_STRFUNC, dispatch, request->server, request->resource)); @@ -1766,7 +1766,7 @@ cups_request_job_info_cb (GtkPrintBackendCups *print_backend, timeout = 1000; id = g_timeout_add (timeout, cups_job_info_poll_timeout, data); - g_source_set_name_by_id (id, "[gtk+] cups_job_info_poll_timeout"); + g_source_set_name_by_id (id, "[gtk] cups_job_info_poll_timeout"); } else cups_job_poll_data_free (data); @@ -3685,7 +3685,7 @@ cups_request_printer_list (GtkPrintBackendCups *cups_backend) if (cups_backend->list_printers_poll > 0) g_source_remove (cups_backend->list_printers_poll); cups_backend->list_printers_poll = g_timeout_add (200, (GSourceFunc) cups_request_printer_list, cups_backend); - g_source_set_name_by_id (cups_backend->list_printers_poll, "[gtk+] cups_request_printer_list"); + g_source_set_name_by_id (cups_backend->list_printers_poll, "[gtk] cups_request_printer_list"); } else if (cups_backend->list_printers_attempts != -1) cups_backend->list_printers_attempts++; @@ -3734,7 +3734,7 @@ cups_get_printer_list (GtkPrintBackend *backend) if (cups_request_printer_list (cups_backend)) { cups_backend->list_printers_poll = g_timeout_add (50, (GSourceFunc) cups_request_printer_list, backend); - g_source_set_name_by_id (cups_backend->list_printers_poll, "[gtk+] cups_request_printer_list"); + g_source_set_name_by_id (cups_backend->list_printers_poll, "[gtk] cups_request_printer_list"); } #ifdef HAVE_CUPS_API_1_6 @@ -3868,7 +3868,7 @@ cups_request_ppd (GtkPrinter *printer) if (cups_printer->get_remote_ppd_poll > 0) g_source_remove (cups_printer->get_remote_ppd_poll); cups_printer->get_remote_ppd_poll = g_timeout_add (200, (GSourceFunc) cups_request_ppd, printer); - g_source_set_name_by_id (cups_printer->get_remote_ppd_poll, "[gtk+] cups_request_ppd"); + g_source_set_name_by_id (cups_printer->get_remote_ppd_poll, "[gtk] cups_request_ppd"); } else if (cups_printer->get_remote_ppd_attempts != -1) cups_printer->get_remote_ppd_attempts++; @@ -4132,7 +4132,7 @@ cups_get_default_printer (GtkPrintBackendCups *backend) if (cups_request_default_printer (cups_backend)) { cups_backend->default_printer_poll = g_timeout_add (200, (GSourceFunc) cups_request_default_printer, backend); - g_source_set_name_by_id (cups_backend->default_printer_poll, "[gtk+] cups_request_default_printer"); + g_source_set_name_by_id (cups_backend->default_printer_poll, "[gtk] cups_request_default_printer"); } } } @@ -4268,7 +4268,7 @@ cups_printer_request_details (GtkPrinter *printer) if (cups_request_ppd (printer)) { cups_printer->get_remote_ppd_poll = g_timeout_add (50, (GSourceFunc) cups_request_ppd, printer); - g_source_set_name_by_id (cups_printer->get_remote_ppd_poll, "[gtk+] cups_request_ppd"); + g_source_set_name_by_id (cups_printer->get_remote_ppd_poll, "[gtk] cups_request_ppd"); } } } @@ -5173,7 +5173,7 @@ colord_printer_option_set_changed_cb (GtkPrinterOptionSet *set, #endif /* - * Lookup translation and Gtk+ name of given IPP option name. + * Lookup translation and GTK name of given IPP option name. */ static gboolean get_ipp_option_translation (const gchar *ipp_option_name, diff --git a/modules/printbackends/meson.build b/modules/printbackends/meson.build index 338bf6a602..0e26d829f9 100644 --- a/modules/printbackends/meson.build +++ b/modules/printbackends/meson.build @@ -14,7 +14,7 @@ endif # The 'file' print backend cannot be disabled print_backends = ['file'] -# Checks to see if we should compile with CUPS backend for GTK+ +# Checks to see if we should compile with CUPS backend for GTK enable_cups = enabled_print_backends.contains('cups') if enable_cups #cups_config = find_program('cups-config', required : true) @@ -49,7 +49,7 @@ if enable_cups endif endif -# Checks to see if we should compile with cloudprint backend for GTK+ +# Checks to see if we should compile with cloudprint backend for GTK enable_cloudprint = enabled_print_backends.contains('cloudprint') if enable_cloudprint rest_dep = dependency('rest-0.7', required : true) From 4569bc63587316ee4cb4972a943a0720a5cbf74e Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 5 Feb 2019 11:25:15 +0100 Subject: [PATCH 5/8] inspector: Drop the "plus" From user-visible strings, mostly. --- gtk/inspector/css-editor.c | 2 +- gtk/inspector/general.ui | 2 +- gtk/inspector/general.ui.h | 2 +- gtk/inspector/visual.ui | 2 +- gtk/inspector/visual.ui.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gtk/inspector/css-editor.c b/gtk/inspector/css-editor.c index 4ec4e71cf9..198ff351cb 100644 --- a/gtk/inspector/css-editor.c +++ b/gtk/inspector/css-editor.c @@ -109,7 +109,7 @@ set_initial_text (GtkInspectorCssEditor *ce) { gchar *initial_text; initial_text = g_strconcat ("/*\n", - _("You can type here any CSS rule recognized by GTK+."), "\n", + _("You can type here any CSS rule recognized by GTK."), "\n", _("You can temporarily disable this custom CSS by clicking on the “Pause” button above."), "\n\n", _("Changes are applied instantly and globally, for the whole application."), "\n", "*/\n\n", NULL); diff --git a/gtk/inspector/general.ui b/gtk/inspector/general.ui index 7a9ba394d9..07f4e130a2 100644 --- a/gtk/inspector/general.ui +++ b/gtk/inspector/general.ui @@ -24,7 +24,7 @@ 40 - GTK+ Version + GTK Version start baseline 0.0 diff --git a/gtk/inspector/general.ui.h b/gtk/inspector/general.ui.h index 73a9e2876f..156a0643c8 100644 --- a/gtk/inspector/general.ui.h +++ b/gtk/inspector/general.ui.h @@ -1,4 +1,4 @@ -N_("GTK+ Version"); +N_("GTK Version"); N_("GDK Backend"); N_("Prefix"); N_("X display"); diff --git a/gtk/inspector/visual.ui b/gtk/inspector/visual.ui index 923c9a7527..84fb5e7362 100644 --- a/gtk/inspector/visual.ui +++ b/gtk/inspector/visual.ui @@ -51,7 +51,7 @@ 40 - GTK+ Theme + GTK Theme start baseline 0.0 diff --git a/gtk/inspector/visual.ui.h b/gtk/inspector/visual.ui.h index baab2331b4..2271676361 100644 --- a/gtk/inspector/visual.ui.h +++ b/gtk/inspector/visual.ui.h @@ -1,4 +1,4 @@ -N_("GTK+ Theme"); +N_("GTK Theme"); N_("Dark Variant"); N_("Cursor Theme"); N_("Cursor Size"); From 866d0c4fb9a0497aa3da310e4ce891d19f0368d8 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 5 Feb 2019 11:25:41 +0100 Subject: [PATCH 6/8] themes: Drop the "plus" Comments and documentation. --- gtk/theme/Adwaita/README | 2 +- gtk/theme/HighContrast/_common.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk/theme/Adwaita/README b/gtk/theme/Adwaita/README index fd5692e78f..a2e97d13d5 100644 --- a/gtk/theme/Adwaita/README +++ b/gtk/theme/Adwaita/README @@ -34,4 +34,4 @@ _common.scss - actual definitions of style for each widget. This is where you are likely to add/remove your changes. You can read about SASS at http://sass-lang.com/documentation/. Once you make -your changes to the _common.scss file, GTK+ will rebuild the CSS files. +your changes to the _common.scss file, GTK will rebuild the CSS files. diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss index c5b64ed635..ac3b5a5dc5 100644 --- a/gtk/theme/HighContrast/_common.scss +++ b/gtk/theme/HighContrast/_common.scss @@ -3276,7 +3276,7 @@ colorswatch { // nth-child is used for the custom colors row. // the :not() madness is needed since actually the overlay is selectable by GtkColorSwatch > .overlay - // and GtkColorSwatch.overlay, I know it's weird, but this is gtk+. + // and GtkColorSwatch.overlay, I know it's weird, but this is GTK. // hover effect &.activatable:hover, From 25fd230327c4349e0a970ebbac70684e4f9e222c Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 5 Feb 2019 11:26:20 +0100 Subject: [PATCH 7/8] gtk: Drop the "plus" Source names should use "[gtk]" without the plus. --- gtk/a11y/gtkiconviewaccessible.c | 2 +- gtk/gtkbutton.c | 2 +- gtk/gtkcalendar.c | 4 ++-- gtk/gtkcellrendererspin.c | 2 +- gtk/gtkcellrenderertext.c | 2 +- gtk/gtkdnd.c | 2 +- gtk/gtkentry.c | 12 +++++------ gtk/gtkentrycompletion.c | 4 ++-- gtk/gtkexpander.c | 2 +- gtk/gtkfilechooserwidget.c | 6 +++--- gtk/gtkfilesystemmodel.c | 2 +- gtk/gtkgesturelongpress.c | 2 +- gtk/gtkgesturemultipress.c | 2 +- gtk/gtkgladecatalog.c | 2 +- gtk/gtkicontheme.c | 2 +- gtk/gtkiconview.c | 4 ++-- gtk/gtkmain.c | 2 +- gtk/gtkmenu.c | 4 ++-- gtk/gtkmenuitem.c | 2 +- gtk/gtkmenusectionbox.c | 2 +- gtk/gtknotebook.c | 8 ++++---- gtk/gtkpapersize.c | 4 ++-- gtk/gtkprintoperation-win32.c | 4 ++-- gtk/gtkprintoperation.c | 6 +++--- gtk/gtkprintunixdialog.c | 2 +- gtk/gtkrange.c | 4 ++-- gtk/gtkrecentmanager.c | 2 +- gtk/gtkscrolledwindow.c | 6 +++--- gtk/gtksearchenginemodel.c | 2 +- gtk/gtksearchenginesimple.c | 4 ++-- gtk/gtksearchentry.c | 2 +- gtk/gtksettings.c | 28 +++++++++++++------------- gtk/gtkspinbutton.c | 4 ++-- gtk/gtkstackswitcher.c | 2 +- gtk/gtktextview.c | 20 +++++++++--------- gtk/gtktoolbar.c | 2 +- gtk/gtktooltip.c | 4 ++-- gtk/gtktreeview.c | 22 ++++++++++---------- gtk/gtkwindow.c | 6 +++--- gtk/org.gtk.Settings.Debug.gschema.xml | 4 ++-- 40 files changed, 99 insertions(+), 99 deletions(-) diff --git a/gtk/a11y/gtkiconviewaccessible.c b/gtk/a11y/gtkiconviewaccessible.c index 800f8274de..1cebf28df6 100644 --- a/gtk/a11y/gtkiconviewaccessible.c +++ b/gtk/a11y/gtkiconviewaccessible.c @@ -114,7 +114,7 @@ gtk_icon_view_item_accessible_do_action (AtkAction *action, if (!item->action_idle_handler) { item->action_idle_handler = g_idle_add (idle_do_action, item); - g_source_set_name_by_id (item->action_idle_handler, "[gtk+] idle_do_action"); + g_source_set_name_by_id (item->action_idle_handler, "[gtk] idle_do_action"); } return TRUE; diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index c0de0014a2..6b2346cdba 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -771,7 +771,7 @@ gtk_real_button_activate (GtkButton *button) if (gtk_widget_get_realized (widget) && !priv->activate_timeout) { priv->activate_timeout = g_timeout_add (ACTIVATE_TIMEOUT, button_activate_timeout, button); - g_source_set_name_by_id (priv->activate_timeout, "[gtk+] button_activate_timeout"); + g_source_set_name_by_id (priv->activate_timeout, "[gtk] button_activate_timeout"); priv->button_down = TRUE; } } diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c index 8b9de85d2a..561a474f5b 100644 --- a/gtk/gtkcalendar.c +++ b/gtk/gtkcalendar.c @@ -2487,7 +2487,7 @@ calendar_timer (gpointer data) TIMEOUT_REPEAT * SCROLL_DELAY_FACTOR, (GSourceFunc) calendar_timer, calendar, NULL); - g_source_set_name_by_id (priv->timer, "[gtk+] calendar_timer"); + g_source_set_name_by_id (priv->timer, "[gtk] calendar_timer"); } else retval = TRUE; @@ -2511,7 +2511,7 @@ calendar_start_spinning (GtkCalendar *calendar, TIMEOUT_INITIAL, (GSourceFunc) calendar_timer, calendar, NULL); - g_source_set_name_by_id (priv->timer, "[gtk+] calendar_timer"); + g_source_set_name_by_id (priv->timer, "[gtk] calendar_timer"); } } diff --git a/gtk/gtkcellrendererspin.c b/gtk/gtkcellrendererspin.c index b8cbdfe179..4483e5a01d 100644 --- a/gtk/gtkcellrendererspin.c +++ b/gtk/gtkcellrendererspin.c @@ -48,7 +48,7 @@ * of #GtkCellRendererSpin:digits to display. Other #GtkSpinButton properties * can be set in a handler for the #GtkCellRenderer::editing-started signal. * - * The #GtkCellRendererSpin cell renderer was added in GTK+ 2.10. + * The #GtkCellRendererSpin cell renderer was added in GTK 2.10. */ diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index f7ee9aaee2..093dfcbba0 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -1832,7 +1832,7 @@ gtk_cell_renderer_text_popup_unmap (GtkMenu *menu, return; priv->entry_menu_popdown_timeout = g_timeout_add (500, popdown_timeout, data); - g_source_set_name_by_id (priv->entry_menu_popdown_timeout, "[gtk+] popdown_timeout"); + g_source_set_name_by_id (priv->entry_menu_popdown_timeout, "[gtk] popdown_timeout"); } static void diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index 1d70e56c86..0313566573 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -1246,7 +1246,7 @@ gtk_drag_drop (GtkDragSourceInfo *info) gtk_widget_hide (info->icon_window); info->drop_timeout = g_timeout_add (DROP_ABORT_TIME, gtk_drag_abort_timeout, info); - g_source_set_name_by_id (info->drop_timeout, "[gtk+] gtk_drag_abort_timeout"); + g_source_set_name_by_id (info->drop_timeout, "[gtk] gtk_drag_abort_timeout"); } /* diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 2115852aa3..4585df6899 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -4575,7 +4575,7 @@ buffer_inserted_text (GtkEntryBuffer *buffer, password_hint->source_id = g_timeout_add (password_hint_timeout, (GSourceFunc)gtk_entry_remove_password_hint, entry); - g_source_set_name_by_id (password_hint->source_id, "[gtk+] gtk_entry_remove_password_hint"); + g_source_set_name_by_id (password_hint->source_id, "[gtk] gtk_entry_remove_password_hint"); } } } @@ -8414,7 +8414,7 @@ gtk_entry_selection_bubble_popup_set (GtkEntry *entry) priv->selection_bubble_timeout_id = g_timeout_add (50, gtk_entry_selection_bubble_popup_show, entry); - g_source_set_name_by_id (priv->selection_bubble_timeout_id, "[gtk+] gtk_entry_selection_bubble_popup_cb"); + g_source_set_name_by_id (priv->selection_bubble_timeout_id, "[gtk] gtk_entry_selection_bubble_popup_cb"); } static void @@ -8832,7 +8832,7 @@ blink_cb (gpointer data) priv->blink_timeout = g_timeout_add (get_cursor_time (entry) * CURSOR_OFF_MULTIPLIER / CURSOR_DIVIDER, blink_cb, entry); - g_source_set_name_by_id (priv->blink_timeout, "[gtk+] blink_cb"); + g_source_set_name_by_id (priv->blink_timeout, "[gtk] blink_cb"); } else { @@ -8841,7 +8841,7 @@ blink_cb (gpointer data) priv->blink_timeout = g_timeout_add (get_cursor_time (entry) * CURSOR_ON_MULTIPLIER / CURSOR_DIVIDER, blink_cb, entry); - g_source_set_name_by_id (priv->blink_timeout, "[gtk+] blink_cb"); + g_source_set_name_by_id (priv->blink_timeout, "[gtk] blink_cb"); } return G_SOURCE_REMOVE; @@ -8860,7 +8860,7 @@ gtk_entry_check_cursor_blink (GtkEntry *entry) priv->blink_timeout = g_timeout_add (get_cursor_time (entry) * CURSOR_ON_MULTIPLIER / CURSOR_DIVIDER, blink_cb, entry); - g_source_set_name_by_id (priv->blink_timeout, "[gtk+] blink_cb"); + g_source_set_name_by_id (priv->blink_timeout, "[gtk] blink_cb"); } } else @@ -8888,7 +8888,7 @@ gtk_entry_pend_cursor_blink (GtkEntry *entry) priv->blink_timeout = g_timeout_add (get_cursor_time (entry) * CURSOR_PEND_MULTIPLIER / CURSOR_DIVIDER, blink_cb, entry); - g_source_set_name_by_id (priv->blink_timeout, "[gtk+] blink_cb"); + g_source_set_name_by_id (priv->blink_timeout, "[gtk] blink_cb"); show_cursor (entry); } } diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c index d010d9e5f5..6d43daff98 100644 --- a/gtk/gtkentrycompletion.c +++ b/gtk/gtkentrycompletion.c @@ -2386,7 +2386,7 @@ gtk_entry_completion_changed (GtkWidget *widget, g_timeout_add (COMPLETION_TIMEOUT, gtk_entry_completion_timeout, completion); - g_source_set_name_by_id (completion->priv->completion_timeout, "[gtk+] gtk_entry_completion_timeout"); + g_source_set_name_by_id (completion->priv->completion_timeout, "[gtk] gtk_entry_completion_timeout"); } static gboolean @@ -2448,7 +2448,7 @@ completion_insert_text_callback (GtkEntry *entry, g_cclosure_new_object (G_CALLBACK (check_completion_callback), G_OBJECT (completion))); g_source_attach (completion->priv->check_completion_idle, NULL); - g_source_set_name (completion->priv->check_completion_idle, "[gtk+] check_completion_callback"); + g_source_set_name (completion->priv->check_completion_idle, "[gtk] check_completion_callback"); } } diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c index fa412f8cf1..cba7916c12 100644 --- a/gtk/gtkexpander.c +++ b/gtk/gtkexpander.c @@ -542,7 +542,7 @@ gtk_expander_drag_motion (GtkWidget *widget, if (!priv->expanded && !priv->expand_timer) { priv->expand_timer = g_timeout_add (TIMEOUT_EXPAND, (GSourceFunc) expand_timeout, expander); - g_source_set_name_by_id (priv->expand_timer, "[gtk+] expand_timeout"); + g_source_set_name_by_id (priv->expand_timer, "[gtk] expand_timeout"); } return TRUE; diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index d52fd98dfd..707f40139d 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -2461,7 +2461,7 @@ reset_location_timeout (GtkFileChooserWidget *impl) priv->location_changed_id = g_timeout_add (LOCATION_CHANGED_TIMEOUT, location_changed_timeout_cb, impl); - g_source_set_name_by_id (priv->location_changed_id, "[gtk+] location_changed_timeout_cb"); + g_source_set_name_by_id (priv->location_changed_id, "[gtk] location_changed_timeout_cb"); } static void @@ -4285,7 +4285,7 @@ load_setup_timer (GtkFileChooserWidget *impl) g_assert (priv->load_state != LOAD_PRELOAD); priv->load_timeout_id = g_timeout_add (MAX_LOADING_TIME, load_timeout_cb, impl); - g_source_set_name_by_id (priv->load_timeout_id, "[gtk+] load_timeout_cb"); + g_source_set_name_by_id (priv->load_timeout_id, "[gtk] load_timeout_cb"); priv->load_state = LOAD_PRELOAD; } @@ -7471,7 +7471,7 @@ recent_start_loading (GtkFileChooserWidget *impl) recent_idle_load, load_data, recent_idle_cleanup); - g_source_set_name_by_id (priv->load_recent_id, "[gtk+] recent_idle_load"); + g_source_set_name_by_id (priv->load_recent_id, "[gtk] recent_idle_load"); } /* Called from ::should_respond(). We return whether there are selected diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c index 1c39100bde..bf49e0196b 100644 --- a/gtk/gtkfilesystemmodel.c +++ b/gtk/gtkfilesystemmodel.c @@ -1148,7 +1148,7 @@ gtk_file_system_model_got_files (GObject *object, GAsyncResult *res, gpointer da thaw_func, model, NULL); - g_source_set_name_by_id (model->dir_thaw_source, "[gtk+] thaw_func"); + g_source_set_name_by_id (model->dir_thaw_source, "[gtk] thaw_func"); } for (walk = files; walk; walk = walk->next) diff --git a/gtk/gtkgesturelongpress.c b/gtk/gtkgesturelongpress.c index f16bc1da90..073a7b6d09 100644 --- a/gtk/gtkgesturelongpress.c +++ b/gtk/gtkgesturelongpress.c @@ -143,7 +143,7 @@ gtk_gesture_long_press_begin (GtkGesture *gesture, gtk_gesture_get_point (gesture, sequence, &priv->initial_x, &priv->initial_y); priv->timeout_id = g_timeout_add (delay, _gtk_gesture_long_press_timeout, gesture); - g_source_set_name_by_id (priv->timeout_id, "[gtk+] _gtk_gesture_long_press_timeout"); + g_source_set_name_by_id (priv->timeout_id, "[gtk] _gtk_gesture_long_press_timeout"); } static void diff --git a/gtk/gtkgesturemultipress.c b/gtk/gtkgesturemultipress.c index d6dc115d5f..d2877d46d7 100644 --- a/gtk/gtkgesturemultipress.c +++ b/gtk/gtkgesturemultipress.c @@ -152,7 +152,7 @@ _gtk_gesture_multi_press_update_timeout (GtkGestureMultiPress *gesture) g_object_get (settings, "gtk-double-click-time", &double_click_time, NULL); priv->double_click_timeout_id = g_timeout_add (double_click_time, _double_click_timeout_cb, gesture); - g_source_set_name_by_id (priv->double_click_timeout_id, "[gtk+] _double_click_timeout_cb"); + g_source_set_name_by_id (priv->double_click_timeout_id, "[gtk] _double_click_timeout_cb"); } static gboolean diff --git a/gtk/gtkgladecatalog.c b/gtk/gtkgladecatalog.c index a2dcfc18f5..c104562b33 100644 --- a/gtk/gtkgladecatalog.c +++ b/gtk/gtkgladecatalog.c @@ -38,7 +38,7 @@ void gtk_glade_catalog_init (const gchar *catalog_name); /* This function is referred to in gtk/glade/gtk-private-widgets.xml * and is used to ensure the private types for use in Glade while - * editing UI files that define GTK+’s various composite widget classes. + * editing UI files that define GTK’s various composite widget classes. */ void gtk_glade_catalog_init (const gchar *catalog_name) diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index ccdb7f77a8..f1b8545cda 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -729,7 +729,7 @@ queue_theme_changed (GtkIconTheme *icon_theme) theme_changed_idle, icon_theme, NULL); - g_source_set_name_by_id (priv->theme_changed_idle, "[gtk+] theme_changed_idle"); + g_source_set_name_by_id (priv->theme_changed_idle, "[gtk] theme_changed_idle"); } } diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index 29ed4dff8a..3f95db58ff 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -1841,7 +1841,7 @@ gtk_icon_view_motion (GtkEventController *controller, if (icon_view->priv->scroll_timeout_id == 0) { icon_view->priv->scroll_timeout_id = g_timeout_add (30, rubberband_scroll_timeout, icon_view); - g_source_set_name_by_id (icon_view->priv->scroll_timeout_id, "[gtk+] rubberband_scroll_timeout"); + g_source_set_name_by_id (icon_view->priv->scroll_timeout_id, "[gtk] rubberband_scroll_timeout"); } } else @@ -6256,7 +6256,7 @@ gtk_icon_view_drag_motion (GtkWidget *widget, if (icon_view->priv->scroll_timeout_id == 0) { icon_view->priv->scroll_timeout_id = g_timeout_add (50, drag_scroll_timeout, icon_view); - g_source_set_name_by_id (icon_view->priv->scroll_timeout_id, "[gtk+] drag_scroll_timeout"); + g_source_set_name_by_id (icon_view->priv->scroll_timeout_id, "[gtk] drag_scroll_timeout"); } if (target == g_intern_static_string ("GTK_TREE_MODEL_ROW")) diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 50fae76925..e1bd39dd86 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -1090,7 +1090,7 @@ gtk_main_sync (void) store.store_loop = g_main_loop_new (NULL, TRUE); store_timeout = g_timeout_add_seconds (10, (GSourceFunc) g_main_loop_quit, store.store_loop); - g_source_set_name_by_id (store_timeout, "[gtk+] gtk_main_sync clipboard store timeout"); + g_source_set_name_by_id (store_timeout, "[gtk] gtk_main_sync clipboard store timeout"); if (g_main_loop_is_running (store.store_loop)) g_main_loop_run (store.store_loop); diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 45ac5b824d..c12b19bcf3 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -3066,7 +3066,7 @@ gtk_menu_handle_scrolling (GtkMenu *menu, : MENU_SCROLL_TIMEOUT1, gtk_menu_scroll_timeout, menu); - g_source_set_name_by_id (priv->scroll_timeout, "[gtk+] gtk_menu_scroll_timeout"); + g_source_set_name_by_id (priv->scroll_timeout, "[gtk] gtk_menu_scroll_timeout"); } else if (!enter && !in_arrow && priv->upper_arrow_prelight) { @@ -3132,7 +3132,7 @@ gtk_menu_handle_scrolling (GtkMenu *menu, : MENU_SCROLL_TIMEOUT1, gtk_menu_scroll_timeout, menu); - g_source_set_name_by_id (priv->scroll_timeout, "[gtk+] gtk_menu_scroll_timeout"); + g_source_set_name_by_id (priv->scroll_timeout, "[gtk] gtk_menu_scroll_timeout"); } else if (!enter && !in_arrow && priv->lower_arrow_prelight) { diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index f1843ab349..f516c38d6d 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -1548,7 +1548,7 @@ _gtk_menu_item_popup_submenu (GtkWidget *widget, info->trigger_event = gtk_get_current_event (); priv->timer = g_timeout_add (popup_delay, gtk_menu_item_popup_timeout, info); - g_source_set_name_by_id (priv->timer, "[gtk+] gtk_menu_item_popup_timeout"); + g_source_set_name_by_id (priv->timer, "[gtk] gtk_menu_item_popup_timeout"); return; } diff --git a/gtk/gtkmenusectionbox.c b/gtk/gtkmenusectionbox.c index f87259e3bb..7b21eebc13 100644 --- a/gtk/gtkmenusectionbox.c +++ b/gtk/gtkmenusectionbox.c @@ -164,7 +164,7 @@ gtk_menu_section_box_schedule_separator_sync (GtkMenuSectionBox *box) box->separator_sync_idle = g_idle_add_full (G_PRIORITY_HIGH_IDLE, /* before resize... */ gtk_menu_section_box_handle_sync_separators, box, NULL); - g_source_set_name_by_id (box->separator_sync_idle, "[gtk+] menu section box handle sync separators"); + g_source_set_name_by_id (box->separator_sync_idle, "[gtk] menu section box handle sync separators"); } } diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index 8c52b52012..decf8c61cd 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -2689,7 +2689,7 @@ gtk_notebook_motion (GtkEventController *controller, priv->dnd_timer = g_timeout_add (TIMEOUT_REPEAT * SCROLL_DELAY_FACTOR, scroll_notebook_timer, notebook); - g_source_set_name_by_id (priv->dnd_timer, "[gtk+] scroll_notebook_timer"); + g_source_set_name_by_id (priv->dnd_timer, "[gtk] scroll_notebook_timer"); } } else @@ -3084,7 +3084,7 @@ gtk_notebook_drag_motion (GtkWidget *widget, if (!priv->switch_tab_timer) { priv->switch_tab_timer = g_timeout_add (TIMEOUT_EXPAND, gtk_notebook_switch_tab_timeout, widget); - g_source_set_name_by_id (priv->switch_tab_timer, "[gtk+] gtk_notebook_switch_tab_timeout"); + g_source_set_name_by_id (priv->switch_tab_timer, "[gtk] gtk_notebook_switch_tab_timeout"); } } else @@ -4063,7 +4063,7 @@ gtk_notebook_timer (GtkNotebook *notebook) priv->timer = g_timeout_add (TIMEOUT_REPEAT * SCROLL_DELAY_FACTOR, (GSourceFunc) gtk_notebook_timer, notebook); - g_source_set_name_by_id (priv->timer, "[gtk+] gtk_notebook_timer"); + g_source_set_name_by_id (priv->timer, "[gtk] gtk_notebook_timer"); } else retval = TRUE; @@ -4082,7 +4082,7 @@ gtk_notebook_set_scroll_timer (GtkNotebook *notebook) priv->timer = g_timeout_add (TIMEOUT_INITIAL, (GSourceFunc) gtk_notebook_timer, notebook); - g_source_set_name_by_id (priv->timer, "[gtk+] gtk_notebook_timer"); + g_source_set_name_by_id (priv->timer, "[gtk] gtk_notebook_timer"); priv->need_timer = TRUE; } } diff --git a/gtk/gtkpapersize.c b/gtk/gtkpapersize.c index 2a39bec8d0..119b1a9eee 100644 --- a/gtk/gtkpapersize.c +++ b/gtk/gtkpapersize.c @@ -55,7 +55,7 @@ * and height) of a paper size and its name, it also provides * default [print margins][print-margins]. * - * Printing support has been added in GTK+ 2.10. + * Printing support has been added in GTK 2.10. */ @@ -765,7 +765,7 @@ gtk_paper_size_set_size (GtkPaperSize *size, * depends on the current locale. * * Returns: the name of the default paper size. The string - * is owned by GTK+ and should not be modified. + * is owned by GTK and should not be modified. */ const gchar * gtk_paper_size_get_default (void) diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c index c484209f5b..980e9c5925 100644 --- a/gtk/gtkprintoperation-win32.c +++ b/gtk/gtkprintoperation-win32.c @@ -538,7 +538,7 @@ win32_poll_status_timeout (GtkPrintOperation *op) op_win32->timeout_id = g_timeout_add (STATUS_POLLING_TIME, (GSourceFunc)win32_poll_status_timeout, op); - g_source_set_name_by_id (op_win32->timeout_id, "[gtk+] win32_poll_status_timeout"); + g_source_set_name_by_id (op_win32->timeout_id, "[gtk] win32_poll_status_timeout"); } g_object_unref (op); return FALSE; @@ -582,7 +582,7 @@ win32_end_run (GtkPrintOperation *op, op_win32->timeout_id = g_timeout_add (STATUS_POLLING_TIME, (GSourceFunc)win32_poll_status_timeout, op); - g_source_set_name_by_id (op_win32->timeout_id, "[gtk+] win32_poll_status_timeout"); + g_source_set_name_by_id (op_win32->timeout_id, "[gtk] win32_poll_status_timeout"); } else /* Dunno what happened, pretend its finished */ diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c index 090a4d5a03..c18d3d2d78 100644 --- a/gtk/gtkprintoperation.c +++ b/gtk/gtkprintoperation.c @@ -641,7 +641,7 @@ preview_ready (GtkPrintOperationPreview *preview, preview_print_idle, pop, preview_print_idle_done); - g_source_set_name_by_id (id, "[gtk+] preview_print_idle"); + g_source_set_name_by_id (id, "[gtk] preview_print_idle"); } @@ -2907,7 +2907,7 @@ print_pages (GtkPrintOperation *op, g_timeout_add (SHOW_PROGRESS_TIME, (GSourceFunc) show_progress_timeout, data); - g_source_set_name_by_id (priv->show_progress_timeout_id, "[gtk+] show_progress_timeout"); + g_source_set_name_by_id (priv->show_progress_timeout_id, "[gtk] show_progress_timeout"); data->progress = progress; } @@ -2976,7 +2976,7 @@ print_pages (GtkPrintOperation *op, print_pages_idle, data, print_pages_idle_done); - g_source_set_name_by_id (priv->print_pages_idle_id, "[gtk+] print_pages_idle"); + g_source_set_name_by_id (priv->print_pages_idle_id, "[gtk] print_pages_idle"); /* Recursive main loop to make sure we don't exit on sync operations */ if (priv->is_sync) diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c index 589fc4ebd4..7dc8c37202 100644 --- a/gtk/gtkprintunixdialog.c +++ b/gtk/gtkprintunixdialog.c @@ -1937,7 +1937,7 @@ schedule_idle_mark_conflicts (GtkPrintUnixDialog *dialog) return; priv->mark_conflicts_id = g_idle_add (mark_conflicts_callback, dialog); - g_source_set_name_by_id (priv->mark_conflicts_id, "[gtk+] mark_conflicts_callback"); + g_source_set_name_by_id (priv->mark_conflicts_id, "[gtk] mark_conflicts_callback"); } static void diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index 7e4082532e..a96480abbf 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -2767,7 +2767,7 @@ initial_timeout (gpointer data) GtkRangePrivate *priv = gtk_range_get_instance_private (range); priv->timer->timeout_id = g_timeout_add (TIMEOUT_REPEAT, second_timeout, range); - g_source_set_name_by_id (priv->timer->timeout_id, "[gtk+] second_timeout"); + g_source_set_name_by_id (priv->timer->timeout_id, "[gtk] second_timeout"); return G_SOURCE_REMOVE; } @@ -2783,7 +2783,7 @@ gtk_range_add_step_timer (GtkRange *range, priv->timer = g_new (GtkRangeStepTimer, 1); priv->timer->timeout_id = g_timeout_add (TIMEOUT_INITIAL, initial_timeout, range); - g_source_set_name_by_id (priv->timer->timeout_id, "[gtk+] initial_timeout"); + g_source_set_name_by_id (priv->timer->timeout_id, "[gtk] initial_timeout"); priv->timer->step = step; gtk_range_scroll (range, priv->timer->step); diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c index 7d09ce7934..1e098f423e 100644 --- a/gtk/gtkrecentmanager.c +++ b/gtk/gtkrecentmanager.c @@ -1389,7 +1389,7 @@ gtk_recent_manager_changed (GtkRecentManager *manager) if (manager->priv->changed_timeout == 0) { manager->priv->changed_timeout = g_timeout_add (250, emit_manager_changed, manager); - g_source_set_name_by_id (manager->priv->changed_timeout, "[gtk+] emit_manager_changed"); + g_source_set_name_by_id (manager->priv->changed_timeout, "[gtk] emit_manager_changed"); } else { diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index b431e07e9c..b5ad5a7bb1 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -1108,7 +1108,7 @@ check_update_scrollbar_proximity (GtkScrolledWindow *sw, else if (indicator_close && !on_other_scrollbar) { indicator->over_timeout_id = g_timeout_add (30, enable_over_timeout_cb, indicator); - g_source_set_name_by_id (indicator->over_timeout_id, "[gtk+] enable_over_timeout_cb"); + g_source_set_name_by_id (indicator->over_timeout_id, "[gtk] enable_over_timeout_cb"); } else indicator_set_over (indicator, FALSE); @@ -1306,7 +1306,7 @@ scroll_controller_scroll (GtkEventControllerScroll *scroll, priv->scroll_events_overshoot_id = g_timeout_add (50, start_scroll_deceleration_cb, scrolled_window); g_source_set_name_by_id (priv->scroll_events_overshoot_id, - "[gtk+] start_scroll_deceleration_cb"); + "[gtk] start_scroll_deceleration_cb"); } return GDK_EVENT_STOP; @@ -3640,7 +3640,7 @@ indicator_set_fade (Indicator *indicator, if (visible && indicator->conceil_timer == 0) { indicator->conceil_timer = g_timeout_add (INDICATOR_FADE_OUT_TIME, maybe_hide_indicator, indicator); - g_source_set_name_by_id (indicator->conceil_timer, "[gtk+] maybe_hide_indicator"); + g_source_set_name_by_id (indicator->conceil_timer, "[gtk] maybe_hide_indicator"); } if (!visible && indicator->conceil_timer != 0) { diff --git a/gtk/gtksearchenginemodel.c b/gtk/gtksearchenginemodel.c index 2ff615246d..58682e15f9 100644 --- a/gtk/gtksearchenginemodel.c +++ b/gtk/gtksearchenginemodel.c @@ -129,7 +129,7 @@ gtk_search_engine_model_start (GtkSearchEngine *engine) return; model->idle = g_idle_add (do_search, engine); - g_source_set_name_by_id (model->idle, "[gtk+] gtk_search_engine_model_start"); + g_source_set_name_by_id (model->idle, "[gtk] gtk_search_engine_model_start"); } static void diff --git a/gtk/gtksearchenginesimple.c b/gtk/gtksearchenginesimple.c index 8f5d431674..dfefed3aca 100644 --- a/gtk/gtksearchenginesimple.c +++ b/gtk/gtksearchenginesimple.c @@ -181,7 +181,7 @@ send_batch (SearchThreadData *data) batch->thread_data = data; id = g_idle_add (search_thread_add_hits_idle, batch); - g_source_set_name_by_id (id, "[gtk+] search_thread_add_hits_idle"); + g_source_set_name_by_id (id, "[gtk] search_thread_add_hits_idle"); } data->hits = NULL; @@ -288,7 +288,7 @@ search_thread_func (gpointer user_data) send_batch (data); id = g_idle_add (search_thread_done_idle, data); - g_source_set_name_by_id (id, "[gtk+] search_thread_done_idle"); + g_source_set_name_by_id (id, "[gtk] search_thread_done_idle"); return NULL; } diff --git a/gtk/gtksearchentry.c b/gtk/gtksearchentry.c index 693fe6d485..b2368c308a 100644 --- a/gtk/gtksearchentry.c +++ b/gtk/gtksearchentry.c @@ -305,7 +305,7 @@ reset_timeout (GtkSearchEntry *entry) priv->delayed_changed_id = g_timeout_add (DELAYED_TIMEOUT_ID, gtk_search_entry_changed_timeout_cb, entry); - g_source_set_name_by_id (priv->delayed_changed_id, "[gtk+] gtk_search_entry_changed_timeout_cb"); + g_source_set_name_by_id (priv->delayed_changed_id, "[gtk] gtk_search_entry_changed_timeout_cb"); } static void diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index ad477d7cbd..9c9988e22d 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -74,7 +74,7 @@ * [XSettings](http://www.freedesktop.org/wiki/Specifications/xsettings-spec) * manager that is usually part of the desktop environment, along with * utilities that let the user change these settings. In the absence of - * an Xsettings manager, GTK+ reads default values for settings from + * an Xsettings manager, GTK reads default values for settings from * `settings.ini` files in * `/etc/gtk-4.0`, `$XDG_CONFIG_DIRS/gtk-4.0` * and `$XDG_CONFIG_HOME/gtk-4.0`. @@ -440,7 +440,7 @@ gtk_settings_class_init (GtkSettingsClass *class) /** * GtkSettings:gtk-font-name: * - * The default font to use. GTK+ uses the family name and size from this string. + * The default font to use. GTK uses the family name and size from this string. */ result = settings_install_property_parser (class, g_param_spec_string ("gtk-font-name", @@ -578,7 +578,7 @@ gtk_settings_class_init (GtkSettingsClass *class) * GtkSettings:gtk-print-backends: * * A comma-separated list of print backends to use in the print - * dialog. Available print backends depend on the GTK+ installation, + * dialog. Available print backends depend on the GTK installation, * and may include "file", "cups", "lpr" or "papi". */ result = settings_install_property_parser (class, @@ -633,7 +633,7 @@ gtk_settings_class_init (GtkSettingsClass *class) * Which IM (input method) module should be used by default. This is the * input method that will be used if the user has not explicitly chosen * another input method from the IM context menu. - * This also can be a colon-separated list of input methods, which GTK+ + * This also can be a colon-separated list of input methods, which GTK * will try in turn until it finds one available on the system. * * See #GtkIMContext. @@ -683,7 +683,7 @@ gtk_settings_class_init (GtkSettingsClass *class) * See the [Sound Theme Specifications](http://www.freedesktop.org/wiki/Specifications/sound-theme-spec) * for more information on event sounds and sound themes. * - * GTK+ itself does not support event sounds, you have to use a loadable + * GTK itself does not support event sounds, you have to use a loadable * module like the one that comes with libcanberra. */ result = settings_install_property_parser (class, @@ -703,7 +703,7 @@ gtk_settings_class_init (GtkSettingsClass *class) * See the [Sound Theme Specifications](http://www.freedesktop.org/wiki/Specifications/sound-theme-spec) * for more information on event sounds and sound themes. * - * GTK+ itself does not support event sounds, you have to use a loadable + * GTK itself does not support event sounds, you have to use a loadable * module like the one that comes with libcanberra. */ result = settings_install_property_parser (class, @@ -724,7 +724,7 @@ gtk_settings_class_init (GtkSettingsClass *class) * See the [Sound Theme Specifications](http://www.freedesktop.org/wiki/Specifications/sound-theme-spec) * for more information on event sounds and sound themes. * - * GTK+ itself does not support event sounds, you have to use a loadable + * GTK itself does not support event sounds, you have to use a loadable * module like the one that comes with libcanberra. */ result = settings_install_property_parser (class, @@ -745,7 +745,7 @@ gtk_settings_class_init (GtkSettingsClass *class) * slider/value to move by the range’s page-size towards the point clicked. * * Whichever action you choose for the primary button, the other action will - * be available by holding Shift and primary-clicking, or (since GTK+ 3.22.25) + * be available by holding Shift and primary-clicking, or (since GTK 3.22.25) * clicking the middle mouse button. */ result = settings_install_property_parser (class, @@ -760,7 +760,7 @@ gtk_settings_class_init (GtkSettingsClass *class) /** * GtkSettings:gtk-application-prefer-dark-theme: * - * Whether the application prefers to use a dark theme. If a GTK+ theme + * Whether the application prefers to use a dark theme. If a GTK theme * includes a dark variant, it will be used instead of the configured * theme. * @@ -935,7 +935,7 @@ gtk_settings_class_init (GtkSettingsClass *class) /** * GtkSettings:gtk-dialogs-use-header: * - * Whether builtin GTK+ dialogs such as the file chooser, the + * Whether builtin GTK dialogs such as the file chooser, the * color chooser or the font chooser will use a header bar at * the top to show action widgets, or an action area at the bottom. * @@ -945,7 +945,7 @@ gtk_settings_class_init (GtkSettingsClass *class) result = settings_install_property_parser (class, g_param_spec_boolean ("gtk-dialogs-use-header", P_("Dialogs use header bar"), - P_("Whether builtin GTK+ dialogs should use a header bar instead of an action area."), + P_("Whether builtin GTK dialogs should use a header bar instead of an action area."), FALSE, GTK_PARAM_READWRITE), NULL); @@ -969,13 +969,13 @@ gtk_settings_class_init (GtkSettingsClass *class) /** * GtkSettings:gtk-recent-files-enabled: * - * Whether GTK+ should keep track of items inside the recently used + * Whether GTK should keep track of items inside the recently used * resources list. If set to %FALSE, the list will always be empty. */ result = settings_install_property_parser (class, g_param_spec_boolean ("gtk-recent-files-enabled", P_("Recent Files Enabled"), - P_("Whether GTK+ remembers recent files"), + P_("Whether GTK remembers recent files"), TRUE, GTK_PARAM_READWRITE), NULL); @@ -998,7 +998,7 @@ gtk_settings_class_init (GtkSettingsClass *class) /** * GtkSettings:gtk-keynav-use-caret: * - * Whether GTK+ should make sure that text can be navigated with + * Whether GTK should make sure that text can be navigated with * a caret, even if it is not editable. This is useful when using * a screen reader. */ diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index 181b91cd48..cc03839275 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -745,7 +745,7 @@ start_spinning (GtkSpinButton *spin, priv->timer = g_timeout_add (TIMEOUT_INITIAL, (GSourceFunc) gtk_spin_button_timer, (gpointer) spin); - g_source_set_name_by_id (priv->timer, "[gtk+] gtk_spin_button_timer"); + g_source_set_name_by_id (priv->timer, "[gtk] gtk_spin_button_timer"); } gtk_spin_button_real_spin (spin, click_child == priv->up_button ? step : -step); @@ -1172,7 +1172,7 @@ gtk_spin_button_timer (GtkSpinButton *spin_button) priv->timer = g_timeout_add (TIMEOUT_REPEAT, (GSourceFunc) gtk_spin_button_timer, spin_button); - g_source_set_name_by_id (priv->timer, "[gtk+] gtk_spin_button_timer"); + g_source_set_name_by_id (priv->timer, "[gtk] gtk_spin_button_timer"); } else { diff --git a/gtk/gtkstackswitcher.c b/gtk/gtkstackswitcher.c index 50cdcecb55..3fb4dde191 100644 --- a/gtk/gtkstackswitcher.c +++ b/gtk/gtkstackswitcher.c @@ -332,7 +332,7 @@ gtk_stack_switcher_drag_motion (GtkWidget *widget, priv->switch_timer = g_timeout_add (TIMEOUT_EXPAND, gtk_stack_switcher_switch_timeout, self); - g_source_set_name_by_id (priv->switch_timer, "[gtk+] gtk_stack_switcher_switch_timeout"); + g_source_set_name_by_id (priv->switch_timer, "[gtk] gtk_stack_switcher_switch_timeout"); } return retval; diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 2950ad7dec..cf8d2cdca2 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -2633,7 +2633,7 @@ queue_update_im_spot_location (GtkTextView *text_view) do_update_im_spot_location, text_view, NULL); - g_source_set_name_by_id (priv->im_spot_idle, "[gtk+] do_update_im_spot_location"); + g_source_set_name_by_id (priv->im_spot_idle, "[gtk] do_update_im_spot_location"); } } @@ -4320,7 +4320,7 @@ gtk_text_view_invalidate (GtkTextView *text_view) if (!priv->first_validate_idle) { priv->first_validate_idle = g_idle_add_full (GTK_PRIORITY_RESIZE - 2, first_validate_callback, text_view, NULL); - g_source_set_name_by_id (priv->first_validate_idle, "[gtk+] first_validate_callback"); + g_source_set_name_by_id (priv->first_validate_idle, "[gtk] first_validate_callback"); DV (g_print (G_STRLOC": adding first validate idle %d\n", priv->first_validate_idle)); } @@ -4328,7 +4328,7 @@ gtk_text_view_invalidate (GtkTextView *text_view) if (!priv->incremental_validate_idle) { priv->incremental_validate_idle = g_idle_add_full (GTK_TEXT_VIEW_PRIORITY_VALIDATE, incremental_validate_callback, text_view, NULL); - g_source_set_name_by_id (priv->incremental_validate_idle, "[gtk+] incremental_validate_callback"); + g_source_set_name_by_id (priv->incremental_validate_idle, "[gtk] incremental_validate_callback"); DV (g_print (G_STRLOC": adding incremental validate idle %d\n", priv->incremental_validate_idle)); } @@ -5689,14 +5689,14 @@ blink_cb (gpointer data) priv->blink_timeout = g_timeout_add (get_cursor_time (text_view) * CURSOR_OFF_MULTIPLIER / CURSOR_DIVIDER, blink_cb, text_view); - g_source_set_name_by_id (priv->blink_timeout, "[gtk+] blink_cb"); + g_source_set_name_by_id (priv->blink_timeout, "[gtk] blink_cb"); } else { priv->blink_timeout = g_timeout_add (get_cursor_time (text_view) * CURSOR_ON_MULTIPLIER / CURSOR_DIVIDER, blink_cb, text_view); - g_source_set_name_by_id (priv->blink_timeout, "[gtk+] blink_cb"); + g_source_set_name_by_id (priv->blink_timeout, "[gtk] blink_cb"); priv->blink_time += get_cursor_time (text_view); } @@ -5735,7 +5735,7 @@ gtk_text_view_check_cursor_blink (GtkTextView *text_view) priv->blink_timeout = g_timeout_add (get_cursor_time (text_view) * CURSOR_OFF_MULTIPLIER / CURSOR_DIVIDER, blink_cb, text_view); - g_source_set_name_by_id (priv->blink_timeout, "[gtk+] blink_cb"); + g_source_set_name_by_id (priv->blink_timeout, "[gtk] blink_cb"); } } else @@ -5767,7 +5767,7 @@ gtk_text_view_pend_cursor_blink (GtkTextView *text_view) priv->blink_timeout = g_timeout_add (get_cursor_time (text_view) * CURSOR_PEND_MULTIPLIER / CURSOR_DIVIDER, blink_cb, text_view); - g_source_set_name_by_id (priv->blink_timeout, "[gtk+] blink_cb"); + g_source_set_name_by_id (priv->blink_timeout, "[gtk] blink_cb"); } } @@ -7116,7 +7116,7 @@ gtk_text_view_drag_gesture_update (GtkGestureDrag *gesture, g_source_remove (text_view->priv->scroll_timeout); text_view->priv->scroll_timeout = g_timeout_add (50, selection_scan_timeout, text_view); - g_source_set_name_by_id (text_view->priv->scroll_timeout, "[gtk+] selection_scan_timeout"); + g_source_set_name_by_id (text_view->priv->scroll_timeout, "[gtk] selection_scan_timeout"); gtk_text_view_selection_bubble_popup_unset (text_view); @@ -7783,7 +7783,7 @@ gtk_text_view_drag_motion (GtkWidget *widget, if (!priv->scroll_timeout) { priv->scroll_timeout = g_timeout_add (100, drag_scan_timeout, text_view); - g_source_set_name_by_id (text_view->priv->scroll_timeout, "[gtk+] drag_scan_timeout"); + g_source_set_name_by_id (text_view->priv->scroll_timeout, "[gtk] drag_scan_timeout"); } gtk_drag_highlight (widget); @@ -8861,7 +8861,7 @@ gtk_text_view_selection_bubble_popup_set (GtkTextView *text_view) g_source_remove (priv->selection_bubble_timeout_id); priv->selection_bubble_timeout_id = g_timeout_add (50, gtk_text_view_selection_bubble_popup_show, text_view); - g_source_set_name_by_id (priv->selection_bubble_timeout_id, "[gtk+] gtk_text_view_selection_bubble_popup_cb"); + g_source_set_name_by_id (priv->selection_bubble_timeout_id, "[gtk] gtk_text_view_selection_bubble_popup_cb"); } /* Child GdkSurfaces */ diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index f58844a960..6c455cb3d4 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -995,7 +995,7 @@ gtk_toolbar_begin_sliding (GtkToolbar *toolbar) if (!priv->idle_id) { priv->idle_id = g_idle_add (slide_idle_handler, toolbar); - g_source_set_name_by_id (priv->idle_id, "[gtk+] slide_idle_handler"); + g_source_set_name_by_id (priv->idle_id, "[gtk] slide_idle_handler"); } content_allocation.x = 0; diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c index e2bcf29571..22fafbf47b 100644 --- a/gtk/gtktooltip.c +++ b/gtk/gtktooltip.c @@ -762,7 +762,7 @@ gtk_tooltip_hide_tooltip (GtkTooltip *tooltip) tooltip_browse_mode_expired, g_object_ref (tooltip), g_object_unref); - g_source_set_name_by_id (tooltip->browse_mode_timeout_id, "[gtk+] tooltip_browse_mode_expired"); + g_source_set_name_by_id (tooltip->browse_mode_timeout_id, "[gtk] tooltip_browse_mode_expired"); } if (tooltip->current_window) @@ -817,7 +817,7 @@ gtk_tooltip_start_delay (GdkDisplay *display) tooltip_popup_timeout, g_object_ref (display), g_object_unref); - g_source_set_name_by_id (tooltip->timeout_id, "[gtk+] tooltip_popup_timeout"); + g_source_set_name_by_id (tooltip->timeout_id, "[gtk] tooltip_popup_timeout"); } void diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 01f30f5450..3c5acc5a8c 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -3481,7 +3481,7 @@ do_prelight (GtkTreeView *tree_view, { tree_view->priv->auto_expand_timeout = g_timeout_add (AUTO_EXPAND_TIMEOUT, auto_expand_timeout, tree_view); - g_source_set_name_by_id (tree_view->priv->auto_expand_timeout, "[gtk+] auto_expand_timeout"); + g_source_set_name_by_id (tree_view->priv->auto_expand_timeout, "[gtk] auto_expand_timeout"); } } @@ -6362,7 +6362,7 @@ install_presize_handler (GtkTreeView *tree_view) { tree_view->priv->validate_rows_timer = g_idle_add_full (GTK_TREE_VIEW_PRIORITY_VALIDATE, (GSourceFunc) validate_rows, tree_view, NULL); - g_source_set_name_by_id (tree_view->priv->validate_rows_timer, "[gtk+] validate_rows"); + g_source_set_name_by_id (tree_view->priv->validate_rows_timer, "[gtk] validate_rows"); } } @@ -6391,7 +6391,7 @@ install_scroll_sync_handler (GtkTreeView *tree_view) { tree_view->priv->scroll_sync_timer = g_idle_add_full (GTK_TREE_VIEW_PRIORITY_SCROLL_SYNC, (GSourceFunc) scroll_sync_handler, tree_view, NULL); - g_source_set_name_by_id (tree_view->priv->scroll_sync_timer, "[gtk+] scroll_sync_handler"); + g_source_set_name_by_id (tree_view->priv->scroll_sync_timer, "[gtk] scroll_sync_handler"); } } @@ -6754,7 +6754,7 @@ add_scroll_timeout (GtkTreeView *tree_view) if (tree_view->priv->scroll_timeout == 0) { tree_view->priv->scroll_timeout = g_timeout_add (150, scroll_row_timeout, tree_view); - g_source_set_name_by_id (tree_view->priv->scroll_timeout, "[gtk+] scroll_row_timeout"); + g_source_set_name_by_id (tree_view->priv->scroll_timeout, "[gtk] scroll_row_timeout"); } } @@ -7296,7 +7296,7 @@ gtk_tree_view_drag_motion (GtkWidget *widget, { tree_view->priv->open_dest_timeout = g_timeout_add (AUTO_EXPAND_TIMEOUT, open_row_timeout, tree_view); - g_source_set_name_by_id (tree_view->priv->open_dest_timeout, "[gtk+] open_row_timeout"); + g_source_set_name_by_id (tree_view->priv->open_dest_timeout, "[gtk] open_row_timeout"); } else { @@ -10337,7 +10337,7 @@ gtk_tree_view_real_start_interactive_search (GtkTreeView *tree_view, g_timeout_add (GTK_TREE_VIEW_SEARCH_DIALOG_TIMEOUT, (GSourceFunc) gtk_tree_view_search_entry_flush_timeout, tree_view); - g_source_set_name_by_id (tree_view->priv->typeselect_flush_timeout, "[gtk+] gtk_tree_view_search_entry_flush_timeout"); + g_source_set_name_by_id (tree_view->priv->typeselect_flush_timeout, "[gtk] gtk_tree_view_search_entry_flush_timeout"); /* send focus-in event */ send_focus_change (tree_view->priv->search_entry, device, TRUE); @@ -13856,7 +13856,7 @@ gtk_tree_view_search_preedit_changed (GtkIMContext *im_context, g_timeout_add (GTK_TREE_VIEW_SEARCH_DIALOG_TIMEOUT, (GSourceFunc) gtk_tree_view_search_entry_flush_timeout, tree_view); - g_source_set_name_by_id (tree_view->priv->typeselect_flush_timeout, "[gtk+] gtk_tree_view_search_entry_flush_timeout"); + g_source_set_name_by_id (tree_view->priv->typeselect_flush_timeout, "[gtk] gtk_tree_view_search_entry_flush_timeout"); } } @@ -13911,7 +13911,7 @@ gtk_tree_view_search_enable_popdown (GtkWidget *widget, gtk_tree_view_real_search_enable_popdown, g_object_ref (data), g_object_unref); - g_source_set_name_by_id (id, "[gtk+] gtk_tree_view_real_search_enable_popdown"); + g_source_set_name_by_id (id, "[gtk] gtk_tree_view_real_search_enable_popdown"); } static void @@ -13957,7 +13957,7 @@ gtk_tree_view_search_scroll_event (GtkWidget *widget, g_timeout_add (GTK_TREE_VIEW_SEARCH_DIALOG_TIMEOUT, (GSourceFunc) gtk_tree_view_search_entry_flush_timeout, tree_view); - g_source_set_name_by_id (tree_view->priv->typeselect_flush_timeout, "[gtk+] gtk_tree_view_search_entry_flush_timeout"); + g_source_set_name_by_id (tree_view->priv->typeselect_flush_timeout, "[gtk] gtk_tree_view_search_entry_flush_timeout"); } return GDK_EVENT_STOP; @@ -14034,7 +14034,7 @@ gtk_tree_view_search_key_pressed (GtkEventControllerKey *key, g_timeout_add (GTK_TREE_VIEW_SEARCH_DIALOG_TIMEOUT, (GSourceFunc) gtk_tree_view_search_entry_flush_timeout, tree_view); - g_source_set_name_by_id (tree_view->priv->typeselect_flush_timeout, "[gtk+] gtk_tree_view_search_entry_flush_timeout"); + g_source_set_name_by_id (tree_view->priv->typeselect_flush_timeout, "[gtk] gtk_tree_view_search_entry_flush_timeout"); } if (!retval) @@ -14290,7 +14290,7 @@ gtk_tree_view_search_init (GtkWidget *entry, g_timeout_add (GTK_TREE_VIEW_SEARCH_DIALOG_TIMEOUT, (GSourceFunc) gtk_tree_view_search_entry_flush_timeout, tree_view); - g_source_set_name_by_id (tree_view->priv->typeselect_flush_timeout, "[gtk+] gtk_tree_view_search_entry_flush_timeout"); + g_source_set_name_by_id (tree_view->priv->typeselect_flush_timeout, "[gtk] gtk_tree_view_search_entry_flush_timeout"); } if (*text == '\0') diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index b58610c341..44b83e678a 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -2920,7 +2920,7 @@ _gtk_window_notify_keys_changed (GtkWindow *window) if (!priv->keys_changed_handler) { priv->keys_changed_handler = g_idle_add (handle_keys_changed, window); - g_source_set_name_by_id (priv->keys_changed_handler, "[gtk+] handle_keys_changed"); + g_source_set_name_by_id (priv->keys_changed_handler, "[gtk] handle_keys_changed"); } } @@ -10453,7 +10453,7 @@ _gtk_window_schedule_mnemonics_visible (GtkWindow *window) priv->mnemonics_display_timeout_id = g_timeout_add (MNEMONICS_DELAY, schedule_mnemonics_visible_cb, window); - g_source_set_name_by_id (priv->mnemonics_display_timeout_id, "[gtk+] schedule_mnemonics_visible_cb"); + g_source_set_name_by_id (priv->mnemonics_display_timeout_id, "[gtk] schedule_mnemonics_visible_cb"); } /** @@ -10782,7 +10782,7 @@ gtk_window_update_debugging (void) gtk_window_update_debugging_id == 0) { gtk_window_update_debugging_id = g_idle_add (update_debugging, NULL); - g_source_set_name_by_id (gtk_window_update_debugging_id, "[gtk+] gtk_window_update_debugging"); + g_source_set_name_by_id (gtk_window_update_debugging_id, "[gtk] gtk_window_update_debugging"); } } diff --git a/gtk/org.gtk.Settings.Debug.gschema.xml b/gtk/org.gtk.Settings.Debug.gschema.xml index abb985dcc3..ab24ec6afc 100644 --- a/gtk/org.gtk.Settings.Debug.gschema.xml +++ b/gtk/org.gtk.Settings.Debug.gschema.xml @@ -6,7 +6,7 @@ false Enable inspector keybinding - If this setting is true, GTK+ lets the user open an interactive + If this setting is true, GTK lets the user open an interactive debugging window with a keybinding. The default shortcuts for the keybinding are Control-Shift-I and Control-Shift-D. @@ -15,7 +15,7 @@ true Inspector warning - If this setting is true, GTK+ shows a warning before letting + If this setting is true, GTK shows a warning before letting the user use the interactive debugger. From f6c07a0ddb2122173aa6e3e07b8b10adbeaace30 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 5 Feb 2019 11:26:54 +0100 Subject: [PATCH 8/8] glade: Drop the "plus" From documentation and catalog description. --- gtk/glade/README.glade | 10 +++++----- gtk/glade/gtk-private-widgets.xml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gtk/glade/README.glade b/gtk/glade/README.glade index 82576fe7ad..4790294a07 100644 --- a/gtk/glade/README.glade +++ b/gtk/glade/README.glade @@ -1,17 +1,17 @@ The catalog in this directory defines some widgets that are private -to GTK+ and is needed to edit .ui files defining composite classes -in GTK+. +to GTK and is needed to edit .ui files defining composite classes +in GTK. -In order to edit any composite classes in GTK+, startup Glade +In order to edit any composite classes in GTK, startup Glade in the following way, example: - cd /path/to/gtk+/ + cd /path/to/gtk/ GLADE_CATALOG_SEARCH_PATH=`pwd`/gtk/glade glade gtk/ui/gtkfilechooserwidget.ui Documentation for updating this catalog can be found here: https://developer.gnome.org/gladeui/stable/ -Note also that when including private GTK+ widgets as components, it is +Note also that when including private GTK widgets as components, it is important to call g_type_ensure () to register the type explicitly before calling gtk_container_init_template(), otherwise GtkBuilder will not be able to properly load the type. diff --git a/gtk/glade/gtk-private-widgets.xml b/gtk/glade/gtk-private-widgets.xml index d15a568ad3..7e2ca72b81 100644 --- a/gtk/glade/gtk-private-widgets.xml +++ b/gtk/glade/gtk-private-widgets.xml @@ -1,11 +1,11 @@ + version="3.96" + depends="gtk4" + library="gtk-4"> gtk_glade_catalog_init - + @@ -22,7 +22,7 @@ - +