From 868a2a30b6e383a1d3158bc2444828fc76108a02 Mon Sep 17 00:00:00 2001 From: defnax Date: Wed, 9 Jan 2019 22:35:07 +0100 Subject: [PATCH] restored back changes from circles & profile gen dialog *Restored back changes from circles & profile gen dialog *Fixed channel frame stylesheet --- retroshare-gui/src/gui/GenCertDialog.cpp | 4 - retroshare-gui/src/gui/GenCertDialog.ui | 247 +++++++++--------- retroshare-gui/src/gui/Identity/IdDialog.cpp | 22 +- .../src/gui/qss/stylesheet/Standard.qss | 20 +- 4 files changed, 141 insertions(+), 152 deletions(-) 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 @@ 0 0 - 633 - 532 + 978 + 826 @@ -69,6 +69,44 @@ + + + + + 75 + true + + + + Node type: + + + + + + + + 0 + 0 + + + + + Standard node + + + + + Hidden node (over Tor) + + + + + Hidden node (Tor/I2P - Manually configured) + + + + @@ -130,13 +168,6 @@ - - - - - - - @@ -153,7 +184,7 @@ - + @@ -175,19 +206,10 @@ - - - - - 0 - 0 - - - - <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> - - - 24 + + + + @@ -219,7 +241,23 @@ - + + + + + 0 + 0 + + + + <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> + + + 24 + + + + @@ -375,29 +413,7 @@ - - - - - 24 - 24 - - - - - - - :/icons/svg/person.svg - - - true - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - + 6 @@ -468,13 +484,6 @@ - - - - - - - @@ -488,7 +497,7 @@ - + @@ -521,6 +530,35 @@ + + + + + + + + + + + + 24 + 24 + + + + + + + :/icons/svg/person.svg + + + true + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + @@ -546,31 +584,6 @@ - - - - - 24 - 24 - - - - This password is for PGP - - - - - - :/icons/svg/password.svg - - - true - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - @@ -615,6 +628,31 @@ + + + + + 24 + 24 + + + + This password is for PGP + + + + + + :/icons/svg/password.svg + + + true + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + @@ -640,7 +678,7 @@ - + @@ -662,53 +700,6 @@ - - - - - 0 - 0 - - - - - Standard node - - - - - Hidden node (over Tor) - - - - - Hidden node (Tor/I2P - Manually configured) - - - - - - - - - 24 - 26 - - - - Node type - - - - - - :/icons/png/settings.png - - - true - - - 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;