GNOME.org
 

[gtranslator] Moved dialogs files to src folder

commit 12536a3f93640e1c0626e4a7d629a2c0bfc5b995
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Mon Apr 16 12:48:42 2012 +0200

    Moved dialogs files to src folder

 configure.ac                                      |    1 -
 src/Makefile.am                                   |   50 ++++++++++++++++-----
 src/dialogs/Makefile.am                           |   45 ------------------
 src/gtr-actions-edit.c                            |    4 +-
 src/gtr-actions-file.c                            |    2 +-
 src/gtr-actions-search.c                          |    2 +-
 src/gtr-application.c                             |    2 +-
 src/{dialogs => }/gtr-assistant.c                 |    0
 src/{dialogs => }/gtr-assistant.h                 |    0
 src/{dialogs => }/gtr-close-confirmation-dialog.c |    0
 src/{dialogs => }/gtr-close-confirmation-dialog.h |    0
 src/{dialogs => }/gtr-file-dialogs.c              |    0
 src/{dialogs => }/gtr-file-dialogs.h              |    0
 src/{dialogs => }/gtr-header-dialog.c             |    0
 src/{dialogs => }/gtr-header-dialog.h             |    0
 src/{dialogs => }/gtr-header-dialog.ui            |    0
 src/{dialogs => }/gtr-jump-dialog.c               |    0
 src/{dialogs => }/gtr-jump-dialog.h               |    0
 src/{dialogs => }/gtr-jump-dialog.ui              |    0
 src/{dialogs => }/gtr-languages-fetcher.c         |    0
 src/{dialogs => }/gtr-languages-fetcher.h         |    0
 src/{dialogs => }/gtr-languages-fetcher.ui        |    0
 src/{dialogs => }/gtr-preferences-dialog.c        |    0
 src/{dialogs => }/gtr-preferences-dialog.h        |    0
 src/{dialogs => }/gtr-preferences-dialog.ui       |    0
 src/{dialogs => }/gtr-profile-dialog.c            |    0
 src/{dialogs => }/gtr-profile-dialog.h            |    0
 src/{dialogs => }/gtr-profile-dialog.ui           |    0
 src/{dialogs => }/gtr-search-dialog.c             |    0
 src/{dialogs => }/gtr-search-dialog.h             |    0
 src/{dialogs => }/gtr-search-dialog.ui            |    0
 31 files changed, 44 insertions(+), 62 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0d530b8..fff9379 100644
--- a/configure.ac
+++ b/configure.ac
@@ -293,7 +293,6 @@ plugins/translation-memory/Makefile
 plugins/translation-memory/gda/Makefile
 plugins/translation-memory/org.gnome.gtranslator.plugins.translation-memory.gschema.xml.in
 src/Makefile
-src/dialogs/Makefile
 src/toolbareditor/Makefile
 ])
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index 6337609..54c3797 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,17 +2,17 @@
 # Welcome to the gtranslator-automake-autoconf Wonderland!
 # --------------------------------------------------------
 
-SUBDIRS = toolbareditor \
-	  dialogs
+SUBDIRS = toolbareditor
 
-noinst_LTLIBRARIES = libgtranslator.la
+noinst_LTLIBRARIES = \
+	libgtranslator.la
 
 lib_LTLIBRARIES = libgtranslator-private.la
 
 INCLUDES = \
 	-I$(top_srcdir)						\
-	-I$(top_srcdir)/src/dialogs				\
 	-I$(top_srcdir)/src/toolbareditor			\
+	-I$(top_builddir)/src					\
 	$(GTRANSLATOR_CFLAGS)					\
 	$(GTKSPELL_CFLAGS)					\
 	$(WARN_CFLAGS)						\
@@ -21,11 +21,21 @@ INCLUDES = \
 	-DDATADIR=\""$(datadir)"\"				\
 	-DLIBDIR=\""$(libdir)"\"
 
+uidir = $(pkgdatadir)/ui
+ui_DATA =  \
+	gtr-preferences-dialog.ui \
+	gtr-search-dialog.ui \
+	gtr-header-dialog.ui \
+	gtr-profile-dialog.ui \
+	gtr-jump-dialog.ui \
+	gtr-languages-fetcher.ui
+
 bin_PROGRAMS = \
 	gtranslator
 
 gtranslator_SOURCES = main.c
 
+
 gtranslator_LDADD =			\
 	libgtranslator.la		\
 	libgtranslator-private.la	\
@@ -75,14 +85,23 @@ INST_H_FILES = \
 
 NOINST_H_FILES = \
 	gtr-actions.h \
+	gtr-assistant.h \
 	gtr-close-button.h \
+	gtr-close-confirmation-dialog.h \
 	gtr-dirs.h \
+	gtr-file-dialogs.h \
+	gtr-header-dialog.h \
 	gtr-history-entry.h \
 	gtr-io-error-info-bar.h \
-	gtr-message-table-model.h \
+	gtr-jump-dialog.h \
 	gtr-language.h \
+	gtr-languages-fetcher.h \
+	gtr-message-table-model.h \
 	gtr-plugins-engine.h \
+	gtr-preferences-dialog.h \
+	gtr-profile-dialog.h \
 	gtr-profile-manager.h \
+	gtr-search-dialog.h \
 	gtr-settings.h \
 	gtr-status-combo-box.h \
 	gtr-tab-label.h \
@@ -106,21 +125,30 @@ libgtranslator_c_files = \
 	gtr-actions-search.c \
 	gtr-actions-view.c \
 	gtr-application.c \
+	gtr-assistant.c \
 	gtr-close-button.c \
+	gtr-close-confirmation-dialog.c \
 	gtr-context.c \
 	gtr-dirs.c \
+	gtr-file-dialogs.c \
 	gtr-header.c \
+	gtr-header-dialog.c \
 	gtr-history-entry.c \
 	gtr-io-error-info-bar.c \
+	gtr-jump-dialog.c \
+	gtr-language.c \
+	gtr-languages-fetcher.c \
 	gtr-message-table.c \
 	gtr-message-table-model.c \
 	gtr-msg.c \
 	gtr-notebook.c \
-	gtr-language.c \
 	gtr-plugins-engine.c \
 	gtr-po.c \
+	gtr-preferences-dialog.c \
 	gtr-profile.c \
+	gtr-profile-dialog.c \
 	gtr-profile-manager.c \
+	gtr-search-dialog.c \
 	gtr-settings.c \
 	gtr-statusbar.c \
 	gtr-status-combo-box.c \
@@ -137,13 +165,12 @@ libgtranslator_la_SOURCES = \
 	$(INST_H_FILES)
 
 libgtranslator_la_LIBADD = \
-	dialogs/libdialogs.la \
 	toolbareditor/libtoolbareditor.la \
 	$(GTRANSLATOR_LIBS)
 
 gtr-enum-types.h: gtr-enum-types.h.template $(INST_H_FILES) $(GLIB_MKENUMS)
 	$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template gtr-enum-types.h.template $(INST_H_FILES)) > $@
-	
+
 gtr-enum-types.c: gtr-enum-types.c.template $(INST_H_FILES) $(GLIB_MKENUMS)
 	$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template gtr-enum-types.c.template $(INST_H_FILES)) > $@
 
@@ -154,11 +181,11 @@ gtr-marshal.c: gtr-marshal.list $(GLIB_GENMARSHAL)
 	$(AM_V_GEN) $(GLIB_GENMARSHAL) $< --body --header --prefix=gtr_marshal > $@
 
 EXTRA_DIST =	\
+	$(ui_DATA)	\
 	gtr-marshal.list	\
 	gtr-enum-types.h.template	\
 	gtr-enum-types.c.template
 
-CLEANFILES = $(BUILT_SOURCES)
 
 if HAVE_INTROSPECTION
 -include $(INTROSPECTION_MAKEFILE)
@@ -178,9 +205,10 @@ gir_DATA = $(INTROSPECTION_GIRS)
 typelibdir = $(libdir)/gtranslator/girepository-1.0
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
-CLEANFILES +=			\
+CLEANFILES =	\
 	$(gir_DATA)	\
-	$(typelib_DATA)
+	$(typelib_DATA)	\
+	$(BUILT_SOURCES)
 endif
 
 -include $(top_srcdir)/git.mk
diff --git a/src/gtr-actions-edit.c b/src/gtr-actions-edit.c
index e0275a9..3046b6f 100644
--- a/src/gtr-actions-edit.c
+++ b/src/gtr-actions-edit.c
@@ -24,8 +24,8 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include "dialogs/gtr-header-dialog.h"
-#include "dialogs/gtr-preferences-dialog.h"
+#include "gtr-header-dialog.h"
+#include "gtr-preferences-dialog.h"
 #include "gtr-actions.h"
 #include "gtr-msg.h"
 #include "gtr-po.h"
diff --git a/src/gtr-actions-file.c b/src/gtr-actions-file.c
index b575894..1e63c6c 100644
--- a/src/gtr-actions-file.c
+++ b/src/gtr-actions-file.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <gio/gio.h>
 
-#include "dialogs/gtr-close-confirmation-dialog.h"
+#include "gtr-close-confirmation-dialog.h"
 #include "gtr-actions.h"
 #include "gtr-application.h"
 #include "gtr-dirs.h"
diff --git a/src/gtr-actions-search.c b/src/gtr-actions-search.c
index 117a0f3..a4a84f9 100644
--- a/src/gtr-actions-search.c
+++ b/src/gtr-actions-search.c
@@ -38,7 +38,7 @@
 #include "gtr-utils.h"
 #include "gtr-view.h"
 #include "gtr-window.h"
-#include "dialogs/gtr-search-dialog.h"
+#include "gtr-search-dialog.h"
 
 
 #define GTR_SEARCH_DIALOG_KEY		"gtr-search-dialog-key"
diff --git a/src/gtr-application.c b/src/gtr-application.c
index ea788ec..4b540ae 100644
--- a/src/gtr-application.c
+++ b/src/gtr-application.c
@@ -24,7 +24,7 @@
 #include <config.h>
 #endif
 
-#include "dialogs/gtr-assistant.h"
+#include "gtr-assistant.h"
 #include "gtr-actions.h"
 #include "gtr-application.h"
 #include "gtr-debug.h"
diff --git a/src/dialogs/gtr-assistant.c b/src/gtr-assistant.c
similarity index 100%
rename from src/dialogs/gtr-assistant.c
rename to src/gtr-assistant.c
diff --git a/src/dialogs/gtr-assistant.h b/src/gtr-assistant.h
similarity index 100%
rename from src/dialogs/gtr-assistant.h
rename to src/gtr-assistant.h
diff --git a/src/dialogs/gtr-close-confirmation-dialog.c b/src/gtr-close-confirmation-dialog.c
similarity index 100%
rename from src/dialogs/gtr-close-confirmation-dialog.c
rename to src/gtr-close-confirmation-dialog.c
diff --git a/src/dialogs/gtr-close-confirmation-dialog.h b/src/gtr-close-confirmation-dialog.h
similarity index 100%
rename from src/dialogs/gtr-close-confirmation-dialog.h
rename to src/gtr-close-confirmation-dialog.h
diff --git a/src/dialogs/gtr-file-dialogs.c b/src/gtr-file-dialogs.c
similarity index 100%
rename from src/dialogs/gtr-file-dialogs.c
rename to src/gtr-file-dialogs.c
diff --git a/src/dialogs/gtr-file-dialogs.h b/src/gtr-file-dialogs.h
similarity index 100%
rename from src/dialogs/gtr-file-dialogs.h
rename to src/gtr-file-dialogs.h
diff --git a/src/dialogs/gtr-header-dialog.c b/src/gtr-header-dialog.c
similarity index 100%
rename from src/dialogs/gtr-header-dialog.c
rename to src/gtr-header-dialog.c
diff --git a/src/dialogs/gtr-header-dialog.h b/src/gtr-header-dialog.h
similarity index 100%
rename from src/dialogs/gtr-header-dialog.h
rename to src/gtr-header-dialog.h
diff --git a/src/dialogs/gtr-header-dialog.ui b/src/gtr-header-dialog.ui
similarity index 100%
rename from src/dialogs/gtr-header-dialog.ui
rename to src/gtr-header-dialog.ui
diff --git a/src/dialogs/gtr-jump-dialog.c b/src/gtr-jump-dialog.c
similarity index 100%
rename from src/dialogs/gtr-jump-dialog.c
rename to src/gtr-jump-dialog.c
diff --git a/src/dialogs/gtr-jump-dialog.h b/src/gtr-jump-dialog.h
similarity index 100%
rename from src/dialogs/gtr-jump-dialog.h
rename to src/gtr-jump-dialog.h
diff --git a/src/dialogs/gtr-jump-dialog.ui b/src/gtr-jump-dialog.ui
similarity index 100%
rename from src/dialogs/gtr-jump-dialog.ui
rename to src/gtr-jump-dialog.ui
diff --git a/src/dialogs/gtr-languages-fetcher.c b/src/gtr-languages-fetcher.c
similarity index 100%
rename from src/dialogs/gtr-languages-fetcher.c
rename to src/gtr-languages-fetcher.c
diff --git a/src/dialogs/gtr-languages-fetcher.h b/src/gtr-languages-fetcher.h
similarity index 100%
rename from src/dialogs/gtr-languages-fetcher.h
rename to src/gtr-languages-fetcher.h
diff --git a/src/dialogs/gtr-languages-fetcher.ui b/src/gtr-languages-fetcher.ui
similarity index 100%
rename from src/dialogs/gtr-languages-fetcher.ui
rename to src/gtr-languages-fetcher.ui
diff --git a/src/dialogs/gtr-preferences-dialog.c b/src/gtr-preferences-dialog.c
similarity index 100%
rename from src/dialogs/gtr-preferences-dialog.c
rename to src/gtr-preferences-dialog.c
diff --git a/src/dialogs/gtr-preferences-dialog.h b/src/gtr-preferences-dialog.h
similarity index 100%
rename from src/dialogs/gtr-preferences-dialog.h
rename to src/gtr-preferences-dialog.h
diff --git a/src/dialogs/gtr-preferences-dialog.ui b/src/gtr-preferences-dialog.ui
similarity index 100%
rename from src/dialogs/gtr-preferences-dialog.ui
rename to src/gtr-preferences-dialog.ui
diff --git a/src/dialogs/gtr-profile-dialog.c b/src/gtr-profile-dialog.c
similarity index 100%
rename from src/dialogs/gtr-profile-dialog.c
rename to src/gtr-profile-dialog.c
diff --git a/src/dialogs/gtr-profile-dialog.h b/src/gtr-profile-dialog.h
similarity index 100%
rename from src/dialogs/gtr-profile-dialog.h
rename to src/gtr-profile-dialog.h
diff --git a/src/dialogs/gtr-profile-dialog.ui b/src/gtr-profile-dialog.ui
similarity index 100%
rename from src/dialogs/gtr-profile-dialog.ui
rename to src/gtr-profile-dialog.ui
diff --git a/src/dialogs/gtr-search-dialog.c b/src/gtr-search-dialog.c
similarity index 100%
rename from src/dialogs/gtr-search-dialog.c
rename to src/gtr-search-dialog.c
diff --git a/src/dialogs/gtr-search-dialog.h b/src/gtr-search-dialog.h
similarity index 100%
rename from src/dialogs/gtr-search-dialog.h
rename to src/gtr-search-dialog.h
diff --git a/src/dialogs/gtr-search-dialog.ui b/src/gtr-search-dialog.ui
similarity index 100%
rename from src/dialogs/gtr-search-dialog.ui
rename to src/gtr-search-dialog.ui
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]