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

merge PR/81, merging with master

Browse Source
This commit is contained in:
csoler 2015-09-02 22:43:42 -04:00
commit 97237c867c
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -53,6 +53,8 @@ notifications:
- "chat.freenode.net#retroshare" - "chat.freenode.net#retroshare"
template: template:
- "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}" - "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}"
- "Message: %{commit_message}"
- "Commit details: %{compare_url}"
# webhooks: # webhooks:
# urls: # urls:
# - https://webhooks.gitter.im/e/9502afd22ca6c8e85fb3 # - https://webhooks.gitter.im/e/9502afd22ca6c8e85fb3

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

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