From 86d600a8b357ae9aada09e80c4f1d0ddce79fae2 Mon Sep 17 00:00:00 2001
From: Michael Ezra <michael@michaelezra.com>
Date: Wed, 22 Jun 2011 17:23:08 -0400
Subject: [PATCH] New feature: search by filename and file browser toolbar
 optimization (issue 788)

This patch adds "Find" entry box to the toolbar to perform case-insensitive search by part of image filename.
Also, there is a new option in preferences to display File Browser toolbar as single row or not. This also solves issue with lower resolution displays.
---
 rtdata/images/refresh_red.png   | Bin 0 -> 2863 bytes
 rtdata/images/refresh_white.png | Bin 0 -> 3624 bytes
 rtdata/images/unrated.png       | Bin 3196 -> 3180 bytes
 rtdata/images/x_10.png          | Bin 0 -> 3012 bytes
 rtdata/languages/default        |   8 +-
 rtgui/browserfilter.h           |   6 +-
 rtgui/filebrowser.cc            |  13 ++++
 rtgui/filecatalog.cc            | 129 +++++++++++++++++++++++++-------
 rtgui/filecatalog.h             |  11 ++-
 rtgui/options.cc                |   3 +
 rtgui/options.h                 |   1 +
 rtgui/preferences.cc            |   8 +-
 rtgui/preferences.h             |   1 +
 13 files changed, 148 insertions(+), 32 deletions(-)
 create mode 100644 rtdata/images/refresh_red.png
 create mode 100644 rtdata/images/refresh_white.png
 create mode 100644 rtdata/images/x_10.png

diff --git a/rtdata/images/refresh_red.png b/rtdata/images/refresh_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1d99ee41341239bdba30a8ba65bf85e901b3a2f
GIT binary patch
literal 2863
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
N002ovPDHLkV1heDaTfpp

literal 0
HcmV?d00001

diff --git a/rtdata/images/refresh_white.png b/rtdata/images/refresh_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..20b0809aef17e3aaf7d6e23c250aa3325d746176
GIT binary patch
literal 3624
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
RD0aFJ(ACn{ELFF8_CH)tKQ90P

literal 0
HcmV?d00001

diff --git a/rtdata/images/unrated.png b/rtdata/images/unrated.png
index ff75cc7c9e386f028eb9e2cbb665fdd4a09e813b..b5420202e369b68d858c74f2461113dec85554bd 100644
GIT binary patch
delta 439
zcmV;o0Z9J*80;9ZzzTntNkl<Zc-jQPK}b_!0KoD8_x7fcF5&gE4r&L3n!}Y3SFUZZ
z%wiauff0Fh(QdH@b&W0^f}lg^4v)Hbj90#wIF)Cm^OR^oS(ag23{l^bHoks8fP=tA
zK$B83Z_zhz5tdQ{Xh0g!6kyP{Z8M+G7m}yMfYz0aXx+((IUs+cnM|hOx^5hZ1pr^y
z^;of3WaHb`(DCSKsG&yn)la+U9zJ@y?>G*w>%JA<3t@cueKcO#&zjlsT(IP=27G^y
z5wpKJH~s2gd&8PJcDS;jHXCv;W_0=W(CL+TOYe>03zrZA%FA9LZuTw*YdwDD`__({
zn3QXCme{TS{V{*>XQv;f8KI@6mFk8|^QTuoa$x;+GADm20I3`uj@KI=8^6!eqQlgi
z=Zt3WQ2rb{nYxJ%pb8;6)0c-QZr^>-RxU5lp{^~qhfqqTDPuBUXxpr{UKc`a3*gGk
zw43_+(e4Y@pV{47?Ipl^_0YBL##s97$gPz#Lx~Rnor5o7u0Aeue%3;fQX-{f)<Su5
hkA!i88$i$h0RS|aoy}VVbwmIF002ovPDHLkV1h>K+};2H

delta 455
zcmaDO@ke6A0j~Pxo-U3d6}K2>F{b`wICJLAzuw;7HU<U;Q6Og8J(DvBh_irfW*`>p
z2ZFO_&;DaJG&EGRva-rlRaO1Z_+{T+Umu&voP4row{AV!nqS&iY-eYefBg9I1<YHw
zZaofEEM;wNox#K^Ca-JcX3ffLD8j_4r)=-&8e0!im6MZG&A5FASJRLGGH&k~;?#9b
z+yx#!d<eAiAA^E|62rxlo8JpDExE_R_+mQ~GsFMK3i4uxj?PK~_wQX|ke8PSE4p{@
z0)w-=rl5knq!tU)zdMZo|Nm#$JekXbg-3Sw2c{4iRqa5ai3|*PudQVe__y`Z->-KP
z>%FqS?PFqOWMuZs`+n}uo8Y$~Rd=p$XSjQFH-oZPFvHE4?r*$vzF!8a0a^_Vn7+Q=
zdTV<R-^cflF-Y@W`OnYsj^Wu`CPp1YH%T=$73ST$_nc$y>+5T<v$M~;czi7*$JbfM
zKfgK?`{nJ`1q?sVt3Q0oA!}jlX`!yJ{@0!n6y_(6A6@?QVcDT`*Z(eDvgP*=kSk++
nSUC(end7*XdR<LS&4ZX3I6p5o(E7rv29ou3^>bP0l+XkKX9BaN

diff --git a/rtdata/images/x_10.png b/rtdata/images/x_10.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d9182ae84f7504e2fb73db59d946f11dddca1c0
GIT binary patch
literal 3012
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
GLSTZCnwr-D

literal 0
HcmV?d00001

diff --git a/rtdata/languages/default b/rtdata/languages/default
index b1baa76d5..7d5ff0026 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -59,7 +59,10 @@ FILEBROWSER_ARRANGEMENTHINT;Change between vertical/horizontal alignment of thum
 FILEBROWSER_AUTODARKFRAME;Auto dark frame
 FILEBROWSER_AUTOFLATFIELD;Auto flat field
 FILEBROWSER_BROWSEPATHBUTTONHINT;Click to browse to the chosen path
-FILEBROWSER_BROWSEPATHHINT;Type path to browse (<b>Ctrl-o</b> set focus,<b>Ctrl-Enter</b> to browse in File Browser);\nPath shortcuts: <b>~</b> - user's home directory, <b>!</b> - user's pictures directory
+FILEBROWSER_BROWSEPATHHINT;Type path to browse\n<b>Ctrl-o</b> set focus\n<b>Enter</b>, <b>Ctrl-Enter</b> (in File Browser) to browse;\nPath shortcuts:\n  <b>~</b> - user's home directory\n  <b>!</b> - user's pictures directory
+FILEBROWSER_QUERYBUTTONHINT;Clear the Find query
+FILEBROWSER_QUERYHINT;Type a part of filename to search by \n<b>Ctrl-f</b> set focus (in File Browser);\n<b>Enter</b> to find
+FILEBROWSER_QUERYLABEL; Find:
 FILEBROWSER_CACHE;Cache
 FILEBROWSER_CACHECLEARFROMFULL;Clear from cache - full
 FILEBROWSER_CACHECLEARFROMPARTIAL;Clear from cache - partial
@@ -121,7 +124,7 @@ FILEBROWSER_SHOWCOLORLABEL2HINT;Show images labeled Yelow <b>Alt-2</b>
 FILEBROWSER_SHOWCOLORLABEL3HINT;Show images labeled Green <b>Alt-3</b>
 FILEBROWSER_SHOWCOLORLABEL4HINT;Show images labeled Blue <b>Alt-4</b>
 FILEBROWSER_SHOWCOLORLABEL5HINT;Show images labeled Purple <b>Alt-5</b>
-FILEBROWSER_SHOWDIRHINT;Show all images in the directory (clear all filters) <b>D</b>
+FILEBROWSER_SHOWDIRHINT;Clear all filters <b>D</b>
 FILEBROWSER_SHOWEXIFINFO;Show EXIF info <b>i</b>
 FILEBROWSER_SHOWQUEUEHINT;Show content of the processing queue
 FILEBROWSER_SHOWRANK1HINT;Show images ranked as 1 star <b>1</b>
@@ -568,6 +571,7 @@ PREFERENCES_EDITORCMDLINE;Other command line
 PREFERENCES_EDITORLAYOUT;Editor Layout
 PREFERENCES_EXTERNALEDITOR;External editor
 PREFERENCES_FBROWSEROPTS;File Browser Options
+PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar (de-select for low res display)
 PREFERENCES_FILEFORMAT;File format
 PREFERENCES_FLATFIELD;Flat Field
 PREFERENCES_FLATFIELDFOUND;Found
diff --git a/rtgui/browserfilter.h b/rtgui/browserfilter.h
index 7106ce374..6867f65da 100644
--- a/rtgui/browserfilter.h
+++ b/rtgui/browserfilter.h
@@ -20,6 +20,7 @@
 #define _BROWSERFILTER_
 
 #include <exiffiltersettings.h>
+#include <glibmm.h>
 
 class BrowserFilter {
 
@@ -29,7 +30,10 @@ class BrowserFilter {
         bool showTrash;
         bool showNotTrash;
         bool showEdited[2];
-        
+
+        Glib::ustring queryString;
+        Glib::ustring queryFileName;
+
         bool exifFilterEnabled;
         ExifFilterSettings exifFilter;
         
diff --git a/rtgui/filebrowser.cc b/rtgui/filebrowser.cc
index c8ff91e79..93bc2f702 100644
--- a/rtgui/filebrowser.cc
+++ b/rtgui/filebrowser.cc
@@ -693,6 +693,19 @@ bool FileBrowser::checkFilter (ThumbBrowserEntryBase* entryb) { // true -> entry
     if (filter.showRanked[entry->thumbnail->getRank()]==false || filter.showCLabeled[entry->thumbnail->getColorLabel()]==false || (entry->thumbnail->getStage()==1 && !filter.showTrash) || (entry->thumbnail->getStage()==0 && !filter.showNotTrash))
         return false;
 
+    // return false is query is not satisfied
+    if (filter.queryFileName.size()>0){
+    	// check if image's FileName contains queryFileName (case insensitive)
+    	// TODO should we provide case-sensitive search option via preferences?
+    	Glib::ustring FileName;
+    	FileName = Glib::path_get_basename (entry->thumbnail->getFileName());
+    	FileName = FileName.uppercase();
+    	//printf("FileBrowser::checkFilter FileName = '%s'; find() result= %i \n",FileName.c_str(), FileName.find(filter.queryFileName.uppercase()));
+    	
+    	if (FileName.find(filter.queryFileName.uppercase())==-1)
+    		 return false;
+    }
+
     // check exif filter
     const CacheImageData* cfs = entry->thumbnail->getCacheImageData();
     double tol = 0.01;
diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc
index 65a5df987..e38e2593c 100644
--- a/rtgui/filecatalog.cc
+++ b/rtgui/filecatalog.cc
@@ -69,6 +69,51 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
     emptyT->show ();
     trashButtonBox->show ();
     
+    //initialize hbToolBar1
+    Gtk::HBox* hbToolBar1 = Gtk::manage(new Gtk::HBox ());
+
+    //setup BrowsePath
+    iRefreshWhite = new Gtk::Image(argv0+"/images/refresh_white.png");
+    iRefreshRed = new Gtk::Image(argv0+"/images/refresh_red.png");
+
+    BrowsePath = Gtk::manage(new Gtk::Entry ());
+    BrowsePath->set_width_chars (50);
+    BrowsePath->set_tooltip_markup (M("FILEBROWSER_BROWSEPATHHINT"));
+    Gtk::HBox* hbBrowsePath = Gtk::manage(new Gtk::HBox ());
+    buttonBrowsePath = Gtk::manage(new Gtk::Button ());
+    buttonBrowsePath->set_image (*iRefreshWhite);
+    buttonBrowsePath->set_tooltip_markup (M("FILEBROWSER_BROWSEPATHBUTTONHINT"));
+    buttonBrowsePath->set_relief (Gtk::RELIEF_NONE);
+    buttonBrowsePath->signal_clicked().connect( sigc::mem_fun(*this, &FileCatalog::buttonBrowsePathPressed) );
+    hbBrowsePath->pack_start (*BrowsePath, Gtk::PACK_EXPAND_WIDGET,0);
+    hbBrowsePath->pack_start (*buttonBrowsePath,Gtk::PACK_SHRINK, 0);
+    hbToolBar1->pack_start (*hbBrowsePath, Gtk::PACK_EXPAND_WIDGET,0);
+
+    BrowsePath->signal_activate().connect (sigc::mem_fun(*this, &FileCatalog::buttonBrowsePathPressed)); //respond to the Enter key
+
+    //setup Query
+    iQueryClear = new Gtk::Image(argv0+"/images/x_10.png");
+    Gtk::Label* labelQuery = Gtk::manage(new Gtk::Label(M("FILEBROWSER_QUERYLABEL")));
+    Query = Gtk::manage(new Gtk::Entry ()); // cannot use Gtk::manage here as FileCatalog::getFilter will fail on Query->get_text()
+    Query->set_text("");
+    Query->set_width_chars (20); // TODO !!! add this value to options?
+    Query->set_tooltip_markup (M("FILEBROWSER_QUERYHINT"));
+    Gtk::HBox* hbQuery = Gtk::manage(new Gtk::HBox ());
+    buttonQueryClear = Gtk::manage(new Gtk::Button ());
+    buttonQueryClear->set_image (*iQueryClear);
+    buttonQueryClear->set_tooltip_markup (M("FILEBROWSER_QUERYBUTTONHINT"));
+    buttonQueryClear->set_relief (Gtk::RELIEF_NONE);
+    buttonQueryClear->signal_clicked().connect( sigc::mem_fun(*this, &FileCatalog::buttonQueryClearPressed) );
+    hbQuery->pack_start (*labelQuery,Gtk::PACK_SHRINK, 0);
+    hbQuery->pack_start (*Query,Gtk::PACK_SHRINK, 0);
+    hbQuery->pack_start (*buttonQueryClear,Gtk::PACK_SHRINK, 0);
+    hbToolBar1->pack_start (*hbQuery, Gtk::PACK_SHRINK,0);
+
+    Query->signal_activate().connect (sigc::mem_fun(*this, &FileCatalog::executeQuery)); //respond to the Enter key
+
+    // if NOT a single row toolbar
+    if (!options.FileBrowserToolbarSingleRow) pack_start (*hbToolBar1, Gtk::PACK_SHRINK,0);
+
     // setup button bar
     buttonBar = Gtk::manage( new Gtk::HBox () );
     pack_start (*buttonBar, Gtk::PACK_SHRINK);
@@ -220,33 +265,14 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
     zoomOutButton->set_tooltip_markup (M("FILEBROWSER_ZOOMOUTHINT"));
     zoomBox->pack_end (*zoomOutButton, Gtk::PACK_SHRINK);   
 
-    // add default panel 
-    hBox = Gtk::manage( new Gtk::HBox () );
-    hBox->show ();
-    hBox->pack_end (*fileBrowser);
-    fileBrowser->applyFilter (getFilter());
-    pack_start (*hBox);
-
     buttonBar->pack_start (*zoomBox, Gtk::PACK_SHRINK);
-
-    // add browserPath
     buttonBar->pack_start (*Gtk::manage(new Gtk::VSeparator), Gtk::PACK_SHRINK);
 
-    iRightArrow = new Gtk::Image(argv0+"/images/right.png");
-    iRightArrow_red = new Gtk::Image(argv0+"/images/right_red.png");
+    //iRightArrow = new Gtk::Image(argv0+"/images/right.png");
+    //iRightArrow_red = new Gtk::Image(argv0+"/images/right_red.png");
 
-    BrowsePath = new Gtk::Entry ();
-    BrowsePath->set_width_chars (50); // !!! add this value to options
-    BrowsePath->set_tooltip_markup (M("FILEBROWSER_BROWSEPATHHINT"));
-    Gtk::HBox* hbBrowsePath = new Gtk::HBox ();
-    buttonBrowsePath = new Gtk::Button ();
-    buttonBrowsePath->set_image (*iRightArrow);
-    buttonBrowsePath->set_tooltip_markup (M("FILEBROWSER_BROWSEPATHBUTTONHINT"));
-    buttonBrowsePath->set_relief (Gtk::RELIEF_NONE);
-    hbBrowsePath->pack_start (*BrowsePath);
-    hbBrowsePath->pack_start (*buttonBrowsePath,Gtk::PACK_SHRINK, 4);
-    buttonBar->pack_start (*hbBrowsePath, Gtk::PACK_EXPAND_WIDGET,4);
-    buttonBrowsePath->signal_clicked().connect( sigc::mem_fun(*this, &FileCatalog::buttonBrowsePathPressed) );
+    // if it IS a single row toolbar
+    if (options.FileBrowserToolbarSingleRow) buttonBar->pack_start (*hbToolBar1, Gtk::PACK_EXPAND_WIDGET,0);
 
     tbRightPanel_1 = new Gtk::ToggleButton ();
     iRightPanel_1_Show = new Gtk::Image(argv0+"/images/panel_to_left.png");
@@ -264,6 +290,14 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
     buttonBar->pack_end (*toolBar, Gtk::PACK_SHRINK);   
     buttonBar->pack_end (*Gtk::manage(new Gtk::VSeparator), Gtk::PACK_SHRINK, 4);
 
+    // add default panel
+    hBox = Gtk::manage( new Gtk::HBox () );
+    hBox->show ();
+    hBox->pack_end (*fileBrowser);
+    fileBrowser->applyFilter (getFilter()); // warning: can call this only after all objects used in getFilter (e.g. Query) are instantiated
+    //printf("FileCatalog::FileCatalog  fileBrowser->applyFilter (getFilter())\n");
+    pack_start (*hBox);
+
     enabled = true;  
 
     lastScrollPos = 0;
@@ -287,6 +321,13 @@ FileCatalog::~FileCatalog(){
 	}
 	delete iTrashEmpty;
 	delete iTrashFull;
+	delete iRefreshWhite;
+	delete iRefreshRed;
+	delete iQueryClear;
+	delete iLeftPanel_1_Show;
+	delete iLeftPanel_1_Hide;
+	delete iRightPanel_1_Show;
+	delete iRightPanel_1_Hide;
 }
 
 bool FileCatalog::capture_event(GdkEventButton* event){
@@ -366,8 +407,9 @@ void FileCatalog::dirSelected (const Glib::ustring& dirname, const Glib::ustring
             addAndOpenFile (openfile);
 
 		selectedDirectory = dir->get_parse_name();
+		//printf("FileCatalog::dirSelected  selectedDirectory = %s\n",selectedDirectory.c_str());
 		BrowsePath->set_text (selectedDirectory);
-		buttonBrowsePath->set_image (*iRightArrow);
+		buttonBrowsePath->set_image (*iRefreshWhite);
         fileNameList = getFileList ();
 
         for (unsigned int i=0; i<fileNameList.size(); i++) {
@@ -1007,11 +1049,26 @@ BrowserFilter FileCatalog::getFilter () {
 			filter.exifFilter = currentEFS;
 		filter.exifFilterEnabled = filterPanel->isEnabled ();
 	}
+
+    //TODO add support for more query options. e.g by date, iso, f-number, etc
+    //TODO could use date:<value>;iso:<value>  etc
+    // default will be filename
+
+    /* // this is for safe execution if getFilter is called before Query object is instantiated
+    Glib::ustring tempQuery;
+    tempQuery="";
+    if (Query) tempQuery = Query->get_text();
+    */
+    filter.queryString = Query->get_text(); // full query string from Query Entry
+    filter.queryFileName = Query->get_text(); // for now Query is only by file name
+
     return filter;
 }
 
 void FileCatalog::filterChanged () {
-    
+    //TODO !!! there is too many repetitive and unnecessary executions of
+	// " fileBrowser->applyFilter (getFilter()); " throughout the code
+	// this needs further analysis and cleanup
     fileBrowser->applyFilter (getFilter());
     _refreshProgressBar();
 }
@@ -1192,6 +1249,20 @@ void FileCatalog::trashChanged () {
         bTrash->set_image(*iTrashFull);
     }
 }
+void FileCatalog::buttonQueryClearPressed () {
+	Query->set_text("");
+	FileCatalog::executeQuery ();
+}
+
+void FileCatalog::executeQuery(){
+	// if BrowsePath text was changed, do a full browse;
+	// otherwise filter only
+
+	if (BrowsePath->get_text()!=selectedDirectory)
+		buttonBrowsePathPressed ();
+	else
+		FileCatalog::filterChanged ();
+}
 
 void FileCatalog::buttonBrowsePathPressed () {
 	Glib::ustring BrowsePathValue = BrowsePath->get_text();
@@ -1222,7 +1293,7 @@ void FileCatalog::buttonBrowsePathPressed () {
 	}
 	else
 		// error, likely path not found: show red arrow
-		buttonBrowsePath->set_image (*iRightArrow_red);
+		buttonBrowsePath->set_image (*iRefreshRed);
 }
 
 void FileCatalog::tbLeftPanel_1_visible (bool visible){
@@ -1394,6 +1465,12 @@ bool FileCatalog::handleShortcutKey (GdkEventKey* event) {
 					BrowsePath->grab_focus();
 					return true;
 				}
+			case GDK_f:
+				if (!alt){
+					Query->select_region(0, Query->get_text_length());
+					Query->grab_focus();
+					return true;
+				}
         }
     }
 
diff --git a/rtgui/filecatalog.h b/rtgui/filecatalog.h
index 36c90eb4a..e0a007377 100644
--- a/rtgui/filecatalog.h
+++ b/rtgui/filecatalog.h
@@ -90,12 +90,17 @@ class FileCatalog : public Gtk::VBox,
         Gtk::Image* iranked[5], *igranked[5];
         Gtk::Image* iCLabeled[5], *igCLabeled[5];
         Gtk::Image *iTrashEmpty, *iTrashFull;
-        Gtk::Image *iRightArrow_red, *iRightArrow;
+        //Gtk::Image *iRightArrow_red, *iRightArrow;
+        Gtk::Image *iRefreshWhite, *iRefreshRed;
         Gtk::Image *iLeftPanel_1_Show, *iLeftPanel_1_Hide, *iRightPanel_1_Show, *iRightPanel_1_Hide;
+        Gtk::Image *iQueryClear;
+        
         Gtk::Entry* BrowsePath;
         Gtk::Button* buttonBrowsePath;
-        sigc::connection BrowsePathconn;
         
+        Gtk::Entry* Query;
+        Gtk::Button* buttonQueryClear;
+
         double hScrollPos[14];
         double vScrollPos[14];
         int lastScrollPos;
@@ -195,6 +200,8 @@ class FileCatalog : public Gtk::VBox,
                 void zoomOut ();
 
                 void buttonBrowsePathPressed ();
+                void buttonQueryClearPressed ();
+                void executeQuery ();
 
                 void tbLeftPanel_1_toggled ();
                 void tbLeftPanel_1_visible (bool visible);
diff --git a/rtgui/options.cc b/rtgui/options.cc
index bfe76e4cb..d399c7076 100644
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -138,6 +138,7 @@ void Options::setDefaults () {
     tunnelMetaData = false;
     histogramPosition = 2;
     showProfileSelector = true;
+    FileBrowserToolbarSingleRow = true;
 
     cutOverlayBrush = std::vector<double> (4);
     cutOverlayBrush[3] = 0.667;  // :-p
@@ -355,6 +356,7 @@ if (keyFile.has_group ("GUI")) {
     if (keyFile.has_key ("GUI", "CutOverlayBrush"))     cutOverlayBrush   = keyFile.get_double_list ("GUI", "CutOverlayBrush");
     if (keyFile.has_key ("GUI", "HistogramPosition"))   histogramPosition   = keyFile.get_integer ("GUI", "HistogramPosition");
     if (keyFile.has_key ("GUI", "ShowProfileSelector")) showProfileSelector = keyFile.get_boolean ("GUI", "ShowProfileSelector");
+    if (keyFile.has_key ("GUI", "FileBrowserToolbarSingleRow")) FileBrowserToolbarSingleRow = keyFile.get_boolean ("GUI", "FileBrowserToolbarSingleRow");
 }
 
 
@@ -506,6 +508,7 @@ int Options::saveToFile (Glib::ustring fname) {
     keyFile.set_double_list ("GUI", "CutOverlayBrush", cutOverlayBrush);
     keyFile.set_integer ("GUI", "HistogramPosition", histogramPosition);
     keyFile.set_boolean ("GUI", "ShowProfileSelector", showProfileSelector);
+    keyFile.set_boolean ("GUI", "FileBrowserToolbarSingleRow", FileBrowserToolbarSingleRow);
 
     //Glib::ArrayHandle<int> crvopen = crvOpen;
     //keyFile.set_integer_list ("GUI", "CurvePanelsExpanded", crvopen);
diff --git a/rtgui/options.h b/rtgui/options.h
index 15a16a6c9..bf8767a6a 100644
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -146,6 +146,7 @@ class Options {
     bool tunnelMetaData;  // Pass through IPTC and XMP unchanged
     int histogramPosition;  // 0=disabled, 1=left pane, 2=right pane
     bool showProfileSelector;
+    bool FileBrowserToolbarSingleRow;
 
     Options ();
 
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index 22e2c4ce4..a1a44fc5a 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -433,6 +433,11 @@ Gtk::Widget* Preferences::getGeneralPanel () {
     hbworkflow2->pack_start (*ckbShowProfileSelector, Gtk::PACK_SHRINK, 4);
     vbworkflow->pack_start (*hbworkflow2, Gtk::PACK_SHRINK, 4);
     
+    Gtk::HBox* hbworkflow3 = Gtk::manage( new Gtk::HBox () );
+    ckbFileBrowserToolbarSingleRow =  Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_FILEBROWSERTOOLBARSINGLEROW")) );
+    hbworkflow3->pack_start (*ckbFileBrowserToolbarSingleRow, Gtk::PACK_SHRINK, 4);
+    vbworkflow->pack_start (*hbworkflow3, Gtk::PACK_SHRINK, 0);
+
     fworklflow->add (*vbworkflow);
     mvbsd->pack_start (*fworklflow, Gtk::PACK_SHRINK, 4);
      
@@ -973,6 +978,7 @@ void Preferences::storePreferences () {
 
     moptions.histogramPosition = ckbHistogramPositionLeft->get_active() ? 1 : 2;
     moptions.showProfileSelector = ckbShowProfileSelector->get_active();
+    moptions.FileBrowserToolbarSingleRow = ckbFileBrowserToolbarSingleRow->get_active();
     moptions.overwriteOutputFile = chOverwriteOutputFile->get_active ();
 
     // Sounds
@@ -1077,7 +1083,7 @@ void Preferences::fillPreferences () {
 
     ckbHistogramPositionLeft->set_active(moptions.histogramPosition==1);
     ckbShowProfileSelector->set_active(moptions.showProfileSelector);
-
+    ckbFileBrowserToolbarSingleRow->set_active(moptions.FileBrowserToolbarSingleRow);
 
     //darkFrameDir->set_filename( moptions.rtSettings.darkFramesPath );
     //updateDFinfos();
diff --git a/rtgui/preferences.h b/rtgui/preferences.h
index 41054fd34..503996e7f 100644
--- a/rtgui/preferences.h
+++ b/rtgui/preferences.h
@@ -122,6 +122,7 @@ class Preferences : public Gtk::Dialog {
 
     Gtk::CheckButton* ckbHistogramPositionLeft;
     Gtk::CheckButton* ckbShowProfileSelector;
+    Gtk::CheckButton* ckbFileBrowserToolbarSingleRow;
 
 
     Options moptions;