diff --git a/src/gnome-utils/dialog-database-connection.c b/src/gnome-utils/dialog-database-connection.c deleted file mode 100644 index 0f429a0ac6..0000000000 --- a/src/gnome-utils/dialog-database-connection.c +++ /dev/null @@ -1,155 +0,0 @@ -/********************************************************************\ - * dialog-database-connection.c -- dialog for opening a connection * - * to a libgda database, either predefined * - * in ~/.libgda/config or explicit using * - * provider and database. * - * * - * Copyright (C) 2007-8 Phil Longstaff (plongstaff@rogers.com) * - * * - * This program 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. * - * * - * This program 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, contact: * - * * - * Free Software Foundation Voice: +1-617-542-5942 * - * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 * - * Boston, MA 02110-1301, USA gnu@gnu.org * -\********************************************************************/ - -#include "config.h" - -#include -#include -#include - -#include "gnc-ui.h" -#include "dialog-utils.h" -#include "dialog-database-connection.h" -#include "gnc-file.h" -#include "gnc-session.h" - -static QofLogModule log_module = GNC_MOD_GUI; - -void gnc_database_connection_response_cb( GtkDialog *, gint, GtkDialog * ); -#define PB_LOAD_RESPONSE 1000 -#define PB_SAVE_RESPONSE 1001 - -struct DatabaseConnectionWindow -{ - /* Parts of the dialog */ - GtkWidget* dialog; - GtkWidget* rb_mysql; - GtkWidget* rb_postgresql; - GtkWidget* tf_host; - GtkWidget* tf_database; - GtkWidget* tf_username; - GtkWidget* tf_password; -}; - -static gchar* -geturl( struct DatabaseConnectionWindow* dcw ) -{ - gchar* url; - const gchar* host; - const gchar* database; - const gchar* username; - const gchar* password; - const gchar* type; - - host = gtk_entry_get_text( GTK_ENTRY(dcw->tf_host) ); - database = gtk_entry_get_text( GTK_ENTRY(dcw->tf_database) ); - username = gtk_entry_get_text( GTK_ENTRY(dcw->tf_username) ); - password = gtk_entry_get_text( GTK_ENTRY(dcw->tf_password) ); - - if( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(dcw->rb_mysql) ) ) { - type = "mysql"; - } else { - type = "postgres"; - } - url = g_strdup_printf( "%s://%s:%s:%s:%s", - type, host, database, username, password ); - - return url; -} - -void -gnc_database_connection_response_cb(GtkDialog *dialog, gint response, GtkDialog *unused) -{ - struct DatabaseConnectionWindow* dcw; - - g_return_if_fail( dialog != NULL ); - - dcw = g_object_get_data( G_OBJECT(dialog), "DatabaseConnectionWindow" ); - g_return_if_fail(dcw); - - switch( response ) { - case GTK_RESPONSE_HELP: - gnc_gnome_help( HF_HELP, HL_GLOBPREFS ); - break; - - case PB_LOAD_RESPONSE: - gnc_file_open_file( geturl( dcw ) ); - break; - - case PB_SAVE_RESPONSE: - gnc_file_do_save_as( geturl( dcw ) ); - break; - - case GTK_RESPONSE_CANCEL: - break; - - default: - PERR( "Invalid response" ); - break; - } - - if( response != GTK_RESPONSE_HELP ) { - gtk_widget_destroy( GTK_WIDGET(dialog) ); - } -} - -void gnc_ui_database_connection( void ) -{ - struct DatabaseConnectionWindow *dcw; - GladeXML* xml; - GtkWidget* box; - GList* ds_node; - - dcw = g_new0(struct DatabaseConnectionWindow, 1); - g_return_if_fail(dcw); - - /* Open the dialog */ - xml = gnc_glade_xml_new( "dialog-database-connection.glade", "Database Connection" ); - dcw->dialog = glade_xml_get_widget( xml, "Database Connection" ); - - dcw->rb_mysql = glade_xml_get_widget( xml, "rb_mysql" ); - dcw->rb_postgresql = glade_xml_get_widget( xml, "rb_postgresql" ); - dcw->tf_host = glade_xml_get_widget( xml, "tf_host" ); - gtk_entry_set_text( GTK_ENTRY(dcw->tf_host), "localhost" ); - dcw->tf_database = glade_xml_get_widget( xml, "tf_database" ); - gtk_entry_set_text( GTK_ENTRY(dcw->tf_database), "gnucash" ); - dcw->tf_username = glade_xml_get_widget( xml, "tf_username" ); - dcw->tf_password = glade_xml_get_widget( xml, "tf_password" ); - - /* Autoconnect signals */ - glade_xml_signal_autoconnect_full( xml, gnc_glade_autoconnect_full_func, - dcw->dialog ); - - /* Clean up the xml data structure when the dialog is destroyed */ - g_object_set_data_full( G_OBJECT(dcw->dialog), "dialog-database-connection.glade", - xml, g_object_unref ); - g_object_set_data_full( G_OBJECT(dcw->dialog), "DatabaseConnectionWindow", dcw, - g_free ); - - /* Run the dialog */ - gtk_widget_show_all( dcw->dialog ); -} - diff --git a/src/gnome-utils/dialog-database-connection.h b/src/gnome-utils/dialog-database-connection.h deleted file mode 100644 index 0635d415d7..0000000000 --- a/src/gnome-utils/dialog-database-connection.h +++ /dev/null @@ -1,46 +0,0 @@ -/********************************************************************\ - * dialog-database-connection.h -- dialog for opening a connection * - * to a libgda database, either predefined * - * in ~/.libgda/config or explicit using * - * provider and database. * - * * - * Copyright (C) 2007-8 Phil Longstaff (plongstaff@rogers.com) * - * * - * This program 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. * - * * - * This program 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, contact: * - * * - * Free Software Foundation Voice: +1-617-542-5942 * - * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 * - * Boston, MA 02110-1301, USA gnu@gnu.org * -\********************************************************************/ - -#ifndef DIALOG_DATABASE_CONNECTION_H -#define DIALOG_DATABASE_CONNECTION_H - -/** @addtogroup GUI - @{ */ -/** @file dialog-database-connection.h - * - * This file contains the functions to present a GUI to select - * a database connection. - */ - -/** Create and run the dialog to close the book. - * - */ -void gnc_ui_database_connection( void ); - - -/** @} */ - -#endif /* DIALOG_DATABASE_CONNECTION_H */ diff --git a/src/gnome-utils/glade/Makefile.am b/src/gnome-utils/glade/Makefile.am index c5776d2687..27e43c17cc 100644 --- a/src/gnome-utils/glade/Makefile.am +++ b/src/gnome-utils/glade/Makefile.am @@ -2,7 +2,6 @@ gladedir = $(GNC_GLADE_DIR) glade_DATA = \ commodity.glade \ dialog-book-close.glade \ - dialog-database-connection.glade \ dialog-file-access.glade \ dialog-query-list.glade \ dialog-reset-warnings.glade \ diff --git a/src/gnome/gnc-plugin-basic-commands.c b/src/gnome/gnc-plugin-basic-commands.c index 596965a12c..ea542463c1 100644 --- a/src/gnome/gnc-plugin-basic-commands.c +++ b/src/gnome/gnc-plugin-basic-commands.c @@ -70,7 +70,6 @@ static void gnc_plugin_basic_commands_add_to_window (GncPlugin *plugin, GncMainW /* Command callbacks */ static void gnc_main_window_cmd_file_new (GtkAction *action, GncMainWindowActionData *data); static void gnc_main_window_cmd_file_open (GtkAction *action, GncMainWindowActionData *data); -static void gnc_main_window_cmd_file_db_connection (GtkAction *action, GncMainWindowActionData *data); static void gnc_main_window_cmd_file_save (GtkAction *action, GncMainWindowActionData *data); static void gnc_main_window_cmd_file_save_as (GtkAction *action, GncMainWindowActionData *data); static void gnc_main_window_cmd_file_qsf_import (GtkAction *action, GncMainWindowActionData *data); @@ -105,9 +104,6 @@ static GtkActionEntry gnc_plugin_actions [] = { { "FileOpenAction", GTK_STOCK_OPEN, N_("_Open..."), NULL, N_("Open an existing GnuCash file"), G_CALLBACK (gnc_main_window_cmd_file_open) }, - { "FileDatabaseConnectionAction", NULL, N_("_Database Connection"), NULL, - N_("Connect to a database"), - G_CALLBACK (gnc_main_window_cmd_file_db_connection) }, { "FileSaveAction", GTK_STOCK_SAVE, N_("_Save"), "s", N_("Save the current file"), G_CALLBACK (gnc_main_window_cmd_file_save) }, @@ -266,9 +262,6 @@ gnc_plugin_basic_commands_add_to_window (GncPlugin *plugin, GncMainWindow *window, GQuark type) { -#if !defined(HAVE_DBI_DBI_H) - gnc_main_window_all_action_set_sensitive("FileDatabaseConnectionAction", FALSE); -#endif } /** Initialize the class for a new basic commands plugin. This will @@ -369,17 +362,6 @@ gnc_main_window_cmd_file_open (GtkAction *action, GncMainWindowActionData *data) gnc_window_set_progressbar_window (NULL); } -static void -gnc_main_window_cmd_file_db_connection (GtkAction *action, GncMainWindowActionData *data) -{ - g_return_if_fail (data != NULL); - - if (!gnc_main_window_all_finish_pending()) - return; - - gnc_ui_file_access_for_open(); -} - static void gnc_main_window_cmd_file_save (GtkAction *action, GncMainWindowActionData *data) { diff --git a/src/gnome/ui/gnc-plugin-basic-commands-ui.xml b/src/gnome/ui/gnc-plugin-basic-commands-ui.xml index 175132651b..8a16b66867 100644 --- a/src/gnome/ui/gnc-plugin-basic-commands-ui.xml +++ b/src/gnome/ui/gnc-plugin-basic-commands-ui.xml @@ -14,7 +14,6 @@ -