diff --git a/src/Makefile.am b/src/Makefile.am index e9d833ab..70c95843 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -506,7 +506,6 @@ qtgui/ssearch_w.h \ qtgui/ssearchb.ui \ qtgui/systray.cpp \ qtgui/systray.h \ -qtgui/ui_rclmain.h-4.5 \ qtgui/uiprefs.ui \ qtgui/uiprefs_w.cpp \ qtgui/uiprefs_w.h \ diff --git a/src/qtgui/guiutils.cpp b/src/qtgui/guiutils.cpp index 9272f765..8a2c7c43 100644 --- a/src/qtgui/guiutils.cpp +++ b/src/qtgui/guiutils.cpp @@ -300,6 +300,8 @@ void rwSettings(bool writing) SETTING_RW(prefs.noSSTypCMB, "/Recoll/prefs/noSSTypCMB", Bool, false); SETTING_RW(prefs.noResTableHeader, "/Recoll/prefs/noResTableHeader", Bool, false); + SETTING_RW(prefs.showResTableVHeader, "/Recoll/prefs/showResTableVHeader", + 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 e329e9b8..9d7f9cb9 100644 --- a/src/qtgui/guiutils.h +++ b/src/qtgui/guiutils.h @@ -146,6 +146,7 @@ public: bool noMenuBar{false}; bool noSSTypCMB{false}; bool noResTableHeader{false}; + bool showResTableVHeader{false}; bool showTrayIcon{false}; bool closeToTray{false}; bool trayMessages{false}; diff --git a/src/qtgui/ui_rclmain.h-4.5 b/src/qtgui/ui_rclmain.h-4.5 deleted file mode 100644 index 3021e75a..00000000 --- a/src/qtgui/ui_rclmain.h-4.5 +++ /dev/null @@ -1,302 +0,0 @@ -/******************************************************************************** -** Form generated from reading ui file 'rclmain.ui' -** -** Created: Mon Jan 25 20:45:26 2010 -** by: Qt User Interface Compiler version 4.4.0 -** -** WARNING! All changes made in this file will be lost when recompiling ui file! -********************************************************************************/ - -#ifndef UI_RCLMAIN_H -#define UI_RCLMAIN_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "reslist.h" -#include "ssearch_w.h" - -QT_BEGIN_NAMESPACE - -class Ui_RclMainBase -{ -public: - QAction *fileExitAction; - QAction *fileToggleIndexingAction; - QAction *fileEraseDocHistoryAction; - QAction *showMissingHelpers_Action; - QAction *helpAbout_RecollAction; - QAction *userManualAction; - QAction *toolsDoc_HistoryAction; - QAction *toolsAdvanced_SearchAction; - QAction *toolsSort_parametersAction; - QAction *toolsSpellAction; - QAction *nextPageAction; - QAction *firstPageAction; - QAction *prevPageAction; - QAction *indexConfigAction; - QAction *queryPrefsAction; - QAction *extIdxAction; - QWidget *widget; - QVBoxLayout *vboxLayout; - QVBoxLayout *vboxLayout1; - SSearch *sSearch; - Q3ButtonGroup *catgBGRP; - QRadioButton *allRDB; - ResList *resList; - Q3ToolBar *Toolbar; - Q3ToolBar *Toolbar1; - QMenuBar *MenuBar; - QMenu *fileMenu; - QMenu *toolsMenu; - QMenu *preferencesMenu; - QMenu *helpMenu; - - void setupUi(Q3MainWindow *RclMainBase) - { - if (RclMainBase->objectName().isEmpty()) - RclMainBase->setObjectName(QString::fromUtf8("RclMainBase")); - RclMainBase->resize(800, 600); - QSizePolicy sizePolicy(static_cast(5), static_cast(5)); - sizePolicy.setHorizontalStretch(0); - sizePolicy.setVerticalStretch(0); - sizePolicy.setHeightForWidth(RclMainBase->sizePolicy().hasHeightForWidth()); - RclMainBase->setSizePolicy(sizePolicy); - fileExitAction = new QAction(RclMainBase); - fileExitAction->setObjectName(QString::fromUtf8("fileExitAction")); - fileExitAction->setName("fileExitAction"); - fileToggleIndexingAction = new QAction(RclMainBase); - fileToggleIndexingAction->setObjectName(QString::fromUtf8("fileToggleIndexingAction")); - fileToggleIndexingAction->setName("fileToggleIndexingAction"); - fileEraseDocHistoryAction = new QAction(RclMainBase); - fileEraseDocHistoryAction->setObjectName(QString::fromUtf8("fileEraseDocHistoryAction")); - fileEraseDocHistoryAction->setName("fileEraseDocHistoryAction"); - showMissingHelpers_Action = new QAction(RclMainBase); - showMissingHelpers_Action->setObjectName(QString::fromUtf8("showMissingHelpers_Action")); - showMissingHelpers_Action->setName("showMissingHelpers_Action"); - helpAbout_RecollAction = new QAction(RclMainBase); - helpAbout_RecollAction->setObjectName(QString::fromUtf8("helpAbout_RecollAction")); - helpAbout_RecollAction->setName("helpAbout_RecollAction"); - userManualAction = new QAction(RclMainBase); - userManualAction->setObjectName(QString::fromUtf8("userManualAction")); - userManualAction->setName("userManualAction"); - toolsDoc_HistoryAction = new QAction(RclMainBase); - toolsDoc_HistoryAction->setObjectName(QString::fromUtf8("toolsDoc_HistoryAction")); - toolsDoc_HistoryAction->setName("toolsDoc_HistoryAction"); - toolsAdvanced_SearchAction = new QAction(RclMainBase); - toolsAdvanced_SearchAction->setObjectName(QString::fromUtf8("toolsAdvanced_SearchAction")); - toolsAdvanced_SearchAction->setName("toolsAdvanced_SearchAction"); - toolsSort_parametersAction = new QAction(RclMainBase); - toolsSort_parametersAction->setObjectName(QString::fromUtf8("toolsSort_parametersAction")); - toolsSort_parametersAction->setName("toolsSort_parametersAction"); - toolsSpellAction = new QAction(RclMainBase); - toolsSpellAction->setObjectName(QString::fromUtf8("toolsSpellAction")); - toolsSpellAction->setName("toolsSpellAction"); - nextPageAction = new QAction(RclMainBase); - nextPageAction->setObjectName(QString::fromUtf8("nextPageAction")); - nextPageAction->setName("nextPageAction"); - nextPageAction->setEnabled(false); - firstPageAction = new QAction(RclMainBase); - firstPageAction->setObjectName(QString::fromUtf8("firstPageAction")); - firstPageAction->setName("firstPageAction"); - firstPageAction->setEnabled(false); - prevPageAction = new QAction(RclMainBase); - prevPageAction->setObjectName(QString::fromUtf8("prevPageAction")); - prevPageAction->setName("prevPageAction"); - prevPageAction->setEnabled(false); - indexConfigAction = new QAction(RclMainBase); - indexConfigAction->setObjectName(QString::fromUtf8("indexConfigAction")); - indexConfigAction->setName("indexConfigAction"); - queryPrefsAction = new QAction(RclMainBase); - queryPrefsAction->setObjectName(QString::fromUtf8("queryPrefsAction")); - queryPrefsAction->setName("queryPrefsAction"); - extIdxAction = new QAction(RclMainBase); - extIdxAction->setObjectName(QString::fromUtf8("extIdxAction")); - extIdxAction->setName("extIdxAction"); - widget = new QWidget(RclMainBase); - widget->setObjectName(QString::fromUtf8("widget")); - vboxLayout = new QVBoxLayout(widget); - vboxLayout->setSpacing(2); - vboxLayout->setMargin(4); - vboxLayout->setObjectName(QString::fromUtf8("vboxLayout")); - vboxLayout->setContentsMargins(0, 0, 0, 0); - vboxLayout1 = new QVBoxLayout(); - vboxLayout1->setSpacing(2); - vboxLayout1->setMargin(2); - vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1")); - sSearch = new SSearch(widget); - sSearch->setObjectName(QString::fromUtf8("sSearch")); - QSizePolicy sizePolicy1(static_cast(7), static_cast(0)); - sizePolicy1.setHorizontalStretch(0); - sizePolicy1.setVerticalStretch(0); - sizePolicy1.setHeightForWidth(sSearch->sizePolicy().hasHeightForWidth()); - sSearch->setSizePolicy(sizePolicy1); - - vboxLayout1->addWidget(sSearch); - - catgBGRP = new Q3ButtonGroup(widget); - catgBGRP->setObjectName(QString::fromUtf8("catgBGRP")); - QSizePolicy sizePolicy2(static_cast(5), static_cast(0)); - sizePolicy2.setHorizontalStretch(0); - sizePolicy2.setVerticalStretch(0); - sizePolicy2.setHeightForWidth(catgBGRP->sizePolicy().hasHeightForWidth()); - catgBGRP->setSizePolicy(sizePolicy2); - catgBGRP->setFrameShape(Q3GroupBox::GroupBoxPanel); - catgBGRP->setFrameShadow(Q3GroupBox::Sunken); - catgBGRP->setProperty("selectedId", QVariant(0)); - allRDB = new QRadioButton(catgBGRP); - allRDB->setObjectName(QString::fromUtf8("allRDB")); - - vboxLayout1->addWidget(catgBGRP); - - resList = new ResList(widget); - resList->setObjectName(QString::fromUtf8("resList")); - QSizePolicy sizePolicy3(static_cast(5), static_cast(5)); - sizePolicy3.setHorizontalStretch(2); - sizePolicy3.setVerticalStretch(0); - sizePolicy3.setHeightForWidth(resList->sizePolicy().hasHeightForWidth()); - resList->setSizePolicy(sizePolicy3); - - vboxLayout1->addWidget(resList); - - - vboxLayout->addLayout(vboxLayout1); - - RclMainBase->setCentralWidget(widget); - Toolbar = new Q3ToolBar(RclMainBase); - Toolbar->setObjectName(QString::fromUtf8("Toolbar")); - Toolbar1 = new Q3ToolBar(RclMainBase); - Toolbar1->setObjectName(QString::fromUtf8("Toolbar1")); - MenuBar = new QMenuBar(RclMainBase); - MenuBar->setObjectName(QString::fromUtf8("MenuBar")); - fileMenu = new QMenu(MenuBar); - fileMenu->setObjectName(QString::fromUtf8("fileMenu")); - toolsMenu = new QMenu(MenuBar); - toolsMenu->setObjectName(QString::fromUtf8("toolsMenu")); - preferencesMenu = new QMenu(MenuBar); - preferencesMenu->setObjectName(QString::fromUtf8("preferencesMenu")); - helpMenu = new QMenu(MenuBar); - helpMenu->setObjectName(QString::fromUtf8("helpMenu")); - - Toolbar->addAction(toolsAdvanced_SearchAction); - Toolbar->addAction(toolsSort_parametersAction); - Toolbar->addAction(toolsDoc_HistoryAction); - Toolbar->addAction(toolsSpellAction); - Toolbar1->addAction(firstPageAction); - Toolbar1->addAction(prevPageAction); - Toolbar1->addAction(nextPageAction); - MenuBar->addAction(fileMenu->menuAction()); - MenuBar->addAction(toolsMenu->menuAction()); - MenuBar->addAction(preferencesMenu->menuAction()); - MenuBar->addSeparator(); - MenuBar->addAction(helpMenu->menuAction()); - fileMenu->addAction(fileToggleIndexingAction); - fileMenu->addSeparator(); - fileMenu->addAction(fileEraseDocHistoryAction); - fileMenu->addAction(showMissingHelpers_Action); - fileMenu->addSeparator(); - fileMenu->addAction(fileExitAction); - toolsMenu->addAction(toolsDoc_HistoryAction); - toolsMenu->addAction(toolsAdvanced_SearchAction); - toolsMenu->addAction(toolsSort_parametersAction); - toolsMenu->addAction(toolsSpellAction); - preferencesMenu->addAction(indexConfigAction); - preferencesMenu->addSeparator(); - preferencesMenu->addAction(queryPrefsAction); - preferencesMenu->addAction(extIdxAction); - preferencesMenu->addSeparator(); - helpMenu->addAction(userManualAction); - helpMenu->addAction(showMissingHelpers_Action); - helpMenu->addSeparator(); - helpMenu->addAction(helpAbout_RecollAction); - - retranslateUi(RclMainBase); - - QMetaObject::connectSlotsByName(RclMainBase); - } // setupUi - - void retranslateUi(Q3MainWindow *RclMainBase) - { - RclMainBase->setWindowTitle(QApplication::translate("RclMainBase", "Recoll", 0, QApplication::UnicodeUTF8)); - fileExitAction->setText(QApplication::translate("RclMainBase", "E&xit", 0, QApplication::UnicodeUTF8)); - fileExitAction->setShortcut(QApplication::translate("RclMainBase", "Ctrl+Q", 0, QApplication::UnicodeUTF8)); - fileToggleIndexingAction->setText(QApplication::translate("RclMainBase", "Update &index", 0, QApplication::UnicodeUTF8)); - fileEraseDocHistoryAction->setText(QApplication::translate("RclMainBase", "&Erase document history", 0, QApplication::UnicodeUTF8)); - showMissingHelpers_Action->setText(QApplication::translate("RclMainBase", "&Show missing helpers", 0, QApplication::UnicodeUTF8)); - helpAbout_RecollAction->setText(QApplication::translate("RclMainBase", "&About Recoll", 0, QApplication::UnicodeUTF8)); - userManualAction->setText(QApplication::translate("RclMainBase", "&User manual", 0, QApplication::UnicodeUTF8)); - toolsDoc_HistoryAction->setText(QApplication::translate("RclMainBase", "Document &History", 0, QApplication::UnicodeUTF8)); - -#ifndef QT_NO_TOOLTIP - toolsDoc_HistoryAction->setToolTip(QApplication::translate("RclMainBase", "Document History", 0, QApplication::UnicodeUTF8)); -#endif // QT_NO_TOOLTIP - - toolsAdvanced_SearchAction->setText(QApplication::translate("RclMainBase", "&Advanced Search", 0, QApplication::UnicodeUTF8)); - -#ifndef QT_NO_TOOLTIP - toolsAdvanced_SearchAction->setToolTip(QApplication::translate("RclMainBase", "Advanced/complex Search", 0, QApplication::UnicodeUTF8)); -#endif // QT_NO_TOOLTIP - - toolsSort_parametersAction->setText(QApplication::translate("RclMainBase", "&Sort parameters", 0, QApplication::UnicodeUTF8)); - -#ifndef QT_NO_TOOLTIP - toolsSort_parametersAction->setToolTip(QApplication::translate("RclMainBase", "Sort parameters", 0, QApplication::UnicodeUTF8)); -#endif // QT_NO_TOOLTIP - - toolsSpellAction->setText(QApplication::translate("RclMainBase", "Term &explorer", 0, QApplication::UnicodeUTF8)); - -#ifndef QT_NO_TOOLTIP - toolsSpellAction->setToolTip(QApplication::translate("RclMainBase", "Term explorer tool", 0, QApplication::UnicodeUTF8)); -#endif // QT_NO_TOOLTIP - - nextPageAction->setIconText(QApplication::translate("RclMainBase", "Next page", 0, QApplication::UnicodeUTF8)); - -#ifndef QT_NO_TOOLTIP - nextPageAction->setToolTip(QApplication::translate("RclMainBase", "Next page of results", 0, QApplication::UnicodeUTF8)); -#endif // QT_NO_TOOLTIP - - firstPageAction->setIconText(QApplication::translate("RclMainBase", "First page", 0, QApplication::UnicodeUTF8)); - -#ifndef QT_NO_TOOLTIP - firstPageAction->setToolTip(QApplication::translate("RclMainBase", "Go to first page of results", 0, QApplication::UnicodeUTF8)); -#endif // QT_NO_TOOLTIP - - prevPageAction->setIconText(QApplication::translate("RclMainBase", "Previous page", 0, QApplication::UnicodeUTF8)); - -#ifndef QT_NO_TOOLTIP - prevPageAction->setToolTip(QApplication::translate("RclMainBase", "Previous page of results", 0, QApplication::UnicodeUTF8)); -#endif // QT_NO_TOOLTIP - - indexConfigAction->setText(QApplication::translate("RclMainBase", "&Indexing configuration", 0, QApplication::UnicodeUTF8)); - queryPrefsAction->setText(QApplication::translate("RclMainBase", "&Query configuration", 0, QApplication::UnicodeUTF8)); - extIdxAction->setIconText(QApplication::translate("RclMainBase", "External index dialog", 0, QApplication::UnicodeUTF8)); - extIdxAction->setText(QApplication::translate("RclMainBase", "External index dialog", 0, QApplication::UnicodeUTF8)); - catgBGRP->setTitle(QString()); - allRDB->setText(QApplication::translate("RclMainBase", "All", 0, QApplication::UnicodeUTF8)); - Toolbar->setLabel(QApplication::translate("RclMainBase", "Search tools", 0, QApplication::UnicodeUTF8)); - Toolbar1->setLabel(QApplication::translate("RclMainBase", "Result list", 0, QApplication::UnicodeUTF8)); - fileMenu->setTitle(QApplication::translate("RclMainBase", "&File", 0, QApplication::UnicodeUTF8)); - toolsMenu->setTitle(QApplication::translate("RclMainBase", "&Tools", 0, QApplication::UnicodeUTF8)); - preferencesMenu->setTitle(QApplication::translate("RclMainBase", "&Preferences", 0, QApplication::UnicodeUTF8)); - helpMenu->setTitle(QApplication::translate("RclMainBase", "&Help", 0, QApplication::UnicodeUTF8)); - } // retranslateUi - -}; - -namespace Ui { - class RclMainBase: public Ui_RclMainBase {}; -} // namespace Ui - -QT_END_NAMESPACE - -#endif // UI_RCLMAIN_H diff --git a/src/qtgui/uiprefs.ui b/src/qtgui/uiprefs.ui index 536db2fc..99b145dd 100644 --- a/src/qtgui/uiprefs.ui +++ b/src/qtgui/uiprefs.ui @@ -238,6 +238,16 @@ + + + + Show result table row headers. + + + false + + + diff --git a/src/qtgui/uiprefs_w.cpp b/src/qtgui/uiprefs_w.cpp index 8f339786..c95d76f3 100644 --- a/src/qtgui/uiprefs_w.cpp +++ b/src/qtgui/uiprefs_w.cpp @@ -155,6 +155,7 @@ void UIPrefsDialog::setFromPrefs() noMenuBarCB->setChecked(prefs.noMenuBar); noSSTypCMBCB->setChecked(prefs.noSSTypCMB); noResTableHeaderCB->setChecked(prefs.noResTableHeader); + showResTableVHeaderCB->setChecked(prefs.showResTableVHeader); showTrayIconCB->setChecked(prefs.showTrayIcon); if (!prefs.showTrayIcon) { prefs.closeToTray = false; @@ -425,6 +426,7 @@ void UIPrefsDialog::accept() m_mainWindow->setupMenus(); prefs.noSSTypCMB = noSSTypCMBCB->isChecked(); prefs.noResTableHeader = noResTableHeaderCB->isChecked(); + prefs.showResTableVHeader = showResTableVHeaderCB->isChecked(); prefs.noStatusBar = noStatusBarCB->isChecked(); m_mainWindow->setupStatusBar(); prefs.noClearSearch = noClearSearchCB->isChecked();