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

* Changed the logo size for some news feed items to use same size for better look.

Browse Source 
* Added to display blue/black forum message icons for the forum feeds, when forum is anon or signed. 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6966 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2013-12-27 18:24:13 +00:00
parent d5cfa5c9b5
commit 51ed2ca9f9
8 changed files with 181 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
retroshare-gui/src/gui/feeds/ChanNewItem.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>643</width> <width>643</width>
<height>155</height> <height>157</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout">
@ -75,18 +75,18 @@
<widget class="QLabel" name="logoLabel"> <widget class="QLabel" name="logoLabel">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>64</width> <width>70</width>
<height>64</height> <height>70</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>64</width> <width>70</width>
<height>64</height> <height>70</height>
</size> </size>
</property> </property>
<property name="scaledContents"> <property name="scaledContents">
<bool>true</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>

6
retroshare-gui/src/gui/feeds/ForumMsgItem.cpp
View File

@ -121,6 +121,12 @@ void ForumMsgItem::updateItemStatic()
titleLabel->setText(tr("Unknown Forum Post")); titleLabel->setText(tr("Unknown Forum Post"));
} }
if (fi.forumFlags & RS_DISTRIB_AUTHEN_REQ) {
iconLabel->setPixmap(QPixmap(":/images/konv_message64.png"));
} else {
iconLabel->setPixmap(QPixmap(":/images/konversation64.png"));
}
/* get actual Message */ /* get actual Message */
ForumMsgInfo msg; ForumMsgInfo msg;
if (rsForums->getForumMessage(mForumId, mPostId, msg)) if (rsForums->getForumMessage(mForumId, mPostId, msg))

10
retroshare-gui/src/gui/feeds/ForumMsgItem.ui
View File

@ -75,18 +75,18 @@
<widget class="QLabel" name="iconLabel"> <widget class="QLabel" name="iconLabel">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>48</width> <width>70</width>
<height>48</height> <height>70</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>48</width> <width>70</width>
<height>48</height> <height>70</height>
</size> </size>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="../images.qrc">:/images/konversation.png</pixmap> <pixmap resource="../images.qrc">:/images/konversation64.png</pixmap>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>

6
retroshare-gui/src/gui/feeds/ForumNewItem.cpp
View File

@ -87,6 +87,12 @@ void ForumNewItem::updateItemStatic()
postButton->setEnabled(false); postButton->setEnabled(false);
} }
if (fi.forumFlags & RS_DISTRIB_AUTHEN_REQ) {
forumlogo_label->setPixmap(QPixmap(":/images/konv_message64.png"));
} else {
forumlogo_label->setPixmap(QPixmap(":/images/konversation64.png"));
}
/* should also check the other flags */ /* should also check the other flags */
} }
else else

320
retroshare-gui/src/gui/feeds/ForumNewItem.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>618</width> <width>618</width>
<height>117</height> <height>157</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout">
@ -95,180 +95,172 @@
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Sunken</enum> <enum>QFrame::Sunken</enum>
</property> </property>
<layout class="QVBoxLayout"> <layout class="QGridLayout" name="gridLayout_2">
<property name="leftMargin"> <item row="0" column="0">
<number>9</number> <layout class="QGridLayout" name="gridLayout">
</property> <item row="0" column="0" rowspan="2">
<property name="topMargin"> <widget class="QLabel" name="forumlogo_label">
<number>6</number> <property name="minimumSize">
</property> <size>
<property name="bottomMargin"> <width>70</width>
<number>6</number> <height>70</height>
</property> </size>
<item> </property>
<layout class="QHBoxLayout"> <property name="maximumSize">
<item> <size>
<widget class="QLabel" name="label"> <width>70</width>
<height>70</height>
</size>
</property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="../images.qrc">:/images/konversation.png</pixmap> <pixmap resource="../images.qrc">:/images/konversation64.png</pixmap>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="0" column="1">
<widget class="QLabel" name="titleLabel"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="sizePolicy"> <item>
<sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <widget class="QLabel" name="titleLabel">
<horstretch>0</horstretch> <property name="sizePolicy">
<verstretch>0</verstretch> <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
</sizepolicy> <horstretch>0</horstretch>
</property> <verstretch>0</verstretch>
<property name="font"> </sizepolicy>
<font> </property>
<weight>75</weight> <property name="font">
<italic>true</italic> <font>
<bold>true</bold> <weight>75</weight>
</font> <italic>true</italic>
</property> <bold>true</bold>
<property name="text"> </font>
<string notr="true">Forum</string> </property>
</property> <property name="text">
</widget> <string notr="true">Forum</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="nameLabel">
<property name="text">
<string notr="true">name</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item> </item>
<item> <item row="1" column="1">
<spacer> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="orientation"> <item>
<enum>Qt::Horizontal</enum> <spacer>
</property> <property name="orientation">
<property name="sizeType"> <enum>Qt::Horizontal</enum>
<enum>QSizePolicy::Fixed</enum> </property>
</property> <property name="sizeType">
<property name="sizeHint" stdset="0"> <enum>QSizePolicy::Expanding</enum>
<size> </property>
<width>20</width> <property name="sizeHint" stdset="0">
<height>20</height> <size>
</size> <width>254</width>
</property> <height>28</height>
</spacer> </size>
</item> </property>
<item> </spacer>
<widget class="QLabel" name="nameLabel"> </item>
<property name="text"> <item>
<string notr="true">name</string> <widget class="QPushButton" name="subscribeButton">
</property> <property name="sizePolicy">
<property name="openExternalLinks"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<bool>true</bool> <horstretch>0</horstretch>
</property> <verstretch>0</verstretch>
</widget> </sizepolicy>
</item> </property>
<item> <property name="focusPolicy">
<spacer> <enum>Qt::NoFocus</enum>
<property name="orientation"> </property>
<enum>Qt::Horizontal</enum> <property name="toolTip">
</property> <string>Subscribe to Forum</string>
<property name="sizeType"> </property>
<enum>QSizePolicy::Expanding</enum> <property name="icon">
</property> <iconset resource="../images.qrc">
<property name="sizeHint" stdset="0"> <normaloff>:/images/directoryadd_24x24_shadow.png</normaloff>:/images/directoryadd_24x24_shadow.png</iconset>
<size> </property>
<width>500</width> </widget>
<height>20</height> </item>
</size> <item>
</property> <widget class="QPushButton" name="postButton">
</spacer> <property name="focusPolicy">
</item> <enum>Qt::NoFocus</enum>
<item> </property>
<widget class="QPushButton" name="subscribeButton"> <property name="icon">
<property name="sizePolicy"> <iconset resource="../images.qrc">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <normaloff>:/images/mail_new.png</normaloff>:/images/mail_new.png</iconset>
<horstretch>0</horstretch> </property>
<verstretch>0</verstretch> </widget>
</sizepolicy> </item>
</property> <item>
<property name="focusPolicy"> <widget class="QPushButton" name="expandButton">
<enum>Qt::NoFocus</enum> <property name="sizePolicy">
</property> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<property name="toolTip"> <horstretch>0</horstretch>
<string>Subscribe to Forum</string> <verstretch>0</verstretch>
</property> </sizepolicy>
<property name="icon"> </property>
<iconset resource="../images.qrc"> <property name="focusPolicy">
<normaloff>:/images/directoryadd_24x24_shadow.png</normaloff>:/images/directoryadd_24x24_shadow.png</iconset> <enum>Qt::NoFocus</enum>
</property> </property>
</widget> <property name="toolTip">
</item> <string>Expand</string>
<item> </property>
<widget class="QPushButton" name="postButton"> <property name="icon">
<property name="focusPolicy"> <iconset resource="../images.qrc">
<enum>Qt::NoFocus</enum> <normaloff>:/images/edit_add24.png</normaloff>:/images/edit_add24.png</iconset>
</property> </property>
<property name="icon"> </widget>
<iconset resource="../images.qrc"> </item>
<normaloff>:/images/mail_new.png</normaloff>:/images/mail_new.png</iconset> <item>
</property> <widget class="QPushButton" name="clearButton">
</widget> <property name="sizePolicy">
</item> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<item> <horstretch>0</horstretch>
<spacer> <verstretch>0</verstretch>
<property name="orientation"> </sizepolicy>
<enum>Qt::Horizontal</enum> </property>
</property> <property name="focusPolicy">
<property name="sizeType"> <enum>Qt::NoFocus</enum>
<enum>QSizePolicy::Fixed</enum> </property>
</property> <property name="toolTip">
<property name="sizeHint" stdset="0"> <string>Remove Item</string>
<size> </property>
<width>20</width> <property name="icon">
<height>20</height> <iconset resource="../images.qrc">
</size> <normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset>
</property> </property>
</spacer> </widget>
</item> </item>
<item> </layout>
<widget class="QPushButton" name="expandButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Expand</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/edit_add24.png</normaloff>:/images/edit_add24.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="clearButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Remove Item</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset>
</property>
</widget>
</item> </item>
</layout> </layout>
</item> </item>
<item> <item row="1" column="0">
<widget class="QFrame" name="expandFrame"> <widget class="QFrame" name="expandFrame">
<layout class="QVBoxLayout"> <layout class="QVBoxLayout">
<property name="spacing"> <property name="spacing">

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

@ -305,6 +305,7 @@
<file>images/konversation16.png</file> <file>images/konversation16.png</file>
<file>images/konversation128.png</file> <file>images/konversation128.png</file>
<file>images/konv_message2.png</file> <file>images/konv_message2.png</file>
<file>images/konv_message64.png</file>
<file>images/konversation64.png</file> <file>images/konversation64.png</file>
<file>images/forums_new.png</file> <file>images/forums_new.png</file>
<file>images/ksysguard.png</file> <file>images/ksysguard.png</file>

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

2
retroshare-gui/src/gui/qss/stylesheet/Standard.qss
View File

@ -401,7 +401,7 @@ ForumNewItem > QLabel#nextNameLabel, ForumMsgItem > QLabel#nameLabel {
} }
ForumMsgItem QLabel#iconLabel { ForumMsgItem QLabel#iconLabel {
border: 2px solid black; border: 2px solid #CCCCCC;
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #EEEEEE, stop: 1 #CCCCCC); background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #EEEEEE, stop: 1 #CCCCCC);
border-radius: 10px border-radius: 10px
} }