Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved font menu to Settings menu

Browse Source
This commit is contained in:
defnax 2016-08-06 18:35:07 +02:00
parent 9f14103c1c
commit dea776a61a
2 changed files with 10 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,8 +91,6 @@ ChatWidget::ChatWidget(QWidget *parent) :
//Resize Tool buttons //Resize Tool buttons
ui->emoteiconButton->setFixedSize(buttonSize); ui->emoteiconButton->setFixedSize(buttonSize);
ui->emoteiconButton->setIconSize(iconSize); ui->emoteiconButton->setIconSize(iconSize);
ui->fontButton->setFixedSize(buttonSize);
ui->fontButton->setIconSize(iconSize);
ui->attachPictureButton->setFixedSize(buttonSize); ui->attachPictureButton->setFixedSize(buttonSize);
ui->attachPictureButton->setIconSize(iconSize); ui->attachPictureButton->setIconSize(iconSize);
ui->addFileButton->setFixedSize(buttonSize); ui->addFileButton->setFixedSize(buttonSize);
@ -181,21 +179,22 @@ ChatWidget::ChatWidget(QWidget *parent) :
ui->hashBox->setDropWidget(this); ui->hashBox->setDropWidget(this);
ui->hashBox->setAutoHide(true); ui->hashBox->setAutoHide(true);
QMenu *menu = new QMenu(); QMenu *fontmenu = new QMenu(tr("Set text font & color"));
menu->addAction(ui->actionChooseFont); fontmenu->addAction(ui->actionChooseFont);
menu->addAction(ui->actionChooseColor); fontmenu->addAction(ui->actionChooseColor);
menu->addAction(ui->actionResetFont); fontmenu->addAction(ui->actionResetFont);
menu->addAction(ui->actionNoEmbed); fontmenu->addAction(ui->actionNoEmbed);
menu->addAction(ui->actionSendAsPlainText); fontmenu->addAction(ui->actionSendAsPlainText);
ui->fontButton->setMenu(menu);
menu = new QMenu(); QMenu *menu = new QMenu();
menu->addAction(ui->actionClearChatHistory); menu->addAction(ui->actionClearChatHistory);
menu->addAction(ui->actionDeleteChatHistory); menu->addAction(ui->actionDeleteChatHistory);
menu->addAction(ui->actionSaveChatHistory); menu->addAction(ui->actionSaveChatHistory);
menu->addAction(ui->actionMessageHistory); menu->addAction(ui->actionMessageHistory);
ui->pushtoolsButton->setMenu(menu); ui->pushtoolsButton->setMenu(menu);
ui->actionSendAsPlainText->setChecked(Settings->getChatSendAsPlainTextByDef()); menu->addMenu(fontmenu);
ui->actionSendAsPlainText->setChecked(Settings->getChatSendAsPlainTextByDef());
ui->textBrowser->installEventFilter(this); ui->textBrowser->installEventFilter(this);
ui->textBrowser->viewport()->installEventFilter(this); ui->textBrowser->viewport()->installEventFilter(this);

26
retroshare-gui/src/gui/chat/ChatWidget.ui
View File

@ -413,32 +413,6 @@ border-image: url(:/images/closepressed.png)
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QToolButton" name="fontButton">
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
</property>
<property name="toolTip">
<string>Set text font &amp; color</string>
</property>
<property name="icon">
<iconset resource="../icons.qrc">
<normaloff>:/icons/png/font.png</normaloff>:/icons/png/font.png</iconset>
</property>
<property name="iconSize">
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="popupMode">
<enum>QToolButton::InstantPopup</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item> <item>
<widget class="QToolButton" name="pushtoolsButton"> <widget class="QToolButton" name="pushtoolsButton">
<property name="focusPolicy"> <property name="focusPolicy">