tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add preference to hide the simple search type combobox

Browse Source
This commit is contained in:
Jean-Francois Dockes 2020-11-23 09:33:42 +01:00
parent d35abb9abc
commit 76bdc955a5
6 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile.am
View File

@ -405,6 +405,7 @@ qtgui/images/asearch.png \
qtgui/images/cancel.png \ qtgui/images/cancel.png \
qtgui/images/close.png \ qtgui/images/close.png \
qtgui/images/clock.png \ qtgui/images/clock.png \
qtgui/images/menu.png \
qtgui/images/code-block.png \ qtgui/images/code-block.png \
qtgui/images/down.png \ qtgui/images/down.png \
qtgui/images/firstpage.png \ qtgui/images/firstpage.png \

1
src/qtgui/guiutils.cpp
View File

@ -297,6 +297,7 @@ void rwSettings(bool writing)
SETTING_RW(prefs.noToolbars, "/Recoll/prefs/noToolbars", Bool, false); SETTING_RW(prefs.noToolbars, "/Recoll/prefs/noToolbars", Bool, false);
SETTING_RW(prefs.noStatusBar, "/Recoll/prefs/noStatusBar", Bool, false); SETTING_RW(prefs.noStatusBar, "/Recoll/prefs/noStatusBar", Bool, false);
SETTING_RW(prefs.noMenuBar, "/Recoll/prefs/noMenuBar", 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.showTrayIcon, "/Recoll/prefs/showTrayIcon", Bool, false);
SETTING_RW(prefs.closeToTray, "/Recoll/prefs/closeToTray", Bool, false); SETTING_RW(prefs.closeToTray, "/Recoll/prefs/closeToTray", Bool, false);
SETTING_RW(prefs.trayMessages, "/Recoll/prefs/trayMessages", Bool, false); SETTING_RW(prefs.trayMessages, "/Recoll/prefs/trayMessages", Bool, false);

1
src/qtgui/guiutils.h
View File

@ -144,6 +144,7 @@ class PrefsPack {
bool noClearSearch{false}; bool noClearSearch{false};
bool noStatusBar{false}; bool noStatusBar{false};
bool noMenuBar{false}; bool noMenuBar{false};
bool noSSTypCMB{false};
bool showTrayIcon{false}; bool showTrayIcon{false};
bool closeToTray{false}; bool closeToTray{false};
bool trayMessages{false}; bool trayMessages{false};

5
src/qtgui/ssearch_w.cpp
View File

@ -201,6 +201,11 @@ void SSearch::setupButtons()
searchPB->show(); searchPB->show();
queryText->setClearButtonEnabled(false); queryText->setClearButtonEnabled(false);
} }
if (prefs.noSSTypCMB) {
searchTypCMB->hide();
} else {
searchTypCMB->show();
}
} }
void SSearch::takeFocus() void SSearch::takeFocus()

10
src/qtgui/uiprefs.ui
View File

@ -192,6 +192,16 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QCheckBox" name="noSSTypCMBCB">
<property name="text">
<string>Hide simple search type (show in menu only).</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
</item>
<item> <item>
<widget class="QCheckBox" name="noClearSearchCB"> <widget class="QCheckBox" name="noClearSearchCB">
<property name="text"> <property name="text">

2
src/qtgui/uiprefs_w.cpp
View File

@ -148,6 +148,7 @@ void UIPrefsDialog::setFromPrefs()
noClearSearchCB->setChecked(prefs.noClearSearch); noClearSearchCB->setChecked(prefs.noClearSearch);
noStatusBarCB->setChecked(prefs.noStatusBar); noStatusBarCB->setChecked(prefs.noStatusBar);
noMenuBarCB->setChecked(prefs.noMenuBar); noMenuBarCB->setChecked(prefs.noMenuBar);
noSSTypCMBCB->setChecked(prefs.noSSTypCMB);
showTrayIconCB->setChecked(prefs.showTrayIcon); showTrayIconCB->setChecked(prefs.showTrayIcon);
if (!prefs.showTrayIcon) { if (!prefs.showTrayIcon) {
prefs.closeToTray = false; prefs.closeToTray = false;
@ -355,6 +356,7 @@ void UIPrefsDialog::accept()
m_mainWindow->setupToolbars(); m_mainWindow->setupToolbars();
prefs.noMenuBar = noMenuBarCB->isChecked(); prefs.noMenuBar = noMenuBarCB->isChecked();
m_mainWindow->setupMenus(); m_mainWindow->setupMenus();
prefs.noSSTypCMB = noSSTypCMBCB->isChecked();
prefs.noStatusBar = noStatusBarCB->isChecked(); prefs.noStatusBar = noStatusBarCB->isChecked();
m_mainWindow->setupStatusBar(); m_mainWindow->setupStatusBar();
prefs.noClearSearch = noClearSearchCB->isChecked(); prefs.noClearSearch = noClearSearchCB->isChecked();