[evolution] Add a Glade 3 catalog.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Add a Glade 3 catalog.
- Date: Wed, 24 Mar 2010 20:26:03 +0000 (UTC)
commit dcec8c208697106401f714547a79afe48acf750b
Author: Matthew Barnes <mbarnes redhat com>
Date: Wed Mar 24 16:00:30 2010 -0400
Add a Glade 3 catalog.
Evolution maintainers should install this so they can safely open
GtkBuilder files in Glade 3 without Glade silently deleting custom
widgets it doesn't understand. The catalog makes it understand.
Makefile.am | 6 ++++++
configure.ac | 15 +++++++++++++++
maint/Makefile.am | 25 +++++++++++++++++++++++++
maint/evolution.xml | 47 +++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 93 insertions(+), 0 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index bf1adb0..d17b4e1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,11 @@ if WITH_HELP
HELP_SUBDIR=help
endif
+# For maintainers only.
+if GLADE_CATALOG
+MAINT_SUBDIR=maint
+endif
+
SUBDIRS = \
m4 \
data \
@@ -61,6 +66,7 @@ SUBDIRS = \
art \
plugins \
modules \
+ $(MAINT_SUBDIR) \
doc \
ui \
views \
diff --git a/configure.ac b/configure.ac
index 6a2ee14..b9cda60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,7 @@ m4_define([libnotify_minimum_version], [0.3.0])
m4_define([gnome_pilot_minimum_version], [2.0.16])
m4_define([gweather_minimum_version], [2.25.3])
m4_define([gtkimageview_minimum_version], [1.6])
+m4_define([gladeui_minimum_version], [3.0.0])
dnl ******************************
dnl Compiler Warning Flags
@@ -1602,6 +1603,19 @@ fi
AM_CONDITIONAL(HAVE_KDE_APPLNK, test x"$KDE_APPLNK_DIR" != x)
AC_SUBST(KDE_APPLNK_DIR)
+dnl ********************************************
+dnl Glade 3 catalog files (for maintainers only)
+dnl ********************************************
+AC_ARG_WITH([glade-catalog],
+ [AS_HELP_STRING([--with-glade-catalog],
+ [Install the catalog files for Glade 3 ]
+ [(for maintainers only) [default=no]])],
+ [with_catalog="$withval"], [with_catalog="no"])
+if test "$with_catalog" = "yes"; then
+ PKG_CHECK_MODULES(GLADEUI, [gladeui-1.0 >= gladeui_minimum_version])
+fi
+AM_CONDITIONAL(GLADE_CATALOG, test "x$with_catalog" != "xno")
+
dnl ******************************
dnl Makefiles
dnl ******************************
@@ -1706,6 +1720,7 @@ mail/default/sr latin/Makefile
mail/default/sv/Makefile
mail/default/zh_CN/Makefile
mail/importers/Makefile
+maint/Makefile
modules/Makefile
modules/addressbook/Makefile
modules/calendar/Makefile
diff --git a/maint/Makefile.am b/maint/Makefile.am
new file mode 100644
index 0000000..950be7c
--- /dev/null
+++ b/maint/Makefile.am
@@ -0,0 +1,25 @@
+### Process this file with automake to produce Makefile.in
+
+gladecatalog_DATA = evolution.xml
+gladecatalogdir = `$(PKG_CONFIG) --variable=catalogdir gladeui-1.0`
+
+gladeevolution_LTLIBRARIES = libgladeevolution.la
+gladeevolutiondir = `$(PKG_CONFIG) --variable=moduledir gladeui-1.0`
+
+libgladeevolution_la_SOURCES =
+
+libgladeevolution_la_LDFLAGS = \
+ -module -avoid-version
+
+libgladeevolution_la_LIBADD = \
+ $(top_srcdir)/mail/libevolution-mail.la \
+ $(top_srcdir)/calendar/gui/libevolution-calendar.la \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
+ $(EVOLUTION_CALENDAR_LIBS) \
+ $(EVOLUTION_MAIL_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
+
+EXTRA_DIST = \
+ $(gladecatalog_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/maint/evolution.xml b/maint/evolution.xml
new file mode 100644
index 0000000..cefe846
--- /dev/null
+++ b/maint/evolution.xml
@@ -0,0 +1,47 @@
+<glade-catalog name="evolution" library="gladeevolution" depends="gtk+" book="evolution">
+
+ <glade-widget-classes>
+
+ <glade-widget-class name="EDateEdit" generic-name="date-edit" title="Date Edit">
+ <property id="allow-no-date-set"/>
+ <property id="set-none"/>
+ <property id="show-date"/>
+ <property id="show-time"/>
+ <property id="show-week-numbers"/>
+ <property id="twodigit-year-can-future"/>
+ <property id="use-24-hour-format"/>
+ <property id="week-start-day"/>
+ </glade-widget-class>
+
+ <glade-widget-class name="EImageChooser" generic-name="image-chooser" title="Image Chooser">
+ <property id="icon-name"/>
+ </glade-widget-class>
+
+ <glade-widget-class name="EMFolderSelectionButton" generic-name="folder-selection-button" title="Folder Selection Button">
+ <property id="caption"/>
+ <property id="multiselect"/>
+ <property id="title"/>
+ </glade-widget-class>
+
+ <glade-widget-class name="ESourceComboBox" generic-name="source-combo-box" title="Source Combo Box">
+ <property id="source-list"/>
+ </glade-widget-class>
+
+ <glade-widget-class name="ETimezoneEntry" generic-name="timezone-entry" title="Timezone Entry">
+ <property id="timezone"/>
+ </glade-widget-class>
+
+ <glade-widget-class name="EUrlEntry" generic-name="url-entry" title="URL Entry"/>
+
+ </glade-widget-classes>
+
+ <glade-widget-group name="evolution-widgets" title="Evolution">
+ <glade-widget-class-ref name="EDateEdit"/>
+ <glade-widget-class-ref name="EImageChooser"/>
+ <glade-widget-class-ref name="EMFolderSelectionButton"/>
+ <glade-widget-class-ref name="ESourceComboBox"/>
+ <glade-widget-class-ref name="ETimezoneEntry"/>
+ <glade-widget-class-ref name="EUrlEntry"/>
+ </glade-widget-group>
+
+</glade-catalog>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]