Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-01 18:56:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/RetroShare/RetroShare

Browse source
This commit is contained in:
defnax 2015-09-03 17:41:30 +02:00
commit 07c5030c36
35 changed files with 1254 additions and 388 deletions
Download patch file Download diff file Expand all files Collapse all files

8
retroshare-gui/src/gui/common/MimeTextEdit.cpp
View file

@ -19,6 +19,8 @@
* Boston, MA 02110-1301, USA.
****************************************************************/
#include <QApplication>
#include <QClipboard>
#include <QMimeData>
#include <QTextDocumentFragment>
#include <QCompleter>
@ -228,6 +230,7 @@ void MimeTextEdit::contextMenuEvent(QContextMenuEvent *e)
QMenu *contextMenu = createStandardContextMenu(e->pos());
/* Add actions for pasting links */
contextMenu->addAction( tr("Paste as plain text"), this, SLOT(pastePlainText()));
contextMenu->addSeparator();
QAction *pasteLinkAction = contextMenu->addAction(QIcon(":/images/pasterslink.png"), tr("Paste RetroShare Link"), this, SLOT(pasteLink()));
contextMenu->addAction(QIcon(":/images/pasterslink.png"), tr("Paste my certificate link"), this, SLOT(pasteOwnCertificateLink()));
@ -260,3 +263,8 @@ void MimeTextEdit::pasteOwnCertificateLink()
insertHtml(link.toHtml() + " ");
}
}
void MimeTextEdit::pastePlainText()
{
insertPlainText(QApplication::clipboard()->text());
}

2
retroshare-gui/src/gui/common/MimeTextEdit.h
View file

@ -58,7 +58,7 @@ private slots:
void insertCompletion(const QString &completion);
void pasteLink();
void pasteOwnCertificateLink();
void pastePlainText();
private:
QString textUnderCursor() const;

78
retroshare-gui/src/retroshare-gui.pro
View file

@ -1,5 +1,8 @@
QT += network xml script
!include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri")
QT += network xml
CONFIG += qt gui uic qrc resources idle bitdht
CONFIG += link_prl
# Plz never commit the .pro with these flags enabled.
# Use this flag when developping new features only.
@ -73,47 +76,20 @@ linux-* {
QMAKE_CXXFLAGS *= -D_FILE_OFFSET_BITS=64
PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
LIBS += ../../libretroshare/src/lib/libretroshare.a
LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2
LIBS += -lssl -lupnp -lixml -lXss -lgnome-keyring
LIBS *= -lcrypto -ldl -lX11 -lz
LIBS *= -lX11 -lXss
LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
SQLCIPHER_OK = $$system(pkg-config --exists sqlcipher && echo yes)
isEmpty(SQLCIPHER_OK) {
# We need a explicit path here, to force using the home version of sqlite3 that really encrypts the database.
exists(../../../lib/sqlcipher/.libs/libsqlcipher.a) {
LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a
DEPENDPATH += ../../../lib/sqlcipher/src/
INCLUDEPATH += ../../../lib/sqlcipher/src/
DEPENDPATH += ../../../lib/sqlcipher/tsrc/
INCLUDEPATH += ../../../lib/sqlcipher/tsrc/
} else {
message(libsqlcipher.a not found. Compilation will not use SQLCIPHER. Database will be unencrypted.)
DEFINES *= NO_SQLCIPHER
LIBS *= -lsqlite3
}
} else {
LIBS += -lsqlcipher
}
LIBS *= -lglib-2.0
LIBS *= -rdynamic
#LIBS *= -lglib-2.0
LIBS *= -rdynamic -ldl
DEFINES *= HAVE_XSS # for idle time, libx screensaver extensions
DEFINES *= UBUNTU
}
unix {
isEmpty(PREFIX) { PREFIX = /usr }
isEmpty(DATA_DIR) { DATA_DIR = "$${PREFIX}/share/RetroShare06" }
target.path = "$${PREFIX}/bin"
target.path = "$${BIN_DIR}"
INSTALLS += target
data_files.path="$${DATA_DIR}/"
@ -123,6 +99,22 @@ unix {
style_files.path="$${DATA_DIR}/stylesheets"
style_files.files=gui/qss/chat/Bubble gui/qss/chat/Bubble_Compact
INSTALLS += style_files
icon_files.path = "$${PREFIX}/share/icons/hicolor"
icon_files.files = ../../data/24x24
icon_files.files += ../../data/48x48
icon_files.files += ../../data/64x64
icon_files.files += ../../data/128x128
INSTALLS += icon_files
desktop_files.path = "$${PREFIX}/share/applications"
desktop_files.files = ../../data/retroshare06.desktop
INSTALLS += desktop_files
pixmap_files.path = "$${PREFIX}/share/pixmaps"
pixmap_files.files = ../../data/retroshare06.xpm
INSTALLS += pixmap_files
}
linux-g++ {
@ -183,6 +175,9 @@ win32 {
QMAKE_CFLAGS += -Wextra
QMAKE_CXXFLAGS += -Wextra
# solve linker warnings because of the order of the libraries
QMAKE_LFLAGS += -Wl,--start-group
# Switch off optimization for release version
QMAKE_CXXFLAGS_RELEASE -= -O2
QMAKE_CXXFLAGS_RELEASE += -O0
@ -198,20 +193,16 @@ win32 {
#QTPLUGIN += qjpeg
PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
LIBS_DIR = $$PWD/../../../libs
LIBS += ../../libretroshare/src/lib/libretroshare.a
LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2
LIBS += -L"$$LIBS_DIR/lib"
LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
LIBS += -lsqlcipher
LIBS += -lssl -lcrypto -lpthread -lminiupnpc -lz
# added after bitdht
# LIBS += -lws2_32
LIBS += -lssl -lcrypto -lpthread -lminiupnpc -lz -lws2_32
LIBS += -luuid -lole32 -liphlpapi -lcrypt32 -lgdi32
LIBS += -lole32 -lwinmm
RC_FILE = gui/images/retroshare_win.rc
@ -248,7 +239,6 @@ macx {
CONFIG += version_detail_bash_script
LIBS += ../../libretroshare/src/lib/libretroshare.a
LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2
LIBS += -lssl -lcrypto -lz
#LIBS += -lssl -lcrypto -lz -lgpgme -lgpg-error -lassuan
LIBS += ../../../miniupnpc-1.0/libminiupnpc.a
@ -286,10 +276,8 @@ openbsd-* {
INCLUDEPATH *= /usr/local/include
PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
LIBS *= ../../libretroshare/src/lib/libretroshare.a
LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2
LIBS *= -lssl -lcrypto
LIBS *= -lgpgme
LIBS *= -lupnp
@ -311,11 +299,6 @@ openbsd-* {
# ###########################################
bitdht {
LIBS += ../../libbitdht/src/lib/libbitdht.a
PRE_TARGETDEPS *= ../../libbitdht/src/lib/libbitdht.a
}
DEPENDPATH += . ../../libretroshare/src/
INCLUDEPATH += ../../libretroshare/src/
@ -325,11 +308,6 @@ INCLUDEPATH += ../../libresapi/src
PRE_TARGETDEPS *= ../../libresapi/src/lib/libresapi.a
LIBS += ../../libresapi/src/lib/libresapi.a -lmicrohttpd
win32 {
# must be added after bitdht
LIBS += -lws2_32
}
# Input
HEADERS += rshare.h \
retroshare-gui/configpage.h \