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

Add ability to past RsLink in some more text fields.

Browse Source
This commit is contained in:
Phenom 2016-10-22 16:02:38 +02:00
parent b8b78dd6cb
commit 9eafdd30f7
3 changed files with 86 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui
View File

@ -13,8 +13,17 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Submit Post</string> <string>Submit Post</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="PostedCreatePostDialogGLayout">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing"> <property name="spacing">
@ -31,14 +40,14 @@
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QFrame" name="frame"> <widget class="QFrame" name="mainFrame">
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="mainFrameGLayout">
<item row="0" column="0" colspan="3"> <item row="0" column="0" colspan="3">
<widget class="StyledLabel" name="info_label"> <widget class="StyledLabel" name="info_label">
<property name="palette"> <property name="palette">
@ -120,7 +129,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="3"> <item row="1" column="0" colspan="3">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="titleGLayout">
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLineEdit" name="titleEdit"/> <widget class="QLineEdit" name="titleEdit"/>
</item> </item>
@ -144,9 +153,9 @@
</layout> </layout>
</item> </item>
<item row="2" column="0" colspan="3"> <item row="2" column="0" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="signedHLayout">
<item> <item>
<spacer name="spacer_2"> <spacer name="signedHSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@ -162,7 +171,7 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="signedLabel">
<property name="text"> <property name="text">
<string>Signed by: </string> <string>Signed by: </string>
</property> </property>
@ -183,12 +192,12 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QTextEdit" name="notesTextEdit"/> <widget class="MimeTextEdit" name="notesTextEdit"/>
</item> </item>
</layout> </layout>
</item> </item>
<item row="4" column="0"> <item row="4" column="0">
<spacer name="horizontalSpacer"> <spacer name="buttonHSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@ -235,6 +244,11 @@
<header>gui/common/HeaderFrame.h</header> <header>gui/common/HeaderFrame.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>MimeTextEdit</class>
<extends>QTextEdit</extends>
<header location="global">gui/common/MimeTextEdit.h</header>
</customwidget>
<customwidget> <customwidget>
<class>GxsIdChooser</class> <class>GxsIdChooser</class>
<extends>QComboBox</extends> <extends>QComboBox</extends>
@ -246,9 +260,7 @@
<header>gui/common/StyledLabel.h</header> <header>gui/common/StyledLabel.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources/>
<include location="../images.qrc"/>
</resources>
<connections> <connections>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>

19
retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.ui
View File

@ -13,9 +13,9 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Make Comment</string> <string>Make Comment</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="GxsCreateCommentDialogVLayout">
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="titleLabel">
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@ -26,11 +26,11 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="mainVLayout">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="signedHLayout">
<item> <item>
<spacer name="horizontalSpacer"> <spacer name="signedHSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@ -43,7 +43,7 @@ p, li { white-space: pre-wrap; }
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QLabel" name="subjectLabel"> <widget class="QLabel" name="signedLabel">
<property name="text"> <property name="text">
<string>Signed by</string> <string>Signed by</string>
</property> </property>
@ -55,7 +55,7 @@ p, li { white-space: pre-wrap; }
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QTextEdit" name="commentTextEdit"/> <widget class="MimeTextEdit" name="commentTextEdit"/>
</item> </item>
</layout> </layout>
</item> </item>
@ -72,6 +72,11 @@ p, li { white-space: pre-wrap; }
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>MimeTextEdit</class>
<extends>QTextEdit</extends>
<header location="global">gui/common/MimeTextEdit.h</header>
</customwidget>
<customwidget> <customwidget>
<class>GxsIdChooser</class> <class>GxsIdChooser</class>
<extends>QComboBox</extends> <extends>QComboBox</extends>

76
retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui
View File

@ -20,8 +20,17 @@
<iconset resource="../images.qrc"> <iconset resource="../images.qrc">
<normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset> <normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
</property> </property>
<layout class="QGridLayout" name="gridLayout_8"> <layout class="QGridLayout" name="CreateGxsChannelMsgGLayout">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing"> <property name="spacing">
@ -31,14 +40,14 @@
<widget class="HeaderFrame" name="headerFrame"/> <widget class="HeaderFrame" name="headerFrame"/>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QFrame" name="frame_2"> <widget class="QFrame" name="mainFrame">
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="gridLayout_6"> <layout class="QGridLayout" name="mainFrameGLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="mouseTracking"> <property name="mouseTracking">
@ -53,15 +62,15 @@
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="channelPostTab">
<attribute name="title"> <attribute name="title">
<string>Channel Post</string> <string>Channel Post</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_7"> <layout class="QGridLayout" name="channelPostTabGLayout">
<item row="0" column="0" colspan="3"> <item row="0" column="0" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="channelNameHLayout">
<item> <item>
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="channelNameLabel">
<property name="font"> <property name="font">
<font> <font>
<weight>75</weight> <weight>75</weight>
@ -86,9 +95,9 @@
</layout> </layout>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="channelAttachGLayout">
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="channelAttachLabel">
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@ -157,15 +166,15 @@ p, li { white-space: pre-wrap; }
</spacer> </spacer>
</item> </item>
<item row="2" column="0" colspan="3"> <item row="2" column="0" colspan="3">
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="messageGBox">
<property name="title"> <property name="title">
<string>Message</string> <string>Message</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="messageGBoxVLayout">
<item> <item>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout" name="subjectHLayout">
<item> <item>
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="subjectLabel">
<property name="font"> <property name="font">
<font> <font>
<weight>75</weight> <weight>75</weight>
@ -183,14 +192,14 @@ p, li { white-space: pre-wrap; }
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QTextEdit" name="msgEdit"/> <widget class="MimeTextEdit" name="msgEdit"/>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab_2"> <widget class="QWidget" name="attachmentsTab">
<attribute name="icon"> <attribute name="icon">
<iconset resource="../images.qrc"> <iconset resource="../images.qrc">
<normaloff>:/images/attachment.png</normaloff>:/images/attachment.png</iconset> <normaloff>:/images/attachment.png</normaloff>:/images/attachment.png</iconset>
@ -198,9 +207,9 @@ p, li { white-space: pre-wrap; }
<attribute name="title"> <attribute name="title">
<string>Attachments</string> <string>Attachments</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="attachmentsTabGLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="attachmentsPixLabel">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
@ -210,7 +219,7 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="attachmentsLabel">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>16777215</width>
@ -229,7 +238,7 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="2">
<spacer> <spacer name="attachmentsHSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@ -281,7 +290,7 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="5"> <item row="1" column="0" colspan="5">
<widget class="QScrollArea" name="scrollArea"> <widget class="QScrollArea" name="attachmentsScrollArea">
<property name="verticalScrollBarPolicy"> <property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOn</enum> <enum>Qt::ScrollBarAlwaysOn</enum>
</property> </property>
@ -293,7 +302,7 @@ p, li { white-space: pre-wrap; }
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>98</width> <width>523</width>
<height>24</height> <height>24</height>
</rect> </rect>
</property> </property>
@ -303,11 +312,20 @@ p, li { white-space: pre-wrap; }
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="scrollAreaWidgetContentsVLayout">
<property name="spacing"> <property name="spacing">
<number>3</number> <number>3</number>
</property> </property>
<property name="margin"> <property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<number>3</number> <number>3</number>
</property> </property>
<item> <item>
@ -324,7 +342,7 @@ p, li { white-space: pre-wrap; }
<property name="toolTip"> <property name="toolTip">
<string>Drag and Drop Files from Search Results</string> <string>Drag and Drop Files from Search Results</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"/> <layout class="QGridLayout" name="fileFrameGLayout"/>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -336,7 +354,7 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="buttonHLayout">
<item> <item>
<widget class="QCheckBox" name="generateCheckBox"> <widget class="QCheckBox" name="generateCheckBox">
<property name="text"> <property name="text">
@ -378,10 +396,14 @@ p, li { white-space: pre-wrap; }
<header>gui/common/HeaderFrame.h</header> <header>gui/common/HeaderFrame.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>MimeTextEdit</class>
<extends>QTextEdit</extends>
<header location="global">gui/common/MimeTextEdit.h</header>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../images.qrc"/> <include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>