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

Added icons for create & post to pulse

Browse Source 
* Added icons for create & post to pulse
* Changed Subscribe strings to Follow/Unfollow
* Added Label for Follow list
This commit is contained in:
defnax 2020-04-17 21:57:44 +02:00
parent 27f2a191c8
commit 519fb01536
5 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
retroshare-gui/src/gui/TheWire/TheWire_images.qrc
View File

@ -1,15 +1,5 @@
<RCC> <RCC>
<qresource prefix="/" > <qresource prefix="/" >
<file>images/kuickshow.png</file> <file>images/compose.png</file>
<file>images/kview_24.png</file>
<file>images/kview_64.png</file>
<file>images/album_64.png</file>
<file>images/album_subscribe.png</file>
<file>images/album_unsubscribe.png</file>
<file>images/album_create_64.png</file>
<file>images/album_default_128.png</file>
<file>images/my_album_48.png</file>
<file>images/subscribed_album_48.png</file>
<file>images/friends_album_48.png</file>
</qresource> </qresource>
</RCC> </RCC>

39
retroshare-gui/src/gui/TheWire/WireDialog.ui
View File

@ -40,6 +40,13 @@
<property name="text"> <property name="text">
<string>Create Account</string> <string>Create Account</string>
</property> </property>
<property name="icon">
<iconset resource="../icons.qrc">
<normaloff>:/icons/png/add.png</normaloff>:/icons/png/add.png</iconset>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -47,6 +54,13 @@
<property name="text"> <property name="text">
<string>Post Pulse</string> <string>Post Pulse</string>
</property> </property>
<property name="icon">
<iconset resource="TheWire_images.qrc">
<normaloff>:/images/compose.png</normaloff>:/images/compose.png</iconset>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -143,7 +157,7 @@
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>Subscribed</string> <string>Following</string>
</property> </property>
</item> </item>
<item> <item>
@ -153,6 +167,20 @@
</item> </item>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="followLabel">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Who to Follow</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QScrollArea" name="scrollArea_2"> <widget class="QScrollArea" name="scrollArea_2">
<property name="widgetResizable"> <property name="widgetResizable">
@ -163,8 +191,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>231</width> <width>228</width>
<height>435</height> <height>421</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_4">
@ -291,8 +319,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>429</width> <width>431</width>
<height>435</height> <height>443</height>
</rect> </rect>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
@ -339,6 +367,7 @@
</widget> </widget>
<resources> <resources>
<include location="TheWire_images.qrc"/> <include location="TheWire_images.qrc"/>
<include location="../icons.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

6
retroshare-gui/src/gui/TheWire/WireGroupItem.cpp
View File

@ -64,13 +64,13 @@ void WireGroupItem::setGroupSet()
} }
else if (mGroup.mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED) else if (mGroup.mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED)
{ {
toolButton_type->setText("Subcribed"); toolButton_type->setText("Following");
toolButton_subscribe->setText("Unsubcribe"); toolButton_subscribe->setText("Unfollow");
} }
else else
{ {
toolButton_type->setText("Other"); toolButton_type->setText("Other");
toolButton_subscribe->setText("Subcribe"); toolButton_subscribe->setText("Follow");
} }
} }

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

3
retroshare-gui/src/retroshare-gui.pro
View File

@ -1240,7 +1240,8 @@ gxsthewire {
gui/TheWire/WireGroupItem.cpp \ gui/TheWire/WireGroupItem.cpp \
gui/TheWire/WireGroupDialog.cpp \ gui/TheWire/WireGroupDialog.cpp \
gui/TheWire/PulseAddDialog.cpp \ gui/TheWire/PulseAddDialog.cpp \
RESOURCES += gui/TheWire/TheWire_images.qrc
} }
identities { identities {