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

GUI preview add popup entry to toggle pre/br for mode of displaying plain text

Browse Source
This commit is contained in:
"Jean-Francois Dockes ext:(%22) 2012-03-13 16:33:19 +01:00
parent 6a81ca4bc9
commit 9ff88adf22
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/qtgui/preview_w.cpp
View File

@ -80,7 +80,12 @@ public:
} else { } else {
if (prefs.previewPlainPre) { if (prefs.previewPlainPre) {
m_eolbr = false; m_eolbr = false;
return string("<qt><head><title></title></head><body><pre>"); return string("<qt><head><title></title></head><body>"
"<pre>");
// Note we could also use the following for line-folding instead of <br>s
// This would be possible without recomputing the whole text, much better perfs
// for toggling wrap/no-wrap
// "<pre style=\"white-space: pre-wrap\">");
} else { } else {
m_eolbr = true; m_eolbr = true;
return string("<qt><head><title></title></head><body>"); return string("<qt><head><title></title></head><body>");
@ -505,7 +510,7 @@ void Preview::setCurTabProps(const Rcl::Doc &doc, int docnum)
LOGDEB1(("PreviewTextEdit::setCurTabProps\n")); LOGDEB1(("PreviewTextEdit::setCurTabProps\n"));
QString title; QString title;
string ctitle; string ctitle;
if (doc.getmeta(Rcl::Doc::keytt, &ctitle)) { if (doc.getmeta(Rcl::Doc::keytt, &ctitle) && !ctitle.empty()) {
title = QString::fromUtf8(ctitle.c_str(), ctitle.length()); title = QString::fromUtf8(ctitle.c_str(), ctitle.length());
} else { } else {
title = QString::fromLocal8Bit(path_getsimple(doc.url).c_str()); title = QString::fromLocal8Bit(path_getsimple(doc.url).c_str());
@ -577,6 +582,14 @@ bool Preview::makeDocCurrent(const Rcl::Doc& doc, int docnum, bool sametab)
raise(); raise();
return true; return true;
} }
void Preview::togglePlainPre()
{
prefs.previewPlainPre = !prefs.previewPlainPre;
PreviewTextEdit *editor = currentEditor();
if (editor)
loadDocInCurrentTab(editor->m_dbdoc, editor->m_docnum);
}
void Preview::emitWordSelect(QString word) void Preview::emitWordSelect(QString word)
{ {
@ -703,7 +716,7 @@ public:
bool Preview::loadDocInCurrentTab(const Rcl::Doc &idoc, int docnum) bool Preview::loadDocInCurrentTab(const Rcl::Doc &idoc, int docnum)
{ {
LOGDEB1(("PreviewTextEdit::loadDocInCurrentTab()\n")); LOGDEB1(("Preview::loadDocInCurrentTab()\n"));
LoadGuard guard(&m_loading); LoadGuard guard(&m_loading);
CancelCheck::instance().setCancel(false); CancelCheck::instance().setCancel(false);
@ -1015,6 +1028,12 @@ void PreviewTextEdit::createPopupMenu(const QPoint& pos)
popup->addAction(tr("Select All"), this, SLOT(selectAll())); popup->addAction(tr("Select All"), this, SLOT(selectAll()));
popup->addAction(tr("Copy"), this, SLOT(copy())); popup->addAction(tr("Copy"), this, SLOT(copy()));
popup->addAction(tr("Print"), this, SLOT(print())); popup->addAction(tr("Print"), this, SLOT(print()));
if (prefs.previewPlainPre) {
popup->addAction(tr("Fold lines"), m_preview, SLOT(togglePlainPre()));
} else {
popup->addAction(tr("Preserve indentation"),
m_preview, SLOT(togglePlainPre()));
}
// Need to check ipath until we fix the internfile bug that always // Need to check ipath until we fix the internfile bug that always
// has it convert to html for top level docs // has it convert to html for top level docs
if (!m_dbdoc.url.empty() && !m_dbdoc.ipath.empty()) if (!m_dbdoc.url.empty() && !m_dbdoc.ipath.empty())

1
src/qtgui/preview_w.h
View File

@ -120,6 +120,7 @@ public slots:
virtual void currentChanged(QWidget *tw); virtual void currentChanged(QWidget *tw);
virtual void closeCurrentTab(); virtual void closeCurrentTab();
virtual void emitSaveDocToFile(); virtual void emitSaveDocToFile();
virtual void togglePlainPre();
signals: signals:
void previewClosed(Preview *); void previewClosed(Preview *);