Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-26 23:36:59 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #712 from RetroPooh/test3

Browse Source 
fix channel item display layout
This commit is contained in:
csoler 2017-03-02 20:10:10 +01:00 committed by GitHub
commit af1c22a4d5
5 changed files with 201 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
retroshare-gui/src/gui/Identity/IdEditDialog.cpp
View File

@ -93,6 +93,9 @@ IdEditDialog::IdEditDialog(QWidget *parent) :
mIdQueue = new TokenQueue(rsIdentity->getTokenService(), this); mIdQueue = new TokenQueue(rsIdentity->getTokenService(), this);
ui->pushButton_Tag->setEnabled(false); ui->pushButton_Tag->setEnabled(false);
ui->pushButton_Tag->hide(); // unfinished
ui->plainTextEdit_Tag->hide();
ui->label_TagCheck->hide();
} }
IdEditDialog::~IdEditDialog() IdEditDialog::~IdEditDialog()

6
retroshare-gui/src/gui/chat/ChatWidget.cpp
View File

@ -1738,9 +1738,9 @@ void ChatWidget::quote()
if(text.length() > 0) if(text.length() > 0)
{ {
QStringList sl = text.split(QRegExp("[\r\n]"),QString::SkipEmptyParts); QStringList sl = text.split(QRegExp("[\r\n]"),QString::SkipEmptyParts);
text = sl.join("\n>"); text = sl.join("\n> ");
text.replace(QChar(-4),"");//Char used when image on text. text.replace(QChar(-4)," ");//Char used when image on text.
emit ui->chatTextEdit->append(QString(">") + text); emit ui->chatTextEdit->append(QString("> ") + text);
} }
} }

348
retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui
View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>643</width> <width>618</width>
<height>157</height> <height>157</height>
</rect> </rect>
</property> </property>
@ -34,34 +34,61 @@
<property name="palette"> <property name="palette">
<palette> <palette>
<active> <active>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>215</red>
<green>215</green>
<blue>215</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window"> <colorrole role="Window">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
<red>248</red> <red>215</red>
<green>248</green> <green>215</green>
<blue>248</blue> <blue>215</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
</active> </active>
<inactive> <inactive>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>215</red>
<green>215</green>
<blue>215</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window"> <colorrole role="Window">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
<red>248</red> <red>215</red>
<green>248</green> <green>215</green>
<blue>248</blue> <blue>215</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
</inactive> </inactive>
<disabled> <disabled>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>215</red>
<green>215</green>
<blue>215</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window"> <colorrole role="Window">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
<red>248</red> <red>215</red>
<green>248</green> <green>215</green>
<blue>248</blue> <blue>215</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
@ -78,7 +105,7 @@
<enum>QFrame::Sunken</enum> <enum>QFrame::Sunken</enum>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout">
<item row="0" column="0" rowspan="2"> <item row="0" column="0">
<layout class="QGridLayout"> <layout class="QGridLayout">
<item row="0" column="0" rowspan="2"> <item row="0" column="0" rowspan="2">
<widget class="QLabel" name="logoLabel"> <widget class="QLabel" name="logoLabel">
@ -94,163 +121,155 @@
<height>70</height> <height>70</height>
</size> </size>
</property> </property>
<property name="text">
<string/>
</property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="../images.qrc">:/images/channels.png</pixmap> <pixmap resource="../images.qrc">:/images/channels.png</pixmap>
</property> </property>
<property name="scaledContents">
<bool>false</bool>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLabel" name="nameLabel"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="text"> <item>
<string notr="true">name</string> <widget class="QLabel" name="titleLabel">
</property> <property name="sizePolicy">
<property name="alignment"> <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <horstretch>0</horstretch>
</property> <verstretch>0</verstretch>
<property name="openExternalLinks"> </sizepolicy>
<bool>true</bool> </property>
</property> <property name="font">
</widget> <font>
<weight>75</weight>
<italic>true</italic>
<bold>true</bold>
</font>
</property>
<property name="text">
<string notr="true">Channel</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="nameLabel">
<property name="text">
<string notr="true">name</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLabel" name="titleLabel"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="sizePolicy"> <item>
<sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <spacer>
<horstretch>0</horstretch> <property name="orientation">
<verstretch>0</verstretch> <enum>Qt::Horizontal</enum>
</sizepolicy> </property>
</property> <property name="sizeType">
<property name="font"> <enum>QSizePolicy::Expanding</enum>
<font> </property>
<weight>75</weight> <property name="sizeHint" stdset="0">
<italic>true</italic> <size>
<bold>true</bold> <width>254</width>
</font> <height>28</height>
</property> </size>
<property name="text"> </property>
<string notr="true">New Channel</string> </spacer>
</property> </item>
</widget> <item>
<widget class="QPushButton" name="copyLinkButton">
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/copyrslink.png</normaloff>:/images/copyrslink.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="subscribeButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Subscribe to Channel</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/directoryadd_24x24_shadow.png</normaloff>:/images/directoryadd_24x24_shadow.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="expandButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Expand</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/edit_add24.png</normaloff>:/images/edit_add24.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="clearButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Remove Item</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset>
</property>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="1"> <item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>338</width>
<height>28</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="copyLinkButton">
<property name="maximumSize">
<size>
<width>24</width>
<height>16777215</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Copy RetroShare Link</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/copyrslink.png</normaloff>:/images/copyrslink.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="subscribeButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Subscribe to Channel</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/directoryadd_24x24_shadow.png</normaloff>:/images/directoryadd_24x24_shadow.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="expandButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Expand</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/edit_add24.png</normaloff>:/images/edit_add24.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="clearButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Remove Item</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="1">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>455</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" colspan="2">
<widget class="QFrame" name="expandFrame"> <widget class="QFrame" name="expandFrame">
<layout class="QVBoxLayout"> <layout class="QVBoxLayout">
<property name="spacing"> <property name="spacing">
@ -273,8 +292,8 @@
<property name="title"> <property name="title">
<string>Channel Description</string> <string>Channel Description</string>
</property> </property>
<layout class="QGridLayout"> <layout class="QHBoxLayout">
<item row="0" column="0"> <item>
<widget class="QLabel" name="iconLabel"> <widget class="QLabel" name="iconLabel">
<property name="text"> <property name="text">
<string/> <string/>
@ -284,7 +303,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item>
<widget class="QLabel" name="descLabel"> <widget class="QLabel" name="descLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
@ -296,15 +315,6 @@
<string notr="true">Description <string notr="true">Description
of Channel</string> of Channel</string>
</property> </property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>

13
retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
View File

@ -548,6 +548,19 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>

6
retroshare-gui/src/util/HandleRichText.cpp
View File

@ -1187,9 +1187,9 @@ QString RsHtml::makeQuotedText(RSTextBrowser *browser)
text = browser->toPlainText(); text = browser->toPlainText();
} }
QStringList sl = text.split(QRegExp("[\r\n]"),QString::SkipEmptyParts); QStringList sl = text.split(QRegExp("[\r\n]"),QString::SkipEmptyParts);
text = sl.join("\n>"); text = sl.join("\n> ");
text.replace(QChar(-4),"");//Char used when image on text. text.replace(QChar(-4)," ");//Char used when image on text.
return QString(">") + text; return QString("> ") + text;
} }
void RsHtml::insertSpoilerText(QTextCursor cursor) void RsHtml::insertSpoilerText(QTextCursor cursor)