Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-11 10:35:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added subscribe/unsubscribe to album icons

Browse source 
Fixed layout spaces for GxsGroupDialog.ui, when some labels/buttons is hided.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5859 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2012-11-20 14:08:28 +00:00
parent 03a3499a1b
commit 96b0d4a372
7 changed files with 319 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

533
retroshare-gui/src/gui/Identity/IdDialog.ui
View file

@ -13,10 +13,73 @@
<property name="windowTitle"> <property name="windowTitle">
<string/> <string/>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0" rowspan="3"> <item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QGridLayout" name="gridLayout_3">
<item> <property name="bottomMargin">
<number>6</number>
</property>
<property name="spacing">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="margin">
<number>1</number>
</property>
<item>
<widget class="QLabel" name="label_9">
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/groupchat.png</pixmap>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_10">
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="text">
<string>Identities</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton_NewId">
<property name="text">
<string>New ID</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
<string>Showing:</string> <string>Showing:</string>
@ -84,7 +147,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item row="2" column="0">
<widget class="QTreeWidget" name="treeWidget_IdList"> <widget class="QTreeWidget" name="treeWidget_IdList">
<column> <column>
<property name="text"> <property name="text">
@ -106,260 +169,278 @@
</layout> </layout>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QGridLayout" name="gridLayout_4">
<item> <property name="verticalSpacing">
<widget class="QPushButton" name="pushButton_Delete"> <number>0</number>
<property name="text">
<string>Delete ID</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_Reputation">
<property name="text">
<string>Edit Reputation</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_EditId">
<property name="text">
<string>Edit ID</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_NewId">
<property name="text">
<string>New ID</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="1">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Identity Type</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <item row="0" column="0">
<item row="0" column="0"> <widget class="QFrame" name="frame">
<widget class="QLabel" name="label"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="text"> <property name="margin">
<string>Nickname</string> <number>3</number>
</property> </property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineEdit_Nickname">
<property name="enabled">
<bool>true</bool>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="2" rowspan="6">
<layout class="QVBoxLayout" name="verticalLayout_3">
<item> <item>
<widget class="QRadioButton" name="radioButton_IdYourself"> <widget class="QPushButton" name="pushButton_Delete">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text"> <property name="text">
<string>Yourself</string> <string>Delete ID</string>
</property>
<property name="checkable">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QRadioButton" name="radioButton_IdFriend"> <widget class="QPushButton" name="pushButton_Reputation">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text"> <property name="text">
<string>Friend</string> <string>Edit Reputation</string>
</property>
<property name="checkable">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QRadioButton" name="radioButton_IdFOF"> <widget class="QPushButton" name="pushButton_EditId">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text"> <property name="text">
<string>Friend of Friend</string> <string>Edit ID</string>
</property>
<property name="checkable">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QRadioButton" name="radioButton_IdOther"> <spacer name="horizontalSpacer">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Other</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line_2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Identity Type</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Nickname</string>
</property>
</widget> </widget>
</item> </item>
<item> <item row="0" column="1">
<widget class="QRadioButton" name="radioButton_IdPseudo"> <widget class="QLineEdit" name="lineEdit_Nickname">
<property name="enabled"> <property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Pseudonym</string>
</property>
<property name="checkable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="2" rowspan="6">
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QRadioButton" name="radioButton_IdYourself">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Yourself</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_IdFriend">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Friend</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_IdFOF">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Friend of Friend</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_IdOther">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Other</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_IdPseudo">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Pseudonym</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Key ID</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="lineEdit_KeyId">
<property name="enabled">
<bool>true</bool>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>GPG Name</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="lineEdit_GpgName">
<property name="enabled">
<bool>true</bool>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>GPG Email</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLineEdit" name="lineEdit_GpgEmail">
<property name="enabled">
<bool>true</bool>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="lineEdit_GpgHash">
<property name="enabled">
<bool>true</bool>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="lineEdit_GpgId">
<property name="enabled">
<bool>true</bool>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>GPG Id</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>GPG Hash</string>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </widget>
<item row="1" column="0"> </item>
<widget class="QLabel" name="label_4"> <item row="2" column="0">
<property name="text"> <widget class="QGroupBox" name="groupBox_3">
<string>Key ID</string> <property name="title">
</property> <string>Reputation</string>
</widget> </property>
</item> <layout class="QGridLayout" name="gridLayout_2">
<item row="1" column="1"> <item row="0" column="0">
<widget class="QLineEdit" name="lineEdit_KeyId"> <widget class="QLabel" name="label_6">
<property name="enabled"> <property name="text">
<bool>true</bool> <string>Your Rating</string>
</property> </property>
<property name="readOnly"> </widget>
<bool>true</bool> </item>
</property> <item row="0" column="1">
</widget> <widget class="QSpinBox" name="spinBox"/>
</item> </item>
<item row="4" column="0"> <item row="0" column="2">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>GPG Name</string> <string>Overall Rating</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="0" column="3">
<widget class="QLineEdit" name="lineEdit_GpgName"> <widget class="QLineEdit" name="lineEdit_3"/>
<property name="enabled"> </item>
<bool>true</bool> <item row="1" column="0" colspan="4">
</property> <widget class="QListWidget" name="listWidget"/>
<property name="readOnly"> </item>
<bool>true</bool> </layout>
</property> </widget>
</widget> </item>
</item> </layout>
<item row="5" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>GPG Email</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLineEdit" name="lineEdit_GpgEmail">
<property name="enabled">
<bool>true</bool>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="lineEdit_GpgHash">
<property name="enabled">
<bool>true</bool>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="lineEdit_GpgId">
<property name="enabled">
<bool>true</bool>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>GPG Id</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>GPG Hash</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="1">
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Reputation</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Your Rating</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="spinBox"/>
</item>
<item row="0" column="2">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Overall Rating</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QLineEdit" name="lineEdit_3"/>
</item>
<item row="1" column="0" colspan="4">
<widget class="QListWidget" name="listWidget"/>
</item>
</layout>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="../LinksCloud/images.qrc"/> <include location="../images.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

2
retroshare-gui/src/gui/PhotoShare/PhotoShare.cpp
View file

@ -330,6 +330,7 @@ void PhotoShare::updateAlbums()
ui.toolButton_subscribe->setEnabled(true); ui.toolButton_subscribe->setEnabled(true);
ui.toolButton_subscribe->setText("Unsubscribe From Album"); ui.toolButton_subscribe->setText("Unsubscribe From Album");
ui.toolButton_subscribe->setIcon(QIcon(":/images/album_unsubscribe.png"));
ui.toolButton_NewAlbum->setEnabled(false); ui.toolButton_NewAlbum->setEnabled(false);
ui.toolButton_SlideShow->setEnabled(true); ui.toolButton_SlideShow->setEnabled(true);
@ -347,6 +348,7 @@ void PhotoShare::updateAlbums()
ui.toolButton_subscribe->setEnabled(true); ui.toolButton_subscribe->setEnabled(true);
ui.toolButton_subscribe->setText("Subscribe To Album"); ui.toolButton_subscribe->setText("Subscribe To Album");
ui.toolButton_subscribe->setIcon(QIcon(":/images/album_subscribe.png"));
ui.toolButton_NewAlbum->setEnabled(false); ui.toolButton_NewAlbum->setEnabled(false);
ui.toolButton_SlideShow->setEnabled(false); ui.toolButton_SlideShow->setEnabled(false);

4
retroshare-gui/src/gui/PhotoShare/PhotoShare.ui
View file

@ -111,8 +111,8 @@
<string>Subscribe To Album</string> <string>Subscribe To Album</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../images.qrc"> <iconset resource="Photo_images.qrc">
<normaloff>:/images/konqsidebar_news24.png</normaloff>:/images/konqsidebar_news24.png</iconset> <normaloff>:/images/album_subscribe.png</normaloff>:/images/album_subscribe.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
<size> <size>

4
retroshare-gui/src/gui/PhotoShare/Photo_images.qrc
View file

@ -1,6 +1,8 @@
<RCC> <RCC>
<qresource prefix="/" > <qresource prefix="/" >
<file>images/kuickshow.png</file> <file>images/kuickshow.png</file>
<file>images/kview_24.png</file> <file>images/kview_24.png</file>
<file>images/album_subscribe.png</file>
<file>images/album_unsubscribe.png</file>
</qresource> </qresource>
</RCC> </RCC>

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

7
retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
View file

@ -159,8 +159,11 @@ border-radius: 10px;
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="leftMargin"> <property name="spacing">
<number>0</number> <number>9</number>
</property>
<property name="margin">
<number>3</number>
</property> </property>
<item> <item>
<widget class="QPushButton" name="addLogoButton"> <widget class="QPushButton" name="addLogoButton">