[dasher/relicence] Revert "Fixed Issue: Linux:Option to disable confirm on quit #54 (#109)"
- From: Gavin Henderson <ghenderson src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dasher/relicence] Revert "Fixed Issue: Linux:Option to disable confirm on quit #54 (#109)"
- Date: Fri, 4 Mar 2022 17:17:54 +0000 (UTC)
commit 26e4cc3f0e081b0bf4f4be6c6701801718cd9a69
Author: Gavin Henderson <gavin henderson hotmail co uk>
Date: Thu Mar 3 12:33:06 2022 +0000
Revert "Fixed Issue: Linux:Option to disable confirm on quit #54 (#109)"
This reverts commit 8982186b424f2b0183a2678cefe245ff2d80c4cc.
Data/GUI/dasher.preferences.ui | 17 -----------------
Src/Gtk2/Preferences.cpp | 3 +--
Src/Gtk2/dasher_main.cpp | 6 ------
3 files changed, 1 insertion(+), 25 deletions(-)
---
diff --git a/Data/GUI/dasher.preferences.ui b/Data/GUI/dasher.preferences.ui
index c4ffd9a0..07464fb8 100644
--- a/Data/GUI/dasher.preferences.ui
+++ b/Data/GUI/dasher.preferences.ui
@@ -1249,23 +1249,6 @@ your writing speed.</property>
<property
name="position">7</property>
</packing>
</child>
-<child>
- <object class="GtkCheckButton" id="confirm_unsaved_files">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="border_width">2</property>
- <property name="label" translatable="yes">Confirm unsaved files</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal handler="generic_bool_changed" name="clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">8</property>
- </packing>
- </child>
-
</object>
</child>
</object>
diff --git a/Src/Gtk2/Preferences.cpp b/Src/Gtk2/Preferences.cpp
index bc23ae29..9bf37a0e 100644
--- a/Src/Gtk2/Preferences.cpp
+++ b/Src/Gtk2/Preferences.cpp
@@ -48,8 +48,7 @@ BoolTranslation sBoolTranslationTable[] = {
{BP_LM_ADAPTIVE, "cb_adaptive", NULL},
{BP_COPY_ALL_ON_STOP,"copy_all_on_stop",NULL},
{BP_SPEAK_ALL_ON_STOP,"speak_all_on_stop",NULL},
- {BP_SPEAK_WORDS,"speak_words",NULL},
- {APP_BP_CONFIRM_UNSAVED, "confirm_unsaved_files", NULL}
+ {BP_SPEAK_WORDS,"speak_words",NULL}
};
// List widgets which map directly to string parameters
diff --git a/Src/Gtk2/dasher_main.cpp b/Src/Gtk2/dasher_main.cpp
index 2b33a0d3..1b977fa5 100644
--- a/Src/Gtk2/dasher_main.cpp
+++ b/Src/Gtk2/dasher_main.cpp
@@ -780,12 +780,6 @@ static void dasher_main_command_quit(DasherMain *pSelf) {
GtkWidget *pDialogue = NULL;
dasher_main_save_state(pSelf);
-
- if (!pPrivate->pAppSettings->GetBool(APP_BP_CONFIRM_UNSAVED)) {
- gtk_main_quit();
- return;
- }
-
if(dasher_editor_file_changed(pPrivate->pEditor)) {
// XXX PRLW: Just open the save dialogue box.
#if 0
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]