From ecc2d1510dbfc5d3697a2297386e40305770f92e Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Mon, 19 Sep 2016 16:39:54 +0200
Subject: [PATCH] Renamed to zak-confi-gui.

---
 .gitignore                                      |  2 +-
 autogen.sh                                      |  4 ++--
 configure.ac                                    | 17 +++++++++--------
 data/Makefile.am                                |  2 +-
 data/gconfi/Makefile.am                         |  1 -
 data/gconfi/glade/Makefile.am                   |  5 -----
 data/zak-confi-gui/Makefile.am                  |  1 +
 data/zak-confi-gui/ui/Makefile.am               |  5 +++++
 .../ui/zak-confi-gui.ui}                        | 15 ++++++++++-----
 src/Makefile.am                                 | 12 ++++++------
 src/main.c                                      | 16 ++++++++--------
 11 files changed, 43 insertions(+), 37 deletions(-)
 delete mode 100644 data/gconfi/Makefile.am
 delete mode 100644 data/gconfi/glade/Makefile.am
 create mode 100644 data/zak-confi-gui/Makefile.am
 create mode 100644 data/zak-confi-gui/ui/Makefile.am
 rename data/{gconfi/glade/gconfi.glade => zak-confi-gui/ui/zak-confi-gui.ui} (98%)

diff --git a/.gitignore b/.gitignore
index 59a9c5d..9fc9867 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,4 +53,4 @@ tests/test
 *.csv
 gtk-doc.m4
 COPYING
-gconfi
\ No newline at end of file
+zak-confi-gui
\ No newline at end of file
diff --git a/autogen.sh b/autogen.sh
index 3a7dd78..184b960 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,13 +4,13 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="gconfi"
+PKG_NAME="zak-confi-gui"
 
 (test -f $srcdir/configure.ac \
   && test -d $srcdir/src \
   && test -f $srcdir/src/main.c) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level gconfi directory"
+    echo " top-level zak-confi-gui directory"
     exit 1
 }
 
diff --git a/configure.ac b/configure.ac
index 2b382d6..b3b05ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,9 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([gConfi], [0.10.0], [azagli@libero.it])
+AC_INIT([zak-confi-gui], [0.10.0], [azagli@libero.it])
 AC_CONFIG_SRCDIR([src/main.c])
+AC_CONFIG_HEADER([config.h])
 
 AM_INIT_AUTOMAKE(-Wall)
 
@@ -19,18 +20,18 @@ AC_PROG_CC
 dnl ******************************
 dnl Translations
 dnl ******************************
-GETTEXT_PACKAGE=gconfi
+GETTEXT_PACKAGE=zak-confi-gui
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
                    [The prefix for our gettext translation domains.])
 AM_GLIB_GNU_GETTEXT
 
 # Checks for libraries.
-PKG_CHECK_MODULES(GCONFI, [gtk+-3.0 >= 3.0.0
-                           libzakconfi >= 0.10.0])
+PKG_CHECK_MODULES(ZAKCONFIGUI, [gtk+-3.0 >= 3.0.0
+                                libzakconfi >= 0.10.0])
 
-AC_SUBST(GCONFI_CFLAGS)
-AC_SUBST(GCONFI_LIBS)
+AC_SUBST(ZAKCONFIGUI_CFLAGS)
+AC_SUBST(ZAKCONFIGUI_LIBS)
 
 # Checks for header files.
 
@@ -56,8 +57,8 @@ AC_CONFIG_FILES([
   Makefile
   src/Makefile
   data/Makefile
-  data/gconfi/Makefile
-  data/gconfi/glade/Makefile
+  data/zak-confi-gui/Makefile
+  data/zak-confi-gui/ui/Makefile
 ])
 
 AC_OUTPUT
diff --git a/data/Makefile.am b/data/Makefile.am
index 36537bb..65f29dc 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1 +1 @@
-SUBDIRS = gconfi
+SUBDIRS = zak-confi-gui
diff --git a/data/gconfi/Makefile.am b/data/gconfi/Makefile.am
deleted file mode 100644
index 21cc77b..0000000
--- a/data/gconfi/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = glade
diff --git a/data/gconfi/glade/Makefile.am b/data/gconfi/glade/Makefile.am
deleted file mode 100644
index 86969b6..0000000
--- a/data/gconfi/glade/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-gladedir = $(datadir)/gconfi/glade
-
-glade_DATA = gconfi.glade
-
-EXTRA_DIST = $(glade_DATA)
diff --git a/data/zak-confi-gui/Makefile.am b/data/zak-confi-gui/Makefile.am
new file mode 100644
index 0000000..aac7812
--- /dev/null
+++ b/data/zak-confi-gui/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = ui
diff --git a/data/zak-confi-gui/ui/Makefile.am b/data/zak-confi-gui/ui/Makefile.am
new file mode 100644
index 0000000..cc25bde
--- /dev/null
+++ b/data/zak-confi-gui/ui/Makefile.am
@@ -0,0 +1,5 @@
+uidir = $(datadir)/$(PACKAGE)/ui
+
+ui_DATA = zak-confi-gui.ui
+
+EXTRA_DIST = $(ui_DATA)
diff --git a/data/gconfi/glade/gconfi.glade b/data/zak-confi-gui/ui/zak-confi-gui.ui
similarity index 98%
rename from data/gconfi/glade/gconfi.glade
rename to data/zak-confi-gui/ui/zak-confi-gui.ui
index 5927654..a47849a 100644
--- a/data/gconfi/glade/gconfi.glade
+++ b/data/zak-confi-gui/ui/zak-confi-gui.ui
@@ -19,7 +19,7 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="border_width">1</property>
-    <property name="title" translatable="yes">gConfi</property>
+    <property name="title" translatable="yes">ZakConfiGUI</property>
     <property name="default_width">600</property>
     <property name="default_height">400</property>
     <accel-groups>
@@ -321,6 +321,7 @@
     <property name="can_focus">False</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">normal</property>
+    <property name="transient_for">wMain</property>
     <property name="attached_to">wMain</property>
     <property name="program_name">ZakConfiGUI</property>
     <property name="version">0.10.0</property>
@@ -349,11 +350,12 @@
   <object class="GtkDialog" id="diagNewDbCfg">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="title" translatable="yes">New - gConfi</property>
+    <property name="title" translatable="yes">New - ZakConfiGUI</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="default_width">300</property>
     <property name="type_hint">dialog</property>
+    <property name="transient_for">wMain</property>
     <property name="attached_to">wMain</property>
     <signal name="response" handler="gtk_widget_hide" swapped="no"/>
     <child internal-child="vbox">
@@ -505,11 +507,12 @@
   <object class="GtkDialog" id="diagOpenDbCfg">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Open - gConfi</property>
+    <property name="title" translatable="yes">Open - ZakConfiGUI</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="default_width">300</property>
     <property name="type_hint">dialog</property>
+    <property name="transient_for">wMain</property>
     <property name="attached_to">wMain</property>
     <signal name="response" handler="gtk_widget_hide" swapped="no"/>
     <child internal-child="vbox">
@@ -638,10 +641,11 @@
   <object class="GtkDialog" id="wConfiguration">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Configuration - gConfi</property>
+    <property name="title" translatable="yes">Configuration - ZakConfiGUI</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
+    <property name="transient_for">wMain</property>
     <property name="attached_to">wMain</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox2">
@@ -804,10 +808,11 @@
   <object class="GtkDialog" id="wKey">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Key - gConfi</property>
+    <property name="title" translatable="yes">Key - ZakConfiGUI</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
+    <property name="transient_for">wMain</property>
     <property name="attached_to">wMain</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox3">
diff --git a/src/Makefile.am b/src/Makefile.am
index 0b63e72..23b1436 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,11 @@
-gladedir = $(datadir)/gconfi/glade
+uidir = $(datadir)/$(PACKAGE)/ui
 
-AM_CPPFLAGS = $(GCONFI_CFLAGS) \
-              -DGLADEDIR=\""$(gladedir)"\"
+AM_CPPFLAGS = $(ZAKCONFIGUI_CFLAGS) \
+              -DUIDIR=\""$(uidir)"\"
 
-LIBS = $(GCONFI_LIBS) \
+LIBS = $(ZAKCONFIGUI_LIBS) \
        -export-dynamic
 
-bin_PROGRAMS = gconfi
+bin_PROGRAMS = zak-confi-gui
 
-gconfi_SOURCES = main.c
+zak_confi_gui_SOURCES = main.c
diff --git a/src/main.c b/src/main.c
index 3d9f630..d8c4134 100644
--- a/src/main.c
+++ b/src/main.c
@@ -550,7 +550,7 @@ on_mnuDbNew_activate (GtkMenuItem *menuitem,
 {
 	GError *error = NULL;
 	gtk_builder_add_objects_from_file (glaMain,
-	                                   GLADEDIR "/gconfi.glade",
+	                                   UIDIR "/zak-confi-gui.ui",
 	                                   g_strsplit_set ("diagNewDbCfg", "|", -1),
 	                                   &error);
 
@@ -678,7 +678,7 @@ on_mnuDbOpen_activate (GtkMenuItem *menuitem,
 {
 	GError *error = NULL;
 	gtk_builder_add_objects_from_file (glaMain,
-	                                   GLADEDIR "/gconfi.glade",
+	                                   UIDIR "/zak-confi-gui.ui",
 	                                   g_strsplit_set ("diagOpenDbCfg", "|", -1),
 	                                   &error);
 
@@ -742,7 +742,7 @@ on_mnuConfigsNew_activate (GtkMenuItem *menuitem,
 {
 	GError *error = NULL;
 	gtk_builder_add_objects_from_file (glaMain,
-	                                   GLADEDIR "/gconfi.glade",
+	                                   UIDIR "/zak-confi-gui.ui",
 	                                   g_strsplit_set ("wConfiguration", "|", -1),
 	                                   &error);
 
@@ -829,7 +829,7 @@ on_mnuConfigsEdit_activate (GtkMenuItem *menuitem,
 
 					GError *error = NULL;
 					gtk_builder_add_objects_from_file (glaMain,
-					                                   GLADEDIR "/gconfi.glade",
+					                                   UIDIR "/zak-confi-gui.ui",
 					                                   g_strsplit_set ("wConfiguration", "|", -1),
 					                                   &error);
 
@@ -1014,7 +1014,7 @@ on_mnuKeysNew_activate (GtkMenuItem *menuitem,
 
 					GError *error = NULL;
 					gtk_builder_add_objects_from_file (glaMain,
-					                                   GLADEDIR "/gconfi.glade",
+					                                   UIDIR "/zak-confi-gui.ui",
 					                                   g_strsplit_set ("wKey", "|", -1),
 					                                   &error);
 
@@ -1134,7 +1134,7 @@ on_mnuKeysEdit_activate (GtkMenuItem *menuitem,
 
 					GError *error = NULL;
 					gtk_builder_add_objects_from_file (glaMain,
-					                                   GLADEDIR "/gconfi.glade",
+					                                   UIDIR "/zak-confi-gui.ui",
 					                                   g_strsplit_set ("wKey", "|", -1),
 					                                   &error);
 
@@ -1281,7 +1281,7 @@ on_mnuHelpAbout_activate (GtkMenuItem *menuitem,
 {
 	GError *error = NULL;
 	gtk_builder_add_objects_from_file (glaMain,
-	                                   GLADEDIR "/gconfi.glade",
+	                                   UIDIR "/zak-confi-gui.ui",
 	                                   g_strsplit_set ("diagAbout", "|", -1),
 	                                   &error);
 
@@ -1373,7 +1373,7 @@ main (int argc, char **argv)
 
 	error = NULL;
 	gtk_builder_add_objects_from_file (glaMain,
-	                                   GLADEDIR "/gconfi.glade",
+	                                   UIDIR "/zak-confi-gui.ui",
 	                                   g_strsplit_set ("accelgroup1"
 	                                                   "|image2"
 	                                                   "|image3"
-- 
2.49.0