Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changes to allow the GXS services to compile with up-to-date GUI code.

Browse Source 
* Mainly just update header file locations.
 * ForumsV2Dialog needs changes/improvements from ForumsDialog applied to it.
     - This merge has broken bits of the code (#warning's inserted).



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5339 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-07-27 15:41:52 +00:00
parent bec1407648
commit 2e4cc099dc
12 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
retroshare-gui/src/gui/ForumsV2Dialog.cpp
View File

@ -41,6 +41,8 @@
#include "RetroShareLink.h"
#include "channels/ShareKey.h"
#include "util/HandleRichText.h"
#include <retroshare/rspeers.h>
#include <retroshare/rsforumsv2.h>
@ -1121,7 +1123,14 @@ void ForumsV2Dialog::insertPostData(const RsForumV2Msg &msg)
}
}
QString extraTxt = RsHtml::formatText(QString::fromUtf8(msg.mMsg.c_str()), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS);
#warning "THIS CODE TO BE FIXED"
QString extraTxt("");
#if 0
QString info("");
QString extraTxt = RsHtml().formatText(QString::fromUtf8(msg.mMsg.c_str()), info, RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS);
#endif
ui.postText->setHtml(extraTxt);
ui.threadTitle->setText(QString::fromUtf8(msg.mMeta.mMsgName.c_str()));
@ -1545,12 +1554,18 @@ void ForumsV2Dialog::replyMessageData(const RsForumV2Msg &msg)
if (rsPeers->getPeerName(msg.mMeta.mAuthorId) !="")
{
MessageComposer *nMsgDialog = MessageComposer::newMsg();
#warning "THIS CODE TO BE FIXED"
#if 0
nMsgDialog->insertTitleText(QString::fromUtf8(msg.mMeta.mMsgName.c_str()), MessageComposer::REPLY);
#endif
QTextDocument doc ;
doc.setHtml(QString::fromUtf8(msg.mMsg.c_str())) ;
#warning "THIS CODE TO BE FIXED"
#if 0
nMsgDialog->insertPastedText(doc.toPlainText());
#endif
nMsgDialog->addRecipient(MessageComposer::TO, msg.mMeta.mAuthorId, false);
nMsgDialog->show();
nMsgDialog->activateWindow();

2
retroshare-gui/src/gui/Identity/IdDialog.h
View File

@ -24,7 +24,7 @@
#ifndef MRK_IDENTITY_DIALOG_H
#define MRK_IDENTITY_DIALOG_H
#include "gui/mainpage.h"
#include "retroshare-gui/mainpage.h"
#include "ui_IdDialog.h"
#include <retroshare/rsidentity.h>

2
retroshare-gui/src/gui/PhotoShare/PhotoDialog.h
View File

@ -24,7 +24,7 @@
#ifndef MRK_PHOTO_DIALOG_H
#define MRK_PHOTO_DIALOG_H
#include "gui/mainpage.h"
#include "retroshare-gui/mainpage.h"
#include "ui_PhotoDialog.h"
#include <retroshare/rsphoto.h>

6
retroshare-gui/src/gui/Posted/PostedDialog.cpp
View File

@ -65,8 +65,10 @@ PostedDialog::PostedDialog(QWidget *parent)
mPostedList = new PostedListDialog(NULL);
mPostedComments = new PostedComments(NULL);
ui.tabWidget->addTab(mPostedList, QString("List"));
ui.tabWidget->addTab(mPostedComments, QString("Comments"));
QString list("List");
ui.tabWidget->addTab(mPostedList, list);
QString comments("Comments");
ui.tabWidget->addTab(mPostedComments, comments);
}

2
retroshare-gui/src/gui/Posted/PostedDialog.h
View File

@ -24,7 +24,7 @@
#ifndef MRK_POSTED_DIALOG_H
#define MRK_POSTED_DIALOG_H
#include "gui/mainpage.h"
#include "retroshare-gui/mainpage.h"
#include "ui_PostedDialog.h"
#include <retroshare/rsposted.h>

4
retroshare-gui/src/gui/Posted/PostedListDialog.h
View File

@ -24,7 +24,7 @@
#ifndef MRK_POSTED_LIST_DIALOG_H
#define MRK_POSTED_LIST_DIALOG_H
#include "gui/mainpage.h"
#include "retroshare-gui/mainpage.h"
#include "ui_PostedListDialog.h"
#include <retroshare/rsposted.h>
@ -36,7 +36,7 @@
#include "util/TokenQueue.h"
#include "gui/RsAutoUpdatePage.h"
#include "retroshare-gui/RsAutoUpdatePage.h"
class PostedListDialog : public RsAutoUpdatePage, public PostedHolder, public TokenResponse
{

2
retroshare-gui/src/gui/TheWire/WireDialog.h
View File

@ -24,7 +24,7 @@
#ifndef MRK_WIRE_DIALOG_H
#define MRK_WIRE_DIALOG_H
#include "gui/mainpage.h"
#include "retroshare-gui/mainpage.h"
#include "ui_WireDialog.h"
#include <retroshare/rsphoto.h>

2
retroshare-gui/src/gui/WikiPoos/WikiDialog.h
View File

@ -24,7 +24,7 @@
#ifndef MRK_WIKI_DIALOG_H
#define MRK_WIKI_DIALOG_H
#include "gui/mainpage.h"
#include "retroshare-gui/mainpage.h"
#include "ui_WikiDialog.h"
#include <retroshare/rswiki.h>

2
retroshare-gui/src/gui/unfinished/CalDialog.h
View File

@ -27,7 +27,7 @@
#include <QString>
#include <QMap>
#include "gui/mainpage.h"
#include "retroshare-gui/mainpage.h"
#include "ui_CalDialog.h"
class CalItem

8
retroshare-gui/src/gui/unfinished/ExampleDialog.cpp
View File

@ -243,15 +243,15 @@ QTreeWidgetItem *ExampleDialog::getCurrentLine()
}
/* Display the columns of this item. */
std::ostringstream out;
out << "CurrentPeerItem: " << std::endl;
//std::ostringstream out;
//out << "CurrentPeerItem: " << std::endl;
for(int i = 1; i < 6; i++)
{
QString txt = item -> text(i);
out << "\t" << i << ":" << txt.toStdString() << std::endl;
//out << "\t" << i << ":" << txt.toStdString() << std::endl;
}
std::cerr << out.str();
//std::cerr << out.str();
return item;
}

2
retroshare-gui/src/gui/unfinished/ExampleDialog.h
View File

@ -24,7 +24,7 @@
#include <QFileDialog>
#include "gui/mainpage.h"
#include "retroshare-gui/mainpage.h"
#include "ui_ExampleDialog.h"

2
retroshare-gui/src/gui/unfinished/GamesDialog.h
View File

@ -22,7 +22,7 @@
#ifndef _GAMESDIALOG_H
#define _GAMESDIALOG_H
#include "gui/mainpage.h"
#include "retroshare-gui/mainpage.h"
#include "ui_GamesDialog.h"
class GamesDialog : public MainPage