From bab38667ff46d43769e6c7e9e9a3d542867df818 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Thu, 6 Nov 2014 12:13:52 +0100 Subject: [PATCH] Adjustments. --- data/gconfi/glade/gconfi.glade | 1020 +++++++++++++++----------------- src/main.c | 258 ++++---- 2 files changed, 613 insertions(+), 665 deletions(-) diff --git a/data/gconfi/glade/gconfi.glade b/data/gconfi/glade/gconfi.glade index 202ce68..487e568 100644 --- a/data/gconfi/glade/gconfi.glade +++ b/data/gconfi/glade/gconfi.glade @@ -3,254 +3,383 @@ - + True False - normal - Copyright (C) 2005-2014 Andrea Zagli - gConfi is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -gConfi is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - Andrea Zagli <azagli@libero.it> - translator-credits - image-missing - - - False - vertical - - - False - - - True - True - 0 - - - - + gtk-save-as + 1 - + True False - New - gConfi - True - 300 - dialog - - - + gtk-save-as + 1 + + + True + False + 1 + gConfi + 600 + 400 + + + + + + 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 - 4 - 2 - 3 - 3 - - - True - False - 0 - Provider ID - - - GTK_FILL - - - - + True False - 0 - 1° Connection String + _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 + + + + + - - 1 - 2 - GTK_FILL - - - + 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 + + + + + - - 1 - 2 - GTK_FILL - - - - - True - True - False - False - - - 1 - 2 - 1 - 2 - - - + True False - 0 - Database Name - - - 2 - 3 - GTK_FILL - - - - - - True - True - False - 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 + + + + + - - 1 - 2 - 2 - 3 - - - + True False - 0 - 2° Connection String + _Help + True + + + False + + + gtk-about + True + False + True + True + accelgroup1 + + + + + - - 3 - 4 - GTK_FILL - - + + + False + False + 0 + + + + + True + True + in - + True True - False - False + + + + + + - - 1 - 2 - 3 - 4 - - True True + 1 + + + + + True + False + + + False + False 2 - - button1 - button2 - - + True False - Open - gConfi + center-on-parent + normal + wMain + GConfi + 0.5.0 + Copyright (C) 2005-2014 Andrea Zagli + gConfi is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +gConfi is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + Andrea Zagli <azagli@libero.it> + translator-credits + image-missing + + + False + vertical + + + False + + + True + True + 0 + + + + + + + True + False + New - gConfi True + center-on-parent 300 dialog + wMain - + True False vertical - + True False end - + gtk-cancel True True @@ -265,7 +394,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - + gtk-ok True True @@ -288,7 +417,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - + True False 3 @@ -297,44 +426,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 3 3 - - True - False - 0 - Provider ID - - - GTK_FILL - - - - - + True False 0 - Connection String + 1° Connection String - 1 - 2 GTK_FILL - - True - False - - - 1 - 2 - GTK_FILL - - - - + True True False @@ -343,365 +447,215 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 1 2 - 1 - 2 - + True False 0 - Configurations Filter + Database Name - 2 - 3 + 1 + 2 GTK_FILL - - - - - - True - True - False - False - - - 1 - 2 - 2 - 3 - - - - - - True - True - 2 - - - - - - cancelbutton1 - okbutton1 - - - - True - False - gtk-save-as - 1 - - - True - False - gtk-save-as - 1 - - - True - False - 1 - gConfi - 600 - 400 - - - - - - - True - False - - - 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 + True + False + False + + 1 + 2 + 1 + 2 + + - + 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 - - - - - + 0 + 2° Connection String + + 2 + 3 + GTK_FILL + + - + True - False - _Help - True - - - False - - - gtk-about - True - False - True - True - accelgroup1 - - - - - + True + False + False + + 1 + 2 + 2 + 3 + + - False - False - 0 + True + True + 2 - - + + + + button1 + button2 + + + + True + False + Open - gConfi + True + center-on-parent + 300 + dialog + wMain + + + + True + False + vertical + + True - True - in + False + end - + + gtk-cancel True True - - - - - - + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + False + True + + False + False + 1 + - True + False True - 1 + end + 0 - + True False + 3 + 2 + 2 + 3 + 3 + + + True + False + 0 + Connection String + + + GTK_FILL + + + + + + True + True + False + False + + + 1 + 2 + + + + + + True + False + 0 + Configurations Filter + + + 1 + 2 + GTK_FILL + + + + + + True + True + False + False + + + 1 + 2 + 1 + 2 + + + - False - False + True + True 2 + + cancelbutton1 + okbutton1 + @@ -709,7 +663,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. False Configuration - gConfi True + center-on-parent dialog + wMain True @@ -878,7 +834,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. False Key - gConfi True + center-on-parent dialog + wMain True diff --git a/src/main.c b/src/main.c index df6380f..f418aaf 100644 --- a/src/main.c +++ b/src/main.c @@ -36,6 +36,8 @@ enum FOLDERS_COLS }; +static GtkBuilder *glaMain; + static GtkWidget *w; static GtkWidget *trFolders; static GtkWidget *mnuConfigs; @@ -189,8 +191,8 @@ fill_trFolders (const gchar *cnc_string, const gchar *filter) static void view_trFolders_popup_menu (GdkEventButton *event) { - GtkWidget *menu = gtk_menu_new (), - *mnuitem; + GtkWidget *menu = gtk_menu_new (); + GtkWidget *mnuitem; GtkTreeIter iter; @@ -202,12 +204,12 @@ view_trFolders_popup_menu (GdkEventButton *event) mnuitem = gtk_menu_item_new_with_mnemonic ("New _Config"); gtk_menu_shell_append (GTK_MENU_SHELL (menu), mnuitem); g_signal_connect (G_OBJECT (mnuitem), "activate", - G_CALLBACK (on_mnuConfigsNew_activate), NULL); + G_CALLBACK (on_mnuConfigsNew_activate), NULL); mnuitem = gtk_menu_item_new_with_mnemonic ("New _Key"); gtk_menu_shell_append (GTK_MENU_SHELL (menu), mnuitem); g_signal_connect (G_OBJECT (mnuitem), "activate", - G_CALLBACK (on_mnuKeysNew_activate), NULL); + G_CALLBACK (on_mnuKeysNew_activate), NULL); mnuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_EDIT, NULL); gtk_menu_shell_append (GTK_MENU_SHELL (menu), mnuitem); @@ -273,8 +275,8 @@ static void save_configuration_to_xml (Confi *confi, xmlNodePtr xroot) { xmlNodePtr xnode; - gchar *name, - *description; + gchar *name; + gchar *description; g_object_get (G_OBJECT (confi), "name", &name, @@ -388,8 +390,8 @@ create_config_from_xml (xmlNode *xnode, xmlXPathContextPtr xpcontext) { GtkTreeIter iter; gint id; - gchar *name, - *description; + gchar *name; + gchar *description; xpresult = xmlXPathEvalExpression ((const xmlChar *)"child::description", xpcontext); if (!xmlXPathNodeSetIsEmpty (xpresult->nodesetval)) @@ -411,11 +413,11 @@ create_config_from_xml (xmlNode *xnode, xmlXPathContextPtr xpcontext) gtk_tree_store_append (storeFolders, &iter, NULL); gtk_tree_store_set (storeFolders, &iter, - FOLDERS_COL_ID, id, - FOLDERS_COL_NAME, name, - FOLDERS_COL_DESCRIPTION, description, - FOLDERS_COL_OBJPTR, confi, - -1); + FOLDERS_COL_ID, id, + FOLDERS_COL_NAME, name, + FOLDERS_COL_DESCRIPTION, description, + FOLDERS_COL_OBJPTR, confi, + -1); xpresult = xmlXPathEvalExpression ((const xmlChar *)"child::gconfi-key", xpcontext); if (!xmlXPathNodeSetIsEmpty (xpresult->nodesetval)) @@ -538,45 +540,21 @@ load_xml_configuration_schema (const gchar *filename) } /* CALLBACKS */ -void +G_MODULE_EXPORT void on_mnuDbNew_activate (GtkMenuItem *menuitem, gpointer user_data) { - GtkBuilder *glaOpenDbCfg = gtk_builder_new_from_file (GLADEDIR "/gconfi.glade"); - GtkWidget *diag = GTK_WIDGET (gtk_builder_get_object (glaOpenDbCfg, "diagNewDbCfg")); - - GtkWidget *cbProvider = GTK_WIDGET (gtk_builder_get_object (glaOpenDbCfg, "cbProvider")); - GtkWidget *txtCncString1 = GTK_WIDGET (gtk_builder_get_object (glaOpenDbCfg, "txtCncString1")); - GtkWidget *txtDbName = GTK_WIDGET (gtk_builder_get_object (glaOpenDbCfg, "txtDbName")); - GtkWidget *txtCncString2 = GTK_WIDGET (gtk_builder_get_object (glaOpenDbCfg, "txtCncString2")); - - GtkListStore *store; - GtkTreeIter iter; - GtkCellRenderer *renderer; - - store = gtk_list_store_new (1, G_TYPE_STRING); - gtk_combo_box_set_model (GTK_COMBO_BOX (cbProvider), GTK_TREE_MODEL (store)); - - renderer = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (cbProvider), renderer, FALSE); - gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (cbProvider), renderer, - "text", 0); - - /* fill providers list */ - GdaDataModel *providers = gda_config_list_providers (); - if (providers != NULL) - { - int i; - for (i = 0; i < gda_data_model_get_n_rows (providers); i++) - { - GdaProviderInfo *pi = gda_config_get_provider_info (gdaex_data_model_get_value_stringify_at (providers, 0, 0)); + GError *error = NULL; + gtk_builder_add_objects_from_file (glaMain, + GLADEDIR "/gconfi.glade", + g_strsplit_set ("diagNewDbCfg", "|", -1), + &error); - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, pi->id, -1); - } + GtkWidget *diag = GTK_WIDGET (gtk_builder_get_object (glaMain, "diagNewDbCfg")); - g_object_unref (providers); - } + GtkWidget *txtCncString1 = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtCncString1")); + GtkWidget *txtDbName = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtDbName")); + GtkWidget *txtCncString2 = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtCncString2")); if (gtk_dialog_run (GTK_DIALOG (diag)) == GTK_RESPONSE_OK) { @@ -690,44 +668,20 @@ on_mnuDbNew_activate (GtkMenuItem *menuitem, gtk_widget_destroy (diag); } -void +G_MODULE_EXPORT void on_mnuDbOpen_activate (GtkMenuItem *menuitem, gpointer user_data) { - GtkBuilder *glaOpenDbCfg = gtk_builder_new_from_file (GLADEDIR "/gconfi.glade"); - GtkWidget *diag = GTK_WIDGET (gtk_builder_get_object (glaOpenDbCfg, "diagOpenDbCfg")); - - GtkWidget *cbProvider = GTK_WIDGET (gtk_builder_get_object (glaOpenDbCfg, "cbProvider")); - GtkWidget *txtCncString = GTK_WIDGET (gtk_builder_get_object (glaOpenDbCfg, "txtCncString")); - GtkWidget *txtConfigsFilter = GTK_WIDGET (gtk_builder_get_object (glaOpenDbCfg, "txtConfigsFilter")); - - GtkListStore *store; - GtkTreeIter iter; - GtkCellRenderer *renderer; - - store = gtk_list_store_new (1, G_TYPE_STRING); - gtk_combo_box_set_model (GTK_COMBO_BOX (cbProvider), GTK_TREE_MODEL (store)); - - renderer = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (cbProvider), renderer, FALSE); - gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (cbProvider), renderer, - "text", 0); - - /* fill providers list */ - GdaDataModel *providers = gda_config_list_providers (); - if (providers != NULL) - { - int i; - for (i = 0; i < gda_data_model_get_n_rows (providers); i++) - { - GdaProviderInfo *pi = gda_config_get_provider_info (gdaex_data_model_get_value_stringify_at (providers, 0, 0)); + GError *error = NULL; + gtk_builder_add_objects_from_file (glaMain, + GLADEDIR "/gconfi.glade", + g_strsplit_set ("diagOpenDbCfg", "|", -1), + &error); - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, pi->id, -1); - } + GtkWidget *diag = GTK_WIDGET (gtk_builder_get_object (glaMain, "diagOpenDbCfg")); - g_object_unref (providers); - } + GtkWidget *txtCncString = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtCncString")); + GtkWidget *txtConfigsFilter = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtConfigsFilter")); if (gtk_dialog_run (GTK_DIALOG (diag)) == GTK_RESPONSE_OK) { @@ -752,7 +706,7 @@ on_mnuDbOpen_activate (GtkMenuItem *menuitem, gtk_widget_destroy (diag); } -void +G_MODULE_EXPORT void on_mnuDbClose_activate (GtkMenuItem *menuitem, gpointer user_data) { @@ -771,19 +725,24 @@ on_mnuDbClose_activate (GtkMenuItem *menuitem, gtk_statusbar_pop (GTK_STATUSBAR (stbar), 0); } -void +G_MODULE_EXPORT void on_mnuDbRefresh_activate (GtkMenuItem *menuitem, gpointer user_data) { fill_trFolders (cnc_string, filter); } -void +G_MODULE_EXPORT void on_mnuConfigsNew_activate (GtkMenuItem *menuitem, gpointer user_data) { - GtkBuilder *glaCNew = gtk_builder_new_from_file (GLADEDIR "/gconfi.glade"); - GtkWidget *diag = GTK_WIDGET (gtk_builder_get_object (glaCNew, "wConfiguration")); + GError *error = NULL; + gtk_builder_add_objects_from_file (glaMain, + GLADEDIR "/gconfi.glade", + g_strsplit_set ("wConfiguration", "|", -1), + &error); + + GtkWidget *diag = GTK_WIDGET (gtk_builder_get_object (glaMain, "wConfiguration")); if (gtk_dialog_run (GTK_DIALOG (diag)) == GTK_RESPONSE_OK) { @@ -796,8 +755,8 @@ on_mnuConfigsNew_activate (GtkMenuItem *menuitem, gchar *description; Confi *confi; - txtName = GTK_WIDGET (gtk_builder_get_object (glaCNew, "txtName")); - txtvDescription = GTK_WIDGET (gtk_builder_get_object (glaCNew, "txtvDescription")); + txtName = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtName")); + txtvDescription = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtvDescription")); name = (gchar *)gtk_entry_get_text (GTK_ENTRY (txtName)); @@ -834,7 +793,7 @@ on_mnuConfigsNew_activate (GtkMenuItem *menuitem, gtk_widget_destroy (diag); } -void +G_MODULE_EXPORT void on_mnuConfigsNewFromSchema_activate (GtkMenuItem *menuitem, gpointer user_data) { @@ -854,7 +813,7 @@ on_mnuConfigsNewFromSchema_activate (GtkMenuItem *menuitem, gtk_widget_destroy (diag); } -void +G_MODULE_EXPORT void on_mnuConfigsEdit_activate (GtkMenuItem *menuitem, gpointer user_data) { @@ -866,12 +825,17 @@ on_mnuConfigsEdit_activate (GtkMenuItem *menuitem, if (path != NULL && gtk_tree_path_get_depth (path) == 1) { Confi *confi; - - GtkBuilder *glaConfig = gtk_builder_new_from_file (GLADEDIR "/gconfi.glade"); - GtkWidget *diag = GTK_WIDGET (gtk_builder_get_object (glaConfig, "wConfiguration")); - GtkWidget *txtID = GTK_WIDGET (gtk_builder_get_object (glaConfig, "txtID")); - GtkWidget *txtName = GTK_WIDGET (gtk_builder_get_object (glaConfig, "txtName")); - GtkWidget *txtvDescription = GTK_WIDGET (gtk_builder_get_object (glaConfig, "txtvDescription")); + + GError *error = NULL; + gtk_builder_add_objects_from_file (glaMain, + GLADEDIR "/gconfi.glade", + g_strsplit_set ("wConfiguration", "|", -1), + &error); + + GtkWidget *diag = GTK_WIDGET (gtk_builder_get_object (glaMain, "wConfiguration")); + GtkWidget *txtID = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtID")); + GtkWidget *txtName = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtName")); + GtkWidget *txtvDescription = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtvDescription")); GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (txtvDescription)); gint id; @@ -917,7 +881,7 @@ on_mnuConfigsEdit_activate (GtkMenuItem *menuitem, } } -void +G_MODULE_EXPORT void on_mnuConfigsDelete_activate (GtkMenuItem *menuitem, gpointer user_data) { @@ -954,7 +918,7 @@ on_mnuConfigsDelete_activate (GtkMenuItem *menuitem, } } -void +G_MODULE_EXPORT void on_mnuConfigsExport_activate (GtkMenuItem *menuitem, gpointer user_data) { @@ -1033,7 +997,7 @@ on_mnuConfigsExport_activate (GtkMenuItem *menuitem, gtk_widget_destroy (diag); } -void +G_MODULE_EXPORT void on_mnuKeysNew_activate (GtkMenuItem *menuitem, gpointer user_data) { @@ -1046,16 +1010,22 @@ on_mnuKeysNew_activate (GtkMenuItem *menuitem, { Confi *confi; ConfiKey *ck; - GtkBuilder *glaKey = gtk_builder_new_from_file (GLADEDIR "/gconfi.glade"); - GtkWidget *diag = GTK_WIDGET (gtk_builder_get_object (glaKey, "wKey")); - GtkWidget *txtIDConfig = GTK_WIDGET (gtk_builder_get_object (glaKey, "txtIDConfig")); - GtkWidget *txtConfig = GTK_WIDGET (gtk_builder_get_object (glaKey, "txtConfig")); - GtkWidget *txtID = GTK_WIDGET (gtk_builder_get_object (glaKey, "txtID")); - GtkWidget *txtIDParent = GTK_WIDGET (gtk_builder_get_object (glaKey, "txtIDParent")); - GtkWidget *txtParent = GTK_WIDGET (gtk_builder_get_object (glaKey, "txtParent")); - GtkWidget *txtName = GTK_WIDGET (gtk_builder_get_object (glaKey, "txtName")); - GtkWidget *txtValue = GTK_WIDGET (gtk_builder_get_object (glaKey, "txtValue")); - GtkWidget *txtvDescription = GTK_WIDGET (gtk_builder_get_object (glaKey, "txtvDescription")); + + GError *error = NULL; + gtk_builder_add_objects_from_file (glaMain, + GLADEDIR "/gconfi.glade", + g_strsplit_set ("wKey", "|", -1), + &error); + + GtkWidget *diag = GTK_WIDGET (gtk_builder_get_object (glaMain, "wKey")); + GtkWidget *txtIDConfig = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtIDConfig")); + GtkWidget *txtConfig = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtConfig")); + GtkWidget *txtID = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtID")); + GtkWidget *txtIDParent = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtIDParent")); + GtkWidget *txtParent = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtParent")); + GtkWidget *txtName = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtName")); + GtkWidget *txtValue = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtValue")); + GtkWidget *txtvDescription = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtvDescription")); GtkTreeIter iterConfi; gint id_config; gchar *name; @@ -1129,7 +1099,7 @@ on_mnuKeysNew_activate (GtkMenuItem *menuitem, } } -void +G_MODULE_EXPORT void on_mnuKeysNewFromSchema_activate (GtkMenuItem *menuitem, gpointer user_data) { @@ -1149,7 +1119,7 @@ on_mnuKeysNewFromSchema_activate (GtkMenuItem *menuitem, gtk_widget_destroy (diag); } -void +G_MODULE_EXPORT void on_mnuKeysEdit_activate (GtkMenuItem *menuitem, gpointer user_data) { @@ -1161,16 +1131,22 @@ on_mnuKeysEdit_activate (GtkMenuItem *menuitem, if (path != NULL && gtk_tree_path_get_depth (path) > 1) { Confi *confi; - GtkBuilder *glaKey = gtk_builder_new_from_file (GLADEDIR "/gconfi.glade"); - GtkWidget *diag = GTK_WIDGET (gtk_builder_get_object (glaKey, "wKey")); - GtkWidget *txtIDConfig = GTK_WIDGET (gtk_builder_get_object (glaKey, "txtIDConfig")); - GtkWidget *txtConfig = GTK_WIDGET (gtk_builder_get_object (glaKey, "txtConfig")); - GtkWidget *txtID = GTK_WIDGET (gtk_builder_get_object (glaKey, "txtID")); - GtkWidget *txtIDParent = GTK_WIDGET (gtk_builder_get_object (glaKey, "txtIDParent")); - GtkWidget *txtParent = GTK_WIDGET (gtk_builder_get_object (glaKey, "txtParent")); - GtkWidget *txtName = GTK_WIDGET (gtk_builder_get_object (glaKey, "txtName")); - GtkWidget *txtValue = GTK_WIDGET (gtk_builder_get_object (glaKey, "txtValue")); - GtkWidget *txtvDescription = GTK_WIDGET (gtk_builder_get_object (glaKey, "txtvDescription")); + + GError *error = NULL; + gtk_builder_add_objects_from_file (glaMain, + GLADEDIR "/gconfi.glade", + g_strsplit_set ("wKey", "|", -1), + &error); + + GtkWidget *diag = GTK_WIDGET (gtk_builder_get_object (glaMain, "wKey")); + GtkWidget *txtIDConfig = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtIDConfig")); + GtkWidget *txtConfig = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtConfig")); + GtkWidget *txtID = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtID")); + GtkWidget *txtIDParent = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtIDParent")); + GtkWidget *txtParent = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtParent")); + GtkWidget *txtName = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtName")); + GtkWidget *txtValue = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtValue")); + GtkWidget *txtvDescription = GTK_WIDGET (gtk_builder_get_object (glaMain, "txtvDescription")); GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (txtvDescription)); ConfiKey *ck; @@ -1220,7 +1196,8 @@ on_mnuKeysEdit_activate (GtkMenuItem *menuitem, if (gtk_dialog_run (GTK_DIALOG (diag)) == GTK_RESPONSE_OK) { - GtkTextIter iter1, iter2; + GtkTextIter iter1; + GtkTextIter iter2; ck->key = g_strdup (gtk_entry_get_text (GTK_ENTRY (txtName))); ck->value = g_strdup (gtk_entry_get_text (GTK_ENTRY (txtValue))); @@ -1244,7 +1221,7 @@ on_mnuKeysEdit_activate (GtkMenuItem *menuitem, } } -void +G_MODULE_EXPORT void on_mnuKeysDelete_activate (GtkMenuItem *menuitem, gpointer user_data) { @@ -1263,7 +1240,7 @@ on_mnuKeysDelete_activate (GtkMenuItem *menuitem, if (gtk_dialog_run (GTK_DIALOG (diag)) == GTK_RESPONSE_YES) { Confi *confi; - + GtkTreeIter iterConfig; gtk_tree_model_get_iter (GTK_TREE_MODEL (storeFolders), &iterConfig, gtk_tree_path_new_from_indices (gtk_tree_path_get_indices (path)[0], -1)); @@ -1292,23 +1269,28 @@ on_mnuKeysDelete_activate (GtkMenuItem *menuitem, } } -void +G_MODULE_EXPORT void on_mnuKeysExport_activate (GtkMenuItem *menuitem, gpointer user_data) { } -void +G_MODULE_EXPORT void on_mnuHelpAbout_activate (GtkMenuItem *menuitem, gpointer user_data) { - GtkBuilder *glaAbout = gtk_builder_new_from_file (GLADEDIR "/gconfi.glade"); - GtkWidget *diag = GTK_WIDGET (gtk_builder_get_object (glaAbout, "diagAbout")); + GError *error = NULL; + gtk_builder_add_objects_from_file (glaMain, + GLADEDIR "/gconfi.glade", + g_strsplit_set ("diagAbout", "|", -1), + &error); + + GtkWidget *diag = GTK_WIDGET (gtk_builder_get_object (glaMain, "diagAbout")); gtk_dialog_run (GTK_DIALOG (diag)); gtk_widget_destroy (diag); } -gboolean +G_MODULE_EXPORT gboolean on_trFolders_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data) @@ -1338,7 +1320,7 @@ on_trFolders_button_press_event (GtkWidget *widget, return FALSE; } -gboolean +G_MODULE_EXPORT gboolean on_trFolders_popup_menu (GtkWidget *widget, gpointer user_data) { @@ -1347,7 +1329,7 @@ on_trFolders_popup_menu (GtkWidget *widget, return TRUE; } -void +G_MODULE_EXPORT void on_trFolders_row_activated (GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, @@ -1375,8 +1357,6 @@ on_trFolders_row_activated (GtkTreeView *tree_view, int main (int argc, char **argv) { - GtkBuilder *glaMain; - GOptionEntry entries[] = { { "cnc_string", 'c', 0, G_OPTION_ARG_STRING, &cnc_string, "Connection string", NULL }, @@ -1385,11 +1365,20 @@ main (int argc, char **argv) }; GOptionContext *context; - GError *error = NULL; + GError *error; gtk_init (&argc, &argv); - glaMain = gtk_builder_new_from_file (GLADEDIR "/gconfi.glade"); + glaMain = gtk_builder_new (); + + error = NULL; + gtk_builder_add_objects_from_file (glaMain, + GLADEDIR "/gconfi.glade", + g_strsplit_set ("accelgroup1" + "|image2" + "|image3" + "|wMain", "|", -1), + &error); gtk_builder_connect_signals (glaMain, NULL); w = GTK_WIDGET (gtk_builder_get_object (glaMain, "wMain")); @@ -1410,6 +1399,7 @@ main (int argc, char **argv) create_trFolders (); /* command line options */ + error = NULL; context = g_option_context_new (""); g_option_context_add_main_entries (context, entries, NULL); if (!g_option_context_parse (context, &argc, &argv, &error)) -- 2.49.0