Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-26 01:31:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Hide by default the Attachments Recommend Files list.

Browse Source 
* Changed the tooltips for the Hide/Show Button , "Download all" Button now with default text.
* Moved files count label before "Recommend Files" label

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7708 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2014-11-25 01:01:43 +00:00
parent 09dbb63a78
commit 03cee1b998
2 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
retroshare-gui/src/gui/msgs/MessageWidget.cpp
View File

@ -247,7 +247,7 @@ void MessageWidget::processSettings(const QString &settingsGroup, bool load)
// load settings // load settings
// expandFiles // expandFiles
bool value = Settings->value("expandFiles", true).toBool(); bool value = Settings->value("expandFiles", false).toBool();
ui.expandFilesButton->setChecked(value); ui.expandFilesButton->setChecked(value);
ui.msgList->setVisible(value); ui.msgList->setVisible(value);
togglefileview(); togglefileview();
@ -289,10 +289,10 @@ void MessageWidget::togglefileview()
if (ui.expandFilesButton->isChecked()) { if (ui.expandFilesButton->isChecked()) {
ui.expandFilesButton->setIcon(QIcon(QString(":/images/edit_remove24.png"))); ui.expandFilesButton->setIcon(QIcon(QString(":/images/edit_remove24.png")));
ui.expandFilesButton->setToolTip(tr("Hide")); ui.expandFilesButton->setToolTip(tr("Hide the attachment pane"));
} else { } else {
ui.expandFilesButton->setIcon(QIcon(QString(":/images/edit_add24.png"))); ui.expandFilesButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
ui.expandFilesButton->setToolTip(tr("Expand")); ui.expandFilesButton->setToolTip(tr("Show the attachment pane"));
} }
} }
@ -583,7 +583,7 @@ void MessageWidget::fill(const std::string &msgId)
ui.msgText->resetImagesStatus(Settings->getMsgLoadEmbeddedImages() || (msgInfo.msgflags & RS_MSG_LOAD_EMBEDDED_IMAGES)); ui.msgText->resetImagesStatus(Settings->getMsgLoadEmbeddedImages() || (msgInfo.msgflags & RS_MSG_LOAD_EMBEDDED_IMAGES));
ui.msgText->setHtml(text); ui.msgText->setHtml(text);
ui.filesText->setText(QString("(%1 %2)").arg(msgInfo.count).arg(msgInfo.count == 1 ? tr("File") : tr("Files"))); ui.filesText->setText(QString("%1").arg(msgInfo.count)/*.arg(msgInfo.count == 1 ? tr("File") : tr("Files"))*/);
if (msgInfo.msgflags & RS_MSG_ENCRYPTED) { if (msgInfo.msgflags & RS_MSG_ENCRYPTED) {
ui.decryptFrame->show(); ui.decryptFrame->show();

53
retroshare-gui/src/gui/msgs/MessageWidget.ui
View File

@ -355,6 +355,26 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="0">
<widget class="QPushButton" name="expandFilesButton">
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/edit_remove24.png</normaloff>:/images/edit_remove24.png</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="2"> <item row="0" column="2">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
@ -365,13 +385,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="3"> <item row="0" column="4">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="font"> <property name="font">
<font> <font>
<pointsize>10</pointsize> <pointsize>10</pointsize>
<weight>75</weight> <weight>50</weight>
<bold>true</bold> <bold>false</bold>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
@ -379,12 +399,12 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="4"> <item row="0" column="3">
<widget class="QLabel" name="filesText"> <widget class="QLabel" name="filesText">
<property name="font"> <property name="font">
<font> <font>
<pointsize>10</pointsize> <pointsize>10</pointsize>
<italic>true</italic> <italic>false</italic>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
@ -415,32 +435,15 @@
<property name="toolTip"> <property name="toolTip">
<string>Download all Recommended Files</string> <string>Download all Recommended Files</string>
</property> </property>
<property name="text">
<string>Download all</string>
</property>
<property name="icon"> <property name="icon">
<iconset resource="../images.qrc"> <iconset resource="../images.qrc">
<normaloff>:/images/down.png</normaloff>:/images/down.png</iconset> <normaloff>:/images/down.png</normaloff>:/images/down.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="expandFilesButton">
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/edit_remove24.png</normaloff>:/images/edit_remove24.png</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>