diff --git a/src/Makefile.am b/src/Makefile.am index 84359225..9906fa89 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -405,6 +405,7 @@ qtgui/images/asearch.png \ qtgui/images/cancel.png \ qtgui/images/close.png \ qtgui/images/clock.png \ +qtgui/images/menu.png \ qtgui/images/code-block.png \ qtgui/images/down.png \ qtgui/images/firstpage.png \ diff --git a/src/qtgui/guiutils.cpp b/src/qtgui/guiutils.cpp index 3c7a9a69..7745b0c7 100644 --- a/src/qtgui/guiutils.cpp +++ b/src/qtgui/guiutils.cpp @@ -297,6 +297,7 @@ void rwSettings(bool writing) SETTING_RW(prefs.noToolbars, "/Recoll/prefs/noToolbars", Bool, false); SETTING_RW(prefs.noStatusBar, "/Recoll/prefs/noStatusBar", Bool, false); SETTING_RW(prefs.noMenuBar, "/Recoll/prefs/noMenuBar", Bool, false); + SETTING_RW(prefs.noSSTypCMB, "/Recoll/prefs/noSSTypCMB", Bool, false); SETTING_RW(prefs.showTrayIcon, "/Recoll/prefs/showTrayIcon", Bool, false); SETTING_RW(prefs.closeToTray, "/Recoll/prefs/closeToTray", Bool, false); SETTING_RW(prefs.trayMessages, "/Recoll/prefs/trayMessages", Bool, false); diff --git a/src/qtgui/guiutils.h b/src/qtgui/guiutils.h index c2156dee..c80dc66e 100644 --- a/src/qtgui/guiutils.h +++ b/src/qtgui/guiutils.h @@ -144,6 +144,7 @@ class PrefsPack { bool noClearSearch{false}; bool noStatusBar{false}; bool noMenuBar{false}; + bool noSSTypCMB{false}; bool showTrayIcon{false}; bool closeToTray{false}; bool trayMessages{false}; diff --git a/src/qtgui/ssearch_w.cpp b/src/qtgui/ssearch_w.cpp index 45841b24..836baf1e 100644 --- a/src/qtgui/ssearch_w.cpp +++ b/src/qtgui/ssearch_w.cpp @@ -201,6 +201,11 @@ void SSearch::setupButtons() searchPB->show(); queryText->setClearButtonEnabled(false); } + if (prefs.noSSTypCMB) { + searchTypCMB->hide(); + } else { + searchTypCMB->show(); + } } void SSearch::takeFocus() diff --git a/src/qtgui/uiprefs.ui b/src/qtgui/uiprefs.ui index c16741cd..a5d13d55 100644 --- a/src/qtgui/uiprefs.ui +++ b/src/qtgui/uiprefs.ui @@ -192,6 +192,16 @@ + + + + Hide simple search type (show in menu only). + + + false + + + diff --git a/src/qtgui/uiprefs_w.cpp b/src/qtgui/uiprefs_w.cpp index 5cdb32bf..6b15967f 100644 --- a/src/qtgui/uiprefs_w.cpp +++ b/src/qtgui/uiprefs_w.cpp @@ -148,6 +148,7 @@ void UIPrefsDialog::setFromPrefs() noClearSearchCB->setChecked(prefs.noClearSearch); noStatusBarCB->setChecked(prefs.noStatusBar); noMenuBarCB->setChecked(prefs.noMenuBar); + noSSTypCMBCB->setChecked(prefs.noSSTypCMB); showTrayIconCB->setChecked(prefs.showTrayIcon); if (!prefs.showTrayIcon) { prefs.closeToTray = false; @@ -355,6 +356,7 @@ void UIPrefsDialog::accept() m_mainWindow->setupToolbars(); prefs.noMenuBar = noMenuBarCB->isChecked(); m_mainWindow->setupMenus(); + prefs.noSSTypCMB = noSSTypCMBCB->isChecked(); prefs.noStatusBar = noStatusBarCB->isChecked(); m_mainWindow->setupStatusBar(); prefs.noClearSearch = noClearSearchCB->isChecked();