nyje
/
medit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed canvas; put all generated files into nodist_SOURCES; added rules to generate headers from glade files

master
Yevgen Muntyan 2007-07-12 00:54:41 -05:00
parent 360c5762f2
commit 5951a869d0
38 changed files with 171 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
moo/Makefile.am
View File

@ -5,10 +5,12 @@ ini_files = $(ini_in_files:.ini.in=.ini)
CLEANFILES = $(ini_files)
moo_include_headers = \
moo.h \
moo.h
nodist_moo_include_headers = \
moo-config.h
BUILT_SOURCES = moo-config.h
CLEANFILES += moo-config.h
scriptsdir = ${MOO_DATA_DIR}/scripts
scripts_SCRIPTS = \
@ -22,6 +24,7 @@ EXTRA_DIST = \
if MOO_INSTALL_HEADERS
moo_include_HEADERS = $(moo_include_headers)
nodist_moo_include_HEADERS = $(nodist_moo_include_headers)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = moo.pc
endif
@ -78,12 +81,15 @@ noinst_LTLIBRARIES += libmoo.la
endif
endif
nodist_libmoo_la_SOURCES =
if MOO_OS_MINGW
@MOO_WIN32_RC_RULE@
CLEANFILES += libmoo.res
libmoo_res_ldflag = -Wl,libmoo.res
BUILT_SOURCES += libmoo.res
nodist_libmoo_la_SOURCES = libmoo.res
CLEANFILES += libmoo.res
nodist_libmoo_la_SOURCES += libmoo.res
libs += -lwsock32
endif
@ -100,6 +106,7 @@ endif
libmoo_la_LIBADD = $(libs) $(MOO_LIBS) $(objc_libs)
libmoo_la_LDFLAGS = $(libmoo_res_ldflag) -no-undefined -avoid-version $(export_flags)
libmoo_la_SOURCES = $(moo_include_headers)
nodist_libmoo_la_SOURCES += $(nodist_moo_include_headers)
if MOO_PYTHON_BUILTIN
if !MOO_BUILD_MOO_MODULE

9
moo/mooapp/Makefile.am
View File

@ -2,6 +2,8 @@ SUBDIRS = smclient
BUILT_SOURCES = \
mooappabout-glade.h
CLEANFILES = \
mooappabout-glade.h
mooapp_include_headers = \
mooapp.h
@ -13,7 +15,6 @@ endif
mooapp_sources = \
$(mooapp_include_headers) \
mooappabout-glade.h \
mooappabout.c \
mooappabout.h \
mooapp.c \
@ -30,13 +31,11 @@ EXTRA_DIST = \
gpl \
glade/mooappabout.glade
XML2H = $(srcdir)/../mooutils/xml2h.sh
mooappabout-glade.h: $(srcdir)/glade/mooappabout.glade $(XML2H)
$(SHELL) $(XML2H) MOO_APP_ABOUT_GLADE_UI $(srcdir)/glade/mooappabout.glade > $@.tmp && \
mv $@.tmp $@
@MOO_GLADE_SUBDIR_RULE@
noinst_LTLIBRARIES = libmooapp.la
libmooapp_la_SOURCES = $(mooapp_sources)
nodist_libmooapp_la_SOURCES = mooappabout-glade.h
libmooapp_la_LIBADD = smclient/libsmclient.la
AM_CFLAGS = \

14
moo/mooapp/mooappabout.c
View File

@ -48,11 +48,13 @@ set_translator_credits (MooGladeXML *xml)
const char *credits, *credits_markup;
GtkTextView *view;
/* Translators: this goes into About box, under Translated by tab */
/* Translators: this goes into About box, under Translated by tab,
do not ignore it, markup isn't always used */
credits = _("translator-credits");
/* Translators: this goes into About box, under Translated by tab,
this must be valid html markup, e.g.
"Some Guy <a href=\"mailto://someguy@domain.net\">&lt;someguy@domain.net&gt;</a>" */
"Some Guy <a href=\"mailto://someguy@domain.net\">&lt;someguy@domain.net&gt;</a>"
Lines must be separated by <br>, like "First guy<br>Second Guy" */
credits_markup = _("translator-credits-markup");
if (!strcmp (credits, "translator-credits"))
@ -99,7 +101,7 @@ show_credits (void)
xml = moo_glade_xml_new_empty (GETTEXT_PACKAGE);
moo_glade_xml_map_id (xml, "written_by", MOO_TYPE_HTML);
moo_glade_xml_map_id (xml, "translated_by", MOO_TYPE_HTML);
moo_glade_xml_parse_memory (xml, MOO_APP_ABOUT_GLADE_UI, -1, "credits", NULL);
moo_glade_xml_parse_memory (xml, mooappabout_glade_xml, -1, "credits", NULL);
credits_dialog = moo_glade_xml_get_widget (xml, "credits");
g_return_if_fail (credits_dialog != NULL);
@ -151,7 +153,7 @@ show_license (void)
return;
}
xml = moo_glade_xml_new_from_buf (MOO_APP_ABOUT_GLADE_UI, -1, "license", GETTEXT_PACKAGE, NULL);
xml = moo_glade_xml_new_from_buf (mooappabout_glade_xml, -1, "license", GETTEXT_PACKAGE, NULL);
license_dialog = moo_glade_xml_get_widget (xml, "license");
g_return_if_fail (license_dialog != NULL);
@ -198,7 +200,7 @@ create_about_dialog (void)
info = moo_app_get_info (moo_app_get_instance());
xml = moo_glade_xml_new_empty (GETTEXT_PACKAGE);
moo_glade_xml_map_id (xml, "url", MOO_TYPE_LINK_LABEL);
moo_glade_xml_parse_memory (xml, MOO_APP_ABOUT_GLADE_UI, -1, "dialog", NULL);
moo_glade_xml_parse_memory (xml, mooappabout_glade_xml, -1, "dialog", NULL);
g_return_val_if_fail (xml != NULL, NULL);
dialog = moo_glade_xml_get_widget (xml, "dialog");
@ -283,7 +285,7 @@ create_system_info_dialog (void)
if (system_info_dialog != NULL)
return;
xml = moo_glade_xml_new_from_buf (MOO_APP_ABOUT_GLADE_UI, -1,
xml = moo_glade_xml_new_from_buf (mooappabout_glade_xml, -1,
"system", GETTEXT_PACKAGE, NULL);
system_info_dialog = moo_glade_xml_get_widget (xml, "system");

152
moo/mooedit/Makefile.am
View File

@ -4,16 +4,10 @@ SUBDIRS = gtksourceview plugins language-specs
mooedit_toolsdir = $(MOO_DATA_DIR)
mooedit_tools_DATA = context.cfg menu.cfg filters.xml
dummy_targets = \
moocommand-exe.o \
moocommand-exe-private.o \
moolangmgr-private.o \
mootextview-private.o
CLEANFILES = $(dummy_targets)
moocommand-exe.o: moocommand-exe-unix.o ; echo stamp > $(@F)
moocommand-exe-private.o: moocommand-exe-unix.o ; echo stamp > $(@F)
moolangmgr-private.o: moolangmgr.o ; echo stamp > $(@F)
mootextview-private.o: mootextview.o ; echo stamp > $(@F)
moocommand-exe.lo: moocommand-exe-unix.lo
moocommand-exe-private.lo: moocommand-exe-unix.lo
moolangmgr-private.lo: moolangmgr.lo
mootextview-private.lo: mootextview.lo
unix_sources = \
moocommand-exe-unix.c
@ -53,7 +47,6 @@ completion_sources = \
mooedit_sources = \
$(mooedit_include_headers) \
$(moocommand_stuff) \
medit-ui.h \
moocmdview.c \
moocommand.c \
moocommanddisplay.c \
@ -81,18 +74,9 @@ mooedit_sources = \
mooeditor.c \
mooeditor-private.h \
mooeditprefs.c \
mooeditprefs-general-glade.h \
mooeditprefs-view-glade.h \
mooeditprefs-font-glade.h \
mooeditprefs-file-glade.h \
mooeditprefs-langs-glade.h \
mooeditprefspage.c \
mooedit-private.h \
mooeditprogress-glade.h \
mooeditsavemultiple-glade.h \
mooedit-script.c \
mooedittools-glade.h \
mooedit-ui.h \
mooeditwindow.c \
moofold.c \
moofold.h \
@ -112,8 +96,6 @@ mooedit_sources = \
moooutputfilterregex.h \
mooplugin.c \
mooplugin-loader.c \
moopluginprefs-glade.h \
mooprint-glade.h \
mootext-private.h \
mootextbox.c \
mootextbox.h \
@ -121,9 +103,7 @@ mooedit_sources = \
mootextbtree.h \
mootextbuffer.c \
mootextfind.c \
mootextfind-glade.h \
mootextfind.h \
mootextgotoline-glade.h \
mootextsearch.c \
mootextsearch-private.h \
mootextstylescheme.c \
@ -132,13 +112,10 @@ mooedit_sources = \
moousertools.c \
moousertools.h \
moousertools-prefs.c \
moousertools-prefs.h \
quicksearch-glade.h \
statusbar-glade.h
moousertools-prefs.h
mooedit_printing_sources = \
mooprintpreview.h \
mooprintpreview-glade.h \
mooprintpreview.c \
mootextprint.c \
mootextprint-private.h \
@ -149,27 +126,12 @@ nodist_mooedit_sources = \
mooedit-enums.h
nodist_mooedit_include_headers = \
mooedit-enums.h
BUILT_SOURCES = \
quicksearch-glade.h \
statusbar-glade.h \
medit-ui.h \
mootextgotoline-glade.h \
mootextfind-glade.h \
moopluginprefs-glade.h \
mooprint-glade.h \
mooeditprefs-general-glade.h \
mooeditprefs-view-glade.h \
mooeditprefs-font-glade.h \
mooeditprefs-file-glade.h \
mooeditprefs-langs-glade.h \
mooeditprogress-glade.h \
mooeditsavemultiple-glade.h \
mooedittools-glade.h \
mooedit-enums.c \
mooedit-enums.h \
mooedit-ui.h \
mooprintpreview-glade.h
mooedit-enums.h
CLEANFILES = \
mooedit-enums.c \
mooedit-enums.h
mooedit_enums_headers = \
moocommand.h \
@ -180,7 +142,7 @@ mooedit_enums_headers = \
mootextsearch.h \
mootextview.h
CLEANFILES += stamp-mooedit-enums.h stamp-mooedit-enums.c mooedit-enums.h mooedit-enums.c
CLEANFILES += stamp-mooedit-enums.h stamp-mooedit-enums.c
mooedit-enums.h: stamp-mooedit-enums.h
@true
mooedit-enums.c: stamp-mooedit-enums.c
@ -208,81 +170,44 @@ stamp-mooedit-enums.c: $(mooedit_enums_headers) Makefile
&& rm -f xgen-gtbc \
&& echo timestamp > $(@F)
@MOO_GLADE_SUBDIR_RULE@
glade_files = \
glade/mooeditprefs-general.glade\
glade/mooeditprefs-view.glade \
glade/mooeditprefs-file.glade \
glade/mooeditprefs-langs.glade \
glade/mooeditprogress.glade \
glade/mooeditsavemult.glade \
glade/mooedittools.glade \
glade/moopluginprefs.glade \
glade/mooprint.glade \
glade/mootextfind.glade \
glade/mootextgotoline.glade \
glade/quicksearch.glade \
glade/statusbar.glade \
glade/mooprintpreview.glade
glade_sources = $(patsubst glade/%.glade,%-glade.h,$(glade_files))
nodist_mooedit_sources += $(glade_sources)
BUILT_SOURCES += $(glade_sources)
CLEANFILES += $(glade_sources)
EXTRA_DIST = $(glade_files)
XML2H = $(srcdir)/../mooutils/xml2h.sh
mootextgotoline-glade.h: $(srcdir)/glade/mootextgotoline.glade $(XML2H)
$(SHELL) $(XML2H) MOO_TEXT_GOTO_LINE_GLADE_UI $(srcdir)/glade/mootextgotoline.glade > $@.tmp && \
mv $@.tmp $@
mootextfind-glade.h: $(srcdir)/glade/mootextfind.glade $(XML2H)
$(SHELL) $(XML2H) MOO_TEXT_FIND_GLADE_UI $(srcdir)/glade/mootextfind.glade > $@.tmp && \
mv $@.tmp $@
mooeditprefs-general-glade.h: $(srcdir)/glade/mooeditprefs-general.glade $(XML2H)
$(SHELL) $(XML2H) MOO_EDIT_PREFS_GENERAL_GLADE_UI $(srcdir)/glade/mooeditprefs-general.glade > $@.tmp && \
mv $@.tmp $@
mooeditprefs-view-glade.h: $(srcdir)/glade/mooeditprefs-view.glade $(XML2H)
$(SHELL) $(XML2H) MOO_EDIT_PREFS_VIEW_GLADE_UI $(srcdir)/glade/mooeditprefs-view.glade > $@.tmp && \
mv $@.tmp $@
mooeditprefs-font-glade.h: $(srcdir)/glade/mooeditprefs-font.glade $(XML2H)
$(SHELL) $(XML2H) MOO_EDIT_PREFS_FONT_GLADE_UI $(srcdir)/glade/mooeditprefs-font.glade > $@.tmp && \
mv $@.tmp $@
mooeditprefs-file-glade.h: $(srcdir)/glade/mooeditprefs-file.glade $(XML2H)
$(SHELL) $(XML2H) MOO_EDIT_PREFS_FILE_GLADE_UI $(srcdir)/glade/mooeditprefs-file.glade > $@.tmp && \
mv $@.tmp $@
mooeditprefs-langs-glade.h: $(srcdir)/glade/mooeditprefs-langs.glade $(XML2H)
$(SHELL) $(XML2H) MOO_EDIT_PREFS_LANGS_GLADE_UI $(srcdir)/glade/mooeditprefs-langs.glade > $@.tmp && \
mv $@.tmp $@
mooeditprogress-glade.h: $(srcdir)/glade/mooeditprogress.glade $(XML2H)
$(SHELL) $(XML2H) MOO_EDIT_PROGRESS_GLADE_XML $(srcdir)/glade/mooeditprogress.glade > $@.tmp && \
mv $@.tmp $@
moopluginprefs-glade.h: $(srcdir)/glade/moopluginprefs.glade $(XML2H)
$(SHELL) $(XML2H) MOO_PLUGIN_PREFS_GLADE_UI $(srcdir)/glade/moopluginprefs.glade > $@.tmp && \
mv $@.tmp $@
mooeditsavemultiple-glade.h: $(srcdir)/glade/mooeditsavemult.glade $(XML2H)
$(SHELL) $(XML2H) MOO_EDIT_SAVE_MULTIPLE_GLADE_UI $(srcdir)/glade/mooeditsavemult.glade > $@.tmp && \
mv $@.tmp $@
quicksearch-glade.h: $(srcdir)/glade/quicksearch.glade $(XML2H)
$(SHELL) $(XML2H) QUICK_SEARCH_GLADE_XML $(srcdir)/glade/quicksearch.glade > $@.tmp && \
mv $@.tmp $@
statusbar-glade.h: $(srcdir)/glade/statusbar.glade $(XML2H)
$(SHELL) $(XML2H) STATUSBAR_GLADE_XML $(srcdir)/glade/statusbar.glade > $@.tmp && \
mv $@.tmp $@
mooprint-glade.h: $(srcdir)/glade/mooprint.glade $(XML2H)
$(SHELL) $(XML2H) MOO_PRINT_GLADE_XML $(srcdir)/glade/mooprint.glade > $@.tmp && \
mv $@.tmp $@
mooedittools-glade.h: $(srcdir)/glade/mooedittools.glade $(XML2H)
$(SHELL) $(XML2H) MOO_EDIT_TOOLS_GLADE_XML $(srcdir)/glade/mooedittools.glade > $@.tmp && \
mv $@.tmp $@
mooprintpreview-glade.h: $(srcdir)/glade/mooprintpreview.glade $(XML2H)
$(SHELL) $(XML2H) MOO_PRINT_PREVIEW_GLADE_XML $(srcdir)/glade/mooprintpreview.glade > $@.tmp && \
mv $@.tmp $@
mooedit-ui.h: mooedit-ui.xml $(XML2H)
$(SHELL) $(XML2H) MOO_EDIT_UI_XML $(srcdir)/mooedit-ui.xml > $@.tmp && \
mv $@.tmp $@
medit-ui.h: medit-ui.xml $(XML2H)
$(SHELL) $(XML2H) MEDIT_UI_XML $(srcdir)/medit-ui.xml > $@.tmp && \
mv $@.tmp $@
nodist_mooedit_sources += mooedit-ui.h medit-ui.h
BUILT_SOURCES += mooedit-ui.h medit-ui.h
CLEANFILES += mooedit-ui.h medit-ui.h
EXTRA_DIST = \
EXTRA_DIST += \
$(completion_sources) \
$(mooedit_tools_DATA) \
medit-ui.xml \
mooedit-ui.xml \
glade/statusbar.glade \
glade/quicksearch.glade \
glade/mootextgotoline.glade \
glade/mootextfind.glade \
glade/mooeditprefs-general.glade\
glade/mooeditprefs-view.glade \
glade/mooeditprefs-file.glade \
glade/mooeditprefs-langs.glade \
glade/mooeditprefs-font.glade \
glade/mooeditprogress.glade \
glade/mooeditsavemult.glade \
glade/mooedittools.glade \
glade/moopluginprefs.glade \
glade/mooprint.glade \
glade/mooprintpreview.glade \
$(mooedit_tools_DATA)
mooedit-ui.xml
if GTK_2_10
mooedit_sources += $(mooedit_printing_sources)
@ -310,5 +235,6 @@ AM_CFLAGS = \
if MOO_INSTALL_HEADERS
mooedit_includedir = $(moo_includedir)/mooedit
mooedit_include_HEADERS = $(mooedit_include_headers) $(nodist_mooedit_include_headers)
mooedit_include_HEADERS = $(mooedit_include_headers)
nodist_mooedit_include_HEADERS = $(nodist_mooedit_include_headers)
endif

2
moo/mooedit/moocommand-exe-unix.c
View File

@ -793,7 +793,7 @@ exe_factory_create_widget (G_GNUC_UNUSED MooCommandFactory *factory)
xml = moo_glade_xml_new_empty (GETTEXT_PACKAGE);
moo_glade_xml_map_id (xml, "textview", MOO_TYPE_TEXT_VIEW);
moo_glade_xml_parse_memory (xml, MOO_EDIT_TOOLS_GLADE_XML, -1, "exe_page", NULL);
moo_glade_xml_parse_memory (xml, mooedittools_glade_xml, -1, "exe_page", NULL);
page = moo_glade_xml_get_widget (xml, "exe_page");
g_return_val_if_fail (page != NULL, NULL);

2
moo/mooedit/moocommand-script.c
View File

@ -139,7 +139,7 @@ script_factory_create_widget (G_GNUC_UNUSED MooCommandFactory *factory)
xml = moo_glade_xml_new_empty (GETTEXT_PACKAGE);
moo_glade_xml_map_id (xml, "textview", MOO_TYPE_TEXT_VIEW);
moo_glade_xml_parse_memory (xml, MOO_EDIT_TOOLS_GLADE_XML, -1, "moo_script_page", NULL);
moo_glade_xml_parse_memory (xml, mooedittools_glade_xml, -1, "moo_script_page", NULL);
page = moo_glade_xml_get_widget (xml, "moo_script_page");
g_return_val_if_fail (page != NULL, NULL);

2
moo/mooedit/mooedit.c
View File

@ -1710,7 +1710,7 @@ show_progress (MooEdit *edit)
g_return_val_if_fail (!edit->priv->progress, FALSE);
xml = moo_glade_xml_new_from_buf (MOO_EDIT_PROGRESS_GLADE_XML, -1,
xml = moo_glade_xml_new_from_buf (mooeditprogress_glade_xml, -1,
"eventbox", GETTEXT_PACKAGE, NULL);
g_return_val_if_fail (xml != NULL, FALSE);

6
moo/mooedit/mooeditdialogs.c
View File

@ -17,7 +17,7 @@
#include "mooedit/mooeditprefs.h"
#include "mooedit/mootextfind-glade.h"
#include "mooedit/mooeditfileops.h"
#include "mooedit/mooeditsavemultiple-glade.h"
#include "mooedit/mooeditsavemult-glade.h"
#include "mooutils/moodialogs.h"
#include "mooutils/moostock.h"
#include "mooutils/mooglade.h"
@ -363,7 +363,7 @@ _moo_edit_save_multiple_changes_dialog (GSList *docs,
for (l = docs; l != NULL; l = l->next)
g_return_val_if_fail (MOO_IS_EDIT (l->data), MOO_EDIT_RESPONSE_CANCEL);
xml = moo_glade_xml_new_from_buf (MOO_EDIT_SAVE_MULTIPLE_GLADE_UI, -1,
xml = moo_glade_xml_new_from_buf (mooeditsavemult_glade_xml, -1,
"dialog", GETTEXT_PACKAGE, NULL);
dialog = moo_glade_xml_get_widget (xml, "dialog");
@ -737,7 +737,7 @@ _moo_text_prompt_on_replace_dialog (GtkWidget *parent)
GtkWidget *dialog;
MooGladeXML *xml;
xml = moo_glade_xml_new_from_buf (MOO_TEXT_FIND_GLADE_UI, -1,
xml = moo_glade_xml_new_from_buf (mootextfind_glade_xml, -1,
"prompt_on_replace_dialog",
GETTEXT_PACKAGE, NULL);
dialog = moo_glade_xml_get_widget (xml, "prompt_on_replace_dialog");

2
moo/mooedit/mooeditwindow.c
View File

@ -3039,7 +3039,7 @@ create_statusbar (MooEditWindow *window)
MooGladeXML *xml;
GtkWidget *hbox;
xml = moo_glade_xml_new_from_buf (STATUSBAR_GLADE_XML, -1,
xml = moo_glade_xml_new_from_buf (statusbar_glade_xml, -1,
"hbox", GETTEXT_PACKAGE, NULL);
hbox = moo_glade_xml_get_widget (xml, "hbox");
g_return_if_fail (hbox != NULL);

2
moo/mooedit/mooplugin.c
View File

@ -1481,7 +1481,7 @@ moo_plugin_attach_prefs (GtkWidget *dialog)
g_return_if_fail (MOO_IS_PREFS_DIALOG (dialog));
page = moo_prefs_dialog_page_new_from_xml ("Plugins", MOO_STOCK_PLUGINS,
NULL, MOO_PLUGIN_PREFS_GLADE_UI,
NULL, moopluginprefs_glade_xml,
"page", MOO_PLUGIN_PREFS_ROOT);
g_return_if_fail (page != NULL);

4
moo/mooedit/mooprintpreview.c
View File

@ -89,7 +89,7 @@ _moo_print_preview_init (MooPrintPreview *preview)
preview->priv->xml = moo_glade_xml_new_empty (GETTEXT_PACKAGE);
moo_glade_xml_fill_widget (preview->priv->xml, GTK_WIDGET (preview),
MOO_PRINT_PREVIEW_GLADE_XML, -1,
mooprintpreview_glade_xml, -1,
"dialog", NULL);
preview->priv->context = NULL;
@ -583,7 +583,7 @@ _moo_print_preview_start (MooPrintPreview *preview)
G_CALLBACK (size_allocate), preview);
entry_item = moo_glade_xml_get_widget (preview->priv->xml, "entry_item");
xml = moo_glade_xml_new_from_buf (MOO_PRINT_PREVIEW_GLADE_XML, -1,
xml = moo_glade_xml_new_from_buf (mooprintpreview_glade_xml, -1,
"entry_hbox", GETTEXT_PACKAGE, NULL);
box = moo_glade_xml_get_widget (xml, "entry_hbox");
gtk_container_add (GTK_CONTAINER (entry_item), box);

4
moo/mooedit/mootextfind.c
View File

@ -128,7 +128,7 @@ moo_find_init (MooFind *find)
moo_glade_xml_map_id (find->xml, "search_entry", MOO_TYPE_HISTORY_COMBO);
moo_glade_xml_map_id (find->xml, "replace_entry", MOO_TYPE_HISTORY_COMBO);
if (!moo_glade_xml_parse_memory (find->xml, MOO_TEXT_FIND_GLADE_UI, -1, "vbox", NULL))
if (!moo_glade_xml_parse_memory (find->xml, mootextfind_glade_xml, -1, "vbox", NULL))
{
g_object_unref (find->xml);
find->xml = NULL;
@ -1336,7 +1336,7 @@ moo_text_view_run_goto_line (GtkTextView *view)
buffer = gtk_text_view_get_buffer (view);
line_count = gtk_text_buffer_get_line_count (buffer);
xml = moo_glade_xml_new_from_buf (MOO_TEXT_GOTO_LINE_GLADE_UI, -1,
xml = moo_glade_xml_new_from_buf (mootextgotoline_glade_xml, -1,
NULL, GETTEXT_PACKAGE, NULL);
g_return_if_fail (xml != NULL);

2
moo/mooedit/mootextprint.c
View File

@ -1873,7 +1873,7 @@ moo_print_operation_create_custom_widget (G_GNUC_UNUSED GtkPrintOperation *opera
GtkWidget *page, *font_button, *line_numbers_hbox;
MooGladeXML *xml;
xml = moo_glade_xml_new_from_buf (MOO_PRINT_GLADE_XML, -1, "page", GETTEXT_PACKAGE, NULL);
xml = moo_glade_xml_new_from_buf (mooprint_glade_xml, -1, "page", GETTEXT_PACKAGE, NULL);
g_return_val_if_fail (xml != NULL, NULL);
font_button = moo_glade_xml_get_widget (xml, "font");

2
moo/mooedit/mootextview.c
View File

@ -4114,7 +4114,7 @@ moo_text_view_start_quick_search (MooTextView *view)
xml = moo_glade_xml_new_empty (GETTEXT_PACKAGE);
moo_glade_xml_map_class (xml, "GtkEntry", MOO_TYPE_ENTRY);
moo_glade_xml_parse_memory (xml, QUICK_SEARCH_GLADE_XML, -1, "evbox", NULL);
moo_glade_xml_parse_memory (xml, quicksearch_glade_xml, -1, "evbox", NULL);
view->priv->qs.evbox = moo_glade_xml_get_widget (xml, "evbox");
g_return_if_fail (view->priv->qs.evbox != NULL);

6
moo/mooedit/moousertools-prefs.c
View File

@ -416,17 +416,17 @@ _moo_user_tools_prefs_page_new (void)
moo_glade_xml_map_id (xml, "page_menu", MOO_TYPE_PREFS_DIALOG_PAGE);
moo_glade_xml_map_id (xml, "page_context", MOO_TYPE_PREFS_DIALOG_PAGE);
page = moo_prefs_dialog_page_new_from_xml (_("Tools"), GTK_STOCK_EXECUTE,
xml, MOO_EDIT_TOOLS_GLADE_XML,
xml, mooedittools_glade_xml,
"page", NULL);
g_signal_connect (page, "init", G_CALLBACK (main_page_init), NULL);
g_signal_connect (page, "apply", G_CALLBACK (main_page_apply), NULL);
page_menu = moo_glade_xml_get_widget (xml, "page_menu");
moo_prefs_dialog_page_fill_from_xml (page_menu, NULL, MOO_EDIT_TOOLS_GLADE_XML,
moo_prefs_dialog_page_fill_from_xml (page_menu, NULL, mooedittools_glade_xml,
"page_command", NULL);
page_context = moo_glade_xml_get_widget (xml, "page_context");
moo_prefs_dialog_page_fill_from_xml (page_context, NULL, MOO_EDIT_TOOLS_GLADE_XML,
moo_prefs_dialog_page_fill_from_xml (page_context, NULL, mooedittools_glade_xml,
"page_command", NULL);
g_object_unref (xml);

31
moo/mooedit/plugins/Makefile.am
View File

@ -1,4 +1,4 @@
DIST_SUBDIRS = activestrings fileselector completion
DIST_SUBDIRS = fileselector
# subdirs = activestrings completion
# libs = activestrings/libastrings.la completion/libcompletion.la
@ -10,30 +10,23 @@ libs += fileselector/libfileselector.la
endif
SUBDIRS = $(subdirs) .
BUILT_SOURCES = \
moofind-glade.h
EXTRA_DIST = \
moofind.glade
XML2H = $(srcdir)/../../mooutils/xml2h.sh
moofind-glade.h: moofind.glade $(XML2H)
$(SHELL) $(XML2H) MOO_FIND_GLADE_XML $(srcdir)/moofind.glade > $@.tmp && \
mv $@.tmp $@
unix_sources = \
moofind.c \
moofind-glade.h
noinst_LTLIBRARIES = libmooeditplugins.la
libmooeditplugins_la_LIBADD = $(libs)
libmooeditplugins_la_SOURCES = \
mooeditplugins.h
EXTRA_DIST = \
moofind.glade \
moofind.c
BUILT_SOURCES = moofind-glade.h
CLEANFILES = moofind-glade.h
@MOO_GLADE_RULE@
if MOO_OS_UNIX
libmooeditplugins_la_SOURCES += $(unix_sources)
else
EXTRA_DIST += $(unix_sources)
libmooeditplugins_la_SOURCES += moofind.c
nodist_libmooeditplugins_la_SOURCES = moofind-glade.h
endif
AM_CFLAGS = \

24
moo/mooedit/plugins/fileselector/Makefile.am
View File

@ -1,31 +1,29 @@
noinst_LTLIBRARIES = libfileselector.la
EXTRA_DIST = \
moofileselector.glade \
moofileselector-prefs.glade
fileselector_sources = \
libfileselector_la_SOURCES = \
moofileselector-prefs.c \
moofileselector.c \
moofileselector.h \
moofileselector.h
nodist_libfileselector_la_SOURCES = \
moofileselector-glade.h \
moofileselector-prefs-glade.h
BUILT_SOURCES = \
moofileselector-glade.h \
moofileselector-prefs-glade.h
XML2H = $(srcdir)/../../../mooutils/xml2h.sh
moofileselector-glade.h: moofileselector.glade $(XML2H)
$(SHELL) $(XML2H) MOO_FILE_SELECTOR_GLADE_XML $(srcdir)/moofileselector.glade > $@.tmp && \
mv $@.tmp $@
moofileselector-prefs-glade.h: moofileselector-prefs.glade $(XML2H)
$(SHELL) $(XML2H) MOO_FILE_SELECTOR_PREFS_GLADE_XML $(srcdir)/moofileselector-prefs.glade > $@.tmp && \
mv $@.tmp $@
noinst_LTLIBRARIES = libfileselector.la
libfileselector_la_SOURCES = $(fileselector_sources)
CLEANFILES = \
moofileselector-glade.h \
moofileselector-prefs-glade.h
AM_CFLAGS = \
-I../../.. \
-I$(top_builddir) \
$(MOO_CFLAGS) \
$(MOO_DEBUG_CFLAGS)
@MOO_GLADE_RULE@

2
moo/mooedit/plugins/fileselector/moofileselector-prefs.c
View File

@ -67,7 +67,7 @@ _moo_file_selector_prefs_page (MooPlugin *plugin)
xml = moo_glade_xml_new_empty (GETTEXT_PACKAGE);
page = moo_prefs_dialog_page_new_from_xml (_("File Selector"), MOO_STOCK_FILE_SELECTOR,
xml, MOO_FILE_SELECTOR_PREFS_GLADE_XML,
xml, moofileselector_prefs_glade_xml,
"page", NULL);
g_signal_connect_swapped (page, "apply", G_CALLBACK (prefs_page_apply), xml);

4
moo/mooedit/plugins/fileselector/moofileselector.c
View File

@ -392,7 +392,7 @@ create_new_file_dialog (GtkWidget *parent,
*xml = moo_glade_xml_new_empty (GETTEXT_PACKAGE);
moo_glade_xml_map_class (*xml, "GtkEntry", MOO_TYPE_ENTRY);
moo_glade_xml_parse_memory (*xml, MOO_FILE_SELECTOR_GLADE_XML, -1,
moo_glade_xml_parse_memory (*xml, moofileselector_glade_xml, -1,
"new_file_dialog", NULL);
dialog = moo_glade_xml_get_widget (*xml, "new_file_dialog");
@ -872,7 +872,7 @@ create_save_as_dialog (GtkWidget *parent,
*xml = moo_glade_xml_new_empty (GETTEXT_PACKAGE);
moo_glade_xml_map_class (*xml, "GtkEntry", MOO_TYPE_ENTRY);
moo_glade_xml_parse_memory (*xml, MOO_FILE_SELECTOR_GLADE_XML, -1,
moo_glade_xml_parse_memory (*xml, moofileselector_glade_xml, -1,
"save_untitled_dialog", NULL);
dialog = moo_glade_xml_get_widget (*xml, "save_untitled_dialog");

4
moo/mooedit/plugins/moofind.c
View File

@ -338,7 +338,7 @@ create_grep_dialog (MooEditWindow *window,
map_combo (stuff->grep_xml, "glob_combo", "FindPlugin/grep/glob");
map_combo (stuff->grep_xml, "dir_combo", "FindPlugin/grep/dir");
map_combo (stuff->grep_xml, "skip_combo", "FindPlugin/grep/skip");
moo_glade_xml_parse_memory (stuff->grep_xml, MOO_FIND_GLADE_XML, -1, "grep_dialog", NULL);
moo_glade_xml_parse_memory (stuff->grep_xml, moofind_glade_xml, -1, "grep_dialog", NULL);
stuff->grep_dialog = moo_glade_xml_get_widget (stuff->grep_xml, "grep_dialog");
g_return_if_fail (stuff->grep_dialog != NULL);
@ -376,7 +376,7 @@ create_find_dialog (MooEditWindow *window,
map_combo (stuff->find_xml, "pattern_combo", "FindPlugin/find/pattern");
map_combo (stuff->find_xml, "dir_combo", "FindPlugin/find/dir");
map_combo (stuff->find_xml, "skip_combo", "FindPlugin/find/skip");
moo_glade_xml_parse_memory (stuff->find_xml, MOO_FIND_GLADE_XML, -1, "find_dialog", NULL);
moo_glade_xml_parse_memory (stuff->find_xml, moofind_glade_xml, -1, "find_dialog", NULL);
stuff->find_dialog = moo_glade_xml_get_widget (stuff->find_xml, "find_dialog");
g_return_if_fail (stuff->find_dialog != NULL);

49
moo/moofileview/Makefile.am
View File

@ -5,11 +5,8 @@ moofileview_sources = \
$(moofileview_headers) \
moobookmarkmgr.c \
moobookmarkmgr.h \
moobookmarkmgr-glade.h \
moobookmarkview.c \
moobookmarkview.h \
moocreatefolder-glade.h \
moofileviewdrop-glade.h \
moofile.c \
moofile.h \
moofile-private.h \
@ -17,7 +14,6 @@ moofileview_sources = \
moofileentry.h \
moofileicons.c \
moofileicons.h \
moofileprops-glade.h \
moofilesystem.c \
moofilesystem.h \
moofileview.c \
@ -28,7 +24,6 @@ moofileview_sources = \
moofileview-private.h \
moofileview-tools.c \
moofileview-tools.h \
moofileview-ui.h \
moofolder-private.h \
moofolder.c \
moofolder.h \
@ -38,8 +33,7 @@ moofileview_sources = \
mooiconview.c \
mooiconview.h \
mootreeview.c \
mootreeview.h \
symlink.h
mootreeview.h
if MOO_INSTALL_HEADERS
moofileview_includedir = $(moo_includedir)/moofileview
@ -50,13 +44,15 @@ moofileview_pixmaps = \
symlink.png \
symlink-small.png
nodist_moofileview_sources = \
moofileview-ui.h \
symlink.h
BUILT_SOURCES = \
moofileview-ui.h \
moofileprops-glade.h \
moocreatefolder-glade.h \
moofileviewdrop-glade.h \
symlink.h \
moobookmarkmgr-glade.h
symlink.h
CLEANFILES = \
moofileview-ui.h \
symlink.h
symlink.h: $(moofileview_pixmaps)
gdk-pixbuf-csource --static --build-list \
@ -64,34 +60,29 @@ symlink.h: $(moofileview_pixmaps)
SYMLINK_ARROW_SMALL $(srcdir)/symlink-small.png > $@.tmp && mv $@.tmp $@
XML2H = $(srcdir)/../mooutils/xml2h.sh
moofileview-ui.h: $(srcdir)/moofileview-ui.xml $(XML2H)
$(SHELL) $(XML2H) MOO_FILE_VIEW_UI $(srcdir)/moofileview-ui.xml > $@.tmp && \
mv $@.tmp $@
moofileprops-glade.h: $(srcdir)/glade/moofileprops.glade $(XML2H)
$(SHELL) $(XML2H) MOO_FILE_PROPS_GLADE_UI $(srcdir)/glade/moofileprops.glade > $@.tmp && \
mv $@.tmp $@
moocreatefolder-glade.h: $(srcdir)/glade/moocreatefolder.glade $(XML2H)
$(SHELL) $(XML2H) MOO_CREATE_FOLDER_GLADE_UI $(srcdir)/glade/moocreatefolder.glade > $@.tmp && \
mv $@.tmp $@
moobookmarkmgr-glade.h: $(srcdir)/glade/bookmark_editor.glade $(XML2H)
$(SHELL) $(XML2H) MOO_BOOKMARK_MGR_GLADE_UI $(srcdir)/glade/bookmark_editor.glade > $@.tmp && \
mv $@.tmp $@
moofileviewdrop-glade.h: $(srcdir)/glade/drop.glade $(XML2H)
$(SHELL) $(XML2H) MOO_FILE_VIEW_DROP_GLADE_UI $(srcdir)/glade/drop.glade > $@.tmp && \
mv $@.tmp $@
EXTRA_DIST = \
glade/drop.glade \
@MOO_GLADE_SUBDIR_RULE@
glade_files = \
glade/moofileview-drop.glade \
glade/moofileprops.glade \
glade/moocreatefolder.glade \
glade/bookmark_editor.glade \
glade/moobookmark-editor.glade
glade_sources = $(patsubst glade/%.glade,%-glade.h,$(glade_files))
nodist_moofileview_sources += $(glade_sources)
BUILT_SOURCES += $(glade_sources)
CLEANFILES += $(glade_sources)
EXTRA_DIST = $(glade_files)
EXTRA_DIST += \
moofileview-ui.xml \
$(moofileview_pixmaps)
noinst_LTLIBRARIES = libmoofileview.la
libmoofileview_la_SOURCES = $(moofileview_sources)
nodist_libmoofileview_la_SOURCES = $(nodist_moofileview_sources)
AM_CFLAGS = \
-I.. \

0
moo/moofileview/glade/bookmark_editor.glade → moo/moofileview/glade/moobookmark-editor.glade
View File

0
moo/moofileview/glade/drop.glade → moo/moofileview/glade/moofileview-drop.glade
View File

4
moo/moofileview/moobookmarkmgr.c
View File

@ -17,7 +17,7 @@
#define MOO_FILE_VIEW_COMPILATION
#include "moofileview/moobookmarkmgr.h"
#include "moofileview/moobookmarkmgr-glade.h"
#include "moofileview/moobookmark-editor-glade.h"
#include "moofileview/moofileentry.h"
#include "mooutils/mooglade.h"
#include "mooutils/mooprefs.h"
@ -814,7 +814,7 @@ _moo_bookmark_mgr_get_editor (MooBookmarkMgr *mgr)
if (mgr->priv->editor)
return mgr->priv->editor;
xml = moo_glade_xml_new_from_buf (MOO_BOOKMARK_MGR_GLADE_UI, -1,
xml = moo_glade_xml_new_from_buf (moobookmark_editor_glade_xml, -1,
NULL, GETTEXT_PACKAGE, NULL);
dialog = moo_glade_xml_get_widget (xml, "dialog");

8
moo/moofileview/moofileview-dialogs.c
View File

@ -17,7 +17,7 @@
#include "moofileview/moofile-private.h"
#include "moofileview/moofileprops-glade.h"
#include "moofileview/moocreatefolder-glade.h"
#include "moofileview/moofileviewdrop-glade.h"
#include "moofileview/moofileview-drop-glade.h"
#include "mooutils/mooentry.h"
#include "mooutils/mooutils-gobject.h"
#include "mooutils/moodialogs.h"
@ -55,7 +55,7 @@ _moo_file_props_dialog_init (MooFilePropsDialog *dialog)
dialog->xml = moo_glade_xml_new_empty (GETTEXT_PACKAGE);
moo_glade_xml_map_class (dialog->xml, "GtkEntry", MOO_TYPE_ENTRY);
if (!moo_glade_xml_parse_memory (dialog->xml, MOO_FILE_PROPS_GLADE_UI, -1, "notebook", NULL))
if (!moo_glade_xml_parse_memory (dialog->xml, moofileprops_glade_xml, -1, "notebook", NULL))
{
g_object_unref (dialog->xml);
dialog->xml = NULL;
@ -327,7 +327,7 @@ _moo_file_view_create_folder_dialog (GtkWidget *parent,
xml = moo_glade_xml_new_empty (GETTEXT_PACKAGE);
moo_glade_xml_map_class (xml, "GtkEntry", MOO_TYPE_ENTRY);
moo_glade_xml_parse_memory (xml, MOO_CREATE_FOLDER_GLADE_UI, -1, NULL, NULL);
moo_glade_xml_parse_memory (xml, moocreatefolder_glade_xml, -1, NULL, NULL);
dialog = moo_glade_xml_get_widget (xml, "dialog");
g_return_val_if_fail (dialog != NULL, NULL);
@ -431,7 +431,7 @@ _moo_file_view_save_drop_dialog (GtkWidget *parent,
xml = moo_glade_xml_new_empty (GETTEXT_PACKAGE);
moo_glade_xml_map_class (xml, "GtkEntry", MOO_TYPE_ENTRY);
moo_glade_xml_parse_memory (xml, MOO_FILE_VIEW_DROP_GLADE_UI, -1, NULL, NULL);
moo_glade_xml_parse_memory (xml, moofileview_drop_glade_xml, -1, NULL, NULL);
dialog = moo_glade_xml_get_widget (xml, "save_drop_dialog");
g_return_val_if_fail (dialog != NULL, NULL);

54
moo/moopython/pygtk/Makefile.am
View File

@ -1,14 +1,6 @@
DIST_SUBDIRS = goocanvas
SUBDIRS =
if MOO_BUILD_CANVAS
SUBDIRS += goocanvas
endif MOO_BUILD_CANVAS
moopygtk_sources = \
moo-pygtk.c \
moo-pygtk.h \
canvas-mod.h \
mooapp-mod.h \
mooedit-mod.h \
mooterm-mod.h \
@ -16,7 +8,6 @@ moopygtk_sources = \
moo-mod.h
BUILT_SOURCES = \
canvas-mod.h \
mooapp-mod.h \
mooedit-mod.h \
mooterm-mod.h \
@ -74,14 +65,7 @@ EXTRA_DIST = \
mooutils-pygtk.override \
mooutils-mod.c \
$(mooutils_defs_files) \
$(mooutils_override_files) \
canvas-mod.py \
canvas-mod.c \
pygoocanvas/arg-types.py \
pygoocanvas/AUTHORS \
pygoocanvas/goocanvas.defs \
pygoocanvas/goocanvas.override \
pygoocanvas/goocanvasmodule.c
$(mooutils_override_files)
if MOO_BUILD_UTILS
moopygtk_sources += mooutils-mod.c
@ -104,13 +88,6 @@ BUILT_SOURCES += mooedit-pygtk.c
CLEANFILES += mooedit-pygtk.c
endif MOO_BUILD_EDIT
if MOO_BUILD_CANVAS
moopygtk_sources += canvas-mod.c pygoocanvas/goocanvasmodule.c
nodist_moopygtk_sources += pygoocanvas-pygtk.c
BUILT_SOURCES += pygoocanvas-pygtk.c
CLEANFILES += pygoocanvas-pygtk.c
endif MOO_BUILD_CANVAS
if MOO_BUILD_APP
moopygtk_sources += mooapp-mod.c
nodist_moopygtk_sources += mooapp-pygtk.c
@ -162,17 +139,6 @@ mooedit-pygtk.c: mooedit-pygtk.defs mooedit-pygtk.override $(mooedit_defs_files)
$(srcdir)/mooedit-pygtk.defs > $@.tmp && \
mv $@.tmp $@
pygoocanvas-pygtk.c: pygoocanvas/goocanvas.defs pygoocanvas/goocanvas.override pygoocanvas/arg-types.py $(codegen_files)
$(codegen) --prefix pygoocanvas \
--load-types $(srcdir)/pygoocanvas/arg-types.py \
--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
--register $(PYGTK_DEFS_DIR)/pango-types.defs \
--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
--override $(srcdir)/pygoocanvas/goocanvas.override \
--outfilename pygoocanvas-pygtk.c \
$(srcdir)/pygoocanvas/goocanvas.defs > $@.tmp && \
mv $@.tmp $@
mooapp-pygtk.c: mooapp-pygtk.defs mooapp-pygtk.override $(codegen_files)
$(codegen) --prefix _moo_app \
--load-types $(srcdir)/../codegen/argtypes_m.py \
@ -196,9 +162,6 @@ mooedit-mod.h: $(srcdir)/mooedit-mod.py $(PY2H)
mooapp-mod.h: mooapp-mod.py $(PY2H)
$(SHELL) $(PY2H) MOO_APP_PY $(srcdir)/mooapp-mod.py > $@.tmp && \
mv $@.tmp $@
canvas-mod.h: canvas-mod.py $(PY2H)
$(SHELL) $(PY2H) MOO_CANVAS_PY $(srcdir)/canvas-mod.py > $@.tmp && \
mv $@.tmp $@
mooutils-mod.h: mooutils-mod.py $(PY2H)
$(SHELL) $(PY2H) MOO_UTILS_PY $(srcdir)/mooutils-mod.py > $@.tmp && \
mv $@.tmp $@
@ -213,17 +176,6 @@ libmoopygtk_la_SOURCES = $(moopygtk_sources)
nodist_libmoopygtk_la_SOURCES = $(nodist_moopygtk_sources)
libmoopygtk_la_LIBADD =
if MOO_BUILD_CANVAS
libmoopygtk_la_LIBADD += goocanvas/libgoocanvas.la
endif MOO_BUILD_CANVAS
canvas_cflags = \
-I$(srcdir)/goocanvas \
-Igoocanvas \
-DPYGOOCANVAS_MAJOR_VERSION=0\
-DPYGOOCANVAS_MINOR_VERSION=8\
-DPYGOOCANVAS_MICRO_VERSION=0
common_cflags = \
-I../.. \
-I$(top_builddir) \
@ -233,10 +185,6 @@ common_cflags = \
$(MOO_W_NO_MISSING_FIELD_INITIALIZERS)\
$(MOO_W_NO_UNUSED)
if MOO_BUILD_CANVAS
common_cflags += $(canvas_cflags)
endif MOO_BUILD_CANVAS
AM_CFLAGS = \
$(common_cflags) \
$(PYTHON_INCLUDES) \

6
moo/moopython/pygtk/moo-pygtk.c
View File

@ -119,12 +119,6 @@ _moo_pygtk_init (void)
submod = PyImport_ImportModule ("moo.edit");
PyModule_AddObject (_moo_module, "edit", submod);
#endif
#ifdef MOO_BUILD_CANVAS
if (!_moo_canvas_mod_init ())
return FALSE;
submod = PyImport_ImportModule ("moo.canvas");
PyModule_AddObject (_moo_module, "canvas", submod);
#endif
#ifdef MOO_BUILD_APP
if (!_moo_app_mod_init ())
return FALSE;

5
moo/moopython/pygtk/moo-pygtk.h
View File

@ -24,14 +24,12 @@ gboolean _moo_pygtk_init (void);
gboolean _moo_utils_mod_init (void);
gboolean _moo_edit_mod_init (void);
gboolean _moo_canvas_mod_init (void);
gboolean _moo_term_mod_init (void);
gboolean _moo_app_mod_init (void);
extern const PyMethodDef _moo_utils_functions[];
extern const PyMethodDef _moo_term_functions[];
extern const PyMethodDef _moo_edit_functions[];
extern const PyMethodDef _moo_canvas_functions[];
extern const PyMethodDef _moo_app_functions[];
void _moo_utils_register_classes (PyObject *dict);
@ -40,9 +38,6 @@ void _moo_utils_add_constants (PyObject *module,
void _moo_edit_register_classes (PyObject *dict);
void _moo_edit_add_constants (PyObject *module,
const char *strip_prefix);
void _moo_canvas_register_classes(PyObject *dict);
void _moo_canvas_add_constants (PyObject *module,
const char *strip_prefix);
void _moo_term_register_classes (PyObject *dict);
void _moo_term_add_constants (PyObject *module,
const char *strip_prefix);

25
moo/mooterm/Makefile.am
View File

@ -31,8 +31,7 @@ mooterm_sources = \
mootermpt.h \
mootermpt-private.h \
mootermtag-private.h \
mootermtag.c \
mootermprefs-glade.h
mootermtag.c
mooterm_unix_sources = \
mootermpt-unix.c \
@ -53,21 +52,20 @@ termhelper_sources = \
EXTRA_DIST = \
mootermparser-yacc.y \
$(termhelper_sources) \
mootermhelper_res.rc.in \
glade/mootermprefs.glade
BUILT_SOURCES = \
mootermprefs-glade.h
mootermhelper_res.rc.in
# not using rule for auto-regenerating mootermparser-yacc.[ch]
mootermparser_yacc: mootermparser-yacc.y
touch mootermparser_yacc
bison -o $(srcdir)/mootermparser-yacc.c -d $(srcdir)/mootermparser-yacc.y
XML2H = $(srcdir)/../mooutils/xml2h.sh
mootermprefs-glade.h: glade/mootermprefs.glade $(XML2H)
$(SHELL) $(XML2H) MOO_TERM_PREFS_GLADE_UI $(srcdir)/glade/mootermprefs.glade > $@.tmp && \
mv $@.tmp $@
@MOO_GLADE_SUBDIR_RULE@
glade_files = glade/mootermprefs.glade
glade_sources = $(patsubst glade/%.glade,%-glade.h,$(glade_files))
nodist_mooterm_sources = $(glade_sources)
BUILT_SOURCES = $(glade_sources)
CLEANFILES = $(glade_sources)
EXTRA_DIST += $(glade_files)
noinst_LTLIBRARIES =
@ -76,6 +74,7 @@ noinst_LTLIBRARIES += libmooterm.la
endif
libmooterm_la_SOURCES = $(mooterm_sources)
nodist_libmooterm_la_SOURCES = $(nodist_mooterm_sources)
if MOO_OS_UNIX
libmooterm_la_SOURCES += $(mooterm_unix_sources)
@ -100,7 +99,7 @@ if MOO_OS_CYGWIN
noinst_PROGRAMS = termhelper
termhelper_SOURCES = $(termhelper_sources)
nodist_termhelper_SOURCES = mootermhelper_res.res
CLEANFILES = mootermhelper_res.res
CLEANFILES += mootermhelper_res.res
termhelper_CFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
@ -114,5 +113,5 @@ termhelper_LDADD = mootermhelper_res.res
else
mootermhelper_res.res: mootermhelper_res.rc
touch mootermhelper_res.res
CLEANFILES = mootermhelper_res.res
CLEANFILES += mootermhelper_res.res
endif

2
moo/mooterm/mooterm-prefs.c
View File

@ -124,7 +124,7 @@ GtkWidget *moo_term_prefs_page_new (void)
moo_glade_xml_set_property (xml, "font", "filter-visible", "False");
page = moo_prefs_dialog_page_new_from_xml ("Terminal", MOO_STOCK_TERMINAL,
xml, MOO_TERM_PREFS_GLADE_UI,
xml, mootermprefs_glade_xml,
"page", MOO_TERM_PREFS_PREFIX);
g_object_unref (xml);

52
moo/mooutils/Makefile.am
View File

@ -60,12 +60,10 @@ mooutils_sources = \
$(mooutils_include_headers) \
mooaccel.h \
mooaccel.c \
mooaccelbutton-glade.h \
mooaccelbutton.c \
mooaccelbutton.h \
mooaccelprefs.h \
mooaccelprefs.c \
mooaccelprefs-glade.h \
mooaction.c \
mooaction-private.h \
mooactionbase.c \
@ -96,7 +94,6 @@ mooutils_sources = \
moohistorycombo.c \
moohistorylist.c \
mooi18n.c \
moologwindow-glade.h \
moomarkup.c \
moomenuaction.c \
moomenumgr.c \
@ -124,7 +121,6 @@ mooutils_sources = \
moowindow.c \
stock-file-24.h \
stock-file-selector-24.h \
stock-moo.h \
stock-select-all-16.h \
stock-select-all-24.h \
stock-terminal-24.h
@ -137,22 +133,12 @@ mooutils_sources += $(thread_sources)
endif
endif
nodist_mooutils_sources = \
moomarshals.c \
moomarshals.h
DISTCLEANFILES = \
moomarshals.c \
moomarshals.h
EXTRA_DIST = \
moomarshals.list \
py2h.sh \
xml2h.sh \
$(thread_sources) \
$(win32_sources) \
glade/accelbutton.glade \
glade/accelprefs.glade \
glade/moologwindow.glade \
pixmaps/medit.png \
pixmaps/medit.ico \
pixmaps/hide.png \
@ -164,11 +150,13 @@ EXTRA_DIST = \
BUILT_SOURCES = \
moomarshals.c \
moomarshals.h \
mooaccelbutton-glade.h \
mooaccelprefs-glade.h \
moologwindow-glade.h \
stock-moo.h
moomarshals.h
nodist_mooutils_sources = \
moomarshals.c \
moomarshals.h
CLEANFILES = \
moomarshals.c \
moomarshals.h
moomarshals.c: moomarshals.list
echo '#include "moomarshals.h"' > $@.tmp && \
@ -180,19 +168,16 @@ moomarshals.h: moomarshals.list
$(srcdir)/moomarshals.list > $@.tmp && \
mv $@.tmp $@
XML2H = $(srcdir)/xml2h.sh
mooaccelbutton-glade.h: $(srcdir)/glade/accelbutton.glade $(XML2H)
$(SHELL) $(XML2H) MOO_ACCEL_BUTTON_GLADE_UI \
$(srcdir)/glade/accelbutton.glade > $@.tmp && \
mv $@.tmp $@
mooaccelprefs-glade.h: $(srcdir)/glade/accelprefs.glade $(XML2H)
$(SHELL) $(XML2H) MOO_ACCEL_PREFS_GLADE_UI \
$(srcdir)/glade/accelprefs.glade > $@.tmp && \
mv $@.tmp $@
moologwindow-glade.h: $(srcdir)/glade/moologwindow.glade $(XML2H)
$(SHELL) $(XML2H) MOO_LOG_WINDOW_GLADE_UI \
$(srcdir)/glade/moologwindow.glade > $@.tmp && \
mv $@.tmp $@
@MOO_GLADE_SUBDIR_RULE@
glade_files = \
glade/mooaccelbutton.glade \
glade/mooaccelprefs.glade \
glade/moologwindow.glade
glade_sources = $(patsubst glade/%.glade,%-glade.h,$(glade_files))
nodist_mooutils_sources += $(glade_sources)
BUILT_SOURCES += $(glade_sources)
CLEANFILES += $(glade_sources)
EXTRA_DIST += $(glade_files)
mooutils_pixmaps = \
$(srcdir)/pixmaps/medit.png \
@ -203,6 +188,9 @@ mooutils_pixmaps = \
$(srcdir)/pixmaps/keepontop.png \
$(srcdir)/pixmaps/sticky.png
CLEANFILES += stock-moo.h
BUILT_SOURCES += stock-moo.h
nodist_mooutils_sources += stock-moo.h
stock-moo.h: $(mooutils_pixmaps)
gdk-pixbuf-csource --static --build-list \
MEDIT_ICON $(srcdir)/pixmaps/medit.png \

0
moo/mooutils/glade/accelbutton.glade → moo/mooutils/glade/mooaccelbutton.glade
View File

0
moo/mooutils/glade/accelprefs.glade → moo/mooutils/glade/mooaccelprefs.glade
View File

2
moo/mooutils/mooaccelbutton.c
View File

@ -284,7 +284,7 @@ moo_accel_button_clicked (GtkButton *gtkbutton)
Stuff s = {0, 0, NULL};
int response;
xml = moo_glade_xml_new_from_buf (MOO_ACCEL_BUTTON_GLADE_UI, -1,
xml = moo_glade_xml_new_from_buf (mooaccelbutton_glade_xml, -1,
"dialog", GETTEXT_PACKAGE, NULL);
g_return_if_fail (xml != NULL);

4
moo/mooutils/mooaccelprefs.c
View File

@ -189,7 +189,7 @@ _moo_accel_prefs_page_init (MooAccelPrefsPage *page)
xml = moo_glade_xml_new_empty (GETTEXT_PACKAGE);
moo_glade_xml_map_class (xml, "GtkButton", MOO_TYPE_ACCEL_BUTTON);
moo_glade_xml_fill_widget (xml, GTK_WIDGET (page),
MOO_ACCEL_PREFS_GLADE_UI, -1,
mooaccelprefs_glade_xml, -1,
"page", NULL);
g_object_set (page, "label", "Shortcuts", "icon-stock-id", MOO_STOCK_KEYBOARD, NULL);
@ -723,7 +723,7 @@ _moo_accel_prefs_dialog_new (MooActionCollection *collection)
GtkWidget *dialog, *page_holder;
MooGladeXML *xml;
xml = moo_glade_xml_new_from_buf (MOO_ACCEL_PREFS_GLADE_UI, -1,
xml = moo_glade_xml_new_from_buf (mooaccelprefs_glade_xml, -1,
"dialog", GETTEXT_PACKAGE, NULL);
g_return_val_if_fail (xml != NULL, NULL);

2
moo/mooutils/mooutils-misc.c
View File

@ -631,7 +631,7 @@ moo_log_window_new (void)
MooLogWindow *log;
PangoFontDescription *font;
xml = moo_glade_xml_new_from_buf (MOO_LOG_WINDOW_GLADE_UI, -1,
xml = moo_glade_xml_new_from_buf (moologwindow_glade_xml, -1,
NULL, GETTEXT_PACKAGE, NULL);
log = g_new (MooLogWindow, 1);

2
moo/mooutils/moowindow.c
View File

@ -772,7 +772,7 @@ create_toolbar_style_action (MooWindow *window,
ICONS_AND_LABELS
};
action = moo_menu_action_new (TOOLBAR_STYLE_ACTION_ID, "Toolbar _Style");
action = moo_menu_action_new (TOOLBAR_STYLE_ACTION_ID, _("Toolbar _Style"));
menu_mgr = moo_menu_action_get_mgr (MOO_MENU_ACTION (action));
moo_menu_mgr_set_use_mnemonic (menu_mgr, TRUE);

1
moo/mooutils/xml2h.sh
View File

@ -6,6 +6,7 @@ fi
VARNAME=$1
INPUT=$2
echo "/* -*- C -*- */"
echo "static const char $VARNAME [] = \"\""
sed 's/"/\\"/g' $INPUT | sed 's/^\(.*\)$/"\1\\n"/' || exit $?
echo ";"