[gnome-commander] Remove unnecessary transient config for removed search window
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] Remove unnecessary transient config for removed search window
- Date: Sat, 15 Jan 2022 23:07:08 +0000 (UTC)
commit d1fe81e0749072f242af5f8247bc8d1d9a46fd14
Author: Uwe Scholz <u scholz83 gmx de>
Date: Sat Jan 15 23:19:39 2022 +0100
Remove unnecessary transient config for removed search window
data/org.gnome.gnome-commander.gschema.xml | 7 -------
src/dialogs/gnome-cmd-options-dialog.cc | 11 -----------
src/gnome-cmd-data.cc | 2 --
src/gnome-cmd-data.h | 2 --
4 files changed, 22 deletions(-)
---
diff --git a/data/org.gnome.gnome-commander.gschema.xml b/data/org.gnome.gnome-commander.gschema.xml
index 024ddaad..d7b5cbb3 100644
--- a/data/org.gnome.gnome-commander.gschema.xml
+++ b/data/org.gnome.gnome-commander.gschema.xml
@@ -535,13 +535,6 @@
This option defines the height of the search window.
</description>
</key>
- <key name="search-win-is-transient" type="b">
- <default>true</default>
- <summary>Search window is transient</summary>
- <description>
- Defines if the search window is transient or if it can be minimized and moved behind the main
window.
- </description>
- </key>
<key name="search-text-history" type="as">
<default>[]</default>
<summary>Search text history</summary>
diff --git a/src/dialogs/gnome-cmd-options-dialog.cc b/src/dialogs/gnome-cmd-options-dialog.cc
index 3a494483..585ee643 100644
--- a/src/dialogs/gnome-cmd-options-dialog.cc
+++ b/src/dialogs/gnome-cmd-options-dialog.cc
@@ -214,15 +214,6 @@ static GtkWidget *create_general_tab (GtkWidget *parent, GnomeCmdData::Options &
gtk_box_pack_start (GTK_BOX (cat_box), check, FALSE, TRUE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.quick_search_exact_match_end);
- // Search window options
- cat_box = create_vbox (parent, FALSE, 0);
- cat = create_category (parent, cat_box, _("Search Window"));
- gtk_box_pack_start (GTK_BOX (vbox), cat, FALSE, TRUE, 0);
-
- check = create_check (parent, _("Search window is minimizable\n(Needs program restart if altered)"),
"search_window_transient");
- gtk_box_pack_start (GTK_BOX (cat_box), check, FALSE, TRUE, 0);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), !cfg.search_window_is_transient);
-
#ifdef HAVE_UNIQUE
// Multiple instances
cat_box = create_vbox (parent, FALSE, 0);
@@ -281,7 +272,6 @@ void store_general_options (GtkWidget *dialog, GnomeCmdData::Options &cfg)
#endif
GtkWidget *qsearch_exact_match_begin = lookup_widget (dialog, "qsearch_exact_match_begin");
GtkWidget *qsearch_exact_match_end = lookup_widget (dialog, "qsearch_exact_match_end");
- GtkWidget *search_window_transient = lookup_widget (dialog, "search_window_transient");
GtkWidget *save_dirs = lookup_widget (dialog, "save_dirs");
GtkWidget *save_tabs = lookup_widget (dialog, "save_tabs");
GtkWidget *save_dir_history = lookup_widget (dialog, "save_dir_history");
@@ -312,7 +302,6 @@ void store_general_options (GtkWidget *dialog, GnomeCmdData::Options &cfg)
#endif
cfg.quick_search_exact_match_begin = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(qsearch_exact_match_begin));
cfg.quick_search_exact_match_end = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(qsearch_exact_match_end));
- cfg.search_window_is_transient = !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(search_window_transient));
cfg.save_dirs_on_exit = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (save_dirs));
cfg.save_tabs_on_exit = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (save_tabs));
cfg.save_dir_history_on_exit = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (save_dir_history));
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index 7e28e47e..32779e8d 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -3239,7 +3239,6 @@ void GnomeCmdData::load()
options.save_dir_history_on_exit = g_settings_get_boolean (options.gcmd_settings->general,
GCMD_SETTINGS_SAVE_DIR_HISTORY_ON_EXIT);
options.save_cmdline_history_on_exit = g_settings_get_boolean (options.gcmd_settings->general,
GCMD_SETTINGS_SAVE_CMDLINE_HISTORY_ON_EXIT);
options.save_search_history_on_exit = g_settings_get_boolean (options.gcmd_settings->general,
GCMD_SETTINGS_SAVE_SEARCH_HISTORY_ON_EXIT);
- options.search_window_is_transient = g_settings_get_boolean(options.gcmd_settings->general,
GCMD_SETTINGS_SEARCH_WIN_IS_TRANSIENT);
search_defaults.height = g_settings_get_uint(options.gcmd_settings->general,
GCMD_SETTINGS_SEARCH_WIN_HEIGHT);
search_defaults.width = g_settings_get_uint(options.gcmd_settings->general,
GCMD_SETTINGS_SEARCH_WIN_WIDTH);
search_defaults.content_patterns.ents = get_list_from_gsettings_string_array
(options.gcmd_settings->general, GCMD_SETTINGS_SEARCH_TEXT_HISTORY);
@@ -3642,7 +3641,6 @@ void GnomeCmdData::save()
set_gsettings_when_changed (options.gcmd_settings->general,
GCMD_SETTINGS_SAVE_SEARCH_HISTORY_ON_EXIT, &(options.save_search_history_on_exit));
set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_SEARCH_WIN_WIDTH,
&(search_defaults.width));
set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_SEARCH_WIN_HEIGHT,
&(search_defaults.height));
- set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_SEARCH_WIN_IS_TRANSIENT ,
&(options.search_window_is_transient));
set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_BOOKMARKS_WINDOW_WIDTH,
&(bookmarks_defaults.width));
set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_BOOKMARKS_WINDOW_HEIGHT,
&(bookmarks_defaults.height));
diff --git a/src/gnome-cmd-data.h b/src/gnome-cmd-data.h
index 4351ca44..2ea2fb24 100644
--- a/src/gnome-cmd-data.h
+++ b/src/gnome-cmd-data.h
@@ -130,7 +130,6 @@ GcmdSettings *gcmd_settings_new (void);
#define GCMD_SETTINGS_DIRECTORY_HISTORY "directory-history"
#define GCMD_SETTINGS_SEARCH_WIN_WIDTH "search-win-width"
#define GCMD_SETTINGS_SEARCH_WIN_HEIGHT "search-win-height"
-#define GCMD_SETTINGS_SEARCH_WIN_IS_TRANSIENT "search-win-is-transient"
#define GCMD_SETTINGS_SEARCH_PATTERN_HISTORY "search-pattern-history"
#define GCMD_SETTINGS_SEARCH_TEXT_HISTORY "search-text-history"
#define GCMD_SETTINGS_SEARCH_PROFILES "search-profiles"
@@ -332,7 +331,6 @@ struct GnomeCmdData
gboolean save_dir_history_on_exit;
gboolean save_cmdline_history_on_exit;
gboolean save_search_history_on_exit;
- gboolean search_window_is_transient {true};
gchar *symlink_prefix;
gint main_win_pos[2];
gboolean deleteToTrash;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]