diff --git a/src/qtgui/guiutils.cpp b/src/qtgui/guiutils.cpp index f3328a08..a9a8454f 100644 --- a/src/qtgui/guiutils.cpp +++ b/src/qtgui/guiutils.cpp @@ -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 widths; stringToStrings((const char *)rtcw.toUtf8(), widths); diff --git a/src/qtgui/restable.cpp b/src/qtgui/restable.cpp index 73a75da6..2d07a1e1 100644 --- a/src/qtgui/restable.cpp +++ b/src/qtgui/restable.cpp @@ -14,6 +14,7 @@ static char rcsid[] = "@(#$Id: reslist.cpp,v 1.52 2008-12-17 15:12:08 dockes Exp #include #include #include +#include #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 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(); } diff --git a/src/qtgui/restable.h b/src/qtgui/restable.h index 75cc78af..82b7cf2f 100644 --- a/src/qtgui/restable.h +++ b/src/qtgui/restable.h @@ -93,7 +93,7 @@ public slots: virtual void saveColWidths(); virtual void setDocSource(RefCntr 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&); diff --git a/src/rcldb/rclquery.cpp b/src/rcldb/rclquery.cpp index e4d72aa1..2940201f 100644 --- a/src/rcldb/rclquery.cpp +++ b/src/rcldb/rclquery.cpp @@ -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); }