<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=Windows-1252">
<style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style>
</head>
<body dir="ltr">
From: Michael Kielstra <Michaelkielstra@users.noreply.github.com><br>
<font size="2"><span style="font-size:11pt;">
<div class="PlainText"><br>
---<br>
catfish/CatfishWindow.py | 14 +++++-<br>
catfish_lib/CatfishSettings.py | 1 +<br>
catfish_lib/Window.py | 5 +-<br>
data/ui/CatfishWindow.ui | 19 +++++++<br>
po/catfish.pot | 92 ++++++++++++++++++----------------<br>
5 files changed, 83 insertions(+), 48 deletions(-)<br>
<br>
diff --git a/catfish/CatfishWindow.py b/catfish/CatfishWindow.py<br>
index b09d8f1..4a69e14 100644<br>
--- a/catfish/CatfishWindow.py<br>
+++ b/catfish/CatfishWindow.py<br>
@@ -134,6 +134,8 @@ class CatfishWindow(Window):<br>
self.fulltext = builder.get_named_object("menus.application.fulltext")<br>
self.sidebar_toggle_menu = builder.get_named_object(<br>
"menus.application.advanced")<br>
+ self.close_after_select = builder.get_named_object(<br>
+ "menus.application.closeafterselect")<br>
<br>
# -- Sidebar -- #<br>
self.button_time_custom = builder.get_named_object(<br>
@@ -345,10 +347,10 @@ class CatfishWindow(Window):<br>
self.app_menu_event = not self.app_menu_event<br>
if not self.app_menu_event:<br>
return<br>
- if listbox.get_row_at_index(5) == row:<br>
+ if listbox.get_row_at_index(6) == row:<br>
listbox.get_parent().hide()<br>
self.on_menu_update_index_activate(row)<br>
- if listbox.get_row_at_index(6) == row:<br>
+ if listbox.get_row_at_index(7) == row:<br>
listbox.get_parent().hide()<br>
self.on_mnu_about_activate(row)<br>
<br>
@@ -497,6 +499,8 @@ class CatfishWindow(Window):<br>
self.fulltext.set_active(self.options.fulltext)<br>
self.sidebar_toggle_menu.set_active(<br>
self.settings.get_setting('show-sidebar'))<br>
+ self.close_after_select.set_active(<br>
+ self.settings.get_setting('close-after-select'))<br>
<br>
self.show_thumbnail = self.options.thumbnails<br>
<br>
@@ -873,6 +877,10 @@ class CatfishWindow(Window):<br>
def on_menu_update_index_activate(self, widget):<br>
"""Show the Update Search Index dialog."""<br>
self.update_index_dialog.show()<br>
+<br>
+ def on_menu_closeafterselect_toggled(self, widget):<br>
+ active = widget.get_active()<br>
+ self.settings.set_setting('close-after-select', active)<br>
<br>
# -- Sidebar -- #<br>
def on_sidebar_toggle_toggled(self, widget):<br>
@@ -950,6 +958,8 @@ class CatfishWindow(Window):<br>
command = ['xdg-open', filename]<br>
try:<br>
subprocess.Popen(command, shell=False)<br>
+ if(self.settings.get_setting('close-after-select')):<br>
+ self.destroy()<br>
return<br>
except Exception as msg:<br>
logger.debug('Exception encountered while opening %s.' +<br>
diff --git a/catfish_lib/CatfishSettings.py b/catfish_lib/CatfishSettings.py<br>
index f1b0626..bb4fb0f 100644<br>
--- a/catfish_lib/CatfishSettings.py<br>
+++ b/catfish_lib/CatfishSettings.py<br>
@@ -24,6 +24,7 @@ default_settings = {<br>
'use-headerbar': True,<br>
'show-hidden-files': False,<br>
'show-sidebar': False,<br>
+ 'close-after-select': True,<br>
'window-width': 650,<br>
'window-height': 470,<br>
'window-x': -1,<br>
diff --git a/catfish_lib/Window.py b/catfish_lib/Window.py<br>
index 61cb005..3aa2f47 100644<br>
--- a/catfish_lib/Window.py<br>
+++ b/catfish_lib/Window.py<br>
@@ -56,7 +56,8 @@ __builder__ = {<br>
"hidden": "application_menu_hidden",<br>
"fulltext": "application_menu_fulltext",<br>
"advanced": "application_menu_advanced",<br>
- "update": "application_menu_update"<br>
+ "update": "application_menu_update",<br>
+ "closeafterselect": "application_menu_closeafterselect"<br>
},<br>
# File Context Menu<br>
"file": {<br>
@@ -348,4 +349,4 @@ class Window(Gtk.Window):<br>
def on_catfish_window_configure_event(self, widget, event):<br>
pos = self.get_position()<br>
self.settings.set_setting('window-x', pos.root_x)<br>
- self.settings.set_setting('window-y', pos.root_y)<br>
\ No newline at end of file<br>
+ self.settings.set_setting('window-y', pos.root_y)<br>
diff --git a/data/ui/CatfishWindow.ui b/data/ui/CatfishWindow.ui<br>
index 73820c1..0c4f627 100644<br>
--- a/data/ui/CatfishWindow.ui<br>
+++ b/data/ui/CatfishWindow.ui<br>
@@ -1221,6 +1221,25 @@<br>
</child><br>
</object><br>
</child><br>
+ <child><br>
+ <object class="GtkListBoxRow" id="listboxrow8"><br>
+ <property name="width_request">100</property><br>
+ <property name="visible">True</property><br>
+ <property name="can_focus">True</property><br>
+ <child><br>
+ <object class="GtkCheckButton" id="application_menu_closeafterselect"><br>
+ <property name="label" translatable="yes">Close _on Selection</property><br>
+ <property name="visible">True</property><br>
+ <property name="can_focus">True</property><br>
+ <property name="receives_default">False</property><br>
+ <property name="use_underline">True</property><br>
+ <property name="xalign">0</property><br>
+ <property name="draw_indicator">True</property><br>
+ <signal name="toggled" handler="on_menu_closeafterselect_toggled" swapped="no"/><br>
+ </object><br>
+ </child><br>
+ </object><br>
+ </child><br>
<child><br>
<object class="GtkListBoxRow" id="application_menu_update"><br>
<property name="visible">True</property><br>
diff --git a/po/catfish.pot b/po/catfish.pot<br>
index 5a1dbf9..c050589 100644<br>
--- a/po/catfish.pot<br>
+++ b/po/catfish.pot<br>
@@ -8,7 +8,7 @@ msgid ""<br>
msgstr ""<br>
"Project-Id-Version: PACKAGE VERSION\n"<br>
"Report-Msgid-Bugs-To: \n"<br>
-"POT-Creation-Date: 2018-09-02 07:56-0400\n"<br>
+"POT-Creation-Date: 2018-11-11 13:20-0500\n"<br>
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"<br>
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"<br>
"Language-Team: LANGUAGE <LL@li.org>\n"<br>
@@ -18,7 +18,7 @@ msgstr ""<br>
"Content-Transfer-Encoding: 8bit\n"<br>
<br>
#: ../catfish.desktop.in.h:1 ../data/ui/CatfishWindow.ui.h:28<br>
-#: ../catfish/CatfishWindow.py:665<br>
+#: ../catfish/CatfishWindow.py:669<br>
msgid "Catfish File Search"<br>
msgstr ""<br>
<br>
@@ -121,7 +121,7 @@ msgstr ""<br>
msgid "<b>End Date</b>"<br>
msgstr ""<br>
<br>
-#: ../data/ui/CatfishWindow.ui.h:23 ../catfish_lib/Window.py:217<br>
+#: ../data/ui/CatfishWindow.ui.h:23 ../catfish_lib/Window.py:218<br>
msgid "Catfish"<br>
msgstr ""<br>
<br>
@@ -137,7 +137,7 @@ msgstr ""<br>
msgid "File Type"<br>
msgstr ""<br>
<br>
-#: ../data/ui/CatfishWindow.ui.h:27 ../catfish/CatfishWindow.py:1132<br>
+#: ../data/ui/CatfishWindow.ui.h:27 ../catfish/CatfishWindow.py:1142<br>
msgid "Modified"<br>
msgstr ""<br>
<br>
@@ -191,34 +191,38 @@ msgid "Show _Sidebar"<br>
msgstr ""<br>
<br>
#: ../data/ui/CatfishWindow.ui.h:39<br>
-msgid "_Update Search Index…"<br>
+msgid "Close _on Selection"<br>
msgstr ""<br>
<br>
#: ../data/ui/CatfishWindow.ui.h:40<br>
-msgid "_About"<br>
+msgid "_Update Search Index…"<br>
msgstr ""<br>
<br>
#: ../data/ui/CatfishWindow.ui.h:41<br>
-msgid "Update Search Database"<br>
+msgid "_About"<br>
msgstr ""<br>
<br>
#: ../data/ui/CatfishWindow.ui.h:42<br>
-msgid "Unlock"<br>
+msgid "Update Search Database"<br>
msgstr ""<br>
<br>
#: ../data/ui/CatfishWindow.ui.h:43<br>
-msgid "<b>Database:</b>"<br>
+msgid "Unlock"<br>
msgstr ""<br>
<br>
#: ../data/ui/CatfishWindow.ui.h:44<br>
-msgid "<b>Updated:</b>"<br>
+msgid "<b>Database:</b>"<br>
msgstr ""<br>
<br>
#: ../data/ui/CatfishWindow.ui.h:45<br>
-msgid "<big><b>Update Search Database</b></big>"<br>
+msgid "<b>Updated:</b>"<br>
msgstr ""<br>
<br>
#: ../data/ui/CatfishWindow.ui.h:46<br>
+msgid "<big><b>Update Search Database</b></big>"<br>
+msgstr ""<br>
+<br>
+#: ../data/ui/CatfishWindow.ui.h:47<br>
msgid ""<br>
"For faster search results, the search database needs to be refreshed.\n"<br>
"This action requires administrative rights."<br>
@@ -274,152 +278,152 @@ msgstr ""<br>
msgid "%s (invalid encoding)"<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:237<br>
+#: ../catfish/CatfishWindow.py:239<br>
msgid "Unknown"<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:241<br>
+#: ../catfish/CatfishWindow.py:243<br>
msgid "Never"<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:633<br>
+#: ../catfish/CatfishWindow.py:637<br>
msgid "An error occurred while updating the database."<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:635<br>
+#: ../catfish/CatfishWindow.py:639<br>
msgid "Authentication failed."<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:641<br>
+#: ../catfish/CatfishWindow.py:645<br>
msgid "Authentication cancelled."<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:647<br>
+#: ../catfish/CatfishWindow.py:651<br>
msgid "Search database updated successfully."<br>
msgstr ""<br>
<br>
#. Set the dialog status to running.<br>
-#: ../catfish/CatfishWindow.py:722<br>
+#: ../catfish/CatfishWindow.py:726<br>
msgid "Updating..."<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:756<br>
+#: ../catfish/CatfishWindow.py:760<br>
msgid "Stop Search"<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:757<br>
+#: ../catfish/CatfishWindow.py:761<br>
msgid ""<br>
"Search is in progress...\n"<br>
"Press the cancel button or the Escape key to stop."<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:766<br>
+#: ../catfish/CatfishWindow.py:770<br>
msgid "Begin Search"<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:958<br>
+#: ../catfish/CatfishWindow.py:968<br>
#, python-format<br>
msgid "\"%s\" could not be opened."<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:1004<br>
+#: ../catfish/CatfishWindow.py:1014<br>
#, python-format<br>
msgid "\"%s\" could not be saved."<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:1021<br>
+#: ../catfish/CatfishWindow.py:1031<br>
#, python-format<br>
msgid "\"%s\" could not be deleted."<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:1061<br>
+#: ../catfish/CatfishWindow.py:1071<br>
#, python-format<br>
msgid "Save \"%s\" as…"<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:1096<br>
+#: ../catfish/CatfishWindow.py:1106<br>
#, python-format<br>
msgid ""<br>
"Are you sure that you want to \n"<br>
"permanently delete \"%s\"?"<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:1100<br>
+#: ../catfish/CatfishWindow.py:1110<br>
#, python-format<br>
msgid ""<br>
"Are you sure that you want to \n"<br>
"permanently delete the %i selected files?"<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:1103<br>
+#: ../catfish/CatfishWindow.py:1113<br>
msgid "If you delete a file, it is permanently lost."<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:1126<br>
+#: ../catfish/CatfishWindow.py:1136<br>
msgid "Filename"<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:1128<br>
+#: ../catfish/CatfishWindow.py:1138<br>
msgid "Size"<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:1130<br>
+#: ../catfish/CatfishWindow.py:1140<br>
msgid "Location"<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:1142<br>
+#: ../catfish/CatfishWindow.py:1152<br>
msgid "Preview"<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:1150<br>
+#: ../catfish/CatfishWindow.py:1160<br>
msgid "Details"<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:1369<br>
+#: ../catfish/CatfishWindow.py:1379<br>
msgid "Today"<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:1371<br>
+#: ../catfish/CatfishWindow.py:1381<br>
msgid "Yesterday"<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:1452<br>
+#: ../catfish/CatfishWindow.py:1462<br>
msgid "No files found."<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:1454<br>
+#: ../catfish/CatfishWindow.py:1464<br>
msgid ""<br>
"Try making your search less specific\n"<br>
"or try another directory."<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:1460<br>
+#: ../catfish/CatfishWindow.py:1470<br>
msgid "1 file found."<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:1462<br>
+#: ../catfish/CatfishWindow.py:1472<br>
#, python-format<br>
msgid "%i files found."<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:1468<br>
+#: ../catfish/CatfishWindow.py:1478<br>
msgid "bytes"<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:1576 ../catfish/CatfishWindow.py:1585<br>
+#: ../catfish/CatfishWindow.py:1586 ../catfish/CatfishWindow.py:1595<br>
msgid "Searching…"<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:1578<br>
+#: ../catfish/CatfishWindow.py:1588<br>
msgid "Results will be displayed as soon as they are found."<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:1583<br>
+#: ../catfish/CatfishWindow.py:1593<br>
#, python-format<br>
msgid "Searching for \"%s\""<br>
msgstr ""<br>
<br>
-#: ../catfish/CatfishWindow.py:1672<br>
+#: ../catfish/CatfishWindow.py:1682<br>
#, python-format<br>
msgid "Search results for \"%s\""<br>
msgstr ""<br>
--<br>
2.17.1<br>
<br>
</div>
</span></font>
</body>
</html>