Removed libgda-ui.

diff --git a/configure.ac b/configure.ac
index 27d777315e3c62e319a7e969756252c86fdea06a..df718d6607cce1067c84f13fbaf87217a72b309c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,8 @@ AC_PROG_RANLIB
 AM_PROG_AR
 
 # Checks for libraries.
-PKG_CHECK_MODULES(AUTOZGUI, [libgda-ui-5.0 >= 5.0.0])
+PKG_CHECK_MODULES(AUTOZGUI, [gtk+-3.0
+                             libgda-5.0 >= 5.0.0])
 
 AC_SUBST(AUTOZGUI_CFLAGS)
 AC_SUBST(AUTOZGUI_LIBS)

diff --git a/data/zak-autho-gui/gui/autoz-gui.ui b/data/zak-autho-gui/gui/autoz-gui.ui
index a5b6bb087fbe6fa5a2bbbde8f7114ecd3da1e599..da8c81ae2e3b51dbe33060e2322a393ac613f837 100644 (file)
--- a/data/zak-autho-gui/gui/autoz-gui.ui
+++ b/data/zak-autho-gui/gui/autoz-gui.ui
@@ -166,7 +166,7 @@
         </child>
       </object>
     </child>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
   </object>
@@ -317,7 +317,7 @@
         </child>
       </object>
     </child>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
   </object>
@@ -468,7 +468,7 @@
         </child>
       </object>
     </child>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
   </object>
@@ -744,7 +744,7 @@
         </child>
       </object>
     </child>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
   </object>
@@ -914,7 +914,7 @@
         </child>
       </object>
     </child>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
   </object>
@@ -966,6 +966,7 @@
     <property name="title" translatable="yes">Open ZakAutho Datasource - ZakAutho GUI</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
+    <property name="default_width">400</property>
     <property name="destroy_with_parent">True</property>
     <child>
       <object class="GtkBox" id="vbox2">
@@ -975,10 +976,11 @@
         <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-          <object class="GtkBox" id="hbox1">
+          <object class="GtkGrid">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="spacing">5</property>
+            <property name="row_spacing">5</property>
+            <property name="column_spacing">5</property>
             <child>
               <object class="GtkLabel" id="label9">
                 <property name="visible">True</property>
@@ -987,9 +989,8 @@
                 <property name="label" translatable="yes">Table name prefix</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
@@ -1002,39 +1003,41 @@
                 <property name="secondary_icon_activatable">False</property>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkFrame" id="frame1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
             <child>
-              <placeholder/>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="label7">
+              <object class="GtkLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">&lt;b&gt;Connection parameters&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="halign">start</property>
+                <property name="label" translatable="yes">Connection string</property>
               </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="entry6">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="invisible_char">•</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+              </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
+            <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -1075,12 +1078,12 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">2</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
     </child>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
   </object>
@@ -1125,7 +1128,7 @@
         </child>
       </object>
     </child>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
   </object>
@@ -1250,7 +1253,7 @@
         </child>
       </object>
     </child>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
   </object>
@@ -1375,7 +1378,7 @@
         </child>
       </object>
     </child>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
   </object>

diff --git a/libzakauthogui.pc.in b/libzakauthogui.pc.in
index cd7a08874fef04675f2ff3abadd3e8508fb79fc9..2b913e43dc84eb6521a559d6669557ade26c7dec 100644 (file)
--- a/libzakauthogui.pc.in
+++ b/libzakauthogui.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: @PACKAGE_NAME@
 Description: Library with zak-autho-gui interface.
 Version: @PACKAGE_VERSION@
-Requires: libgda-ui-5.0
+Requires: gtk+-3.0 libgda-5.0
 Libs: -L${libdir} -lzakauthogui
 Cflags: -I${includedir}

diff --git a/src/authorization.c b/src/authorization.c
index 3daad642888d8e723c39847f94580fedf4530e0a..4868b26bc9a1a2da2565e7d6e09ff5976a6857c8 100644 (file)
--- a/src/authorization.c
+++ b/src/authorization.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2012-2017 Andrea Zagli <azagli@libero.it>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,7 @@
  *
  */
 
-#include <libgda-ui/libgda-ui.h>
+#include <libgda/libgda.h>
 #include <sql-parser/gda-sql-parser.h>
 
 #include "authorization.h"

diff --git a/src/openauditds.c b/src/openauditds.c
index 997974ed4f92cc7e3692724d2706830e21b457a0..499261218a43f931530cdb3379fa4992cf56ab59 100644 (file)
--- a/src/openauditds.c
+++ b/src/openauditds.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2011-2017 Andrea Zagli <azagli@libero.it>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,7 @@
  *
  */
 
-#include <libgda-ui/libgda-ui.h>
+#include <libgda/libgda.h>
 
 #include "openauditds.h"
 
@@ -33,10 +33,6 @@ static void zak_autho_gui_open_audit_ds_get_property (GObject *object,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static void zak_autho_gui_open_audit_ds_on_wlogin_changed (GdauiLogin *gdauilogin,
-                                             gboolean arg1,
-                                             gpointer user_data);
-
 static void zak_autho_gui_open_audit_ds_on_btn_cancel_clicked (GtkButton *button,
                                     gpointer user_data);
 static void zak_autho_gui_open_audit_ds_on_btn_open_clicked (GtkButton *button,
@@ -99,8 +95,6 @@ ZakAuthoGuiOpenAuditDS
 {
        GError *error;
 
-       GdauiLoginMode mode;
-
        ZakAuthoGuiOpenAuditDS *a = ZAK_AUTHO_GUI_OPEN_AUDIT_DS (g_object_new (zak_autho_gui_open_audit_ds_get_type (), NULL));
 
        ZakAuthoGuiOpenAuditDSPrivate *priv = ZAK_AUTHO_GUI_OPEN_AUDIT_DS_GET_PRIVATE (a);
@@ -124,21 +118,6 @@ ZakAuthoGuiOpenAuditDS
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button2"),
                          "clicked", G_CALLBACK (zak_autho_gui_open_audit_ds_on_btn_open_clicked), (gpointer *)a);
 
-       /* creating login widget */
-       priv->wlogin = gdaui_login_new (NULL);
-
-       g_object_get (G_OBJECT (priv->wlogin), "mode", &mode, NULL);
-       mode |= GDA_UI_LOGIN_HIDE_DSN_SELECTION_MODE;
-       gdaui_login_set_mode (GDAUI_LOGIN (priv->wlogin), mode);
-
-       g_signal_connect (G_OBJECT (priv->wlogin), "changed",
-                         G_CALLBACK (zak_autho_gui_open_audit_ds_on_wlogin_changed), (gpointer *)a);
-
-       gtk_container_add (GTK_CONTAINER (gtk_builder_get_object (priv->commons->gtkbuilder, "frame1")),
-                           priv->wlogin);
-
-       gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "button2")), FALSE);
-
        return a;
 }
 
@@ -185,22 +164,6 @@ zak_autho_gui_open_audit_ds_get_property (GObject *object, guint property_id, GV
 }
 
 /* CALLBACK */
-static void
-zak_autho_gui_open_audit_ds_on_wlogin_changed (GdauiLogin *gdauilogin,
-                                 gboolean arg1,
-                                 gpointer user_data)
-{
-       ZakAuthoGuiOpenAuditDS *open_audit_ds = (ZakAuthoGuiOpenAuditDS *)user_data;
-
-       ZakAuthoGuiOpenAuditDSPrivate *priv = ZAK_AUTHO_GUI_OPEN_AUDIT_DS_GET_PRIVATE (open_audit_ds);
-
-       gboolean is_valid;
-
-       g_object_get (G_OBJECT (priv->wlogin), "valid", &is_valid, NULL);
-       gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "button2")),
-                                 is_valid);
-}
-
 static void
 zak_autho_gui_open_audit_ds_on_btn_cancel_clicked (GtkButton *button,
                                      gpointer user_data)
@@ -219,17 +182,8 @@ zak_autho_gui_open_audit_ds_on_btn_open_clicked (GtkButton *button,
        ZakAuthoGuiOpenAuditDSPrivate *priv = ZAK_AUTHO_GUI_OPEN_AUDIT_DS_GET_PRIVATE (open_audit_ds);
        ZakAuthoGuiOpenAuditDSClass *klass = ZAK_AUTHO_GUI_OPEN_AUDIT_DS_GET_CLASS (open_audit_ds);
 
-       gchar *cncstring;
-
-       const GdaDsnInfo *info;
-       info = gdaui_login_get_connection_information (GDAUI_LOGIN (priv->wlogin));
-
-       cncstring = g_strconcat (info->provider, "://",
-                                (info->auth_string != NULL ? g_strdup_printf ("%s;", info->auth_string) : ""),
-                                info->cnc_string,
-                                NULL);
-
-       g_signal_emit (open_audit_ds, klass->opened_signal_id, 0, cncstring);
+       g_signal_emit (open_audit_ds, klass->opened_signal_id, 0,
+                      gtk_entry_get_text (GTK_ENTRY (gtk_builder_get_object (priv->commons->gtkbuilder , "entry6"))));
 
        gtk_widget_destroy (priv->w);
 }

diff --git a/src/resource.c b/src/resource.c
index acec076a1b0958a1bcb3241be125d913a75ce6e9..b24ab9e12299eee7c4545e350a573d3c239fe7e8 100644 (file)
--- a/src/resource.c
+++ b/src/resource.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2012 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2011-2012-2017 Andrea Zagli <azagli@libero.it>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,7 @@
  *
  */
 
-#include <libgda-ui/libgda-ui.h>
+#include <libgda/libgda.h>
 #include <sql-parser/gda-sql-parser.h>
 
 #include "resource.h"

diff --git a/src/role.c b/src/role.c
index 0afca476af859ba8b9f6a613e0845dca008d99ea..01b2ddf1e684a1e2c43eede8f19bbf4a62d3d43d 100644 (file)
--- a/src/role.c
+++ b/src/role.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2012 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2011-2017 Andrea Zagli <azagli@libero.it>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,7 @@
  *
  */
 
-#include <libgda-ui/libgda-ui.h>
+#include <libgda/libgda.h>
 #include <sql-parser/gda-sql-parser.h>
 
 #include "role.h"