From 829b4b3b4ec1a0bb5bffc7fc4d6f2005a6d511c9 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Fri, 24 Dec 2010 18:30:08 +0100 Subject: [PATCH] gui: integrate table to main window --- src/qtgui/guiutils.cpp | 2 ++ src/qtgui/guiutils.h | 2 ++ src/qtgui/images/table.png | Bin 0 -> 3351 bytes src/qtgui/rclmain.ui | 38 ++++++++++++++++++++++++++++++++++--- src/qtgui/rclmain_w.cpp | 36 +++++++++++++++++++++++++++-------- src/qtgui/rclmain_w.h | 1 + src/qtgui/recoll.qrc | 1 + 7 files changed, 69 insertions(+), 11 deletions(-) create mode 100755 src/qtgui/images/table.png diff --git a/src/qtgui/guiutils.cpp b/src/qtgui/guiutils.cpp index 86127d87..f3328a08 100644 --- a/src/qtgui/guiutils.cpp +++ b/src/qtgui/guiutils.cpp @@ -117,6 +117,8 @@ void rwSettings(bool writing) SETTING_RW(prefs.respagesize, "/Recoll/prefs/reslist/pagelen", Int, 8); SETTING_RW(prefs.collapseDuplicates, "/Recoll/prefs/reslist/collapseDuplicates", Bool, false); + SETTING_RW(prefs.showResultsAsTable, + "/Recoll/prefs/showResultsAsTable", Bool, false); SETTING_RW(prefs.maxhltextmbs, "/Recoll/prefs/preview/maxhltextmbs", Int, 3); SETTING_RW(prefs.qtermcolor, "/Recoll/prefs/qtermcolor", String, "blue"); if (!writing && prefs.qtermcolor == "") diff --git a/src/qtgui/guiutils.h b/src/qtgui/guiutils.h index 6fd42652..d059e991 100644 --- a/src/qtgui/guiutils.h +++ b/src/qtgui/guiutils.h @@ -79,6 +79,8 @@ class PrefsPack { bool startWithAdvSearchOpen; bool previewHtml; bool collapseDuplicates; + bool showResultsAsTable; + // Extra query indexes. This are stored in the history file, not qt prefs list allExtraDbs; list activeExtraDbs; diff --git a/src/qtgui/images/table.png b/src/qtgui/images/table.png new file mode 100755 index 0000000000000000000000000000000000000000..de480f899563b735f64c1cd3ea8e3add3d7c425c GIT binary patch literal 3351 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 + + + 0 + 0 + + Recoll + 0 + + + 4 + + 2 - + 4 + + 2 + @@ -34,7 +49,7 @@ - + 0 0 @@ -51,7 +66,7 @@ 0 0 45 - 29 + 20 @@ -103,6 +118,8 @@ + + @@ -412,6 +429,21 @@ Show Query Details + + + true + + + + :/images/table.png:/images/table.png + + + Show results as table + + + Show results as table + + qPixmapFromMimeSource diff --git a/src/qtgui/rclmain_w.cpp b/src/qtgui/rclmain_w.cpp index f02b9bd6..2c2a91a6 100644 --- a/src/qtgui/rclmain_w.cpp +++ b/src/qtgui/rclmain_w.cpp @@ -195,8 +195,14 @@ void RclMain::init() actionSortByDateAsc->setChecked(true); onSortCtlChanged(); } + restable = new ResTable(this); + verticalLayout->insertWidget(2, restable); + actionShowResultsAsTable->setChecked(prefs.showResultsAsTable); + on_actionShowResultsAsTable_toggled(prefs.showResultsAsTable); - restable = new ResTable(); + // Must not do this when restable is a child of rclmain + // sc = new QShortcut(quitKeySeq, restable); + // connect(sc, SIGNAL (activated()), this, SLOT (fileExit())); // A shortcut to get the focus back to the search entry. QKeySequence seq("Ctrl+Shift+s"); @@ -237,6 +243,7 @@ void RclMain::init() this, SLOT(showUIPrefs())); connect(extIdxAction, SIGNAL(activated()), this, SLOT(showExtIdxDialog())); + if (prefs.catgToolBar && catgCMB) connect(catgCMB, SIGNAL(activated(int)), this, SLOT(catgFilter(int))); @@ -246,10 +253,6 @@ void RclMain::init() this, SLOT(showQueryDetails())); connect(periodictimer, SIGNAL(timeout()), this, SLOT(periodic100())); - - sc = new QShortcut(quitKeySeq, restable); - connect(sc, SIGNAL (activated()), - this, SLOT (fileExit())); connect(this, SIGNAL(docSourceChanged(RefCntr)), restable, SLOT(setDocSource(RefCntr))); connect(this, SIGNAL(searchReset()), @@ -309,7 +312,6 @@ void RclMain::init() // Start timer on a slow period (used for checking ^C). Will be // speeded up during indexing periodictimer->start(1000); - restable->show(); } void RclMain::resultCount(int n) @@ -886,13 +888,31 @@ void RclMain::onSortCtlChanged() void RclMain::onResTableSortBy(DocSeqSortSpec spec) { m_sortspecnochange = true; - actionSortByDateDesc->setChecked(false); - actionSortByDateAsc->setChecked(false); + if (spec.field.compare("mtime")) { + actionSortByDateDesc->setChecked(false); + actionSortByDateAsc->setChecked(false); + } else { + actionSortByDateDesc->setChecked(spec.desc); + actionSortByDateAsc->setChecked(!spec.desc); + } m_sortspecnochange = false; m_sortspec = spec; emit applyFiltSortData(); } +void RclMain::on_actionShowResultsAsTable_toggled(bool on) +{ + LOGDEB(("RclMain::on_actionShowResultsAsTable_toggled(%d)\n", int(on))); + prefs.showResultsAsTable = on; + if (on) { + restable->show(); + reslist->hide(); + } else { + restable->hide(); + reslist->show(); + } +} + void RclMain::on_actionSortByDateAsc_toggled(bool on) { LOGDEB(("RclMain::on_actionSortByDateAsc_toggled(%d)\n", int(on))); diff --git a/src/qtgui/rclmain_w.h b/src/qtgui/rclmain_w.h index 854029ca..e925d6bd 100644 --- a/src/qtgui/rclmain_w.h +++ b/src/qtgui/rclmain_w.h @@ -95,6 +95,7 @@ public slots: virtual void focusToSearch(); virtual void on_actionSortByDateAsc_toggled(bool on); virtual void on_actionSortByDateDesc_toggled(bool on); + virtual void on_actionShowResultsAsTable_toggled(bool on); virtual void onResTableSortBy(DocSeqSortSpec); virtual void resultCount(int); virtual void showQueryDetails(); diff --git a/src/qtgui/recoll.qrc b/src/qtgui/recoll.qrc index 0b92ae56..b55ba775 100644 --- a/src/qtgui/recoll.qrc +++ b/src/qtgui/recoll.qrc @@ -9,6 +9,7 @@ images/firstpage.png images/sortparms.png images/spell.png + images/table.png images/up.png images/down.png