Added a glade catalog file (dshea)
This commit is contained in:
David Shea
parent
15965908d0
commit
299e29647a
103
0011-Added-a-glade-catalog-file.patch
Normal file
103
0011-Added-a-glade-catalog-file.patch
Normal file
@ -0,0 +1,103 @@
|
||||
From fc196f9d0c8ea0531183608dd7bcccc36fffd056 Mon Sep 17 00:00:00 2001
|
||||
From: David Shea <dshea@redhat.com>
|
||||
Date: Wed, 27 Nov 2013 11:22:42 -0500
|
||||
Subject: [PATCH 11/11] Added a glade catalog file.
|
||||
|
||||
This allows CcTimezoneMap and CcTimezoneCompletion to be used in glade.
|
||||
---
|
||||
Makefile.am | 2 +-
|
||||
configure.ac | 1 +
|
||||
glade/Makefile.am | 2 ++
|
||||
glade/TimezoneMap.xml | 47 +++++++++++++++++++++++++++++++++++++++++++++++
|
||||
4 files changed, 51 insertions(+), 1 deletion(-)
|
||||
create mode 100644 glade/Makefile.am
|
||||
create mode 100644 glade/TimezoneMap.xml
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 960f89c..15740b2 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -1,6 +1,6 @@
|
||||
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
|
||||
|
||||
-SUBDIRS = src
|
||||
+SUBDIRS = src glade
|
||||
|
||||
DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 46d26cd..4c079fc 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -79,6 +79,7 @@ AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all
|
||||
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
+glade/Makefile
|
||||
src/Makefile
|
||||
src/timezonemap.pc
|
||||
])
|
||||
diff --git a/glade/Makefile.am b/glade/Makefile.am
|
||||
new file mode 100644
|
||||
index 0000000..37bde31
|
||||
--- /dev/null
|
||||
+++ b/glade/Makefile.am
|
||||
@@ -0,0 +1,2 @@
|
||||
+gladedir = $(datadir)/glade/catalogs
|
||||
+dist_glade_DATA = TimezoneMap.xml
|
||||
diff --git a/glade/TimezoneMap.xml b/glade/TimezoneMap.xml
|
||||
new file mode 100644
|
||||
index 0000000..a43e925
|
||||
--- /dev/null
|
||||
+++ b/glade/TimezoneMap.xml
|
||||
@@ -0,0 +1,47 @@
|
||||
+<glade-catalog name="TimezoneMap"
|
||||
+ version="0.4"
|
||||
+ library="timezonemap"
|
||||
+ domain="glade-3"
|
||||
+ depends="gtk+">
|
||||
+
|
||||
+ <glade-widget-classes>
|
||||
+ <glade-widget-class title="Timezone Map"
|
||||
+ name="CcTimezoneMap"
|
||||
+ icon-name="widget-gtk-image"
|
||||
+ generic-name="TimezoneMap">
|
||||
+ <signals>
|
||||
+ <signal id="location-changed"/>
|
||||
+ </signals>
|
||||
+ </glade-widget-class>
|
||||
+
|
||||
+ <glade-widget-class title="Timezone Entry Complection"
|
||||
+ name="CcTimezoneCompletion"
|
||||
+ generic-name="TimezoneCompletion">
|
||||
+ <!-- From GtkEntryCompletion -->
|
||||
+ <add-child-verify-function>glade_gtk_cell_layout_add_verify</add-child-verify-function>
|
||||
+ <add-child-function>glade_gtk_cell_layout_add_child</add-child-function>
|
||||
+ <remove-child-function>glade_gtk_cell_layout_remove_child</remove-child-function>
|
||||
+ <get-children-function>glade_gtk_cell_layout_get_children</get-children-function>
|
||||
+ <read-child-function>glade_gtk_cell_layout_read_child</read-child-function>
|
||||
+ <write-child-function>glade_gtk_cell_layout_write_child</write-child-function>
|
||||
+ <action-activate-function>glade_gtk_cell_layout_action_activate</action-activate-function>
|
||||
+ <child-set-property-function>glade_gtk_cell_layout_set_child_property</child-set-property-function>
|
||||
+ <child-get-property-function>glade_gtk_cell_layout_get_child_property</child-get-property-function>
|
||||
+
|
||||
+ <properties>
|
||||
+ <property id="model" disabled="True"/>
|
||||
+ <property id="text-column" disabled="True"/>
|
||||
+ <property id="popup-set-width" disabled="True"/>
|
||||
+ </properties>
|
||||
+
|
||||
+ <actions>
|
||||
+ <action stock="gtk-edit" important="True" id="launch_editor" name="Edit…"></action>
|
||||
+ </actions>
|
||||
+ </glade-widget-class>
|
||||
+ </glade-widget-classes>
|
||||
+
|
||||
+ <glade-widget-group name="timezonemap-misc-widgets" title="TimezoneMap Widgets">
|
||||
+ <glade-widget-class-ref name="CcTimezoneMap"/>
|
||||
+ <glade-widget-class-ref name="CcTimezoneCompletion"/>
|
||||
+ </glade-widget-group>
|
||||
+</glade-catalog>
|
||||
--
|
||||
1.8.4.2
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: libtimezonemap
|
||||
Version: 0.4.1
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Time zone map widget for Gtk+
|
||||
|
||||
Group: System Environment/Libraries
|
||||
@ -17,6 +17,7 @@ Patch6: 0007-Added-a-.bzrignore-file-to-ignore-all-the-files-gene.patch
|
||||
Patch7: 0008-Ignore-the-INSTALL-file.patch
|
||||
Patch8: 0009-Added-a-function-to-clear-the-location-set-for-a-CcT.patch
|
||||
Patch9: 0010-Allow-the-timezone-highlight-to-be-manually-set-sepa.patch
|
||||
Patch10: 0011-Added-a-glade-catalog-file.patch
|
||||
|
||||
BuildRequires: glib2-devel >= 2.26
|
||||
BuildRequires: gtk3-devel >= 3.1.4
|
||||
@ -53,6 +54,7 @@ files used for building applications that use %{name}.
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
|
||||
%build
|
||||
./autogen.sh
|
||||
@ -78,8 +80,12 @@ rm -f %{buildroot}%{_libdir}/*.la
|
||||
%{_libdir}/pkgconfig/timezonemap.pc
|
||||
%{_includedir}/timezonemap
|
||||
%{_datadir}/gir-1.0/TimezoneMap-1.0.gir
|
||||
%{_datadir}/glade/catalogs/TimezoneMap.xml
|
||||
|
||||
%changelog
|
||||
* Wed Nov 27 2013 David Shea <dshea@redhat.com> - 0.4.1-3
|
||||
- Added a glade catalog file (dshea)
|
||||
|
||||
* Tue Nov 26 2013 David Shea <dshea@redhat.com> - 0.4.1-2
|
||||
- Make whitespace and indentation consistent (iain.lane@canonical.com)
|
||||
- Switched to a git-formatted patch for the FSF address to make things easier
|
||||
|
||||
Loading…
Reference in New Issue
Block a user