[gtkmm-documentation] Update Builder ui files and AboutDialog example
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm-documentation] Update Builder ui files and AboutDialog example
- Date: Wed, 13 Jan 2021 14:20:07 +0000 (UTC)
commit e10fd60f078354b1dca7c33fac37ff298c7a05da
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date: Wed Jan 13 15:18:29 2021 +0100
Update Builder ui files and AboutDialog example
* examples/book/builder/basic/basic.glade:
* examples/book/builder/derived/derived.glade:
* examples/book/menus/main_menu/examplewindow.cc:
* examples/book/menus_and_toolbars/toolbar.glade:
* examples/book/printing/advanced/examplewindow.cc:
* examples/book/printing/simple/examplewindow.cc: Remove <requires>
elements. They make it difficult to use either e.g. gtk 3.98 or 4.0.
You have to choose one major version or the other.
* examples/book/dialogs/aboutdialog/examplewindow.cc:
Simplify the call to set_logo().
examples/book/builder/basic/basic.glade | 1 -
examples/book/builder/derived/derived.glade | 1 -
examples/book/dialogs/aboutdialog/examplewindow.cc | 4 ++--
examples/book/menus/main_menu/examplewindow.cc | 1 -
examples/book/menus_and_toolbars/toolbar.glade | 1 -
examples/book/printing/advanced/examplewindow.cc | 1 -
examples/book/printing/simple/examplewindow.cc | 1 -
7 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/examples/book/builder/basic/basic.glade b/examples/book/builder/basic/basic.glade
index dac5ec5..6b0e17b 100644
--- a/examples/book/builder/basic/basic.glade
+++ b/examples/book/builder/basic/basic.glade
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 and then changed manually -->
<interface>
- <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>
diff --git a/examples/book/builder/derived/derived.glade b/examples/book/builder/derived/derived.glade
index 010eb1a..29457fc 100644
--- a/examples/book/builder/derived/derived.glade
+++ b/examples/book/builder/derived/derived.glade
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 and then changed manually -->
<interface>
- <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>
diff --git a/examples/book/dialogs/aboutdialog/examplewindow.cc
b/examples/book/dialogs/aboutdialog/examplewindow.cc
index 408ff5b..bf20fec 100644
--- a/examples/book/dialogs/aboutdialog/examplewindow.cc
+++ b/examples/book/dialogs/aboutdialog/examplewindow.cc
@@ -25,6 +25,7 @@ ExampleWindow::ExampleWindow()
m_Button("Show AboutDialog")
{
set_title("Gtk::AboutDialog example");
+ set_default_size(400, 150);
set_child(m_VBox);
@@ -44,8 +45,7 @@ ExampleWindow::ExampleWindow()
m_Dialog.set_transient_for(*this);
m_Dialog.set_hide_on_close();
- m_Dialog.set_logo(Gdk::Texture::create_for_pixbuf(
- Gdk::Pixbuf::create_from_resource("/about/gtkmm_logo.gif", -1, 40, true)));
+ m_Dialog.set_logo(Gdk::Texture::create_from_resource("/about/gtkmm_logo.gif"));
m_Dialog.set_program_name("Example application");
m_Dialog.set_version("1.0.0");
m_Dialog.set_copyright("Murray Cumming");
diff --git a/examples/book/menus/main_menu/examplewindow.cc b/examples/book/menus/main_menu/examplewindow.cc
index 21bb4c4..9dc5e83 100644
--- a/examples/book/menus/main_menu/examplewindow.cc
+++ b/examples/book/menus/main_menu/examplewindow.cc
@@ -60,7 +60,6 @@ ExampleWindow::ExampleWindow()
Glib::ustring ui_info =
"<!-- Generated with glade 3.18.3 and then changed manually -->"
"<interface>"
- " <requires lib='gtk' version='3.94'/>"
" <object class='GtkBox' id='toolbar'>"
" <property name='can_focus'>False</property>"
" <child>"
diff --git a/examples/book/menus_and_toolbars/toolbar.glade b/examples/book/menus_and_toolbars/toolbar.glade
index 1078b02..4f91b5e 100644
--- a/examples/book/menus_and_toolbars/toolbar.glade
+++ b/examples/book/menus_and_toolbars/toolbar.glade
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 and then changed manually -->
<interface>
- <requires lib="gtk" version="3.98"/>
<object class="GtkBox" id="toolbar">
<property name="can_focus">False</property>
<property name="spacing">3</property>
diff --git a/examples/book/printing/advanced/examplewindow.cc
b/examples/book/printing/advanced/examplewindow.cc
index b4a6922..a5dc23a 100644
--- a/examples/book/printing/advanced/examplewindow.cc
+++ b/examples/book/printing/advanced/examplewindow.cc
@@ -155,7 +155,6 @@ void ExampleWindow::build_main_menu(const Glib::RefPtr<Gtk::Application>& app)
Glib::ustring ui_toolbar_info =
"<!-- Generated with glade 3.18.3 and then changed manually -->"
"<interface>"
- "<requires lib='gtk' version='3.98'/>"
"<object class='GtkBox' id='toolbar'>"
"<property name='can_focus'>False</property>"
"<property name='spacing'>3</property>"
diff --git a/examples/book/printing/simple/examplewindow.cc b/examples/book/printing/simple/examplewindow.cc
index b4a6922..a5dc23a 100644
--- a/examples/book/printing/simple/examplewindow.cc
+++ b/examples/book/printing/simple/examplewindow.cc
@@ -155,7 +155,6 @@ void ExampleWindow::build_main_menu(const Glib::RefPtr<Gtk::Application>& app)
Glib::ustring ui_toolbar_info =
"<!-- Generated with glade 3.18.3 and then changed manually -->"
"<interface>"
- "<requires lib='gtk' version='3.98'/>"
"<object class='GtkBox' id='toolbar'>"
"<property name='can_focus'>False</property>"
"<property name='spacing'>3</property>"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]