diff --git a/retroshare-gui/src/gui/settings/ChatPage.ui b/retroshare-gui/src/gui/settings/ChatPage.ui index 9484cc4c6..1ca6431b1 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.ui +++ b/retroshare-gui/src/gui/settings/ChatPage.ui @@ -7,55 +7,20 @@ 0 0 800 - 600 + 649 - - + + - 0 + 2 General - - - - Distant Chat - - - - - - - Everyone - - - - - Contacts - - - - - Nobody - - - - - - - - Accept encrypted distant chat from - - - - - - @@ -67,106 +32,9 @@ - Chat Settings + General settings - - - - - Enable Emoticons Private Chat - - - true - - - - - - - Enable Emoticons Group Chat - - - true - - - - - - - Enable custom fonts - - - true - - - - - - - Enable custom font size - - - true - - - - - - - 0 - - - - - Minimum font size - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - 1 - - - 64 - - - - - - - - - Enable bold - - - true - - - - - - - Enable italics - - - true - - - + @@ -225,120 +93,30 @@ - - - - - - - Chat Rooms - - - - - Blink tab icon + + + Qt::Vertical - - - - - - Default identity for chat rooms: + + + 20 + 40 + - - - - - - - - Qt::Horizontal - - - QSizePolicy::Maximum - - - - 40 - 20 - - - - - - - - - - - - - Do not send typing notifications - - + - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Private Chat - - - - - - Open Window for new chat - - - - - - - Grab Focus when chat arrives - - - - - - - Use a single tabbed window - - - - - - - Blink window/tab icon - - - - - - - Chat Font + Fonts @@ -347,9 +125,6 @@ 2 - - 0 - 0 @@ -386,10 +161,87 @@ + + + + Enable custom fonts + + + true + + + + + + + Enable custom font size + + + true + + + + + + + Enable bold + + + true + + + + + + + Enable italics + + + true + + + + + + + 0 + + + + + Minimum displayed font size + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + 1 + + + 64 + + + + + - Search by default + Search @@ -398,9 +250,6 @@ 2 - - 0 - 0 @@ -567,11 +416,383 @@ + + + Chat rooms + + + + + + + + Default identity for chat rooms: + + + + + + + + + + + + Do not send typing notifications + + + + + + + Blink tab icon + + + + + + + Qt::Horizontal + + + + + + + + + + + + 0 + 0 + + + + Style: + + + + + + + + + + + 0 + 0 + + + + Variant: + + + + + + + + 0 + 0 + + + + + + + + + + + + + + Author: + + + + + + + + 0 + 0 + + + + AuthorText + + + + + + + + + + + Description: + + + + + + + + 0 + 0 + + + + DescriptionText + + + + + + + + + + 0 + 0 + + + + + + + + + Private chat + + + + + + + + Accept chat from: + + + + + + + + Everyone + + + + + Contacts only + + + + + Nobody + + + + + + + + + + Open Window for new chat + + + + + + + Grab Focus when chat arrives + + + + + + + Use a single tabbed window + + + + + + + Blink window/tab icon + + + + + + + Enable Emoticons + + + true + + + + + + + Qt::Horizontal + + + + + + + + + + 0 + 0 + + + + Style: + + + + + + + + + + + 0 + 0 + + + + Variant: + + + + + + + + 0 + 0 + + + + + + + + + + + + + 0 + 0 + + + + Author: + + + + + + + + 0 + 0 + + + + Author Text + + + + + + + + + + + + 0 + 0 + + + + Description: + + + + + + + + 0 + 0 + + + + Description Text + + + + + + + + + + 0 + 0 + + + + + + + + + Broadcast + + + + + + Enable Emoticons + + + true + + + + + + + Qt::Vertical + + + + 20 + 549 + + + + + + History - + @@ -867,375 +1088,123 @@ - + - Qt::Vertical + Qt::Horizontal - - - 20 - 40 - - - + - - - - - Style - - - - - QTabWidget::North + + + + + + 0 + 0 + + + + Style: + + + + + + + + + + + 0 + 0 + + + + Variant: + + + + + + + + 0 + 0 + + + + + + + + + + + + + 0 + 0 + + + + Author: + + + + + + + + 0 + 0 + + + + Author Text + + + + + + + + + + + + 0 + 0 + + + + Description: + + + + + + + + 0 + 0 + + + + Description Text + + + + + + + + + + 0 + 0 + - - 0 - - - - Chat rooms - - - - - - - 0 - 0 - - - - - - - - - - Style: - - - - - - - - - - - 0 - 0 - - - - Variant: - - - - - - - - 0 - 0 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - 0 - 0 - - - - Author - - - - - - - - 0 - 0 - - - - Description - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - Private chat - - - - - - - 0 - 0 - - - - - - - - - - Style: - - - - - - - - - - - 0 - 0 - - - - Variant: - - - - - - - - 0 - 0 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - 0 - 0 - - - - Author - - - - - - - - 0 - 0 - - - - Description - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - History - - - - - - - 0 - 0 - - - - - - - - - - Style: - - - - - - - - - - - 0 - 0 - - - - Variant: - - - - - - - - 0 - 0 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - 0 - 0 - - - - Author - - - - - - - - 0 - 0 - - - - Description - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - -