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

restored back changes from circles & profile gen dialog

Browse Source 
*Restored back changes from circles & profile gen dialog
*Fixed channel frame stylesheet
This commit is contained in:
defnax 2019-01-09 22:35:07 +01:00
parent ef4a29d4d4
commit 868a2a30b6
4 changed files with 141 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
retroshare-gui/src/gui/GenCertDialog.cpp
View File

@ -324,10 +324,6 @@ void GenCertDialog::setupState()
ui.keylength_label->setVisible(adv_state); ui.keylength_label->setVisible(adv_state);
ui.keylength_comboBox->setVisible(adv_state); ui.keylength_comboBox->setVisible(adv_state);
ui.nodeType_CB->setVisible(adv_state);
ui.nodeTypeExplanation_TE->setVisible(adv_state);
ui.nodetype_label->setVisible(adv_state);
ui.entropy_bar->setVisible(true); ui.entropy_bar->setVisible(true);
ui.genButton->setVisible(true); ui.genButton->setVisible(true);

247
retroshare-gui/src/gui/GenCertDialog.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>633</width> <width>978</width>
<height>532</height> <height>826</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -69,6 +69,44 @@
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="nodeType_LB">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Node type:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="nodeType_CB">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Standard node</string>
</property>
</item>
<item>
<property name="text">
<string>Hidden node (over Tor)</string>
</property>
</item>
<item>
<property name="text">
<string>Hidden node (Tor/I2P - Manually configured)</string>
</property>
</item>
</widget>
</item>
<item> <item>
<spacer name="toolBarHSpacer"> <spacer name="toolBarHSpacer">
<property name="orientation"> <property name="orientation">
@ -130,13 +168,6 @@
</property> </property>
<item row="1" column="0"> <item row="1" column="0">
<layout class="QGridLayout" name="profilGLayout"> <layout class="QGridLayout" name="profilGLayout">
<item row="7" column="3">
<widget class="QLabel" name="password_check_LB">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="14" column="2"> <item row="14" column="2">
<widget class="QComboBox" name="keylength_comboBox"> <widget class="QComboBox" name="keylength_comboBox">
<property name="sizePolicy"> <property name="sizePolicy">
@ -153,7 +184,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="19" column="1"> <item row="18" column="1">
<widget class="QLabel" name="randomness_label_"> <widget class="QLabel" name="randomness_label_">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
@ -175,19 +206,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="19" column="2"> <item row="7" column="3">
<widget class="QProgressBar" name="entropy_bar"> <widget class="QLabel" name="password_check_LB">
<property name="sizePolicy"> <property name="text">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <string/>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="value">
<number>24</number>
</property> </property>
</widget> </widget>
</item> </item>
@ -219,7 +241,23 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="19" column="3"> <item row="18" column="2">
<widget class="QProgressBar" name="entropy_bar">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="value">
<number>24</number>
</property>
</widget>
</item>
<item row="18" column="3">
<widget class="QLabel" name="randomness_check_LB"> <widget class="QLabel" name="randomness_check_LB">
<property name="text"> <property name="text">
<string/> <string/>
@ -375,29 +413,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="17" column="2">
<widget class="QLabel" name="name_label">
<property name="maximumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="icons.qrc">:/icons/svg/person.svg</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="18" column="2">
<layout class="QHBoxLayout" name="hiddenInfoHLayout"> <layout class="QHBoxLayout" name="hiddenInfoHLayout">
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
@ -468,13 +484,6 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="20" column="3">
<widget class="QLabel" name="generate_label">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="9" column="2"> <item row="9" column="2">
<widget class="QLineEdit" name="nickname_input"> <widget class="QLineEdit" name="nickname_input">
<property name="sizePolicy"> <property name="sizePolicy">
@ -488,7 +497,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="20" column="2"> <item row="19" column="2">
<widget class="QPushButton" name="genButton"> <widget class="QPushButton" name="genButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@ -521,6 +530,35 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="19" column="3">
<widget class="QLabel" name="generate_label">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="name_label">
<property name="maximumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="icons.qrc">:/icons/svg/person.svg</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="9" column="1"> <item row="9" column="1">
<widget class="QLabel" name="nickname_label"> <widget class="QLabel" name="nickname_label">
<property name="maximumSize"> <property name="maximumSize">
@ -546,31 +584,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="1">
<widget class="QLabel" name="password2_label">
<property name="maximumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="toolTip">
<string>This password is for PGP</string>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="icons.qrc">:/icons/svg/password.svg</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="5" column="1"> <item row="5" column="1">
<widget class="QLabel" name="node_label"> <widget class="QLabel" name="node_label">
<property name="maximumSize"> <property name="maximumSize">
@ -615,6 +628,31 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="1">
<widget class="QLabel" name="password2_label">
<property name="maximumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="toolTip">
<string>This password is for PGP</string>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="icons.qrc">:/icons/svg/password.svg</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="7" column="1"> <item row="7" column="1">
<widget class="QLabel" name="password_label"> <widget class="QLabel" name="password_label">
<property name="maximumSize"> <property name="maximumSize">
@ -640,7 +678,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="18" column="1"> <item row="17" column="1">
<widget class="QLabel" name="hiddenaddr_label"> <widget class="QLabel" name="hiddenaddr_label">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
@ -662,53 +700,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="15" column="2">
<widget class="QComboBox" name="nodeType_CB">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Standard node</string>
</property>
</item>
<item>
<property name="text">
<string>Hidden node (over Tor)</string>
</property>
</item>
<item>
<property name="text">
<string>Hidden node (Tor/I2P - Manually configured)</string>
</property>
</item>
</widget>
</item>
<item row="15" column="1">
<widget class="QLabel" name="nodetype_label">
<property name="maximumSize">
<size>
<width>24</width>
<height>26</height>
</size>
</property>
<property name="toolTip">
<string>Node type</string>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="icons.qrc">:/icons/png/settings.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item row="0" column="0"> <item row="0" column="0">

22
retroshare-gui/src/gui/Identity/IdDialog.cpp
View File

@ -133,8 +133,8 @@ class TreeWidgetItem : public QTreeWidgetItem
return v1 < v2; return v1 < v2;
} }
else else // case insensitive sorting
return data(column,Qt::DisplayRole).toString() < other.data(column,Qt::DisplayRole).toString(); return data(column,Qt::DisplayRole).toString().toUpper() < other.data(column,Qt::DisplayRole).toString().toUpper();
} }
}; };
@ -165,8 +165,7 @@ IdDialog::IdDialog(QWidget *parent) :
ui->treeWidget_membership->clear(); ui->treeWidget_membership->clear();
mMyCircleItem = NULL ; mExternalOtherCircleItem = NULL ;
mExternalOtherCircleItem = NULL ;
mExternalBelongingCircleItem = NULL ; mExternalBelongingCircleItem = NULL ;
/* Setup UI helper */ /* Setup UI helper */
@ -506,12 +505,6 @@ void IdDialog::loadCircleGroupMeta(const uint32_t &token)
//ui->treeWidget_membership->addTopLevelItem(personalCirclesItem); //ui->treeWidget_membership->addTopLevelItem(personalCirclesItem);
#ifdef CIRCLE_MEMBERSHIP_CATEGORIES #ifdef CIRCLE_MEMBERSHIP_CATEGORIES
if(!mMyCircleItem )
{
mMyCircleItem = new QTreeWidgetItem();
mMyCircleItem->setText(0, tr("My Circles"));
ui->treeWidget_membership->addTopLevelItem(mMyCircleItem);
}
if(!mExternalOtherCircleItem) if(!mExternalOtherCircleItem)
{ {
mExternalOtherCircleItem = new QTreeWidgetItem(); mExternalOtherCircleItem = new QTreeWidgetItem();
@ -606,14 +599,7 @@ void IdDialog::loadCircleGroupMeta(const uint32_t &token)
item->setData(CIRCLEGROUP_CIRCLE_COL_GROUPFLAGS, Qt::UserRole, QVariant(vit->mSubscribeFlags)); item->setData(CIRCLEGROUP_CIRCLE_COL_GROUPFLAGS, Qt::UserRole, QVariant(vit->mSubscribeFlags));
#ifdef CIRCLE_MEMBERSHIP_CATEGORIES #ifdef CIRCLE_MEMBERSHIP_CATEGORIES
if(am_I_admin) if(am_I_in_circle)
{
#ifdef ID_DEBUG
std::cerr << " adding item for circle " << vit->mGroupId << " to own circles"<< std::endl;
#endif
mMyCircleItem->addChild(item);
}
else if(am_I_in_circle)
{ {
#ifdef ID_DEBUG #ifdef ID_DEBUG
std::cerr << " adding item for circle " << vit->mGroupId << " to own circles"<< std::endl; std::cerr << " adding item for circle " << vit->mGroupId << " to own circles"<< std::endl;

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

@ -94,6 +94,22 @@ CreateChannelMsg QFrame#fileFrame {
background: white; background: white;
} }
GxsCreateCommentDialog QTextEdit#commentTextEdit {
border: 2px solid #0099cc;
border-radius: 6px;
background: white;
}
GxsCreateCommentDialog QLabel#titleLabel {
font-size: 12px;
font-weight: 600;
color: black;
}
GxsCreateCommentDialog QLabel#replaytolabel {
font-weight: bold;
color: gray;
}
/* Forums */ /* Forums */
@ -351,13 +367,13 @@ ChanNewItem QLabel#logoLabel {
border-radius: 2px; border-radius: 2px;
} }
GxsChannelPostItem > QFrame#frame[new=false] { GxsChannelPostItem > QFrame#mainFrame[new=false] {
border: 3px solid #D3D3D3; border: 3px solid #D3D3D3;
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFFF, stop:1 #F2F2F2); background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFFF, stop:1 #F2F2F2);
border-radius: 10px; border-radius: 10px;
} }
GxsChannelPostItem > QFrame#frame[new=true] { GxsChannelPostItem > QFrame#mainFrame[new=true] {
border: 3px solid #82B9F4; border: 3px solid #82B9F4;
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #F0F8FD, stop:0.8 #E6F2FD, stop: 0.81 #E6F2FD, stop: 1 #D2E7FD); background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #F0F8FD, stop:0.8 #E6F2FD, stop: 0.81 #E6F2FD, stop: 1 #D2E7FD);
border-radius: 10px; border-radius: 10px;