Uses GTK+-3.0; About dialog; *.gcn - Open/Save filter

2 files changed, 53 insertions, 16 deletions

diff --git a/src/dialogs.c b/src/dialogs.c
index 8c96e05..7d34b8b 100644
--- a/src/dialogs.c
+++ b/src/dialogs.c
@@ -231,12 +231,12 @@ void show_options_dialog ()
     gtk_container_add(GTK_CONTAINER(halign), label);
     gtk_table_attach(GTK_TABLE(table), halign, 0, 1, row, row+1,  GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0);
 
-    options.combo_signature = gtk_combo_box_new_text();
-    gtk_combo_box_append_text(GTK_COMBO_BOX(options.combo_signature), _("Do not use signature level"));
-    gtk_combo_box_append_text(GTK_COMBO_BOX(options.combo_signature), _("Level 0 - never"));
-    gtk_combo_box_append_text(GTK_COMBO_BOX(options.combo_signature), _("Level 1 - supported"));
-    gtk_combo_box_append_text(GTK_COMBO_BOX(options.combo_signature), _("Level 2 - prefered"));
-    gtk_combo_box_append_text(GTK_COMBO_BOX(options.combo_signature), _("Level 3 - required"));
+    options.combo_signature = gtk_combo_box_text_new();
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(options.combo_signature), _("Do not use signature level"));
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(options.combo_signature), _("Level 0 - never"));
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(options.combo_signature), _("Level 1 - supported"));
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(options.combo_signature), _("Level 2 - prefered"));
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(options.combo_signature), _("Level 3 - required"));
 
     gtk_combo_box_set_active(GTK_COMBO_BOX(options.combo_signature), 0);
     gtk_table_attach_defaults (GTK_TABLE (table),  options.combo_signature, 1, 2, row, row+1);
@@ -469,6 +469,11 @@ void show_about ()
 
    /* const gchar    *trans = "Jan Lipovský";*/
 
+
+   const gchar    *license = "This program is licensed under the terms of the GNU General Public License version 3\r\n" \
+                             "Available online under:\r\n\r\n" \
+                             "http://www.gnu.org/licenses/gpl-3.0.html";
+
     dialog = gtk_about_dialog_new();
     gtk_window_set_transient_for( GTK_WINDOW( dialog ),
                                   GTK_WINDOW( gui.win ) );
@@ -476,10 +481,14 @@ void show_about ()
 
     gtk_about_dialog_set_program_name( about, "gncpmount" );
     gtk_about_dialog_set_version( about, PROG_VERSION );
-    gtk_about_dialog_set_copyright( about, "Copyright 2010 © Jan Lipovský" );
+    gtk_about_dialog_set_copyright( about, "Copyright 2010 - 2011 © Jan Lipovský" );
     gtk_about_dialog_set_website( about, "http://gncpmount.lipoja.net" );
-    gtk_about_dialog_set_authors( about, auth );
+    gtk_about_dialog_set_website_label ( about, "gncpmount.lipoja.net" );
+    gtk_about_dialog_set_authors( about, auth);
     gtk_about_dialog_set_comments( about, "graphical user interface (GUI) for ncpmount" );
+    gtk_about_dialog_set_license (about, license);
+    gtk_about_dialog_set_wrap_license (about, TRUE);
+    gtk_about_dialog_set_license_type (about, GTK_LICENSE_GPL_3_0);
 /*
     gtk_about_dialog_set_translator_credits( about, trans );
 */
diff --git a/src/gncpmount.c b/src/gncpmount.c
index b9599c6..cb2ce9e 100644
--- a/src/gncpmount.c
+++ b/src/gncpmount.c
@@ -153,12 +153,26 @@ static void
 open_file ()
 {
     GtkWidget *dialog;
+    GtkFileFilter *fgnc, *fall;
+
     dialog = gtk_file_chooser_dialog_new (_("Load options from file"),
                                           GTK_WINDOW (gui.win),
                                           GTK_FILE_CHOOSER_ACTION_OPEN,
                                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                                           GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
                                           NULL);
+
+    fgnc = gtk_file_filter_new();
+    gtk_file_filter_set_name(fgnc,"gncpmout (*.gnc)");
+    gtk_file_filter_add_pattern(fgnc,"*.gnc");
+
+    gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog),fgnc);
+
+    fall = gtk_file_filter_new();
+    gtk_file_filter_set_name(fall,"All files (*.*)");
+    gtk_file_filter_add_pattern(fall,"*");
+    gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog),fall);
+
     if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
     {
         char *filename;
@@ -209,6 +223,8 @@ static void
 save_file ()
 {
     GtkWidget *dialog;
+    GtkFileFilter *fgnc, *fall;
+
     dialog = gtk_file_chooser_dialog_new (_("Save options to file"),
                                           GTK_WINDOW (gui.win),
                                           GTK_FILE_CHOOSER_ACTION_SAVE,
@@ -227,6 +243,18 @@ save_file ()
         gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (dialog), filename_for_existing_document);
         */
 
+    fgnc = gtk_file_filter_new();
+    gtk_file_filter_set_name(fgnc,"gncpmout (*.gnc)");
+    gtk_file_filter_add_pattern(fgnc,"*.gnc");
+
+    gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog),fgnc);
+
+    fall = gtk_file_filter_new();
+    gtk_file_filter_set_name(fall,"All files (*.*)");
+    gtk_file_filter_add_pattern(fall,"*");
+    gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog),fall);
+
+
     if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
     {
         char *filename;
@@ -371,22 +399,22 @@ int main (int argc, char *argv[])
 
     menuitem = gtk_menu_item_new_with_mnemonic (_("_New"));
     gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem);
-    g_signal_connect (GTK_OBJECT (menuitem), "activate", clear_gui, NULL);
+    g_signal_connect ( (menuitem), "activate", clear_gui, NULL);
     gtk_widget_show (menuitem);
 
     menuitem = gtk_menu_item_new_with_mnemonic (_("_Load from file"));
     gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem);
-    g_signal_connect (GTK_OBJECT (menuitem), "activate", open_file, NULL);
+    g_signal_connect ( (menuitem), "activate", open_file, NULL);
     gtk_widget_show (menuitem);
 
     menuitem = gtk_menu_item_new_with_mnemonic (_("_Save as..."));
     gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem);
-    g_signal_connect (GTK_OBJECT (menuitem), "activate", save_file, NULL);
+    g_signal_connect ( (menuitem), "activate", save_file, NULL);
     gtk_widget_show (menuitem);
 
     menuitem = gtk_menu_item_new_with_mnemonic (_("_Set as default"));
     gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem);
-    g_signal_connect (GTK_OBJECT (menuitem), "activate", set_default, NULL);
+    g_signal_connect ( (menuitem), "activate", set_default, NULL);
     gtk_widget_show (menuitem);
 
     menuitem = gtk_separator_menu_item_new ();
@@ -395,7 +423,7 @@ int main (int argc, char *argv[])
 
     menuitem = gtk_menu_item_new_with_mnemonic (_("_Quit"));
     gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem);
-    g_signal_connect (GTK_OBJECT (menuitem), "activate", gtk_main_quit, NULL);
+    g_signal_connect ( (menuitem), "activate", gtk_main_quit, NULL); //GTK_OBJECT
     gtk_widget_show (menuitem);
 
 
@@ -409,12 +437,12 @@ int main (int argc, char *argv[])
 
     menuitem = gtk_menu_item_new_with_mnemonic (_("_Options"));
     gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem);
-    g_signal_connect (GTK_OBJECT (menuitem), "activate", run_options_dialog, NULL);
+    g_signal_connect ( (menuitem), "activate", run_options_dialog, NULL);
     gtk_widget_show (menuitem);
 
     menuitem = gtk_menu_item_new_with_mnemonic (_("Show _command"));
     gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem);
-    g_signal_connect (GTK_OBJECT (menuitem), "activate", run_command_dialog, NULL);
+    g_signal_connect ( (menuitem), "activate", run_command_dialog, NULL);
     gtk_widget_show (menuitem);
 
 
@@ -428,7 +456,7 @@ int main (int argc, char *argv[])
 
     menuitem = gtk_menu_item_new_with_mnemonic (_("_About..."));
     gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem);
-    g_signal_connect (GTK_OBJECT (menuitem), "activate", show_about, NULL);
+    g_signal_connect ( (menuitem), "activate", show_about, NULL);
     gtk_widget_show (menuitem);
 
     /* Create a vertical box */