Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-09 06:42:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Added Folders and Tags Header Buttons, and moved "Total Inbox" and "Total Sent" to the Bottom into a QLabel.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3043 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-05-31 21:27:57 +00:00
parent c23ea03190
commit 647c08c8da
4 changed files with 283 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

8
retroshare-gui/src/gui/MessagesDialog.cpp
View file

@ -58,8 +58,6 @@
#define ROW_DRAFTBOX 2 #define ROW_DRAFTBOX 2
#define ROW_SENTBOX 3 #define ROW_SENTBOX 3
#define ROW_TRASHBOX 4 #define ROW_TRASHBOX 4
#define ROW_INBOX_TOTAL 6
#define ROW_SENTBOX_TOTAL 7
#define ACTION_TAGSINDEX_SIZE 3 #define ACTION_TAGSINDEX_SIZE 3
#define ACTION_TAGSINDEX_TYPE "Type" #define ACTION_TAGSINDEX_TYPE "Type"
@ -2160,14 +2158,12 @@ void MessagesDialog::updateMessageSummaryList()
} }
/* Total Inbox */ /* Total Inbox */
item = ui.listWidget->item(ROW_INBOX_TOTAL);
textItem = tr("Total Inbox:") + " " + QString::number(inboxCount); textItem = tr("Total Inbox:") + " " + QString::number(inboxCount);
item->setText(textItem); ui.totalInbox_label->setText(textItem);
/* Total Sent */ /* Total Sent */
item = ui.listWidget->item(ROW_SENTBOX_TOTAL);
textItem = tr("Total Sent:") + " " + QString::number(newSentboxCount); textItem = tr("Total Sent:") + " " + QString::number(newSentboxCount);
item->setText(textItem); ui.totalSentbox_label->setText(textItem);
} }
/** clear Filter **/ /** clear Filter **/

411
retroshare-gui/src/gui/MessagesDialog.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>656</width> <width>775</width>
<height>487</height> <height>511</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -505,10 +505,7 @@
<property name="contextMenuPolicy"> <property name="contextMenuPolicy">
<enum>Qt::DefaultContextMenu</enum> <enum>Qt::DefaultContextMenu</enum>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_4">
<property name="spacing">
<number>0</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QFrame" name="frame"> <widget class="QFrame" name="frame">
<property name="sizePolicy"> <property name="sizePolicy">
@ -984,145 +981,281 @@ border-image: url(:/images/closepressed.png)
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QSplitter" name="splitter_3"> <widget class="QSplitter" name="splitter">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<widget class="QListWidget" name="listWidget"> <widget class="QFrame" name="frame_2">
<property name="minimumSize">
<size>
<width>140</width>
<height>0</height>
</size>
</property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>140</width> <width>140</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="font"> <property name="frameShape">
<font> <enum>QFrame::StyledPanel</enum>
<pointsize>9</pointsize>
</font>
</property> </property>
<property name="styleSheet"> <property name="frameShadow">
<string notr="true"/> <enum>QFrame::Raised</enum>
</property> </property>
<property name="lineWidth"> <layout class="QGridLayout" name="gridLayout_3">
<number>1</number> <property name="horizontalSpacing">
</property> <number>6</number>
<property name="midLineWidth">
<number>0</number>
</property>
<property name="resizeMode">
<enum>QListView::Fixed</enum>
</property>
<property name="spacing">
<number>0</number>
</property>
<property name="gridSize">
<size>
<width>100</width>
<height>18</height>
</size>
</property>
<property name="modelColumn">
<number>0</number>
</property>
<property name="uniformItemSizes">
<bool>false</bool>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
<item>
<property name="text">
<string>Inbox</string>
</property> </property>
<property name="icon"> <property name="verticalSpacing">
<iconset resource="images.qrc"> <number>0</number>
<normaloff>:/images/folder-inbox.png</normaloff>:/images/folder-inbox.png</iconset>
</property> </property>
</item> <property name="margin">
<item> <number>0</number>
<property name="text">
<string>Outbox</string>
</property> </property>
<property name="icon"> <item row="1" column="0">
<iconset resource="images.qrc"> <widget class="QListWidget" name="listWidget">
<normaloff>:/images/folder-outbox.png</normaloff>:/images/folder-outbox.png</iconset> <property name="minimumSize">
</property> <size>
</item> <width>0</width>
<item> <height>0</height>
<property name="text"> </size>
<string>Draft</string> </property>
</property> <property name="maximumSize">
<property name="icon"> <size>
<iconset resource="images.qrc"> <width>140</width>
<normaloff>:/images/folder-draft.png</normaloff>:/images/folder-draft.png</iconset> <height>16777215</height>
</property> </size>
</item> </property>
<item> <property name="baseSize">
<property name="text"> <size>
<string>Sent</string> <width>0</width>
</property> <height>0</height>
<property name="icon"> </size>
<iconset resource="images.qrc"> </property>
<normaloff>:/images/folder-sent.png</normaloff>:/images/folder-sent.png</iconset> <property name="font">
</property> <font>
</item> <pointsize>9</pointsize>
<item> </font>
<property name="text"> </property>
<string>Trash</string> <property name="styleSheet">
</property> <string notr="true"/>
<property name="icon"> </property>
<iconset resource="images.qrc"> <property name="lineWidth">
<normaloff>:/images/folder-trash.png</normaloff>:/images/folder-trash.png</iconset> <number>1</number>
</property> </property>
</item> <property name="midLineWidth">
<item> <number>0</number>
<property name="text"> </property>
<string/> <property name="isWrapping" stdset="0">
</property> <bool>false</bool>
<property name="background"> </property>
<brush brushstyle="NoBrush"> <property name="resizeMode">
<color alpha="255"> <enum>QListView::Fixed</enum>
<red>0</red> </property>
<green>0</green> <property name="spacing">
<blue>0</blue> <number>0</number>
</color> </property>
</brush> <property name="gridSize">
</property> <size>
<property name="foreground"> <width>100</width>
<brush brushstyle="NoBrush"> <height>18</height>
<color alpha="255"> </size>
<red>0</red> </property>
<green>0</green> <property name="modelColumn">
<blue>0</blue> <number>0</number>
</color> </property>
</brush> <property name="uniformItemSizes">
</property> <bool>false</bool>
<property name="flags"> </property>
<set>ItemIsDragEnabled|ItemIsUserCheckable|ItemIsEnabled</set> <property name="wordWrap">
</property> <bool>false</bool>
</item> </property>
<item> <item>
<property name="text"> <property name="text">
<string>Total Inbox:</string> <string>Inbox</string>
</property> </property>
<property name="flags"> <property name="icon">
<set>ItemIsDragEnabled|ItemIsUserCheckable|ItemIsEnabled</set> <iconset resource="images.qrc">
</property> <normaloff>:/images/folder-inbox.png</normaloff>:/images/folder-inbox.png</iconset>
</item> </property>
<item> </item>
<property name="text"> <item>
<string>Total Sent:</string> <property name="text">
</property> <string>Outbox</string>
<property name="flags"> </property>
<set>ItemIsDragEnabled|ItemIsUserCheckable|ItemIsEnabled</set> <property name="icon">
</property> <iconset resource="images.qrc">
</item> <normaloff>:/images/folder-outbox.png</normaloff>:/images/folder-outbox.png</iconset>
</property>
</item>
<item>
<property name="text">
<string>Draft</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/folder-draft.png</normaloff>:/images/folder-draft.png</iconset>
</property>
</item>
<item>
<property name="text">
<string>Sent</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/folder-sent.png</normaloff>:/images/folder-sent.png</iconset>
</property>
</item>
<item>
<property name="text">
<string>Trash</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/folder-trash.png</normaloff>:/images/folder-trash.png</iconset>
</property>
</item>
</widget>
</item>
<item row="3" column="0">
<widget class="QListWidget" name="tagWidget">
<property name="maximumSize">
<size>
<width>140</width>
<height>16777215</height>
</size>
</property>
<property name="baseSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QToolButton" name="Folders_Button">
<property name="minimumSize">
<size>
<width>0</width>
<height>21</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>140</width>
<height>16777215</height>
</size>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="styleSheet">
<string notr="true">QToolButton#Folders_Button{
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
stop:0 #FEFEFE, stop:1 #E8E8E8);
border: 1px solid #CCCCCC;}</string>
</property>
<property name="text">
<string>Folders</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/foldermail.png</normaloff>:/images/foldermail.png</iconset>
</property>
<property name="checkable">
<bool>false</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
<property name="arrowType">
<enum>Qt::NoArrow</enum>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QToolButton" name="Tags_Button">
<property name="minimumSize">
<size>
<width>0</width>
<height>21</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>140</width>
<height>16777215</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">QToolButton#Tags_Button{
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
stop:0 #FEFEFE, stop:1 #E8E8E8);
border: 1px solid #CCCCCC;}</string>
</property>
<property name="text">
<string>Tags</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/tag24.png</normaloff>:/images/tag24.png</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
<property name="arrowType">
<enum>Qt::NoArrow</enum>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="totalInbox_label">
<property name="minimumSize">
<size>
<width>0</width>
<height>18</height>
</size>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="text">
<string>Total Inbox:</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="totalSentbox_label">
<property name="minimumSize">
<size>
<width>0</width>
<height>18</height>
</size>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="text">
<string>Total Sent:</string>
</property>
</widget>
</item>
</layout>
</widget> </widget>
<widget class="QSplitter" name="msgSplitter"> <widget class="QSplitter" name="msgSplitter">
<property name="orientation"> <property name="orientation">
@ -1603,5 +1736,21 @@ p, li { white-space: pre-wrap; }
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection>
<sender>Tags_Button</sender>
<signal>toggled(bool)</signal>
<receiver>tagWidget</receiver>
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>78</x>
<y>287</y>
</hint>
<hint type="destinationlabel">
<x>78</x>
<y>399</y>
</hint>
</hints>
</connection>
</connections> </connections>
</ui> </ui>

1
retroshare-gui/src/gui/images.qrc
View file

@ -70,6 +70,7 @@
<file>images/finished_background.png</file> <file>images/finished_background.png</file>
<file>images/fonts.png</file> <file>images/fonts.png</file>
<file>images/folder16.png</file> <file>images/folder16.png</file>
<file>images/foldermail.png</file>
<file>images/folderopen.png</file> <file>images/folderopen.png</file>
<file>images/fileopen.png</file> <file>images/fileopen.png</file>
<file>images/graph-downloaded.png</file> <file>images/graph-downloaded.png</file>

BIN
retroshare-gui/src/gui/images/foldermail.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 505 B