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

Maked Group Logo label click to set the icon & removed the add icon button

Browse source 
* Maked group logo label click able to set the icon & removed the add icon button
This commit is contained in:
defnax 2020-02-19 23:14:19 +01:00
parent cc4acc0c50
commit e8caa56dc8
3 changed files with 42 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

5
retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
View file

@ -19,6 +19,7 @@
*******************************************************************************/ *******************************************************************************/
#include <QMessageBox> #include <QMessageBox>
#include <QPushButton>
#include "util/misc.h" #include "util/misc.h"
#include "util/DateTime.h" #include "util/DateTime.h"
@ -105,7 +106,6 @@ void GxsGroupDialog::init()
connect(ui.groupLogo, SIGNAL(clicked() ), this , SLOT(addGroupLogo())); connect(ui.groupLogo, SIGNAL(clicked() ), this , SLOT(addGroupLogo()));
connect(ui.addLogoButton, SIGNAL(clicked() ), this , SLOT(addGroupLogo()));
ui.typePublic->setChecked(true); ui.typePublic->setChecked(true);
ui.distributionValueLabel->setText(tr("Public")); ui.distributionValueLabel->setText(tr("Public"));
@ -377,7 +377,6 @@ void GxsGroupDialog::setupVisibility()
ui.groupName->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_NAME); ui.groupName->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_NAME);
ui.groupLogo->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_ICON); ui.groupLogo->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_ICON);
ui.addLogoButton->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_ICON);
ui.groupDesc->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_DESCRIPTION); ui.groupDesc->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_DESCRIPTION);
@ -418,8 +417,6 @@ void GxsGroupDialog::setAllReadonly()
void GxsGroupDialog::setupReadonly() void GxsGroupDialog::setupReadonly()
{ {
ui.addLogoButton->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_ICON));
ui.publishGroupBox->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_PUBLISHSIGN)); ui.publishGroupBox->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_PUBLISHSIGN));
ui.pubKeyShare_cb->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_SHAREKEYS)); ui.pubKeyShare_cb->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_SHAREKEYS));

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

@ -77,6 +77,9 @@
</property> </property>
<item> <item>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
<property name="topMargin">
<number>3</number>
</property>
<property name="horizontalSpacing"> <property name="horizontalSpacing">
<number>6</number> <number>6</number>
</property> </property>
@ -84,7 +87,7 @@
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0" rowspan="2"> <item row="0" column="0" rowspan="2">
<widget class="QLabel" name="groupLogo"> <widget class="ClickableLabel" name="groupLogo">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>64</width> <width>64</width>
@ -97,6 +100,9 @@
<height>64</height> <height>64</height>
</size> </size>
</property> </property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click to add a Logo&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
@ -104,33 +110,13 @@
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="../images.qrc">:/images/channels.png</pixmap> <pixmap resource="../icons.qrc">:/icons/png/add-image.png</pixmap>
</property> </property>
<property name="scaledContents"> <property name="scaledContents">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="leftMargin">
<number>6</number>
</property>
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Name</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="groupName"/>
</item>
</layout>
</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="spacing"> <property name="spacing">
@ -148,17 +134,6 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>3</number> <number>3</number>
</property> </property>
<item>
<widget class="QPushButton" name="addLogoButton">
<property name="text">
<string>Add Icon</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/add_image24.png</normaloff>:/images/add_image24.png</iconset>
</property>
</widget>
</item>
<item> <item>
<spacer name="horizontalSpacer_2"> <spacer name="horizontalSpacer_2">
<property name="orientation"> <property name="orientation">
@ -211,6 +186,26 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="leftMargin">
<number>6</number>
</property>
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Name</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="groupName"/>
</item>
</layout>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>
@ -894,6 +889,11 @@
<extends>QComboBox</extends> <extends>QComboBox</extends>
<header>gui/common/GroupChooser.h</header> <header>gui/common/GroupChooser.h</header>
</customwidget> </customwidget>
<customwidget>
<class>ClickableLabel</class>
<extends>QLabel</extends>
<header>util/ClickableLabel.h</header>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../icons.qrc"/> <include location="../icons.qrc"/>

9
retroshare-gui/src/gui/qss/stylesheet/Standard.qss
View file

@ -813,6 +813,11 @@ GxsChannelPostsWidget QToolButton#subscribeToolButton::menu-button {
} }
GxsGroupDialog QLabel#groupLogo{
border: 2px solid #CCCCCC;
border-radius: 3px;
}
PostedItem QFrame#frame_notes { PostedItem QFrame#frame_notes {
background: white; background: white;
} }
@ -880,12 +885,12 @@ PostedCreatePostDialog QPushButton#submitButton {
border-radius: 4px; border-radius: 4px;
max-height: 27px; max-height: 27px;
min-width: 4em; min-width: 4em;
padding: 2px; padding: 2px;
} }
PostedCreatePostDialog QPushButton#submitButton:hover { PostedCreatePostDialog QPushButton#submitButton:hover {
background: #03b1f3; background: #03b1f3;
border-radius: 4px; border-radius: 4px;
min-width: 4em; min-width: 4em;
padding: 2px; padding: 2px;
} }