diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp index eb678370b..7581c4a2a 100644 --- a/retroshare-gui/src/gui/GenCertDialog.cpp +++ b/retroshare-gui/src/gui/GenCertDialog.cpp @@ -324,10 +324,6 @@ void GenCertDialog::setupState() ui.keylength_label->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.genButton->setVisible(true); diff --git a/retroshare-gui/src/gui/GenCertDialog.ui b/retroshare-gui/src/gui/GenCertDialog.ui index 64d09328f..6c030db02 100644 --- a/retroshare-gui/src/gui/GenCertDialog.ui +++ b/retroshare-gui/src/gui/GenCertDialog.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>633</width> - <height>532</height> + <width>978</width> + <height>826</height> </rect> </property> <property name="windowTitle"> @@ -69,6 +69,44 @@ </item> <item> <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> <spacer name="toolBarHSpacer"> <property name="orientation"> @@ -130,13 +168,6 @@ </property> <item row="1" column="0"> <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"> <widget class="QComboBox" name="keylength_comboBox"> <property name="sizePolicy"> @@ -153,7 +184,7 @@ </property> </widget> </item> - <item row="19" column="1"> + <item row="18" column="1"> <widget class="QLabel" name="randomness_label_"> <property name="maximumSize"> <size> @@ -175,19 +206,10 @@ </property> </widget> </item> - <item row="19" 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><html><head/><body><p>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.</p></body></html></string> - </property> - <property name="value"> - <number>24</number> + <item row="7" column="3"> + <widget class="QLabel" name="password_check_LB"> + <property name="text"> + <string/> </property> </widget> </item> @@ -219,7 +241,23 @@ </property> </widget> </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><html><head/><body><p>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.</p></body></html></string> + </property> + <property name="value"> + <number>24</number> + </property> + </widget> + </item> + <item row="18" column="3"> <widget class="QLabel" name="randomness_check_LB"> <property name="text"> <string/> @@ -375,29 +413,7 @@ </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="18" column="2"> + <item row="17" column="2"> <layout class="QHBoxLayout" name="hiddenInfoHLayout"> <property name="spacing"> <number>6</number> @@ -468,13 +484,6 @@ </item> </layout> </item> - <item row="20" column="3"> - <widget class="QLabel" name="generate_label"> - <property name="text"> - <string/> - </property> - </widget> - </item> <item row="9" column="2"> <widget class="QLineEdit" name="nickname_input"> <property name="sizePolicy"> @@ -488,7 +497,7 @@ </property> </widget> </item> - <item row="20" column="2"> + <item row="19" column="2"> <widget class="QPushButton" name="genButton"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> @@ -521,6 +530,35 @@ </property> </widget> </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"> <widget class="QLabel" name="nickname_label"> <property name="maximumSize"> @@ -546,31 +584,6 @@ </property> </widget> </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"> <widget class="QLabel" name="node_label"> <property name="maximumSize"> @@ -615,6 +628,31 @@ </property> </widget> </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"> <widget class="QLabel" name="password_label"> <property name="maximumSize"> @@ -640,7 +678,7 @@ </property> </widget> </item> - <item row="18" column="1"> + <item row="17" column="1"> <widget class="QLabel" name="hiddenaddr_label"> <property name="maximumSize"> <size> @@ -662,53 +700,6 @@ </property> </widget> </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> </item> <item row="0" column="0"> diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp index 48bc4682a..2f22229d7 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp @@ -133,8 +133,8 @@ class TreeWidgetItem : public QTreeWidgetItem return v1 < v2; } - else - return data(column,Qt::DisplayRole).toString() < other.data(column,Qt::DisplayRole).toString(); + else // case insensitive sorting + 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(); - mMyCircleItem = NULL ; - mExternalOtherCircleItem = NULL ; + mExternalOtherCircleItem = NULL ; mExternalBelongingCircleItem = NULL ; /* Setup UI helper */ @@ -506,12 +505,6 @@ void IdDialog::loadCircleGroupMeta(const uint32_t &token) //ui->treeWidget_membership->addTopLevelItem(personalCirclesItem); #ifdef CIRCLE_MEMBERSHIP_CATEGORIES - if(!mMyCircleItem ) - { - mMyCircleItem = new QTreeWidgetItem(); - mMyCircleItem->setText(0, tr("My Circles")); - ui->treeWidget_membership->addTopLevelItem(mMyCircleItem); - } if(!mExternalOtherCircleItem) { 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)); #ifdef CIRCLE_MEMBERSHIP_CATEGORIES - if(am_I_admin) - { -#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) + if(am_I_in_circle) { #ifdef ID_DEBUG std::cerr << " adding item for circle " << vit->mGroupId << " to own circles"<< std::endl; diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index 9415a554f..4fd0f7f92 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -94,6 +94,22 @@ CreateChannelMsg QFrame#fileFrame { 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 */ @@ -351,13 +367,13 @@ ChanNewItem QLabel#logoLabel { border-radius: 2px; } -GxsChannelPostItem > QFrame#frame[new=false] { +GxsChannelPostItem > QFrame#mainFrame[new=false] { border: 3px solid #D3D3D3; background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFFF, stop:1 #F2F2F2); border-radius: 10px; } -GxsChannelPostItem > QFrame#frame[new=true] { +GxsChannelPostItem > QFrame#mainFrame[new=true] { 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); border-radius: 10px;