[easytag] Remove quit confirmation dialogue



commit ac3a319bfcbaff1ea8e50137fdf542b05dcd1999
Author: David King <amigadave amigadave com>
Date:   Thu Mar 26 10:39:37 2015 +0100

    Remove quit confirmation dialogue
    
    There is already a dialogue for confirming when unsaved changes would be
    lost, so the extra confirmation is unnecessary.
    
    As suggested by Alexandre Franke.

 data/org.gnome.EasyTAG.gschema.xml |    6 ------
 data/preferences_dialog.ui         |    8 --------
 src/application_window.c           |   33 +--------------------------------
 src/preferences_dialog.c           |    8 +-------
 4 files changed, 2 insertions(+), 53 deletions(-)
---
diff --git a/data/org.gnome.EasyTAG.gschema.xml b/data/org.gnome.EasyTAG.gschema.xml
index ea44451..f8a1e76 100644
--- a/data/org.gnome.EasyTAG.gschema.xml
+++ b/data/org.gnome.EasyTAG.gschema.xml
@@ -375,12 +375,6 @@
       <default>false</default>
     </key>
 
-    <key name="confirm-quit" type="b">
-      <summary>Confirm before quitting the application</summary>
-      <description>Whether to ask for confirmation from the user before quitting the 
application</description>
-      <default>false</default>
-    </key>
-
     <key name="confirm-write-tags" type="b">
       <summary>Confirm before writing tags</summary>
       <description>Whether to ask for confirmation from the user before writing tags to audio 
files</description>
diff --git a/data/preferences_dialog.ui b/data/preferences_dialog.ui
index c700c4e..193a8f2 100644
--- a/data/preferences_dialog.ui
+++ b/data/preferences_dialog.ui
@@ -1454,14 +1454,6 @@
                     </object>
                 </child>
                 <child>
-                    <object class="GtkCheckButton" id="confirm_quit_check">
-                        <property name="label" translatable="yes">Confirm before quitting the 
application</property>
-                        <property name="margin-left">12</property>
-                        <property name="tooltip-text" translatable="yes">Whether to ask for confirmation 
from the user before quitting the application</property>
-                        <property name="visible">True</property>
-                    </object>
-                </child>
-                <child>
                     <object class="GtkCheckButton" id="confirm_write_check">
                         <property name="label" translatable="yes">Confirm before writing tags</property>
                         <property name="margin-left">12</property>
diff --git a/src/application_window.c b/src/application_window.c
index 23c72e0..b658131 100644
--- a/src/application_window.c
+++ b/src/application_window.c
@@ -1,5 +1,5 @@
 /* EasyTAG - tag editor for audio files
- * Copyright (C) 2014  David King <amigadave amigadave com>
+ * Copyright (C) 2014-2015  David King <amigadave amigadave 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
@@ -3019,37 +3019,6 @@ et_application_window_quit (EtApplicationWindow *self)
         }
 
     }
-    else if (g_settings_get_boolean (MainSettings, "confirm-quit"))
-    {
-        msgbox = gtk_message_dialog_new (GTK_WINDOW (self),
-                                         GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                         GTK_MESSAGE_QUESTION,
-                                         GTK_BUTTONS_NONE,
-                                         "%s",
-                                         _("Do you really want to quit?"));
-         gtk_dialog_add_buttons (GTK_DIALOG (msgbox), _("_Cancel"),
-                                 GTK_RESPONSE_CANCEL, _("_Quit"),
-                                 GTK_RESPONSE_CLOSE, NULL);
-        gtk_dialog_set_default_response (GTK_DIALOG (msgbox),
-                                         GTK_RESPONSE_CLOSE);
-        gtk_window_set_title (GTK_WINDOW (msgbox), _("Quit"));
-        response = gtk_dialog_run (GTK_DIALOG (msgbox));
-        gtk_widget_destroy (msgbox);
-
-        switch (response)
-        {
-            case GTK_RESPONSE_CLOSE:
-                quit_confirmed (self);
-                break;
-            case GTK_RESPONSE_CANCEL:
-            case GTK_RESPONSE_DELETE_EVENT:
-                return;
-                break;
-            default:
-                g_assert_not_reached ();
-                break;
-        }
-    }
     else
     {
         quit_confirmed (self);
diff --git a/src/preferences_dialog.c b/src/preferences_dialog.c
index b329bff..f2e9e8a 100644
--- a/src/preferences_dialog.c
+++ b/src/preferences_dialog.c
@@ -1,5 +1,5 @@
 /* EasyTAG - Tag editor for audio files
- * Copyright (C) 2013-2014  David King <amigadave amigadave com>
+ * Copyright (C) 2013-2015  David King <amigadave amigadave com>
  * Copyright (C) 2000-2003  Jerome Couderc <easytag gmail com>
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -269,7 +269,6 @@ create_preferences_dialog (EtPreferencesDialog *self)
     GtkWidget *CddbProxyUserPassword;
     GtkWidget *CddbFollowFile;
     GtkWidget *CddbUseDLM;
-    GtkWidget *ConfirmBeforeExit;
     GtkWidget *ConfirmWriteTag;
     GtkWidget *ConfirmRenameFile;
     GtkWidget *ConfirmDeleteFile;
@@ -937,11 +936,6 @@ create_preferences_dialog (EtPreferencesDialog *self)
     /*
      * Confirmation
      */
-    ConfirmBeforeExit = GTK_WIDGET (gtk_builder_get_object (builder,
-                                                            "confirm_quit_check"));
-    g_settings_bind (MainSettings, "confirm-quit", ConfirmBeforeExit, "active",
-                     G_SETTINGS_BIND_DEFAULT);
-
     ConfirmWriteTag = GTK_WIDGET (gtk_builder_get_object (builder,
                                                           "confirm_write_check"));
     g_settings_bind (MainSettings, "confirm-write-tags", ConfirmWriteTag,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]