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

restable. Set more sensible initial defaults + other small fixes

Browse Source
This commit is contained in:
Jean-Francois Dockes 2011-01-11 08:39:00 +01:00
parent 5fb98cd022
commit 58c4c12b04
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/qtgui/guiutils.cpp
View File

@ -197,9 +197,10 @@ void rwSettings(bool writing)
prefs.restableFields =
settings.value("/Recoll/prefs/query/restableFields").toStringList();
if (prefs.restableFields.empty()) {
prefs.restableFields.push_back("filename");
prefs.restableFields.push_back("title");
prefs.restableFields.push_back("date");
prefs.restableFields.push_back("title");
prefs.restableFields.push_back("filename");
prefs.restableFields.push_back("author");
prefs.restableFields.push_back("url");
}
}
@ -215,7 +216,7 @@ void rwSettings(bool writing)
}
}
SETTING_RW(rtcw, "/Recoll/prefs/query/restableWidths", String,
"");
"83 253 132 172 130 ");
if (!writing) {
vector<string> widths;
stringToStrings((const char *)rtcw.toUtf8(), widths);

21
src/qtgui/restable.cpp
View File

@ -14,6 +14,7 @@ static char rcsid[] = "@(#$Id: reslist.cpp,v 1.52 2008-12-17 15:12:08 dockes Exp
#include <QAbstractTableModel>
#include <QSettings>
#include <QMenu>
#include <QScrollBar>
#include "refcntr.h"
#include "docseq.h"
@ -329,8 +330,17 @@ void ResTable::init()
this, SLOT(onTableView_currentChanged(const QModelIndex&)));
m_pager = new ResTablePager(this);
QSettings settings;
splitter->restoreState(settings.value("resTableSplitterSizes").toByteArray());
QVariant saved = settings.value("resTableSplitterSizes");
if (saved != QVariant()) {
splitter->restoreState(saved.toByteArray());
} else {
QList<int> sizes;
sizes << 355 << 125;
splitter->setSizes(sizes);
}
textBrowser->setReadOnly(TRUE);
textBrowser->setUndoRedoEnabled(FALSE);
textBrowser->setOpenLinks(FALSE);
@ -383,7 +393,7 @@ void ResTable::saveColWidths()
void ResTable::onTableView_currentChanged(const QModelIndex& index)
{
LOGDEB(("ResTable::onTableView_currentChanged(%d, %d)\n",
LOGDEB0(("ResTable::onTableView_currentChanged(%d, %d)\n",
index.row(), index.column()));
if (!m_model || m_model->getDocSource().isNull())
@ -400,7 +410,7 @@ void ResTable::onTableView_currentChanged(const QModelIndex& index)
void ResTable::on_tableView_entered(const QModelIndex& index)
{
LOGDEB(("ResTable::on_tableView_entered(%d, %d)\n",
LOGDEB0(("ResTable::on_tableView_entered(%d, %d)\n",
index.row(), index.column()));
if (!tableView->selectionModel()->hasSelection())
onTableView_currentChanged(index);
@ -432,8 +442,11 @@ void ResTable::onSortDataChanged(DocSeqSortSpec)
header->setSortIndicator(-1, Qt::AscendingOrder);
}
void ResTable::readDocSource()
void ResTable::readDocSource(bool resetPos)
{
if (resetPos)
tableView->verticalScrollBar()->setSliderPosition(0);
m_model->readDocSource();
textBrowser->clear();
}

2
src/qtgui/restable.h
View File

@ -93,7 +93,7 @@ public slots:
virtual void saveColWidths();
virtual void setDocSource(RefCntr<DocSequence> nsource);
virtual void resetSource();
virtual void readDocSource();
virtual void readDocSource(bool resetPos = true);
virtual void onSortDataChanged(DocSeqSortSpec);
virtual void linkWasClicked(const QUrl&);
virtual void createHeaderPopupMenu(const QPoint&);

2
src/rcldb/rclquery.cpp
View File

@ -73,7 +73,7 @@ public:
sortterm = term;
}
// Also remove some common uninteresting starting characters
i1 = sortterm.find_first_not_of(" \t\\\"([*+,");
i1 = sortterm.find_first_not_of(" \t\\\"'([*+,.#/");
if (i1 != 0 && i1 != string::npos) {
sortterm = sortterm.substr(i1, sortterm.size()-i1);
}