From bb5c758f876659e3d2db71623e6b3c8ba3eb36d5 Mon Sep 17 00:00:00 2001 From: csoler Date: Thu, 22 Oct 2020 00:01:17 +0200 Subject: [PATCH 1/3] cleaned up the mess in chat settings --- retroshare-gui/src/gui/settings/ChatPage.ui | 1189 +++++++++---------- 1 file changed, 579 insertions(+), 610 deletions(-) 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 - - - - - - - - From 8b7341185d43c3e6227385a02ad262330c488639 Mon Sep 17 00:00:00 2001 From: csoler Date: Thu, 22 Oct 2020 21:54:26 +0200 Subject: [PATCH 2/3] moved chat room part from notify page into preferences->chat --- retroshare-gui/src/gui/settings/ChatPage.cpp | 49 ++++++++++- retroshare-gui/src/gui/settings/ChatPage.h | 4 + retroshare-gui/src/gui/settings/ChatPage.ui | 73 ++++++++++++++--- .../src/gui/settings/NotifyPage.cpp | 81 ++++++------------- retroshare-gui/src/gui/settings/NotifyPage.h | 2 - retroshare-gui/src/gui/settings/NotifyPage.ui | 60 +------------- 6 files changed, 142 insertions(+), 127 deletions(-) diff --git a/retroshare-gui/src/gui/settings/ChatPage.cpp b/retroshare-gui/src/gui/settings/ChatPage.cpp index d28909220..b1d516186 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.cpp +++ b/retroshare-gui/src/gui/settings/ChatPage.cpp @@ -27,6 +27,7 @@ #include #include #include "ChatPage.h" +#include "gui/MainWindow.h" #include #include "gui/chat/ChatDialog.h" #include "gui/notifyqt.h" @@ -224,7 +225,14 @@ ChatPage::ChatPage(QWidget * parent, Qt::WindowFlags flags) ui.minimumContrastLabel->hide(); ui.minimumContrast->hide(); #endif - connect(ui.distantChatComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(distantChatComboBoxChanged(int))); + connect(ui.chatLobbies_CountFollowingText, SIGNAL(toggled(bool)),ui.chatLobbies_TextToNotify,SLOT(setEnabled(bool))); + connect(ui.chatLobbies_CountUnRead, SIGNAL(toggled(bool)),this, SLOT(updateChatLobbyUserNotify())) ; + connect(ui.chatLobbies_CheckNickName, SIGNAL(toggled(bool)),this, SLOT(updateChatLobbyUserNotify())) ; + connect(ui.chatLobbies_CountFollowingText, SIGNAL(toggled(bool)),this, SLOT(updateChatLobbyUserNotify())) ; + connect(ui.chatLobbies_TextToNotify, SIGNAL(textChanged(QString)),this, SLOT(updateChatLobbyUserNotify())); + connect(ui.chatLobbies_TextCaseSensitive, SIGNAL(toggled(bool)),this, SLOT(updateChatLobbyUserNotify())) ; + + connect(ui.distantChatComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(distantChatComboBoxChanged(int))); connect(ui.checkBox_emoteprivchat, SIGNAL(toggled(bool)), this, SLOT(updateFontsAndEmotes())); connect(ui.checkBox_emotegroupchat, SIGNAL(toggled(bool)), this, SLOT(updateFontsAndEmotes())); @@ -286,7 +294,37 @@ ChatPage::ChatPage(QWidget * parent, Qt::WindowFlags flags) connect(ui.publicStyle, SIGNAL(currentIndexChanged(int)), this,SLOT(on_publicList_currentRowChanged(int))); connect(ui.privateStyle, SIGNAL(currentIndexChanged(int)), this,SLOT(on_privateList_currentRowChanged(int))); connect(ui.historyStyle, SIGNAL(currentIndexChanged(int)), this,SLOT(on_historyList_currentRowChanged(int))); + + /* Add user notify */ + const QList &userNotifyList = MainWindow::getInstance()->getUserNotifyList() ; + QList::const_iterator it; + + mChatLobbyUserNotify = nullptr; + + for (it = userNotifyList.begin(); it != userNotifyList.end(); ++it) + { + UserNotify *userNotify = *it; + + //To get ChatLobbyUserNotify Settings + + if(!mChatLobbyUserNotify) + mChatLobbyUserNotify = dynamic_cast(*it); + } } + +void ChatPage::updateChatLobbyUserNotify() +{ + if(!mChatLobbyUserNotify) + return ; + + mChatLobbyUserNotify->setCountUnRead(ui.chatLobbies_CountUnRead->isChecked()) ; + mChatLobbyUserNotify->setCheckForNickName(ui.chatLobbies_CheckNickName->isChecked()) ; + mChatLobbyUserNotify->setCountSpecificText(ui.chatLobbies_CountFollowingText->isChecked()) ; + mChatLobbyUserNotify->setTextToNotify(ui.chatLobbies_TextToNotify->document()->toPlainText()); + mChatLobbyUserNotify->setTextCaseSensitive(ui.chatLobbies_TextCaseSensitive->isChecked()); +} + + void ChatPage::updateChatFlags() { uint chatflags = 0; @@ -423,6 +461,15 @@ ChatPage::load() ui._collected_contacts_LW->insertItem(0,item) ; } #endif + + if (mChatLobbyUserNotify){ + whileBlocking(ui.chatLobbies_CountUnRead)->setChecked(mChatLobbyUserNotify->isCountUnRead()); + whileBlocking(ui.chatLobbies_CheckNickName)->setChecked(mChatLobbyUserNotify->isCheckForNickName()); + whileBlocking(ui.chatLobbies_CountFollowingText)->setChecked(mChatLobbyUserNotify->isCountSpecificText()) ; + whileBlocking(ui.chatLobbies_TextToNotify)->setEnabled(mChatLobbyUserNotify->isCountSpecificText()) ; + whileBlocking(ui.chatLobbies_TextToNotify)->setPlainText(mChatLobbyUserNotify->textToNotify()); + whileBlocking(ui.chatLobbies_TextCaseSensitive)->setChecked(mChatLobbyUserNotify->isTextCaseSensitive()); + } } void ChatPage::on_pushButtonChangeChatFont_clicked() diff --git a/retroshare-gui/src/gui/settings/ChatPage.h b/retroshare-gui/src/gui/settings/ChatPage.h index 6c79f7ed7..5559d8adc 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.h +++ b/retroshare-gui/src/gui/settings/ChatPage.h @@ -23,6 +23,7 @@ #include "retroshare-gui/configpage.h" #include "gui/chat/ChatStyle.h" +#include "gui/chat/ChatLobbyUserNotify.h" #include "ui_ChatPage.h" #include "gui/common/FilesDefs.h" @@ -44,6 +45,7 @@ class ChatPage : public ConfigPage virtual QString helpText() const { return ""; } private slots: + void updateChatLobbyUserNotify(); void on_historyComboBoxVariant_currentIndexChanged(int index); void on_privateComboBoxVariant_currentIndexChanged(int index); void on_publicComboBoxVariant_currentIndexChanged(int index); @@ -87,6 +89,8 @@ class ChatPage : public ConfigPage /** Qt Designer generated object */ Ui::ChatPage ui; + + ChatLobbyUserNotify* mChatLobbyUserNotify; }; #endif diff --git a/retroshare-gui/src/gui/settings/ChatPage.ui b/retroshare-gui/src/gui/settings/ChatPage.ui index 1ca6431b1..2c61252ab 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.ui +++ b/retroshare-gui/src/gui/settings/ChatPage.ui @@ -14,7 +14,7 @@ - 2 + 1 @@ -420,9 +420,19 @@ Chat rooms - + + + + + Checked, if the identity and the text above occurrences must be in the same case to trigger count. + + + Case sensitive search + + + @@ -436,18 +446,50 @@ - + + + + + Do not send typing notifications + + + + + + + Blink tab icon + + + + + + + + + + + Count all unread messages + + + + + + + Count occurrences of my current identity + + + + + + + - Do not send typing notifications + Count occurrences of any of the following texts (separate by newlines): - - - Blink tab icon - - + @@ -561,6 +603,19 @@ + + + + Qt::Vertical + + + + 20 + 8 + + + + diff --git a/retroshare-gui/src/gui/settings/NotifyPage.cpp b/retroshare-gui/src/gui/settings/NotifyPage.cpp index 6035e25a0..dae48bad9 100755 --- a/retroshare-gui/src/gui/settings/NotifyPage.cpp +++ b/retroshare-gui/src/gui/settings/NotifyPage.cpp @@ -44,7 +44,6 @@ NotifyPage::NotifyPage(QWidget * parent, Qt::WindowFlags flags) connect(ui.testToasterButton, SIGNAL(clicked()), this, SLOT(testToaster())); connect(ui.pushButtonDisableAll,SIGNAL(toggled(bool)), NotifyQt::getInstance(), SLOT(SetDisableAll(bool))); connect(NotifyQt::getInstance(),SIGNAL(disableAllChanged(bool)), ui.pushButtonDisableAll, SLOT(setChecked(bool))); - connect(ui.chatLobbies_CountFollowingText,SIGNAL(toggled(bool)),ui.chatLobbies_TextToNotify,SLOT(setEnabled(bool))); ui.notify_Blogs->hide(); @@ -114,41 +113,37 @@ NotifyPage::NotifyPage(QWidget * parent, Qt::WindowFlags flags) } - /* Add user notify */ - const QList &userNotifyList = MainWindow::getInstance()->getUserNotifyList() ; - QList::const_iterator it; - rowFeed = 0; - mChatLobbyUserNotify = 0; - for (it = userNotifyList.begin(); it != userNotifyList.end(); ++it) { - UserNotify *userNotify = *it; + /* Add user notify */ + const QList &userNotifyList = MainWindow::getInstance()->getUserNotifyList() ; + QList::const_iterator it; + rowFeed = 0; + for (it = userNotifyList.begin(); it != userNotifyList.end(); ++it) { + UserNotify *userNotify = *it; - QString name; - if (!userNotify->hasSetting(&name, NULL)) { - continue; - } + QString name; + if (!userNotify->hasSetting(&name, NULL)) { + continue; + } - QCheckBox *enabledCheckBox = new QCheckBox(name, this); - enabledCheckBox->setFont(font); - ui.notifyLayout->addWidget(enabledCheckBox, rowFeed, 0, 0); - connect(enabledCheckBox, SIGNAL(toggled(bool)), this, SLOT(notifyToggled())); + QCheckBox *enabledCheckBox = new QCheckBox(name, this); + enabledCheckBox->setFont(font); + ui.notifyLayout->addWidget(enabledCheckBox, rowFeed, 0, 0); + connect(enabledCheckBox, SIGNAL(toggled(bool)), this, SLOT(notifyToggled())); - QCheckBox *combinedCheckBox = new QCheckBox(tr("Combined"), this); - combinedCheckBox->setFont(font); - ui.notifyLayout->addWidget(combinedCheckBox, rowFeed, 1); + QCheckBox *combinedCheckBox = new QCheckBox(tr("Combined"), this); + combinedCheckBox->setFont(font); + ui.notifyLayout->addWidget(combinedCheckBox, rowFeed, 1); - QCheckBox *blinkCheckBox = new QCheckBox(tr("Blink"), this); - blinkCheckBox->setFont(font); - ui.notifyLayout->addWidget(blinkCheckBox, rowFeed++, 2); + QCheckBox *blinkCheckBox = new QCheckBox(tr("Blink"), this); + blinkCheckBox->setFont(font); + ui.notifyLayout->addWidget(blinkCheckBox, rowFeed++, 2); - mUserNotifySettingList.push_back(UserNotifySetting(userNotify, enabledCheckBox, combinedCheckBox, blinkCheckBox)); + mUserNotifySettingList.push_back(UserNotifySetting(userNotify, enabledCheckBox, combinedCheckBox, blinkCheckBox)); - connect(enabledCheckBox,SIGNAL(toggled(bool)),this,SLOT(updateUserNotifySettings())) ; - connect(blinkCheckBox,SIGNAL(toggled(bool)),this,SLOT(updateUserNotifySettings())) ; - connect(combinedCheckBox,SIGNAL(toggled(bool)),this,SLOT(updateUserNotifySettings())) ; - - //To get ChatLobbyUserNotify Settings - if (!mChatLobbyUserNotify) mChatLobbyUserNotify = dynamic_cast(*it); - } + connect(enabledCheckBox,SIGNAL(toggled(bool)),this,SLOT(updateUserNotifySettings())) ; + connect(blinkCheckBox,SIGNAL(toggled(bool)),this,SLOT(updateUserNotifySettings())) ; + connect(combinedCheckBox,SIGNAL(toggled(bool)),this,SLOT(updateUserNotifySettings())) ; + } connect(ui.popup_Connect, SIGNAL(toggled(bool)), this, SLOT(updateNotifyFlags())) ; connect(ui.popup_NewMsg, SIGNAL(toggled(bool)), this, SLOT(updateNotifyFlags())) ; @@ -177,12 +172,6 @@ NotifyPage::NotifyPage(QWidget * parent, Qt::WindowFlags flags) connect(ui.spinBoxToasterYMargin, SIGNAL(valueChanged(int)), this, SLOT(updateToasterMargin())); connect(ui.comboBoxToasterPosition, SIGNAL(currentIndexChanged(int)),this, SLOT(updateToasterPosition())) ; - - connect(ui.chatLobbies_CountUnRead, SIGNAL(toggled(bool)),this, SLOT(updateChatLobbyUserNotify())) ; - connect(ui.chatLobbies_CheckNickName, SIGNAL(toggled(bool)),this, SLOT(updateChatLobbyUserNotify())) ; - connect(ui.chatLobbies_CountFollowingText, SIGNAL(toggled(bool)),this, SLOT(updateChatLobbyUserNotify())) ; - connect(ui.chatLobbies_TextToNotify, SIGNAL(textChanged(QString)),this, SLOT(updateChatLobbyUserNotify())); - connect(ui.chatLobbies_TextCaseSensitive, SIGNAL(toggled(bool)),this, SLOT(updateChatLobbyUserNotify())) ; } NotifyPage::~NotifyPage() @@ -297,18 +286,6 @@ void NotifyPage::updateToasterPosition() Settings->setToasterPosition((RshareSettings::enumToasterPosition) ui.comboBoxToasterPosition->itemData(index).toInt()); } -void NotifyPage::updateChatLobbyUserNotify() -{ - if(!mChatLobbyUserNotify) - return ; - - mChatLobbyUserNotify->setCountUnRead(ui.chatLobbies_CountUnRead->isChecked()) ; - mChatLobbyUserNotify->setCheckForNickName(ui.chatLobbies_CheckNickName->isChecked()) ; - mChatLobbyUserNotify->setCountSpecificText(ui.chatLobbies_CountFollowingText->isChecked()) ; - mChatLobbyUserNotify->setTextToNotify(ui.chatLobbies_TextToNotify->document()->toPlainText()); - mChatLobbyUserNotify->setTextCaseSensitive(ui.chatLobbies_TextCaseSensitive->isChecked()); -} - /** Loads the settings for this page */ void NotifyPage::load() { @@ -397,14 +374,6 @@ void NotifyPage::load() notifyToggled() ; - if (mChatLobbyUserNotify){ - whileBlocking(ui.chatLobbies_CountUnRead)->setChecked(mChatLobbyUserNotify->isCountUnRead()); - whileBlocking(ui.chatLobbies_CheckNickName)->setChecked(mChatLobbyUserNotify->isCheckForNickName()); - whileBlocking(ui.chatLobbies_CountFollowingText)->setChecked(mChatLobbyUserNotify->isCountSpecificText()) ; - whileBlocking(ui.chatLobbies_TextToNotify)->setEnabled(mChatLobbyUserNotify->isCountSpecificText()) ; - whileBlocking(ui.chatLobbies_TextToNotify)->setPlainText(mChatLobbyUserNotify->textToNotify()); - whileBlocking(ui.chatLobbies_TextCaseSensitive)->setChecked(mChatLobbyUserNotify->isTextCaseSensitive()); - } } void NotifyPage::notifyToggled() diff --git a/retroshare-gui/src/gui/settings/NotifyPage.h b/retroshare-gui/src/gui/settings/NotifyPage.h index f78c188a0..66bf99e1d 100755 --- a/retroshare-gui/src/gui/settings/NotifyPage.h +++ b/retroshare-gui/src/gui/settings/NotifyPage.h @@ -100,12 +100,10 @@ private slots: void updateToasterMargin(); void updateToasterPosition(); - void updateChatLobbyUserNotify(); private: uint getNewsFlags(); uint getNotifyFlags(); - ChatLobbyUserNotify* mChatLobbyUserNotify; QList mFeedNotifySettingList; QList mToasterNotifySettingList; diff --git a/retroshare-gui/src/gui/settings/NotifyPage.ui b/retroshare-gui/src/gui/settings/NotifyPage.ui index f468a62ec..93883ab2f 100755 --- a/retroshare-gui/src/gui/settings/NotifyPage.ui +++ b/retroshare-gui/src/gui/settings/NotifyPage.ui @@ -14,7 +14,7 @@ - 0 + 2 @@ -443,60 +443,6 @@ - - - Chat Rooms - - - - - - Count all unread messages - - - - - - - Count occurrences of my current identity - - - - - - - Count occurrences of any of the following texts (separate by newlines): - - - - - - - - - - Checked, if the identity and the text above occurrences must be in the same case to trigger count. - - - Case sensitive - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - @@ -527,10 +473,6 @@ spinBoxToasterYMargin systray_GroupChat systray_ChatLobby - chatLobbies_CountUnRead - chatLobbies_CheckNickName - chatLobbies_CountFollowingText - chatLobbies_TextToNotify pushButtonDisableAll From 8efd529af05b83051af84eb28e158171bd4eb086 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 1 Nov 2020 23:17:56 +0100 Subject: [PATCH 3/3] improved layout of chat prefs and hide broadcast tab that wasnt showing any useful option --- retroshare-gui/src/gui/settings/ChatPage.cpp | 3 + retroshare-gui/src/gui/settings/ChatPage.ui | 695 ++++++++++--------- 2 files changed, 356 insertions(+), 342 deletions(-) diff --git a/retroshare-gui/src/gui/settings/ChatPage.cpp b/retroshare-gui/src/gui/settings/ChatPage.cpp index b1d516186..88711a113 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.cpp +++ b/retroshare-gui/src/gui/settings/ChatPage.cpp @@ -310,6 +310,9 @@ ChatPage::ChatPage(QWidget * parent, Qt::WindowFlags flags) if(!mChatLobbyUserNotify) mChatLobbyUserNotify = dynamic_cast(*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() diff --git a/retroshare-gui/src/gui/settings/ChatPage.ui b/retroshare-gui/src/gui/settings/ChatPage.ui index 2c61252ab..2cbce96df 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.ui +++ b/retroshare-gui/src/gui/settings/ChatPage.ui @@ -7,413 +7,424 @@ 0 0 800 - 649 + 592 - 1 + 0 General - - - + + + - - - - 0 - 0 - - - - General settings - - - - + + + + + + 0 + 0 + + + + General settings + + - + + + + + Minimum text contrast + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + 1.000000000000000 + + + 21.000000000000000 + + + 0.500000000000000 + + + + + + + - Minimum text contrast + Send message with Ctrl+Return - - - Qt::Horizontal + + + Send as plain text by default - - - 40 - 20 - - - + - - - 1.000000000000000 - - - 21.000000000000000 - - - 0.500000000000000 + + + Load embedded images - - - - - Send message with Ctrl+Return - - - - - - - Send as plain text by default - - - - - - - Load embedded images - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - - - - Fonts - - - - 2 - - - 2 - - - 0 - - - 0 - - - - - Change Chat Font - - - - - - - - 0 - 0 - - - - Chat Font: - - - - - - - Font Preview - - - - - - - - - - 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 + + + 2 + + + 2 + + + 0 + + + 0 + + + + + Show Bar by default + + + + + + + + + Threshold for automatic search + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + 100 + + + + + + + + + Case sensitive + + + + + + + Whole Words + + + + + + + Move to cursor + + + + + + + Color All Text Found + + + + + + + + + Maximum count for coloring matching text + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + 1000 + + + + + + + + + + + Color of found text + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 24 + 24 + + + + + 24 + 24 + + + + Choose color of found text + + + + + + - - - Search - - - - 2 - - - 2 - - - 0 - - - 0 - - - - - Show Bar by default + + + + + Fonts + + + + 2 + + + 2 + + + 0 + + + 0 - - - - - + - Threshold for automatic search + Change Chat Font - + + + + 0 + 0 + + + + Chat Font: + + + + + + + Font Preview + + + + + Qt::Horizontal - - - 40 - 20 - - - - - - - - 100 - - - - - - - Case sensitive - - - - - - - Whole Words - - - - - - - Move to cursor - - - - - - - Color All Text Found - - - - - - + - Maximum count for coloring matching text + Enable italics + + + true - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - 1000 - - - - - - - - - + - Color of found text + Enable custom fonts + + + true - - - Qt::Horizontal + + + Enable bold - - - 40 - 20 - - - - - - - - - 24 - 24 - - - - - 24 - 24 - - - - Choose color of found text + + true + + + + Enable custom font size + + + true + + + + + + + 0 + + + + + Minimum displayed font size + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + 1 + + + 64 + + + + + - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Qt::Vertical + + + + 20 + 120 + + + +