Include glade files as "file.h", without directory

master
Yevgen Muntyan 2008-01-15 00:46:49 -06:00
parent c6cd06cfce
commit ec4eeddd2b
20 changed files with 31 additions and 31 deletions

View File

@ -10,7 +10,7 @@
* See COPYING file that comes with this distribution.
*/
#include "mooapp/mooappabout-glade.h"
#include "mooappabout-glade.h"
#include "mooapp/mooappabout.h"
#include "mooapp/mooapp.h"
#include "mooapp/moohtml.h"

View File

@ -184,8 +184,8 @@ glade_files = \
glade/mooprint.glade \
glade/mootextfind.glade \
glade/mootextgotoline.glade \
glade/quicksearch.glade \
glade/statusbar.glade \
glade/mooquicksearch.glade \
glade/moostatusbar.glade \
glade/mooprintpreview.glade
glade_sources = $(patsubst glade/%.glade,%-glade.h,$(glade_files))
nodist_mooedit_sources += $(glade_sources)
@ -195,10 +195,10 @@ EXTRA_DIST = $(glade_files)
XML2H = $(srcdir)/../mooutils/xml2h.sh
mooedit-ui.h: mooedit-ui.xml $(XML2H)
$(SHELL) $(XML2H) MOO_EDIT_UI_XML $(srcdir)/mooedit-ui.xml > $@.tmp && \
$(SHELL) $(XML2H) mooedit_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 && \
$(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

View File

@ -13,7 +13,7 @@
#define MOOEDIT_COMPILATION
#include "mooedit/moocommand-lua.h"
#include "mooedit/mooedit-lua.h"
#include "mooedit/mooedittools-glade.h"
#include "mooedittools-glade.h"
#include "mooedit/mooeditor.h"
#include "mooedit/mootext-private.h"
#include "mooutils/mooi18n.h"

View File

@ -18,7 +18,7 @@
#include "mooedit/mooeditdialogs.h"
#include "mooedit/mooeditprefs.h"
#include "mooedit/mootextbuffer.h"
#include "mooedit/mooeditprogress-glade.h"
#include "mooeditprogress-glade.h"
#include "mooedit/mooeditfiltersettings.h"
#include "mooedit/mooeditor-private.h"
#include "mooutils/moomarshals.h"

View File

@ -14,9 +14,9 @@
#include "mooedit/mooeditdialogs.h"
#include "mooedit/mooedit-private.h"
#include "mooedit/mooeditprefs.h"
#include "mooedit/mootextfind-glade.h"
#include "mootextfind-glade.h"
#include "mooedit/mooeditfileops.h"
#include "mooedit/mooeditsavemult-glade.h"
#include "mooeditsavemult-glade.h"
#include "mooutils/moodialogs.h"
#include "mooutils/moocompat.h"
#include "mooutils/moostock.h"

View File

@ -14,10 +14,10 @@
#include "mooedit/mooedit-private.h"
#include "mooedit/mooeditor-private.h"
#include "mooedit/mooeditprefs.h"
#include "mooedit/mooeditprefs-general-glade.h"
#include "mooedit/mooeditprefs-view-glade.h"
#include "mooedit/mooeditprefs-file-glade.h"
#include "mooedit/mooeditprefs-langs-glade.h"
#include "mooeditprefs-general-glade.h"
#include "mooeditprefs-view-glade.h"
#include "mooeditprefs-file-glade.h"
#include "mooeditprefs-langs-glade.h"
#include "mooedit/moolangmgr.h"
#include "mooedit/mooeditfiltersettings.h"
#include "mooutils/mooprefsdialog.h"

View File

@ -15,7 +15,7 @@
#endif
#define MOOEDIT_COMPILATION
#include "mooedit/statusbar-glade.h"
#include "moostatusbar-glade.h"
#include "mooedit/mooedit-private.h"
#include "mooedit/mooeditor-private.h"
#include "mooedit/mooeditfiltersettings.h"
@ -3324,7 +3324,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 (moostatusbar_glade_xml, -1,
"hbox", GETTEXT_PACKAGE, NULL);
hbox = moo_glade_xml_get_widget (xml, "hbox");
g_return_if_fail (hbox != NULL);

View File

@ -16,7 +16,7 @@
#include "mooedit/mooplugin.h"
#include "mooedit/mooplugin-loader.h"
#include "mooedit/moopluginprefs-glade.h"
#include "moopluginprefs-glade.h"
#include "mooedit/plugins/mooeditplugins.h"
#include "moopython/moopython-builtin.h"
#include "mooutils/mooprefsdialog.h"

View File

@ -11,8 +11,8 @@
*/
#include "mooedit/mootextfind.h"
#include "mooedit/mootextfind-glade.h"
#include "mooedit/mootextgotoline-glade.h"
#include "mootextfind-glade.h"
#include "mootextgotoline-glade.h"
#include "mooedit/mootextview.h"
#include "mooedit/mooeditdialogs.h"
#include "mooedit/mootextsearch-private.h"

View File

@ -14,7 +14,7 @@
#include "mooedit/mootextprint-private.h"
#include "mooedit/mooedit.h"
#include "mooedit/mooedit-private.h"
#include "mooedit/mooprint-glade.h"
#include "mooprint-glade.h"
#include "mooedit/mooeditprefs.h"
#include "mooedit/mootext-private.h"
#include "mooedit/mooprintpreview.h"

View File

@ -17,7 +17,7 @@
#include "mooedit/mootextfind.h"
#include "mooedit/mootext-private.h"
#include "mooedit/mooedit-enums.h"
#include "mooedit/quicksearch-glade.h"
#include "mooquicksearch-glade.h"
#include "mooedit/mooeditprefs.h"
#include "mooedit/mootextbox.h"
#include "mooutils/moomarshals.h"
@ -4321,7 +4321,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, quicksearch_glade_xml, -1, "evbox", NULL);
moo_glade_xml_parse_memory (xml, mooquicksearch_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);

View File

@ -12,7 +12,7 @@
#include "mooedit/moousertools-prefs.h"
#include "mooedit/moousertools.h"
#include "mooedit/mooedittools-glade.h"
#include "mooedittools-glade.h"
#include "mooedit/moocommand.h"
#include "mooedit/moocommanddisplay.h"
#include "mooutils/mooprefsdialogpage.h"

View File

@ -61,7 +61,7 @@ symlink.h: $(moofileview_pixmaps)
XML2H = $(srcdir)/../mooutils/xml2h.sh
moofileview-ui.h: $(srcdir)/moofileview-ui.xml $(XML2H)
$(SHELL) $(XML2H) MOO_FILE_VIEW_UI $(srcdir)/moofileview-ui.xml > $@.tmp && \
$(SHELL) $(XML2H) moofileview_ui_xml $(srcdir)/moofileview-ui.xml > $@.tmp && \
mv $@.tmp $@
@MOO_GLADE_SUBDIR_RULE@

View File

@ -16,7 +16,7 @@
#define MOO_FILE_VIEW_COMPILATION
#include "moofileview/moobookmarkmgr.h"
#include "moofileview/moobookmark-editor-glade.h"
#include "moobookmark-editor-glade.h"
#include "moofileview/moofileentry.h"
#include "mooutils/mooglade.h"
#include "mooutils/mooprefs.h"

View File

@ -14,9 +14,9 @@
#include "moofileview/moofileview-dialogs.h"
#include "moofileview/moofilesystem.h"
#include "moofileview/moofile-private.h"
#include "moofileview/moofileprops-glade.h"
#include "moofileview/moocreatefolder-glade.h"
#include "moofileview/moofileview-drop-glade.h"
#include "moofileprops-glade.h"
#include "moocreatefolder-glade.h"
#include "moofileview-drop-glade.h"
#include "mooutils/mooentry.h"
#include "mooutils/mooutils-gobject.h"
#include "mooutils/moodialogs.h"

View File

@ -26,7 +26,7 @@
#include "moofileview/mooiconview.h"
#include "moofileview/moofileview-aux.h"
#include "moofileview/moofileview-private.h"
#include "moofileview/moofileview-ui.h"
#include "moofileview-ui.h"
#include "moofileview/mootreeview.h"
#include "moofileview/moobookmarkview.h"
#include "moofileview/moofileview-tools.h"
@ -1110,7 +1110,7 @@ init_actions (MooFileView *fileview)
fileview->priv->actions = moo_action_collection_new ("File Selector", _("File Selector"));
fileview->priv->ui_xml = moo_ui_xml_new ();
moo_ui_xml_add_ui_from_string (fileview->priv->ui_xml,
MOO_FILE_VIEW_UI, -1);
moofileview_ui_xml, -1);
group = moo_action_collection_get_group (fileview->priv->actions, NULL);

View File

@ -11,7 +11,7 @@
*/
#include "mooutils/mooaccelbutton.h"
#include "mooutils/mooaccelbutton-glade.h"
#include "mooaccelbutton-glade.h"
#include "mooutils/mooglade.h"
#include "mooutils/moomarshals.h"
#include "mooutils/moodialogs.h"

View File

@ -12,7 +12,7 @@
#include "mooutils/mooaccelprefs.h"
#include "mooutils/mooaccel.h"
#include "mooutils/mooaccelprefs-glade.h"
#include "mooaccelprefs-glade.h"
#include "mooutils/mooprefsdialog.h"
#include "mooutils/mooaccelbutton.h"
#include "mooutils/mooglade.h"