diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
index 3bab0f2d4..a8212f426 100644
--- a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
@@ -93,6 +93,9 @@ IdEditDialog::IdEditDialog(QWidget *parent) :
mIdQueue = new TokenQueue(rsIdentity->getTokenService(), this);
ui->pushButton_Tag->setEnabled(false);
+ ui->pushButton_Tag->hide(); // unfinished
+ ui->plainTextEdit_Tag->hide();
+ ui->label_TagCheck->hide();
}
IdEditDialog::~IdEditDialog()
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp
index cfde6a028..44bd9c426 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.cpp
+++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp
@@ -1738,9 +1738,9 @@ void ChatWidget::quote()
if(text.length() > 0)
{
QStringList sl = text.split(QRegExp("[\r\n]"),QString::SkipEmptyParts);
- text = sl.join("\n>");
- text.replace(QChar(-4),"");//Char used when image on text.
- emit ui->chatTextEdit->append(QString(">") + text);
+ text = sl.join("\n> ");
+ text.replace(QChar(-4)," ");//Char used when image on text.
+ emit ui->chatTextEdit->append(QString("> ") + text);
}
}
diff --git a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui
index 1c78b9caf..bc61fe8b3 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui
@@ -6,7 +6,7 @@
0
0
- 643
+ 618
157
@@ -34,34 +34,61 @@
+
+
+
+ 215
+ 215
+ 215
+
+
+
- 248
- 248
- 248
+ 215
+ 215
+ 215
+
+
+
+ 215
+ 215
+ 215
+
+
+
- 248
- 248
- 248
+ 215
+ 215
+ 215
+
+
+
+ 215
+ 215
+ 215
+
+
+
- 248
- 248
- 248
+ 215
+ 215
+ 215
@@ -78,7 +105,7 @@
QFrame::Sunken
- -
+
-
-
@@ -94,163 +121,155 @@
70
+
+
+
:/images/channels.png
-
- false
-
-
-
-
- name
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
- true
-
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ true
+ true
+
+
+
+ Channel
+
+
+
+ -
+
+
+ name
+
+
+ true
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
-
-
-
-
- 0
- 0
-
-
-
-
- 75
- true
- true
-
-
-
- New Channel
-
-
+
+
-
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Expanding
+
+
+
+ 254
+ 28
+
+
+
+
+ -
+
+
+ Qt::NoFocus
+
+
+
+ :/images/copyrslink.png:/images/copyrslink.png
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Qt::NoFocus
+
+
+ Subscribe to Channel
+
+
+
+ :/images/directoryadd_24x24_shadow.png:/images/directoryadd_24x24_shadow.png
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Qt::NoFocus
+
+
+ Expand
+
+
+
+ :/images/edit_add24.png:/images/edit_add24.png
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Qt::NoFocus
+
+
+ Remove Item
+
+
+
+ :/images/close_normal.png:/images/close_normal.png
+
+
+
+
- -
-
-
-
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Expanding
-
-
-
- 338
- 28
-
-
-
-
- -
-
-
-
- 24
- 16777215
-
-
-
- Qt::NoFocus
-
-
- Copy RetroShare Link
-
-
-
- :/images/copyrslink.png:/images/copyrslink.png
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Qt::NoFocus
-
-
- Subscribe to Channel
-
-
-
- :/images/directoryadd_24x24_shadow.png:/images/directoryadd_24x24_shadow.png
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Qt::NoFocus
-
-
- Expand
-
-
-
- :/images/edit_add24.png:/images/edit_add24.png
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Qt::NoFocus
-
-
- Remove Item
-
-
-
- :/images/close_normal.png:/images/close_normal.png
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 455
- 20
-
-
-
-
- -
+
-
@@ -273,8 +292,8 @@
Channel Description
-
-
-
+
+
-
@@ -284,7 +303,7 @@
- -
+
-
@@ -296,15 +315,6 @@
Description
of Channel
-
- true
-
-
- true
-
-
- Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
-
diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
index 8d12fcc8e..010436d7b 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
@@ -548,6 +548,19 @@
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 0
+
+
+
+
diff --git a/retroshare-gui/src/util/HandleRichText.cpp b/retroshare-gui/src/util/HandleRichText.cpp
index f8299687a..73801bd5b 100644
--- a/retroshare-gui/src/util/HandleRichText.cpp
+++ b/retroshare-gui/src/util/HandleRichText.cpp
@@ -1187,9 +1187,9 @@ QString RsHtml::makeQuotedText(RSTextBrowser *browser)
text = browser->toPlainText();
}
QStringList sl = text.split(QRegExp("[\r\n]"),QString::SkipEmptyParts);
- text = sl.join("\n>");
- text.replace(QChar(-4),"");//Char used when image on text.
- return QString(">") + text;
+ text = sl.join("\n> ");
+ text.replace(QChar(-4)," ");//Char used when image on text.
+ return QString("> ") + text;
}
void RsHtml::insertSpoilerText(QTextCursor cursor)