summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-02-21 10:21:12 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-02-21 10:53:15 +0000
commitd48d8c5da8c51d7b87a609932d28db6ff132683b (patch)
tree70c862972a37c1317ba193c93daab97badbaac0e
parentaa0b9d13b5f8c150a3b3035aa7a1d54f70720cdd (diff)
add a glade catalog so glade can manage our custom widgets
export GLADE_CATALOG_SEARCH_PATH=install/share/glade distro maintainers can link/move this to /usr/share/glade/catalogs Change-Id: Id4d8d51103d0ef91eea5cd0da9742a28838028cc
-rw-r--r--Makefile.in4
-rw-r--r--extras/Module_extras.mk1
-rw-r--r--extras/Package_glade.mk14
-rw-r--r--extras/source/glade/libreoffice-catalog.xml46
-rw-r--r--scp2/source/ooo/common_brand.scp6
-rw-r--r--scp2/source/ooo/file_ooo.scp7
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp1
7 files changed, 79 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in
index 45c292791f48..1fdeb860bc70 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -382,6 +382,10 @@ else
endif
endif
@rm -f $(SRCDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(SRCDIR)/install
+ @echo
+ @echo "If you want to edit the .ui files with glade first execute:"
+ @echo
+ @echo "export GLADE_CATALOG_SEARCH_PATH=$(SRCDIR)/install/share/glade"
ifeq ($(OS),LINUX)
@echo
@echo "Developer installation finished, you can now execute:"
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 9e2fe6f8c0f4..7144265d613a 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_Module_add_targets,extras,\
AllLangZip_autotextshare \
CustomTarget_autocorr \
Package_fonts \
+ Package_glade \
Package_labels \
Package_newfiles \
Package_wordbook \
diff --git a/extras/Package_glade.mk b/extras/Package_glade.mk
new file mode 100644
index 000000000000..9621aa9ba8f1
--- /dev/null
+++ b/extras/Package_glade.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,extras_glade,$(SRCDIR)/extras/source/glade))
+
+$(eval $(call gb_Package_add_file,extras_glade,pck/libreoffice-catalog.xml,libreoffice-catalog.xml))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/source/glade/libreoffice-catalog.xml b/extras/source/glade/libreoffice-catalog.xml
new file mode 100644
index 000000000000..294ba917cd14
--- /dev/null
+++ b/extras/source/glade/libreoffice-catalog.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<!--
+ * To get glade to use this, put this .xml into a dir e.g. ~/glade
+ * and
+ * export GLADE_CATALOG_SEARCH_PATH=~/glade
+ * for system-wide installation copy into /usr/share/glade/catalogs/
+-->
+<glade-catalog name="LibreOffice" domain="glade-3" depends="gtk+" version="1.0">
+ <glade-widget-classes>
+ <glade-widget-class title="Thesaurus View" name="cuilo-ThesaurusAlternativesCtrl"
+ generic-name="ThesaurusAlternativesCtrl" parent="GtkTextView"
+ icon-name="widget-gtk-textview"/>
+ <glade-widget-class title="Thesaurus Edit" name="cuilo-ReplaceEdit"
+ generic-name="ReplaceEdit" parent="GtkEntry"
+ icon-name="widget-gtk-textentry"/>
+ <glade-widget-class title="Thesaurus Lookup" name="cuilo-LookUpComboBox"
+ generic-name="LookUpComboBox" parent="GtkEntry"
+ icon-name="widget-gtk-comboboxtext"/>
+ <glade-widget-class title="Hyphen Edit" name="cuilo-HyphenEdit"
+ generic-name="ReplaceEdit" parent="GtkEntry"
+ icon-name="widget-gtk-textentry"/>
+ <glade-widget-class title="Color ListBox" name="svtlo-ColorListBox"
+ generic-name="LookUpComboBox" parent="GtkComboBox"
+ icon-name="widget-gtk-combobox"/>
+ <glade-widget-class title="Line ListBox" name="svtlo-LineListBox"
+ generic-name="LineListBox" parent="GtkComboBox"
+ icon-name="widget-gtk-combobox"/>
+ <glade-widget-class title="Language ListBox" name="svxcorelo-SvxLanguageBox"
+ generic-name="LanguageBox" parent="GtkComboBox"
+ icon-name="widget-gtk-combobox"/>
+ <glade-widget-class title="Font ListBox" name="svtlo-FontStyleBox"
+ generic-name="FontStyleBox" parent="GtkComboBox"
+ icon-name="widget-gtk-combobox"/>
+ <glade-widget-class title="Font Preview" name="svxlo-SvxFontPrevWindow"
+ generic-name="Font Preview Window" parent="GtkDrawingArea"
+ icon-name="widget-gtk-drawingarea"/>
+ </glade-widget-classes>
+</glade-catalog>
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 0f9f95412603..5f9f957ccd8f 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -42,6 +42,7 @@ Module gid_Module_Root_Brand
gid_Brand_Dir_Share_Extensions,
gid_Brand_Dir_Share_Uno_Packages,
gid_Brand_Dir_Share_Uno_Packages_Cache,
+ gid_Brand_Dir_Share_Glade,
gid_Brand_Dir_Share_Labels,
gid_Brand_Dir_Share_Registry,
gid_Brand_Dir_Share_Xdg);
@@ -419,6 +420,11 @@ Directory gid_Brand_Dir_Share_Uno_Packages_Cache_Uno_Packages
Styles = (CREATE);
End
+Directory gid_Brand_Dir_Share_Glade
+ ParentID = gid_Brand_Dir_Share;
+ DosName = "glade";
+End
+
Directory gid_Brand_Dir_Share_Labels
ParentID = gid_Brand_Dir_Share;
DosName = "labels";
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 630d32b98f18..39362a7ad3b8 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -638,6 +638,13 @@ File gid_File_Share_Labels_Xml
Name = "labels.xml";
End
+File gid_File_Share_Glade_Xml
+ TXT_FILE_BODY;
+ Styles = (PACKED);
+ Dir = gid_Brand_Dir_Share_Glade;
+ Name = "libreoffice-catalog.xml";
+End
+
File gid_File_Share_Registry_Main_Xcd
TXT_FILE_BODY;
Styles = (PACKED, SCPZIP_REPLACE);
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 41124fc22eff..14b0766ea844 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -536,6 +536,7 @@ Module gid_Module_Root_Files_6
gid_File_Mod_Text,
gid_File_Oo_Ldap_Xcd_Sample,
gid_File_Oo_Ad_Ldap_Xcd_Sample,
+ gid_File_Share_Glade_Xml,
gid_File_Share_Labels_Xml,
gid_File_Share_Registry_Main_Xcd,
gid_File_Share_Registry_Forcedefault_Xcd,