mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-07-22 14:10:54 -04:00
More improvements to Wiki, mainly EditMode.
- Fixed display of Edit History. (Date, Author, PageId) - Added GxsId for Author Display. - Enabled/Disabled History depending on Modification & oldHistory flags. - Fixed bug where preview triggered Modification Flag. - Switched WikiDialog to Rendered Mode, and removed spacer. git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5929 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
bcd67a8651
commit
083c4411b8
5 changed files with 221 additions and 42 deletions
|
@ -28,7 +28,7 @@
|
|||
#include "gui/WikiPoos/WikiAddDialog.h"
|
||||
#include "gui/WikiPoos/WikiEditDialog.h"
|
||||
|
||||
#include "gui/gxs/WikiGroupDialog.h"
|
||||
#include "gui/gxs/WikiGroupDialog.h"
|
||||
|
||||
#include <retroshare/rswiki.h>
|
||||
|
||||
|
@ -37,6 +37,12 @@
|
|||
|
||||
#include <QTimer>
|
||||
|
||||
//#define USE_PEGMMD_RENDERER 1
|
||||
|
||||
#ifdef USE_PEGMMD_RENDERER
|
||||
#include "markdown_lib.h"
|
||||
#endif
|
||||
|
||||
/******
|
||||
* #define WIKI_DEBUG 1
|
||||
*****/
|
||||
|
@ -318,7 +324,22 @@ void WikiDialog::modTreeChanged()
|
|||
|
||||
void WikiDialog::updateWikiPage(const RsWikiSnapshot &page)
|
||||
{
|
||||
ui.textBrowser->setPlainText(QString::fromStdString(page.mPage));
|
||||
#ifdef USE_PEGMMD_RENDERER
|
||||
/* render as HTML */
|
||||
int extensions = 0;
|
||||
char *answer = markdown_to_string((char *) page.mPage.c_str(), extensions, HTML_FORMAT);
|
||||
|
||||
QString renderedText = QString::fromUtf8(answer);
|
||||
ui.textBrowser->setHtml(renderedText);
|
||||
|
||||
// free answer.
|
||||
free(answer);
|
||||
#else
|
||||
/* render as HTML */
|
||||
QString renderedText = "IN (dummy) RENDERED TEXT MODE:\n";
|
||||
renderedText += QString::fromStdString(page.mPage);
|
||||
ui.textBrowser->setPlainText(renderedText);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue