From: Andrea Zagli Date: Mon, 19 Sep 2016 14:39:54 +0000 (+0200) Subject: Renamed to zak-confi-gui. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=ecc2d1510dbfc5d3697a2297386e40305770f92e;p=zakconfi%2Fgui Renamed to zak-confi-gui. --- 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/gconfi/glade/gconfi.glade b/data/gconfi/glade/gconfi.glade deleted file mode 100644 index 5927654..0000000 --- a/data/gconfi/glade/gconfi.glade +++ /dev/null @@ -1,1088 +0,0 @@ - - - - - - - True - False - gtk-save-as - 1 - - - True - False - gtk-save-as - 1 - - - True - False - 1 - gConfi - 600 - 400 - - - - - - - True - False - vertical - - - True - False - - - True - False - _Database - True - - - False - - - gtk-new - True - False - True - True - accelgroup1 - - - - - - gtk-open - True - False - True - True - accelgroup1 - - - - - - gtk-close - True - False - True - True - accelgroup1 - - - - - - True - False - - - - - gtk-refresh - True - False - True - True - accelgroup1 - - - - - - True - False - - - - - gtk-quit - True - False - True - True - accelgroup1 - - - - - - - - - - True - False - _Configuration - True - - - False - - - gtk-new - True - False - True - True - accelgroup1 - - - - - - True - False - New from _schema - True - - - - - - gtk-edit - True - False - True - True - accelgroup1 - - - - - - gtk-delete - True - False - True - True - accelgroup1 - - - - - - E_xport - True - False - True - image2 - False - - - - - - - - - - True - False - _Key - True - - - False - - - gtk-new - True - False - True - True - accelgroup1 - - - - - - True - False - New from _schema - True - - - - - - gtk-edit - True - False - True - True - accelgroup1 - - - - - - gtk-delete - True - False - True - True - accelgroup1 - - - - - - E_xport - True - False - True - image3 - False - - - - - - - - - - True - False - _Help - True - - - False - - - gtk-about - True - False - True - True - accelgroup1 - - - - - - - - - - False - False - 0 - - - - - True - True - in - - - True - True - - - - - - - - - - - True - True - 1 - - - - - True - False - - - False - False - 2 - - - - - - - True - False - center-on-parent - normal - wMain - ZakConfiGUI - 0.10.0 - Copyright (C) 2005-2016 Andrea Zagli - Andrea Zagli <azagli@libero.it> - translator-credits - image-missing - gpl-2-0 - - - False - vertical - - - False - - - True - True - 0 - - - - - - - True - False - New - gConfi - True - center-on-parent - 300 - dialog - wMain - - - - True - False - 5 - 5 - 5 - 5 - vertical - - - True - False - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - False - False - 1 - - - - - False - True - end - 0 - - - - - True - False - 3 - 3 - 3 - - - True - False - start - 1° Connection String - - - 0 - 0 - - - - - True - True - True - False - False - - - 1 - 0 - - - - - True - True - False - False - - - 1 - 1 - - - - - True - True - False - False - - - 1 - 2 - - - - - True - False - start - Database Name - - - 0 - 1 - - - - - True - False - start - 2° Connection String - - - 0 - 2 - - - - - True - True - 2 - - - - - - button1 - button2 - - - - True - False - Open - gConfi - True - center-on-parent - 300 - dialog - wMain - - - - True - False - 5 - 5 - 5 - 5 - vertical - - - True - False - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - False - False - 1 - - - - - False - True - end - 0 - - - - - True - False - 3 - 3 - 3 - - - True - False - start - Connection String - - - 0 - 0 - - - - - True - True - True - False - False - - - 1 - 0 - - - - - True - True - False - False - - - 1 - 1 - - - - - True - False - start - Configurations Filter - - - 0 - 1 - - - - - True - True - 2 - - - - - - cancelbutton1 - okbutton1 - - - - - True - False - Configuration - gConfi - True - center-on-parent - dialog - wMain - - - True - False - 5 - 5 - 5 - 5 - vertical - - - True - False - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - False - False - 1 - - - - - False - True - end - 0 - - - - - True - False - 3 - 3 - 3 - - - True - False - start - ID - - - 0 - 0 - - - - - True - True - True - False - False - False - - - 1 - 0 - - - - - True - True - False - False - - - 1 - 1 - - - - - True - True - True - True - in - - - True - True - word - textbuffer1 - - - - - 1 - 2 - - - - - True - False - start - Name - - - 0 - 1 - - - - - True - False - start - start - Description - - - 0 - 2 - - - - - True - True - 2 - - - - - - btnCancel - btnOk - - - - - True - False - Key - gConfi - True - center-on-parent - dialog - wMain - - - True - False - vertical - - - True - False - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - False - False - 1 - - - - - False - True - end - 0 - - - - - True - False - 3 - 3 - 3 - - - True - False - start - Configuration - - - 0 - 0 - - - - - True - True - False - False - False - - - 1 - 1 - - - - - True - True - False - False - - - 1 - 3 - - - - - True - True - False - False - - - 1 - 4 - - - - - True - True - True - True - in - - - True - True - word - textbuffer2 - - - - - 1 - 5 - - - - - True - False - - - True - True - False - False - False - - - False - False - 0 - - - - - True - True - False - False - False - - - True - True - 1 - - - - - 1 - 2 - - - - - True - False - - - True - True - False - False - False - - - False - False - 0 - - - - - True - True - False - False - False - - - True - True - 1 - - - - - 1 - 0 - - - - - True - False - start - Parent - - - 0 - 2 - - - - - True - False - start - Name - - - 0 - 3 - - - - - True - False - start - Value - - - 0 - 4 - - - - - True - False - start - start - Description - - - 0 - 5 - - - - - True - False - start - ID - - - 0 - 1 - - - - - True - True - 2 - - - - - - btnCancel1 - btnOk1 - - - 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/zak-confi-gui/ui/zak-confi-gui.ui b/data/zak-confi-gui/ui/zak-confi-gui.ui new file mode 100644 index 0000000..a47849a --- /dev/null +++ b/data/zak-confi-gui/ui/zak-confi-gui.ui @@ -0,0 +1,1093 @@ + + + + + + + True + False + gtk-save-as + 1 + + + True + False + gtk-save-as + 1 + + + True + False + 1 + ZakConfiGUI + 600 + 400 + + + + + + + True + False + vertical + + + True + False + + + True + False + _Database + True + + + False + + + gtk-new + True + False + True + True + accelgroup1 + + + + + + gtk-open + True + False + True + True + accelgroup1 + + + + + + gtk-close + True + False + True + True + accelgroup1 + + + + + + True + False + + + + + gtk-refresh + True + False + True + True + accelgroup1 + + + + + + True + False + + + + + gtk-quit + True + False + True + True + accelgroup1 + + + + + + + + + + True + False + _Configuration + True + + + False + + + gtk-new + True + False + True + True + accelgroup1 + + + + + + True + False + New from _schema + True + + + + + + gtk-edit + True + False + True + True + accelgroup1 + + + + + + gtk-delete + True + False + True + True + accelgroup1 + + + + + + E_xport + True + False + True + image2 + False + + + + + + + + + + True + False + _Key + True + + + False + + + gtk-new + True + False + True + True + accelgroup1 + + + + + + True + False + New from _schema + True + + + + + + gtk-edit + True + False + True + True + accelgroup1 + + + + + + gtk-delete + True + False + True + True + accelgroup1 + + + + + + E_xport + True + False + True + image3 + False + + + + + + + + + + True + False + _Help + True + + + False + + + gtk-about + True + False + True + True + accelgroup1 + + + + + + + + + + False + False + 0 + + + + + True + True + in + + + True + True + + + + + + + + + + + True + True + 1 + + + + + True + False + + + False + False + 2 + + + + + + + True + False + center-on-parent + normal + wMain + wMain + ZakConfiGUI + 0.10.0 + Copyright (C) 2005-2016 Andrea Zagli + Andrea Zagli <azagli@libero.it> + translator-credits + image-missing + gpl-2-0 + + + False + vertical + + + False + + + True + True + 0 + + + + + + + True + False + New - ZakConfiGUI + True + center-on-parent + 300 + dialog + wMain + wMain + + + + True + False + 5 + 5 + 5 + 5 + vertical + + + True + False + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + 3 + 3 + 3 + + + True + False + start + 1° Connection String + + + 0 + 0 + + + + + True + True + True + False + False + + + 1 + 0 + + + + + True + True + False + False + + + 1 + 1 + + + + + True + True + False + False + + + 1 + 2 + + + + + True + False + start + Database Name + + + 0 + 1 + + + + + True + False + start + 2° Connection String + + + 0 + 2 + + + + + True + True + 2 + + + + + + button1 + button2 + + + + True + False + Open - ZakConfiGUI + True + center-on-parent + 300 + dialog + wMain + wMain + + + + True + False + 5 + 5 + 5 + 5 + vertical + + + True + False + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + 3 + 3 + 3 + + + True + False + start + Connection String + + + 0 + 0 + + + + + True + True + True + False + False + + + 1 + 0 + + + + + True + True + False + False + + + 1 + 1 + + + + + True + False + start + Configurations Filter + + + 0 + 1 + + + + + True + True + 2 + + + + + + cancelbutton1 + okbutton1 + + + + + True + False + Configuration - ZakConfiGUI + True + center-on-parent + dialog + wMain + wMain + + + True + False + 5 + 5 + 5 + 5 + vertical + + + True + False + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + 3 + 3 + 3 + + + True + False + start + ID + + + 0 + 0 + + + + + True + True + True + False + False + False + + + 1 + 0 + + + + + True + True + False + False + + + 1 + 1 + + + + + True + True + True + True + in + + + True + True + word + textbuffer1 + + + + + 1 + 2 + + + + + True + False + start + Name + + + 0 + 1 + + + + + True + False + start + start + Description + + + 0 + 2 + + + + + True + True + 2 + + + + + + btnCancel + btnOk + + + + + True + False + Key - ZakConfiGUI + True + center-on-parent + dialog + wMain + wMain + + + True + False + vertical + + + True + False + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + 3 + 3 + 3 + + + True + False + start + Configuration + + + 0 + 0 + + + + + True + True + False + False + False + + + 1 + 1 + + + + + True + True + False + False + + + 1 + 3 + + + + + True + True + False + False + + + 1 + 4 + + + + + True + True + True + True + in + + + True + True + word + textbuffer2 + + + + + 1 + 5 + + + + + True + False + + + True + True + False + False + False + + + False + False + 0 + + + + + True + True + False + False + False + + + True + True + 1 + + + + + 1 + 2 + + + + + True + False + + + True + True + False + False + False + + + False + False + 0 + + + + + True + True + False + False + False + + + True + True + 1 + + + + + 1 + 0 + + + + + True + False + start + Parent + + + 0 + 2 + + + + + True + False + start + Name + + + 0 + 3 + + + + + True + False + start + Value + + + 0 + 4 + + + + + True + False + start + start + Description + + + 0 + 5 + + + + + True + False + start + ID + + + 0 + 1 + + + + + True + True + 2 + + + + + + btnCancel1 + btnOk1 + + + 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"