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

* Added to change dynamicly the share key info description.

Browse Source 
* Added default stylesheet for the info label. 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7673 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2014-11-11 20:12:53 +00:00
parent db4b87cd01
commit fcb7b6c340
3 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
retroshare-gui/src/gui/gxs/GxsGroupShareKey.cpp
View File

@ -79,14 +79,14 @@ void GroupShareKey::setTyp()
ui->headerFrame->setHeaderImage(QPixmap(":/images/channels.png")); ui->headerFrame->setHeaderImage(QPixmap(":/images/channels.png"));
ui->headerFrame->setHeaderText(tr("Share Channel")); ui->headerFrame->setHeaderText(tr("Share Channel"));
ui->sharekeyinfo_label->setText(tr("You can let your friends know about your Channel by sharing it with them. Select the Friends with which you want to Share your Channel."));
} }
else if(mGrpType == FORUM_KEY_SHARE) else if(mGrpType == FORUM_KEY_SHARE)
{ {
ui->headerFrame->setHeaderImage(QPixmap(":/images/konversation64.png")); ui->headerFrame->setHeaderImage(QPixmap(":/images/konversation64.png"));
ui->headerFrame->setHeaderText(tr("Share Forum")); ui->headerFrame->setHeaderText(tr("Share Forum"));
ui->sharekeyinfo_label->setText(tr("You can let your friends know about your Forum by sharing it with them. Select the Friends with which you want to Share your Forum."));
} }
else if (mGrpType == POSTED_KEY_SHARE) else if (mGrpType == POSTED_KEY_SHARE)
@ -95,7 +95,8 @@ void GroupShareKey::setTyp()
return; return;
ui->headerFrame->setHeaderImage(QPixmap(":/images/posted_64.png")); ui->headerFrame->setHeaderImage(QPixmap(":/images/posted_64.png"));
ui->headerFrame->setHeaderText(tr("Share Posted")); ui->headerFrame->setHeaderText(tr("Share Posted"));
ui->sharekeyinfo_label->setText(tr("You can let your friends know about your Posted by sharing it with them. Select the Friends with which you want to Share your Posted."));
} }
else else

26
retroshare-gui/src/gui/gxs/GxsGroupShareKey.ui
View File

@ -6,12 +6,12 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>472</width> <width>526</width>
<height>347</height> <height>347</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Share Channel</string> <string>Share</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="margin"> <property name="margin">
@ -134,9 +134,27 @@
</layout> </layout>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="sharekeyinfo_label">
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<property name="text"> <property name="text">
<string>Select the Friends with which you want to Share your Channel.</string> <string>You can let your friends know about your Channel by sharing it with them.
Select the Friends with which you want to Share your Channel.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>

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

@ -563,3 +563,10 @@ PostedItem QLabel#notes {
border: 2px solid #CCCCCC; border: 2px solid #CCCCCC;
border-radius: 10px border-radius: 10px
} }
QLabel#sharekeyinfo_label{
border: 1px solid #DCDC41;
border-radius: 6px;
background: #FFFFD7;
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2);
}