Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-25 23:49:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

improved layout of chat prefs and hide broadcast tab that wasnt showing any useful option

Browse Source
This commit is contained in:
csoler 2020-11-01 23:17:56 +01:00
parent 8b7341185d
commit 8efd529af0
2 changed files with 356 additions and 342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
retroshare-gui/src/gui/settings/ChatPage.cpp
View File

@ -310,6 +310,9 @@ ChatPage::ChatPage(QWidget * parent, Qt::WindowFlags flags)
if(!mChatLobbyUserNotify) if(!mChatLobbyUserNotify)
mChatLobbyUserNotify = dynamic_cast<ChatLobbyUserNotify*>(*it); mChatLobbyUserNotify = dynamic_cast<ChatLobbyUserNotify*>(*it);
} }
// hide the broadcast page: it only shows "show/hide emoticons, which is really not much for an entire page
ui.tabWidget->removeTab(3);
} }
void ChatPage::updateChatLobbyUserNotify() void ChatPage::updateChatLobbyUserNotify()

695
retroshare-gui/src/gui/settings/ChatPage.ui
View File

@ -7,413 +7,424 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>800</width> <width>800</width>
<height>649</height> <height>592</height>
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_6"> <layout class="QHBoxLayout" name="horizontalLayout_6">
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="general"> <widget class="QWidget" name="general">
<attribute name="title"> <attribute name="title">
<string>General</string> <string>General</string>
</attribute> </attribute>
<layout class="QGridLayout" name="generalGLayout"> <layout class="QVBoxLayout" name="verticalLayout_5">
<item row="1" column="0"> <item>
<layout class="QVBoxLayout" name="leftVLayout"> <layout class="QHBoxLayout" name="horizontalLayout_16">
<item> <item>
<widget class="QGroupBox" name="chatSettingsGBox"> <layout class="QVBoxLayout" name="verticalLayout_3">
<property name="sizePolicy"> <item>
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <widget class="QGroupBox" name="chatSettingsGBox">
<horstretch>0</horstretch> <property name="sizePolicy">
<verstretch>0</verstretch> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
</sizepolicy> <horstretch>0</horstretch>
</property> <verstretch>0</verstretch>
<property name="title"> </sizepolicy>
<string>General settings</string> </property>
</property> <property name="title">
<layout class="QVBoxLayout" name="verticalLayout"> <string>General settings</string>
<item> </property>
<layout class="QHBoxLayout" name="minimumContrastHLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QLabel" name="minimumContrastLabel"> <layout class="QHBoxLayout" name="minimumContrastHLayout">
<item>
<widget class="QLabel" name="minimumContrastLabel">
<property name="text">
<string>Minimum text contrast</string>
</property>
</widget>
</item>
<item>
<spacer name="minimumContrastHSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QDoubleSpinBox" name="minimumContrast">
<property name="minimum">
<double>1.000000000000000</double>
</property>
<property name="maximum">
<double>21.000000000000000</double>
</property>
<property name="singleStep">
<double>0.500000000000000</double>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="sendMessageWithCtrlReturn">
<property name="text"> <property name="text">
<string>Minimum text contrast</string> <string>Send message with Ctrl+Return</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="minimumContrastHSpacer"> <widget class="QCheckBox" name="sendAsPlainTextByDef">
<property name="orientation"> <property name="text">
<enum>Qt::Horizontal</enum> <string>Send as plain text by default</string>
</property> </property>
<property name="sizeHint" stdset="0"> </widget>
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item> </item>
<item> <item>
<widget class="QDoubleSpinBox" name="minimumContrast"> <widget class="QCheckBox" name="loadEmbeddedImages">
<property name="minimum"> <property name="text">
<double>1.000000000000000</double> <string>Load embedded images</string>
</property>
<property name="maximum">
<double>21.000000000000000</double>
</property>
<property name="singleStep">
<double>0.500000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item>
<item>
<widget class="QCheckBox" name="sendMessageWithCtrlReturn">
<property name="text">
<string>Send message with Ctrl+Return</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="sendAsPlainTextByDef">
<property name="text">
<string>Send as plain text by default</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="loadEmbeddedImages">
<property name="text">
<string>Load embedded images</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item row="1" column="1">
<layout class="QVBoxLayout" name="rightVLayout">
<item>
<widget class="QGroupBox" name="chatFontGBox">
<property name="title">
<string>Fonts</string>
</property>
<layout class="QVBoxLayout" name="chatFontGBoxVLayout">
<property name="spacing">
<number>2</number>
</property>
<property name="leftMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="pushButtonChangeChatFont">
<property name="text">
<string>Change Chat Font</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="labelChatFont">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Chat Font:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="labelChatFontPreview">
<property name="text">
<string notr="true">Font Preview</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_enableCustomFonts">
<property name="text">
<string>Enable custom fonts</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_enableCustomFontSize">
<property name="text">
<string>Enable custom font size</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_enableBold">
<property name="text">
<string>Enable bold</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_enableItalics">
<property name="text">
<string>Enable italics</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="minimumFontSizeHLayout">
<property name="topMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="minimumFontSizeLabel">
<property name="text">
<string>Minimum displayed font size</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="minimumFontSizeHSpacer"> <widget class="QGroupBox" name="searchGBox">
<property name="orientation"> <property name="title">
<enum>Qt::Horizontal</enum> <string>Search</string>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QSpinBox" name="minimumFontSize">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>64</number>
</property> </property>
<layout class="QVBoxLayout" name="vlSearch">
<property name="spacing">
<number>2</number>
</property>
<property name="leftMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="cbSearch_ShowBar">
<property name="text">
<string>Show Bar by default</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="hlSearch_CharToStart">
<item>
<widget class="QLabel" name="lSearch_CharToStart">
<property name="text">
<string>Threshold for automatic search</string>
</property>
</widget>
</item>
<item>
<spacer name="hsSearch_CharToStart">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QSpinBox" name="sbSearch_CharToStart">
<property name="maximum">
<number>100</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="cbSearch_CaseSensitively">
<property name="text">
<string>Case sensitive</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cbSearch_WholeWords">
<property name="text">
<string>Whole Words</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cbSearch_MoveToCursor">
<property name="text">
<string>Move to cursor</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cbSearch_WithoutLimit">
<property name="text">
<string>Color All Text Found</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="hlSearch_MaxLimitColor">
<item>
<widget class="QLabel" name="lSearch_MaxLimitColor">
<property name="text">
<string>Maximum count for coloring matching text</string>
</property>
</widget>
</item>
<item>
<spacer name="hsSearch_MaxLimitColor">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QSpinBox" name="sbSearch_MaxLimitColor">
<property name="maximum">
<number>1000</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="hlSearch_FoundColor">
<item>
<widget class="QLabel" name="lSearch_FoundColor">
<property name="text">
<string>Color of found text</string>
</property>
</widget>
</item>
<item>
<spacer name="hsSearch_FoundColor">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="btSearch_FoundColor">
<property name="minimumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="toolTip">
<string>Choose color of found text</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="searchGBox"> <layout class="QVBoxLayout" name="rightVLayout">
<property name="title"> <item>
<string>Search</string> <widget class="QGroupBox" name="chatFontGBox">
</property> <property name="title">
<layout class="QVBoxLayout" name="vlSearch"> <string>Fonts</string>
<property name="spacing"> </property>
<number>2</number> <layout class="QVBoxLayout" name="chatFontGBoxVLayout">
</property> <property name="spacing">
<property name="leftMargin"> <number>2</number>
<number>2</number> </property>
</property> <property name="leftMargin">
<property name="rightMargin"> <number>2</number>
<number>0</number> </property>
</property> <property name="rightMargin">
<property name="bottomMargin"> <number>0</number>
<number>0</number> </property>
</property> <property name="bottomMargin">
<item> <number>0</number>
<widget class="QCheckBox" name="cbSearch_ShowBar">
<property name="text">
<string>Show Bar by default</string>
</property> </property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="hlSearch_CharToStart">
<item> <item>
<widget class="QLabel" name="lSearch_CharToStart"> <widget class="QPushButton" name="pushButtonChangeChatFont">
<property name="text"> <property name="text">
<string>Threshold for automatic search</string> <string>Change Chat Font</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="hsSearch_CharToStart"> <widget class="QLabel" name="labelChatFont">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Chat Font:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="labelChatFontPreview">
<property name="text">
<string notr="true">Font Preview</string>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line_4">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QSpinBox" name="sbSearch_CharToStart">
<property name="maximum">
<number>100</number>
</property>
</widget> </widget>
</item> </item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="cbSearch_CaseSensitively">
<property name="text">
<string>Case sensitive</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cbSearch_WholeWords">
<property name="text">
<string>Whole Words</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cbSearch_MoveToCursor">
<property name="text">
<string>Move to cursor</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cbSearch_WithoutLimit">
<property name="text">
<string>Color All Text Found</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="hlSearch_MaxLimitColor">
<item> <item>
<widget class="QLabel" name="lSearch_MaxLimitColor"> <widget class="QCheckBox" name="checkBox_enableItalics">
<property name="text"> <property name="text">
<string>Maximum count for coloring matching text</string> <string>Enable italics</string>
</property>
<property name="checked">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="hsSearch_MaxLimitColor"> <widget class="QCheckBox" name="checkBox_enableCustomFonts">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QSpinBox" name="sbSearch_MaxLimitColor">
<property name="maximum">
<number>1000</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="hlSearch_FoundColor">
<item>
<widget class="QLabel" name="lSearch_FoundColor">
<property name="text"> <property name="text">
<string>Color of found text</string> <string>Enable custom fonts</string>
</property>
<property name="checked">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="hsSearch_FoundColor"> <widget class="QCheckBox" name="checkBox_enableBold">
<property name="orientation"> <property name="text">
<enum>Qt::Horizontal</enum> <string>Enable bold</string>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="checked">
<size> <bool>true</bool>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="btSearch_FoundColor">
<property name="minimumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="toolTip">
<string>Choose color of found text</string>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QCheckBox" name="checkBox_enableCustomFontSize">
<property name="text">
<string>Enable custom font size</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="minimumFontSizeHLayout">
<property name="topMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="minimumFontSizeLabel">
<property name="text">
<string>Minimum displayed font size</string>
</property>
</widget>
</item>
<item>
<spacer name="minimumFontSizeHSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QSpinBox" name="minimumFontSize">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>64</number>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</item> </widget>
</layout> </item>
</widget> <item>
</item> <spacer name="rightVSpacer">
<item> <property name="orientation">
<spacer name="rightVSpacer"> <enum>Qt::Vertical</enum>
<property name="orientation"> </property>
<enum>Qt::Vertical</enum> <property name="sizeHint" stdset="0">
</property> <size>
<property name="sizeHint" stdset="0"> <width>20</width>
<size> <height>40</height>
<width>20</width> </size>
<height>40</height> </property>
</size> </spacer>
</property> </item>
</spacer> </layout>
</item> </item>
</layout> </layout>
</item> </item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>120</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">