From 3fdad396b6ef8f797f3b088551a65f618e1e7154 Mon Sep 17 00:00:00 2001
From: Bruce Cowan <bruce@bcowan.me.uk>
Date: Sat, 2 Jun 2012 01:45:00 +0100
Subject: [PATCH] Move about dialogue to main interface file
Not actually used yet
---
interface.ui | 35 ++++++++++++++++++++++++++++++++++-
rugby-about.ui | 34 ----------------------------------
rugby-application.c | 3 +++
3 files changed, 37 insertions(+), 35 deletions(-)
delete mode 100644 rugby-about.ui
diff --git a/interface.ui b/interface.ui
index 894e62d..ec53fe2 100644
--- a/interface.ui
+++ b/interface.ui
@@ -1,6 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="3.4"/>
+ <!-- interface-requires gtk+ 3.4 -->
+ <object class="GtkAboutDialog" id="about">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="type_hint">dialog</property>
+ <property name="program_name">Rugby</property>
+ <property name="copyright" translatable="yes">Copyright © 2012 Bruce Cowan</property>
+ <property name="comments" translatable="yes">A rugby scores possibilities program.</property>
+ <property name="website">http://www.bcowan.me.uk</property>
+ <property name="authors">Bruce Cowan</property>
+ <property name="license_type">mit-x11</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="aboutdialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="aboutdialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ </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>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
<object class="GtkAdjustment" id="filteradj">
<property name="upper">1</property>
<property name="step_increment">1</property>
diff --git a/rugby-about.ui b/rugby-about.ui
deleted file mode 100644
index b39c934..0000000
--- a/rugby-about.ui
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <object class="GtkAboutDialog" id="aboutdialog1">
- <property name="can_focus">False</property>
- <property name="border_width">5</property>
- <property name="type_hint">dialog</property>
- <property name="program_name">Rugby</property>
- <property name="authors">Bruce Cowan</property>
- <property name="license_type">mit-x11</property>
- <child internal-child="vbox">
- <object class="GtkBox" id="aboutdialog-vbox1">
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">2</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="aboutdialog-action_area1">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- </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>
- <placeholder/>
- </child>
- </object>
- </child>
- </object>
-</interface>
diff --git a/rugby-application.c b/rugby-application.c
index 6a39505..ff66154 100644
--- a/rugby-application.c
+++ b/rugby-application.c
@@ -102,6 +102,7 @@ app_about (GSimpleAction *action,
windows = gtk_application_get_windows (application);
window = windows->data;
+ /* TODO show proper about dialogue */
gtk_show_about_dialog (window,
"program-name", "Rugby",
"license-type", GTK_LICENSE_MIT_X11,
@@ -209,6 +210,8 @@ rugby_application_activate (GApplication *app)
window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
gtk_window_set_application (GTK_WINDOW (window), GTK_APPLICATION (app));
gtk_widget_show_all (window);
+
+ g_object_unref (builder);
}
static void
--
GitLab