[gtkmm-documentation] examples: Update .ui files
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm-documentation] examples: Update .ui files
- Date: Fri, 12 Apr 2019 16:46:15 +0000 (UTC)
commit b414240850d82a19512a9a72866f789b5f41bb9f
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date: Fri Apr 12 18:41:58 2019 +0200
examples: Update .ui files
and .glade files, and .cc files with ui strings.
examples/book/buildapp/step1/exampleapp.desktop | 2 +-
examples/book/buildapp/step2/window.ui | 8 +--
examples/book/buildapp/step3/window.ui | 8 +--
examples/book/buildapp/step4/window.ui | 8 +--
examples/book/buildapp/step5/prefs.ui | 38 ++++++--------
examples/book/buildapp/step5/window.ui | 8 +--
examples/book/buildapp/step6/prefs.ui | 38 ++++++--------
examples/book/buildapp/step6/window.ui | 24 +--------
examples/book/buildapp/step7/prefs.ui | 38 ++++++--------
examples/book/buildapp/step7/window.ui | 34 ++-----------
examples/book/buildapp/step8/prefs.ui | 38 ++++++--------
examples/book/buildapp/step8/window.ui | 40 ++-------------
examples/book/buildapp/step9/prefs.ui | 38 ++++++--------
examples/book/buildapp/step9/window.ui | 58 +++++-----------------
examples/book/builder/basic/basic.glade | 33 +++---------
examples/book/builder/derived/derived.glade | 33 +++---------
.../book/menus/main_menu/exampleapplication.cc | 2 +
examples/book/menus/main_menu/examplewindow.cc | 15 ++----
examples/book/menus_and_toolbars/toolbar.glade | 21 ++------
examples/book/printing/advanced/examplewindow.cc | 25 +++-------
examples/book/printing/simple/examplewindow.cc | 25 +++-------
examples/book/recent_files/examplewindow.cc | 11 +---
22 files changed, 144 insertions(+), 401 deletions(-)
---
diff --git a/examples/book/buildapp/step1/exampleapp.desktop b/examples/book/buildapp/step1/exampleapp.desktop
index 5c433e1..968ac27 100644
--- a/examples/book/buildapp/step1/exampleapp.desktop
+++ b/examples/book/buildapp/step1/exampleapp.desktop
@@ -2,7 +2,7 @@
Type=Application
Name=Gtkmm example
GenericName=Example
-Comment=From the "Programming with gtkmm 3" tutorial
+Comment=From the "Programming with gtkmm 4" tutorial
Icon=exampleapp
StartupNotify=true
Exec=@bindir@/exampleapp %U
diff --git a/examples/book/buildapp/step2/window.ui b/examples/book/buildapp/step2/window.ui
index 5f8e5ba..1328bb1 100644
--- a/examples/book/buildapp/step2/window.ui
+++ b/examples/book/buildapp/step2/window.ui
@@ -1,29 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 3.8 -->
<object class="GtkApplicationWindow" id="app_window">
<property name="title" translatable="yes">Example Application</property>
<property name="default-width">600</property>
<property name="default-height">400</property>
<child>
<object class="GtkBox" id="content_box">
- <property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHeaderBar" id="header">
- <property name="visible">True</property>
<child type="title">
<object class="GtkStackSwitcher" id="tabs">
- <property name="visible">True</property>
<property name="stack">stack</property>
</object>
</child>
</object>
</child>
<child>
- <object class="GtkStack" id="stack">
- <property name="visible">True</property>
- </object>
+ <object class="GtkStack" id="stack"/>
</child>
</object>
</child>
diff --git a/examples/book/buildapp/step3/window.ui b/examples/book/buildapp/step3/window.ui
index 5f8e5ba..1328bb1 100644
--- a/examples/book/buildapp/step3/window.ui
+++ b/examples/book/buildapp/step3/window.ui
@@ -1,29 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 3.8 -->
<object class="GtkApplicationWindow" id="app_window">
<property name="title" translatable="yes">Example Application</property>
<property name="default-width">600</property>
<property name="default-height">400</property>
<child>
<object class="GtkBox" id="content_box">
- <property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHeaderBar" id="header">
- <property name="visible">True</property>
<child type="title">
<object class="GtkStackSwitcher" id="tabs">
- <property name="visible">True</property>
<property name="stack">stack</property>
</object>
</child>
</object>
</child>
<child>
- <object class="GtkStack" id="stack">
- <property name="visible">True</property>
- </object>
+ <object class="GtkStack" id="stack"/>
</child>
</object>
</child>
diff --git a/examples/book/buildapp/step4/window.ui b/examples/book/buildapp/step4/window.ui
index 5f8e5ba..1328bb1 100644
--- a/examples/book/buildapp/step4/window.ui
+++ b/examples/book/buildapp/step4/window.ui
@@ -1,29 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 3.8 -->
<object class="GtkApplicationWindow" id="app_window">
<property name="title" translatable="yes">Example Application</property>
<property name="default-width">600</property>
<property name="default-height">400</property>
<child>
<object class="GtkBox" id="content_box">
- <property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHeaderBar" id="header">
- <property name="visible">True</property>
<child type="title">
<object class="GtkStackSwitcher" id="tabs">
- <property name="visible">True</property>
<property name="stack">stack</property>
</object>
</child>
</object>
</child>
<child>
- <object class="GtkStack" id="stack">
- <property name="visible">True</property>
- </object>
+ <object class="GtkStack" id="stack"/>
</child>
</object>
</child>
diff --git a/examples/book/buildapp/step5/prefs.ui b/examples/book/buildapp/step5/prefs.ui
index abe5d95..580daaf 100644
--- a/examples/book/buildapp/step5/prefs.ui
+++ b/examples/book/buildapp/step5/prefs.ui
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 3.8 -->
<object class="GtkDialog" id="prefs_dialog">
<property name="title" translatable="yes">Preferences</property>
<property name="resizable">False</property>
@@ -10,58 +9,53 @@
<object class="GtkBox" id="content_area">
<child>
<object class="GtkGrid" id="grid">
- <property name="visible">True</property>
<property name="margin">6</property>
<property name="row-spacing">12</property>
<property name="column-spacing">6</property>
<child>
<object class="GtkLabel" id="fontlabel">
- <property name="visible">True</property>
<property name="label">_Font:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">font</property>
<property name="xalign">1</property>
+ <layout>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </layout>
</object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
</child>
<child>
<object class="GtkFontButton" id="font">
- <property name="visible">True</property>
+ <layout>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
+ </layout>
</object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">0</property>
- </packing>
</child>
<child>
<object class="GtkLabel" id="transitionlabel">
- <property name="visible">True</property>
<property name="label">_Transition:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">transition</property>
<property name="xalign">1</property>
+ <layout>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </layout>
</object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">1</property>
- </packing>
</child>
<child>
<object class="GtkComboBoxText" id="transition">
- <property name="visible">True</property>
<items>
<item translatable="yes" id="none">None</item>
<item translatable="yes" id="crossfade">Fade</item>
<item translatable="yes" id="slide-left-right">Slide</item>
</items>
+ <layout>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
+ </layout>
</object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">1</property>
- </packing>
</child>
</object>
</child>
diff --git a/examples/book/buildapp/step5/window.ui b/examples/book/buildapp/step5/window.ui
index 5f8e5ba..1328bb1 100644
--- a/examples/book/buildapp/step5/window.ui
+++ b/examples/book/buildapp/step5/window.ui
@@ -1,29 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 3.8 -->
<object class="GtkApplicationWindow" id="app_window">
<property name="title" translatable="yes">Example Application</property>
<property name="default-width">600</property>
<property name="default-height">400</property>
<child>
<object class="GtkBox" id="content_box">
- <property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHeaderBar" id="header">
- <property name="visible">True</property>
<child type="title">
<object class="GtkStackSwitcher" id="tabs">
- <property name="visible">True</property>
<property name="stack">stack</property>
</object>
</child>
</object>
</child>
<child>
- <object class="GtkStack" id="stack">
- <property name="visible">True</property>
- </object>
+ <object class="GtkStack" id="stack"/>
</child>
</object>
</child>
diff --git a/examples/book/buildapp/step6/prefs.ui b/examples/book/buildapp/step6/prefs.ui
index abe5d95..580daaf 100644
--- a/examples/book/buildapp/step6/prefs.ui
+++ b/examples/book/buildapp/step6/prefs.ui
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 3.8 -->
<object class="GtkDialog" id="prefs_dialog">
<property name="title" translatable="yes">Preferences</property>
<property name="resizable">False</property>
@@ -10,58 +9,53 @@
<object class="GtkBox" id="content_area">
<child>
<object class="GtkGrid" id="grid">
- <property name="visible">True</property>
<property name="margin">6</property>
<property name="row-spacing">12</property>
<property name="column-spacing">6</property>
<child>
<object class="GtkLabel" id="fontlabel">
- <property name="visible">True</property>
<property name="label">_Font:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">font</property>
<property name="xalign">1</property>
+ <layout>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </layout>
</object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
</child>
<child>
<object class="GtkFontButton" id="font">
- <property name="visible">True</property>
+ <layout>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
+ </layout>
</object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">0</property>
- </packing>
</child>
<child>
<object class="GtkLabel" id="transitionlabel">
- <property name="visible">True</property>
<property name="label">_Transition:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">transition</property>
<property name="xalign">1</property>
+ <layout>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </layout>
</object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">1</property>
- </packing>
</child>
<child>
<object class="GtkComboBoxText" id="transition">
- <property name="visible">True</property>
<items>
<item translatable="yes" id="none">None</item>
<item translatable="yes" id="crossfade">Fade</item>
<item translatable="yes" id="slide-left-right">Slide</item>
</items>
+ <layout>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
+ </layout>
</object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">1</property>
- </packing>
</child>
</object>
</child>
diff --git a/examples/book/buildapp/step6/window.ui b/examples/book/buildapp/step6/window.ui
index b41e1c2..592ef74 100644
--- a/examples/book/buildapp/step6/window.ui
+++ b/examples/book/buildapp/step6/window.ui
@@ -1,57 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 3.8 -->
<object class="GtkApplicationWindow" id="app_window">
<property name="title" translatable="yes">Example Application</property>
<property name="default-width">600</property>
<property name="default-height">400</property>
<child>
<object class="GtkBox" id="content_box">
- <property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHeaderBar" id="header">
- <property name="visible">True</property>
<child type="title">
<object class="GtkStackSwitcher" id="tabs">
- <property name="visible">True</property>
<property name="stack">stack</property>
</object>
</child>
- <child>
+ <child type="end">
<object class="GtkToggleButton" id="search">
- <property name="visible">True</property>
<property name="sensitive">False</property>
- <style>
- <class name="image-button"/>
- </style>
- <child>
- <object class="GtkImage" id="search-icon">
- <property name="visible">True</property>
- <property name="icon-name">edit-find-symbolic</property>
- <property name="icon-size">1</property>
- </object>
- </child>
+ <property name="icon-name">edit-find-symbolic</property>
</object>
- <packing>
- <property name="pack-type">end</property>
- </packing>
</child>
</object>
</child>
<child>
<object class="GtkSearchBar" id="searchbar">
- <property name="visible">True</property>
<child>
<object class="GtkSearchEntry" id="searchentry">
- <property name="visible">True</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkStack" id="stack">
- <property name="visible">True</property>
<property name="transition-duration">500</property>
</object>
</child>
diff --git a/examples/book/buildapp/step7/prefs.ui b/examples/book/buildapp/step7/prefs.ui
index abe5d95..580daaf 100644
--- a/examples/book/buildapp/step7/prefs.ui
+++ b/examples/book/buildapp/step7/prefs.ui
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 3.8 -->
<object class="GtkDialog" id="prefs_dialog">
<property name="title" translatable="yes">Preferences</property>
<property name="resizable">False</property>
@@ -10,58 +9,53 @@
<object class="GtkBox" id="content_area">
<child>
<object class="GtkGrid" id="grid">
- <property name="visible">True</property>
<property name="margin">6</property>
<property name="row-spacing">12</property>
<property name="column-spacing">6</property>
<child>
<object class="GtkLabel" id="fontlabel">
- <property name="visible">True</property>
<property name="label">_Font:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">font</property>
<property name="xalign">1</property>
+ <layout>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </layout>
</object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
</child>
<child>
<object class="GtkFontButton" id="font">
- <property name="visible">True</property>
+ <layout>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
+ </layout>
</object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">0</property>
- </packing>
</child>
<child>
<object class="GtkLabel" id="transitionlabel">
- <property name="visible">True</property>
<property name="label">_Transition:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">transition</property>
<property name="xalign">1</property>
+ <layout>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </layout>
</object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">1</property>
- </packing>
</child>
<child>
<object class="GtkComboBoxText" id="transition">
- <property name="visible">True</property>
<items>
<item translatable="yes" id="none">None</item>
<item translatable="yes" id="crossfade">Fade</item>
<item translatable="yes" id="slide-left-right">Slide</item>
</items>
+ <layout>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
+ </layout>
</object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">1</property>
- </packing>
</child>
</object>
</child>
diff --git a/examples/book/buildapp/step7/window.ui b/examples/book/buildapp/step7/window.ui
index bc795c7..7ad2e28 100644
--- a/examples/book/buildapp/step7/window.ui
+++ b/examples/book/buildapp/step7/window.ui
@@ -1,82 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 3.8 -->
<object class="GtkApplicationWindow" id="app_window">
<property name="title" translatable="yes">Example Application</property>
<property name="default-width">600</property>
<property name="default-height">400</property>
<child>
<object class="GtkBox" id="content_box">
- <property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHeaderBar" id="header">
- <property name="visible">True</property>
<child type="title">
<object class="GtkStackSwitcher" id="tabs">
- <property name="visible">True</property>
<property name="stack">stack</property>
</object>
</child>
- <child>
+ <child type="end">
<object class="GtkToggleButton" id="search">
- <property name="visible">True</property>
<property name="sensitive">False</property>
- <style>
- <class name="image-button"/>
- </style>
- <child>
- <object class="GtkImage" id="search-icon">
- <property name="visible">True</property>
- <property name="icon-name">edit-find-symbolic</property>
- <property name="icon-size">1</property>
- </object>
- </child>
+ <property name="icon-name">edit-find-symbolic</property>
</object>
- <packing>
- <property name="pack-type">end</property>
- </packing>
</child>
- <child>
+ <child type="end">
<object class="GtkMenuButton" id="gears">
- <property name="visible">True</property>
<property name="direction">none</property>
<property name="use-popover">True</property>
<style>
<class name="image-button"/>
</style>
</object>
- <packing>
- <property name="pack-type">end</property>
- </packing>
</child>
</object>
</child>
<child>
<object class="GtkSearchBar" id="searchbar">
- <property name="visible">True</property>
<child>
<object class="GtkSearchEntry" id="searchentry">
- <property name="visible">True</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkBox" id="hbox">
- <property name="visible">True</property>
<child>
<object class="GtkRevealer" id="sidebar">
- <property name="visible">True</property>
<property name="transition-type">slide-right</property>
<child>
<object class="GtkScrolledWindow" id="sidebar-sw">
- <property name="visible">True</property>
<property name="hscrollbar-policy">never</property>
<property name="vscrollbar-policy">automatic</property>
<child>
<object class="GtkListBox" id="words">
- <property name="visible">True</property>
<property name="selection-mode">none</property>
</object>
</child>
@@ -86,7 +59,6 @@
</child>
<child>
<object class="GtkStack" id="stack">
- <property name="visible">True</property>
<property name="transition-duration">500</property>
</object>
</child>
diff --git a/examples/book/buildapp/step8/prefs.ui b/examples/book/buildapp/step8/prefs.ui
index abe5d95..580daaf 100644
--- a/examples/book/buildapp/step8/prefs.ui
+++ b/examples/book/buildapp/step8/prefs.ui
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 3.8 -->
<object class="GtkDialog" id="prefs_dialog">
<property name="title" translatable="yes">Preferences</property>
<property name="resizable">False</property>
@@ -10,58 +9,53 @@
<object class="GtkBox" id="content_area">
<child>
<object class="GtkGrid" id="grid">
- <property name="visible">True</property>
<property name="margin">6</property>
<property name="row-spacing">12</property>
<property name="column-spacing">6</property>
<child>
<object class="GtkLabel" id="fontlabel">
- <property name="visible">True</property>
<property name="label">_Font:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">font</property>
<property name="xalign">1</property>
+ <layout>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </layout>
</object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
</child>
<child>
<object class="GtkFontButton" id="font">
- <property name="visible">True</property>
+ <layout>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
+ </layout>
</object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">0</property>
- </packing>
</child>
<child>
<object class="GtkLabel" id="transitionlabel">
- <property name="visible">True</property>
<property name="label">_Transition:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">transition</property>
<property name="xalign">1</property>
+ <layout>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </layout>
</object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">1</property>
- </packing>
</child>
<child>
<object class="GtkComboBoxText" id="transition">
- <property name="visible">True</property>
<items>
<item translatable="yes" id="none">None</item>
<item translatable="yes" id="crossfade">Fade</item>
<item translatable="yes" id="slide-left-right">Slide</item>
</items>
+ <layout>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
+ </layout>
</object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">1</property>
- </packing>
</child>
</object>
</child>
diff --git a/examples/book/buildapp/step8/window.ui b/examples/book/buildapp/step8/window.ui
index c908b59..3a0b1fc 100644
--- a/examples/book/buildapp/step8/window.ui
+++ b/examples/book/buildapp/step8/window.ui
@@ -1,99 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 3.8 -->
<object class="GtkApplicationWindow" id="app_window">
<property name="title" translatable="yes">Example Application</property>
<property name="default-width">600</property>
<property name="default-height">400</property>
<child>
<object class="GtkBox" id="content_box">
- <property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHeaderBar" id="header">
- <property name="visible">True</property>
<child>
<object class="GtkLabel" id="lines_label">
<property name="visible">False</property>
<property name="label" translatable="yes">Lines:</property>
</object>
- <packing>
- <property name="pack-type">start</property>
- </packing>
</child>
<child>
<object class="GtkLabel" id="lines">
<property name="visible">False</property>
</object>
- <packing>
- <property name="pack-type">start</property>
- </packing>
</child>
<child type="title">
<object class="GtkStackSwitcher" id="tabs">
- <property name="visible">True</property>
<property name="stack">stack</property>
</object>
</child>
- <child>
+ <child type="end">
<object class="GtkToggleButton" id="search">
- <property name="visible">True</property>
<property name="sensitive">False</property>
- <style>
- <class name="image-button"/>
- </style>
- <child>
- <object class="GtkImage" id="search-icon">
- <property name="visible">True</property>
- <property name="icon-name">edit-find-symbolic</property>
- <property name="icon-size">1</property>
- </object>
- </child>
+ <property name="icon-name">edit-find-symbolic</property>
</object>
- <packing>
- <property name="pack-type">end</property>
- </packing>
</child>
- <child>
+ <child type="end">
<object class="GtkMenuButton" id="gears">
- <property name="visible">True</property>
<property name="direction">none</property>
<property name="use-popover">True</property>
<style>
<class name="image-button"/>
</style>
</object>
- <packing>
- <property name="pack-type">end</property>
- </packing>
</child>
</object>
</child>
<child>
<object class="GtkSearchBar" id="searchbar">
- <property name="visible">True</property>
<child>
<object class="GtkSearchEntry" id="searchentry">
- <property name="visible">True</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkBox" id="hbox">
- <property name="visible">True</property>
<child>
<object class="GtkRevealer" id="sidebar">
- <property name="visible">True</property>
<property name="transition-type">slide-right</property>
<child>
<object class="GtkScrolledWindow" id="sidebar-sw">
- <property name="visible">True</property>
<property name="hscrollbar-policy">never</property>
<property name="vscrollbar-policy">automatic</property>
<child>
<object class="GtkListBox" id="words">
- <property name="visible">True</property>
<property name="selection-mode">none</property>
</object>
</child>
@@ -103,7 +70,6 @@
</child>
<child>
<object class="GtkStack" id="stack">
- <property name="visible">True</property>
<property name="transition-duration">500</property>
</object>
</child>
diff --git a/examples/book/buildapp/step9/prefs.ui b/examples/book/buildapp/step9/prefs.ui
index abe5d95..580daaf 100644
--- a/examples/book/buildapp/step9/prefs.ui
+++ b/examples/book/buildapp/step9/prefs.ui
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 3.8 -->
<object class="GtkDialog" id="prefs_dialog">
<property name="title" translatable="yes">Preferences</property>
<property name="resizable">False</property>
@@ -10,58 +9,53 @@
<object class="GtkBox" id="content_area">
<child>
<object class="GtkGrid" id="grid">
- <property name="visible">True</property>
<property name="margin">6</property>
<property name="row-spacing">12</property>
<property name="column-spacing">6</property>
<child>
<object class="GtkLabel" id="fontlabel">
- <property name="visible">True</property>
<property name="label">_Font:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">font</property>
<property name="xalign">1</property>
+ <layout>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </layout>
</object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
</child>
<child>
<object class="GtkFontButton" id="font">
- <property name="visible">True</property>
+ <layout>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
+ </layout>
</object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">0</property>
- </packing>
</child>
<child>
<object class="GtkLabel" id="transitionlabel">
- <property name="visible">True</property>
<property name="label">_Transition:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">transition</property>
<property name="xalign">1</property>
+ <layout>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </layout>
</object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">1</property>
- </packing>
</child>
<child>
<object class="GtkComboBoxText" id="transition">
- <property name="visible">True</property>
<items>
<item translatable="yes" id="none">None</item>
<item translatable="yes" id="crossfade">Fade</item>
<item translatable="yes" id="slide-left-right">Slide</item>
</items>
+ <layout>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
+ </layout>
</object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">1</property>
- </packing>
</child>
</object>
</child>
diff --git a/examples/book/buildapp/step9/window.ui b/examples/book/buildapp/step9/window.ui
index c0389f7..83baf4a 100644
--- a/examples/book/buildapp/step9/window.ui
+++ b/examples/book/buildapp/step9/window.ui
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 3.8 -->
<object class="GtkApplicationWindow" id="app_window">
<property name="default-width">600</property>
<property name="default-height">400</property>
<child type="titlebar">
<object class="GtkHeaderBar" id="header">
<property name="title" translatable="yes">Example Application</property>
- <property name="visible">True</property>
<property name="show-title-buttons">True</property>
<property name="decoration-layout">menu:close</property>
<child>
@@ -15,97 +13,65 @@
<property name="visible">False</property>
<property name="label" translatable="yes">Lines:</property>
</object>
- <packing>
- <property name="pack-type">start</property>
- </packing>
</child>
<child>
<object class="GtkLabel" id="lines">
<property name="visible">False</property>
</object>
- <packing>
- <property name="pack-type">start</property>
- </packing>
</child>
<child type="title">
<object class="GtkStackSwitcher" id="tabs">
- <property name="visible">True</property>
<property name="stack">stack</property>
</object>
</child>
- <child>
+ <child type="end">
<object class="GtkToggleButton" id="search">
- <property name="visible">True</property>
<property name="sensitive">False</property>
- <style>
- <class name="image-button"/>
- </style>
- <child>
- <object class="GtkImage" id="search-icon">
- <property name="visible">True</property>
- <property name="icon-name">edit-find-symbolic</property>
- <property name="icon-size">1</property>
- </object>
- </child>
+ <property name="icon-name">edit-find-symbolic</property>
</object>
- <packing>
- <property name="pack-type">end</property>
- </packing>
</child>
- <child>
+ <child type="end">
<object class="GtkMenuButton" id="gears">
- <property name="visible">True</property>
<property name="direction">none</property>
<property name="use-popover">True</property>
<style>
<class name="image-button"/>
</style>
</object>
- <packing>
- <property name="pack-type">end</property>
- </packing>
</child>
</object>
</child>
<child>
<object class="GtkBox" id="content_box">
- <property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkSearchBar" id="searchbar">
- <property name="visible">True</property>
<child>
<object class="GtkSearchEntry" id="searchentry">
- <property name="visible">True</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkBox" id="hbox">
- <property name="visible">True</property>
<child>
<object class="GtkRevealer" id="sidebar">
- <property name="visible">True</property>
<property name="transition-type">slide-right</property>
<child>
- <object class="GtkScrolledWindow" id="sidebar-sw">
- <property name="visible">True</property>
- <property name="hscrollbar-policy">never</property>
- <property name="vscrollbar-policy">automatic</property>
- <child>
- <object class="GtkListBox" id="words">
- <property name="visible">True</property>
- <property name="selection-mode">none</property>
- </object>
- </child>
- </object>
+ <object class="GtkScrolledWindow" id="sidebar-sw">
+ <property name="hscrollbar-policy">never</property>
+ <property name="vscrollbar-policy">automatic</property>
+ <child>
+ <object class="GtkListBox" id="words">
+ <property name="selection-mode">none</property>
+ </object>
+ </child>
+ </object>
</child>
</object>
</child>
<child>
<object class="GtkStack" id="stack">
- <property name="visible">True</property>
<property name="transition-duration">500</property>
</object>
</child>
diff --git a/examples/book/builder/basic/basic.glade b/examples/book/builder/basic/basic.glade
index b78a873..d840b5d 100644
--- a/examples/book/builder/basic/basic.glade
+++ b/examples/book/builder/basic/basic.glade
@@ -1,58 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.16.1 and then changed manually -->
<interface>
- <requires lib="gtk+" version="3.0"/>
+ <requires lib="gtk" version="3.94"/>
<object class="GtkDialog" id="DialogBasic">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Basic Builder example</property>
<property name="default_width">250</property>
<property name="default_height">100</property>
<property name="type_hint">normal</property>
- <child internal-child="vbox">
+ <child internal-child="content_area">
<object class="GtkBox" id="dialog-vbox2">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area2">
- <property name="visible">True</property>
+ <child type="end" internal-child="action_area">
+ <object class="GtkBox" id="dialog-action_area2">
<property name="can_focus">False</property>
- <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="quit_button">
<property name="label">_Quit</property>
- <property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
<object class="GtkLabel" id="label1">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">This is a basic Glade and Gtk::Builder
example</property>
<property name="wrap">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
</child>
diff --git a/examples/book/builder/derived/derived.glade b/examples/book/builder/derived/derived.glade
index c3363b4..c31d9a1 100644
--- a/examples/book/builder/derived/derived.glade
+++ b/examples/book/builder/derived/derived.glade
@@ -1,58 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.16.1 and then changed manually -->
<interface>
- <requires lib="gtk+" version="3.0"/>
+ <requires lib="gtk" version="3.94"/>
<object class="GtkDialog" id="DialogDerived">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Derived Builder example</property>
<property name="default_width">250</property>
<property name="default_height">100</property>
<property name="type_hint">normal</property>
- <child internal-child="vbox">
+ <child internal-child="content_area">
<object class="GtkBox" id="dialog-vbox2">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area2">
- <property name="visible">True</property>
+ <child type="end" internal-child="action_area">
+ <object class="GtkBox" id="dialog-action_area2">
<property name="can_focus">False</property>
- <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="quit_button">
<property name="label">_Quit</property>
- <property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
<object class="GtkLabel" id="label1">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">This is a Glade and Gtk::Builder example with a
derived widget</property>
<property name="wrap">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
</child>
diff --git a/examples/book/menus/main_menu/exampleapplication.cc
b/examples/book/menus/main_menu/exampleapplication.cc
index 0968930..5b96f59 100644
--- a/examples/book/menus/main_menu/exampleapplication.cc
+++ b/examples/book/menus/main_menu/exampleapplication.cc
@@ -233,6 +233,8 @@ void ExampleApplication::create_window()
//That's enough for this simple example.
win->signal_hide().connect(sigc::bind(
sigc::mem_fun(*this, &ExampleApplication::on_window_hide), win));
+
+ win->show();
}
void ExampleApplication::on_window_hide(Gtk::Window* window)
diff --git a/examples/book/menus/main_menu/examplewindow.cc b/examples/book/menus/main_menu/examplewindow.cc
index b5e55b1..8605fb7 100644
--- a/examples/book/menus/main_menu/examplewindow.cc
+++ b/examples/book/menus/main_menu/examplewindow.cc
@@ -58,37 +58,30 @@ ExampleWindow::ExampleWindow()
m_refBuilder = Gtk::Builder::create();
Glib::ustring ui_info =
- "<!-- Generated with glade 3.18.3 -->"
+ "<!-- Generated with glade 3.18.3 and then changed manually -->"
"<interface>"
- " <requires lib='gtk+' version='3.4'/>"
+ " <requires lib='gtk' version='3.94'/>"
" <object class='GtkToolbar' id='toolbar'>"
- " <property name='visible'>True</property>"
" <property name='can_focus'>False</property>"
" <child>"
" <object class='GtkToolButton' id='toolbutton_new'>"
- " <property name='visible'>True</property>"
" <property name='can_focus'>False</property>"
" <property name='tooltip_text' translatable='yes'>New Standard</property>"
" <property name='action_name'>app.newstandard</property>"
" <property name='icon_name'>document-new</property>"
- " </object>"
- " <packing>"
" <property name='expand'>False</property>"
" <property name='homogeneous'>True</property>"
- " </packing>"
+ " </object>"
" </child>"
" <child>"
" <object class='GtkToolButton' id='toolbutton_quit'>"
- " <property name='visible'>True</property>"
" <property name='can_focus'>False</property>"
" <property name='tooltip_text' translatable='yes'>Quit</property>"
" <property name='action_name'>app.quit</property>"
" <property name='icon_name'>application-exit</property>"
- " </object>"
- " <packing>"
" <property name='expand'>False</property>"
" <property name='homogeneous'>True</property>"
- " </packing>"
+ " </object>"
" </child>"
" </object>"
"</interface>";
diff --git a/examples/book/menus_and_toolbars/toolbar.glade b/examples/book/menus_and_toolbars/toolbar.glade
index 65cc92a..e543985 100644
--- a/examples/book/menus_and_toolbars/toolbar.glade
+++ b/examples/book/menus_and_toolbars/toolbar.glade
@@ -1,53 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.18.3 and then changed manually -->
<interface>
- <requires lib="gtk+" version="3.8"/>
+ <requires lib="gtk" version="3.94"/>
<object class="GtkImage" id="image_rain">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="resource">/toolbar/rain.png</property>
</object>
<object class="GtkToolbar" id="toolbar">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkToolButton" id="toolbutton_new">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">New</property>
<property name="action_name">example.new</property>
<property name="icon_name">document-new</property>
- </object>
- <packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
- </packing>
+ </object>
</child>
<child>
<object class="GtkToggleToolButton" id="toolbutton_rain">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Stay dry in the rain</property>
<property name="action_name">example.rain</property>
<property name="label_widget">image_rain</property>
- </object>
- <packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
- </packing>
+ </object>
</child>
<child>
<object class="GtkToolButton" id="toolbutton_quit">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Quit</property>
<property name="action_name">example.quit</property>
<property name="icon_name">application-exit</property>
- </object>
- <packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
- </packing>
+ </object>
</child>
</object>
</interface>
diff --git a/examples/book/printing/advanced/examplewindow.cc
b/examples/book/printing/advanced/examplewindow.cc
index d5e27bb..df84f7b 100644
--- a/examples/book/printing/advanced/examplewindow.cc
+++ b/examples/book/printing/advanced/examplewindow.cc
@@ -153,60 +153,47 @@ void ExampleWindow::build_main_menu(const Glib::RefPtr<Gtk::Application>& app)
// Layout the actions in a toolbar:
Glib::ustring ui_toolbar_info =
- "<!-- Generated with glade 3.18.3 -->"
+ "<!-- Generated with glade 3.18.3 and then changed manually -->"
"<interface>"
- "<requires lib='gtk+' version='3.8'/>"
+ "<requires lib='gtk' version='3.94'/>"
"<object class='GtkToolbar' id='toolbar'>"
- "<property name='visible'>True</property>"
"<property name='can_focus'>False</property>"
"<child>"
"<object class='GtkToolButton' id='toolbutton_new'>"
- "<property name='visible'>True</property>"
"<property name='can_focus'>False</property>"
"<property name='tooltip_text' translatable='yes'>New</property>"
"<property name='action_name'>example.new</property>"
"<property name='icon_name'>document-new</property>"
- "</object>"
- "<packing>"
"<property name='expand'>False</property>"
"<property name='homogeneous'>True</property>"
- "</packing>"
+ "</object>"
"</child>"
"<child>"
"<object class='GtkToolButton' id='toolbutton_print'>"
- "<property name='visible'>True</property>"
"<property name='can_focus'>False</property>"
"<property name='tooltip_text' translatable='yes'>Print</property>"
"<property name='action_name'>example.print</property>"
"<property name='icon_name'>document-print</property>"
- "</object>"
- "<packing>"
"<property name='expand'>False</property>"
"<property name='homogeneous'>True</property>"
- "</packing>"
+ "</object>"
"</child>"
"<child>"
"<object class='GtkSeparatorToolItem' id='separator1'>"
- "<property name='visible'>True</property>"
"<property name='can_focus'>False</property>"
- "</object>"
- "<packing>"
"<property name='expand'>False</property>"
"<property name='homogeneous'>False</property>"
- "</packing>"
+ "</object>"
"</child>"
"<child>"
"<object class='GtkToolButton' id='toolbutton_quit'>"
- "<property name='visible'>True</property>"
"<property name='can_focus'>False</property>"
"<property name='tooltip_text' translatable='yes'>Quit</property>"
"<property name='action_name'>example.quit</property>"
"<property name='icon_name'>application-exit</property>"
- "</object>"
- "<packing>"
"<property name='expand'>False</property>"
"<property name='homogeneous'>True</property>"
- "</packing>"
+ "</object>"
"</child>"
"</object>"
"</interface>";
diff --git a/examples/book/printing/simple/examplewindow.cc b/examples/book/printing/simple/examplewindow.cc
index b46e94d..e767d69 100644
--- a/examples/book/printing/simple/examplewindow.cc
+++ b/examples/book/printing/simple/examplewindow.cc
@@ -154,60 +154,47 @@ void ExampleWindow::build_main_menu(const Glib::RefPtr<Gtk::Application>& app)
// Layout the actions in a toolbar:
Glib::ustring ui_toolbar_info =
- "<!-- Generated with glade 3.18.3 -->"
+ "<!-- Generated with glade 3.18.3 and then changed manually -->"
"<interface>"
- "<requires lib='gtk+' version='3.8'/>"
+ "<requires lib='gtk' version='3.94'/>"
"<object class='GtkToolbar' id='toolbar'>"
- "<property name='visible'>True</property>"
"<property name='can_focus'>False</property>"
"<child>"
"<object class='GtkToolButton' id='toolbutton_new'>"
- "<property name='visible'>True</property>"
"<property name='can_focus'>False</property>"
"<property name='tooltip_text' translatable='yes'>New</property>"
"<property name='action_name'>example.new</property>"
"<property name='icon_name'>document-new</property>"
- "</object>"
- "<packing>"
"<property name='expand'>False</property>"
"<property name='homogeneous'>True</property>"
- "</packing>"
+ "</object>"
"</child>"
"<child>"
"<object class='GtkToolButton' id='toolbutton_print'>"
- "<property name='visible'>True</property>"
"<property name='can_focus'>False</property>"
"<property name='tooltip_text' translatable='yes'>Print</property>"
"<property name='action_name'>example.print</property>"
"<property name='icon_name'>document-print</property>"
- "</object>"
- "<packing>"
"<property name='expand'>False</property>"
"<property name='homogeneous'>True</property>"
- "</packing>"
+ "</object>"
"</child>"
"<child>"
"<object class='GtkSeparatorToolItem' id='separator1'>"
- "<property name='visible'>True</property>"
"<property name='can_focus'>False</property>"
- "</object>"
- "<packing>"
"<property name='expand'>False</property>"
"<property name='homogeneous'>False</property>"
- "</packing>"
+ "</object>"
"</child>"
"<child>"
"<object class='GtkToolButton' id='toolbutton_quit'>"
- "<property name='visible'>True</property>"
"<property name='can_focus'>False</property>"
"<property name='tooltip_text' translatable='yes'>Quit</property>"
"<property name='action_name'>example.quit</property>"
"<property name='icon_name'>application-exit</property>"
- "</object>"
- "<packing>"
"<property name='expand'>False</property>"
"<property name='homogeneous'>True</property>"
- "</packing>"
+ "</object>"
"</child>"
"</object>"
"</interface>";
diff --git a/examples/book/recent_files/examplewindow.cc b/examples/book/recent_files/examplewindow.cc
index dd98c97..704701f 100644
--- a/examples/book/recent_files/examplewindow.cc
+++ b/examples/book/recent_files/examplewindow.cc
@@ -78,33 +78,26 @@ ExampleWindow::ExampleWindow(const Glib::RefPtr<Gtk::Application>& app)
" </submenu>"
" </menu>"
" <object class='GtkToolbar' id='toolbar'>"
- " <property name='visible'>True</property>"
" <property name='can_focus'>False</property>"
" <child>"
" <object class='GtkToolButton' id='toolbutton_new'>"
- " <property name='visible'>True</property>"
" <property name='can_focus'>False</property>"
" <property name='tooltip_text' translatable='yes'>New</property>"
" <property name='action_name'>example.new</property>"
" <property name='icon_name'>document-new</property>"
- " </object>"
- " <packing>"
" <property name='expand'>False</property>"
" <property name='homogeneous'>True</property>"
- " </packing>"
+ " </object>"
" </child>"
" <child>"
" <object class='GtkToolButton' id='toolbutton_quit'>"
- " <property name='visible'>True</property>"
" <property name='can_focus'>False</property>"
" <property name='tooltip_text' translatable='yes'>Quit</property>"
" <property name='action_name'>example.quit</property>"
" <property name='icon_name'>application-exit</property>"
- " </object>"
- " <packing>"
" <property name='expand'>False</property>"
" <property name='homogeneous'>True</property>"
- " </packing>"
+ " </object>"
" </child>"
" </object>"
"</interface>";
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
