From bb038ab3e031cf2389846f4f36a2fe1e350df52f Mon Sep 17 00:00:00 2001 From: zapek Date: Fri, 18 Jan 2019 23:30:52 +0100 Subject: [PATCH] removed HeaderFrame where it's not needed; changed the font of top tooltips to be the same --- .../src/gui/Circles/CreateCircleDialog.cpp | 12 +-- .../src/gui/Circles/CreateCircleDialog.ui | 30 ++---- retroshare-gui/src/gui/GenCertDialog.cpp | 4 - retroshare-gui/src/gui/HelpDialog.ui | 54 +++++------ retroshare-gui/src/gui/Identity/IdDialog.cpp | 5 - retroshare-gui/src/gui/Identity/IdDialog.ui | 97 +++++-------------- .../src/gui/Identity/IdEditDialog.cpp | 5 - .../src/gui/Identity/IdEditDialog.ui | 11 --- retroshare-gui/src/gui/People/PeopleDialog.ui | 22 ++++- .../src/gui/Posted/PostedCreatePostDialog.cpp | 3 - .../src/gui/Posted/PostedCreatePostDialog.ui | 16 --- .../src/gui/ServicePermissionDialog.cpp | 3 - .../src/gui/ServicePermissionDialog.ui | 36 +++---- retroshare-gui/src/gui/ShareManager.cpp | 3 - retroshare-gui/src/gui/ShareManager.ui | 21 +--- .../src/gui/chat/CreateLobbyDialog.cpp | 3 - .../src/gui/chat/CreateLobbyDialog.ui | 82 ++++++++++++++-- .../src/gui/common/RsCollectionDialog.cpp | 5 - .../src/gui/common/RsCollectionDialog.ui | 20 +--- .../src/gui/connect/ConfCertDialog.cpp | 4 +- .../src/gui/connect/ConfCertDialog.ui | 16 --- .../src/gui/connect/ConnectProgressDialog.cpp | 3 - .../src/gui/connect/ConnectProgressDialog.ui | 20 +--- .../src/gui/connect/PGPKeyDialog.cpp | 3 - .../src/gui/connect/PGPKeyDialog.ui | 21 +--- retroshare-gui/src/gui/groups/CreateGroup.cpp | 6 +- retroshare-gui/src/gui/groups/CreateGroup.ui | 26 ++--- retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp | 8 +- retroshare-gui/src/gui/gxs/GxsGroupDialog.ui | 43 ++++---- .../gui/gxschannels/CreateGxsChannelMsg.cpp | 6 +- .../gui/gxschannels/CreateGxsChannelMsg.ui | 13 +-- .../src/gui/gxsforums/CreateGxsForumMsg.cpp | 3 - .../src/gui/gxsforums/CreateGxsForumMsg.ui | 11 +-- .../src/gui/qss/stylesheet/Standard.qss | 6 -- .../src/gui/qss/stylesheet/qss.default | 15 --- 35 files changed, 211 insertions(+), 425 deletions(-) diff --git a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp index 985eeca72..241265569 100644 --- a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp +++ b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp @@ -54,8 +54,6 @@ CreateCircleDialog::CreateCircleDialog() mCircleQueue = new TokenQueue(rsGxsCircles->getTokenService(), this); mIdQueue = new TokenQueue(rsIdentity->getTokenService(), this); - ui.headerFrame->setHeaderImage(QPixmap(":/icons/png/circles.png")); - // connect up the buttons. connect(ui.addButton, SIGNAL(clicked()), this, SLOT(addMember())); connect(ui.removeButton, SIGNAL(clicked()), this, SLOT(removeMember())); @@ -120,9 +118,9 @@ void CreateCircleDialog::editExistingId(const RsGxsGroupId &circleId, const bool mClearList = clearList; if(readonly) - ui.headerFrame->setHeaderText(tr("Circle Details")); - else - ui.headerFrame->setHeaderText(tr("Edit Circle")); + setWindowTitle(tr("Circle Details")); + else + setWindowTitle(tr("Edit Circle")); ui.radioButton_Public->setEnabled(!readonly) ; ui.radioButton_Self->setEnabled(!readonly) ; @@ -168,13 +166,13 @@ void CreateCircleDialog::editNewId(bool isExternal) if (isExternal) { setupForExternalCircle(); - ui.headerFrame->setHeaderText(tr("Create New Circle")); + setWindowTitle(tr("Create New Circle")); ui.buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Create")); } else { setupForPersonalCircle(); - ui.headerFrame->setHeaderText(tr("Create New Circle")); + setWindowTitle(tr("Create New Circle")); } /* enable stuff that might be locked */ diff --git a/retroshare-gui/src/gui/Circles/CreateCircleDialog.ui b/retroshare-gui/src/gui/Circles/CreateCircleDialog.ui index f90effb34..a29ee3040 100644 --- a/retroshare-gui/src/gui/Circles/CreateCircleDialog.ui +++ b/retroshare-gui/src/gui/Circles/CreateCircleDialog.ui @@ -30,16 +30,6 @@ 0 - - - QFrame::NoFrame - - - QFrame::Plain - - - - QFrame::StyledPanel @@ -458,38 +448,32 @@ LineEditClear QLineEdit -
gui/common/LineEditClear.h
+
gui/common/LineEditClear.h
 RSTreeWidget QTreeWidget
gui/common/RSTreeWidget.h
 - - HeaderFrame - QFrame -
gui/common/HeaderFrame.h
- 1 - GxsIdChooser QComboBox
gui/gxs/GxsIdChooser.h
 - - GxsCircleChooser - QComboBox -
gui/gxs/GxsCircleChooser.h
- GxsIdLabel QLabel
gui/gxs/GxsIdLabel.h
 + + GxsCircleChooser + QComboBox +
gui/gxs/GxsCircleChooser.h
+ - + diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp index 7581c4a2a..e3f777f07 100644 --- a/retroshare-gui/src/gui/GenCertDialog.cpp +++ b/retroshare-gui/src/gui/GenCertDialog.cpp @@ -132,9 +132,6 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent) /* Invoke Qt Designer generated QObject setup routine */ ui.setupUi(this); - //ui.headerFrame->setHeaderImage(QPixmap(":/icons/svg/profile.svg")); - //ui.headerFrame->setHeaderText(tr("Create a new profile")); - connect(ui.reuse_existing_node_CB, SIGNAL(triggered()), this, SLOT(switchReuseExistingNode())); connect(ui.adv_checkbox, SIGNAL(toggled(bool)), this, SLOT(setupState())); connect(ui.nodeType_CB, SIGNAL(currentIndexChanged(int)), this, SLOT(setupState())); @@ -290,7 +287,6 @@ void GenCertDialog::setupState() //ui.no_node_label->setVisible(false); setWindowTitle(generate_new?tr("Create new profile and new Retroshare node"):tr("Create new Retroshare node")); - //ui.headerFrame->setHeaderText(generate_new?tr("Create a new profile and node"):tr("Create a new node")); ui.reuse_existing_node_CB->setEnabled(adv_state) ; ui.importIdentity_PB->setVisible(adv_state && !generate_new) ; diff --git a/retroshare-gui/src/gui/HelpDialog.ui b/retroshare-gui/src/gui/HelpDialog.ui index 13b059f11..66d6758ee 100644 --- a/retroshare-gui/src/gui/HelpDialog.ui +++ b/retroshare-gui/src/gui/HelpDialog.ui @@ -78,20 +78,20 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-weight:600;">RetroShare is an Open Source cross-platform, </span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-weight:600;">private and secure decentralized communication platform. </span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-weight:600;">It lets you share securely your friends, </span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-weight:600;">using a web-of-trust to authenticate peers and OpenSSL to encrypt all communication. </span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-weight:600;">RetroShare provides file sharing, chat, messages and channels</span></p> -<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600;">Useful external links to more information:</span></p> -<ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'MS Shell Dlg 2'; font-size:8pt;" align="justify" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://retroshare.sourceforge.net"><span style=" font-size:12pt; text-decoration: underline; color:#0000ff;">Retroshare Webpage</span></a></li> -<li style=" font-family:'MS Shell Dlg 2'; font-size:12pt; text-decoration: underline; color:#0000ff;" align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://retroshare.sourceforge.net"><span style=" color:#007af4;">Retroshare Wiki</span></a></li> -<li style=" font-family:'MS Shell Dlg 2'; font-size:12pt; text-decoration: underline; color:#0000ff;" align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://retroshare.sourceforge.net"><span style=" color:#007af4;">RetroShare's Forum</span></a></li> -<li style=" font-family:'MS Shell Dlg 2'; font-size:12pt; text-decoration: underline; color:#0000ff;" align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://retroshare.sourceforge.net"><span style=" color:#007af4;">Retroshare Project Page</span></a></li> -<li style=" font-family:'MS Shell Dlg 2'; font-size:12pt; text-decoration: underline; color:#0000ff;" align="justify" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://retroshare.sourceforge.net"><span style=" color:#007af4;">RetroShare Team Blog</span></a></li> -<li style=" font-family:'MS Shell Dlg 2'; font-size:12pt; text-decoration: underline; color:#0000ff;" align="justify" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://retroshare.sourceforge.net"><span style=" color:#007af4;">RetroShare Dev Twitter</span></a></li></ul></body></html> +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:9pt; font-weight:400; font-style:normal;"> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">RetroShare is an Open Source cross-platform, </span></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">private and secure decentralized communication platform. </span></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">It lets you share securely your friends, </span></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">using a web-of-trust to authenticate peers and OpenSSL to encrypt all communication. </span></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">RetroShare provides file sharing, chat, messages and channels</span></p> +<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Useful external links to more information:</span></p> +<ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:8pt;" align="justify" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://retroshare.sourceforge.net"><span style=" font-size:12pt; text-decoration: underline; color:#0000ff;">Retroshare Webpage</span></a></li> +<li style=" font-size:12pt; text-decoration: underline; color:#0000ff;" align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://retroshare.sourceforge.net"><span style=" color:#007af4;">Retroshare Wiki</span></a></li> +<li style=" font-size:12pt; text-decoration: underline; color:#0000ff;" align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://retroshare.sourceforge.net"><span style=" color:#007af4;">RetroShare's Forum</span></a></li> +<li style=" font-size:12pt; text-decoration: underline; color:#0000ff;" align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://retroshare.sourceforge.net"><span style=" color:#007af4;">Retroshare Project Page</span></a></li> +<li style=" font-size:12pt; text-decoration: underline; color:#0000ff;" align="justify" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://retroshare.sourceforge.net"><span style=" color:#007af4;">RetroShare Team Blog</span></a></li> +<li style=" font-size:12pt; text-decoration: underline; color:#0000ff;" align="justify" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://retroshare.sourceforge.net"><span style=" color:#007af4;">RetroShare Dev Twitter</span></a></li></ul></body></html> true @@ -224,17 +224,17 @@ p, li { white-space: pre-wrap; } <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600;">RetroShare Translations:</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://retroshare.sourceforge.net/wiki/index.php/Translation"><span style=" font-family:'MS Shell Dlg 2'; text-decoration: underline; color:#0000ff;">http://retroshare.sourceforge.net/wiki/index.php/Translation</span></a></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; text-decoration: underline; color:#0000ff;"><br /></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600;">RetroShare Website Translators:</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600;">Swedish: </span><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;"> Daniel Wester</span><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600;"> &lt;</span><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">wester@speedmail.se</span><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600;">&gt;</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600;">German: </span><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Jan</span><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600;"> </span><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Keller</span><span style=" font-family:'MS Shell Dlg 2';"> &lt;</span><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">trilarion@users.sourceforge.net</span><span style=" font-family:'MS Shell Dlg 2';">&gt;</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-weight:600;">Polish: </span><span style=" font-family:'MS Shell Dlg 2';">Maciej Mrug</span></p></body></html> +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">RetroShare Translations:</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://retroshare.sourceforge.net/wiki/index.php/Translation"><span style=" text-decoration: underline; color:#0000ff;">http://retroshare.sourceforge.net/wiki/index.php/Translation</span></a></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; text-decoration: underline; color:#0000ff;"><br /></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">RetroShare Website Translators:</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt; font-weight:600;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Swedish: </span><span style=" font-size:8pt;"> Daniel Wester</span><span style=" font-size:8pt; font-weight:600;"> &lt;</span><span style=" font-size:8pt;">wester@speedmail.se</span><span style=" font-size:8pt; font-weight:600;">&gt;</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">German: </span><span style=" font-size:8pt;">Jan</span><span style=" font-size:8pt; font-weight:600;"> </span><span style=" font-size:8pt;">Keller</span> &lt;<span style=" font-size:8pt;">trilarion@users.sourceforge.net</span>&gt;</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Polish: </span>Maciej Mrug</p></body></html> false @@ -305,8 +305,8 @@ p, li { white-space: pre-wrap; } 0 0 - 550 - 36 + 566 + 18 diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp index 2f22229d7..db5d3fa6e 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp @@ -232,11 +232,6 @@ IdDialog::IdDialog(QWidget *parent) : connect( ui->idTreeWidget, &RSTreeWidget::itemDoubleClicked, this, &IdDialog::chatIdentityItem ); - - ui->avlabel_Circles->setPixmap(QPixmap(":/icons/png/circles.png")); - - ui->headerTextLabel_Circles->setText(tr("Circles")); - /* Initialize splitter */ ui->mainSplitter->setStretchFactor(0, 0); ui->mainSplitter->setStretchFactor(1, 1); diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui index 4e449cfa0..33da8b895 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdDialog.ui @@ -283,8 +283,8 @@ 0 0 - 1372 - 1000 + 1003 + 1090 @@ -742,6 +742,13 @@ p, li { white-space: pre-wrap; } + + + + Send Invite + + + @@ -779,12 +786,18 @@ p, li { white-space: pre-wrap; } - - - - Send Invite + + + + Qt::Vertical - + + + 118 + 17 + + + @@ -868,19 +881,6 @@ p, li { white-space: pre-wrap; } - - - - Qt::Vertical - - - - 118 - 17 - - - - @@ -929,53 +929,6 @@ p, li { white-space: pre-wrap; } Circles - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 12 - - - - - - 64 - 64 - - - - - 64 - 64 - - - - - - - - - - true - - - - - - - Circles - - - - - - @@ -1047,6 +1000,11 @@ p, li { white-space: pre-wrap; } + + RSTextBrowser + QTextBrowser +
gui/common/RSTextBrowser.h
+ LineEditClear QLineEdit @@ -1067,11 +1025,6 @@ p, li { white-space: pre-wrap; } QLabel
gui/common/StyledLabel.h
 - - RSTextBrowser - QTextBrowser -
gui/common/RSTextBrowser.h
- idTreeWidget diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp index d0b0d72ee..6ac9fbcb0 100644 --- a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp @@ -46,9 +46,6 @@ IdEditDialog::IdEditDialog(QWidget *parent) : ui->setupUi(this); - ui->headerFrame->setHeaderImage(QPixmap(":/icons/png/person.png")); - ui->headerFrame->setHeaderText(tr("Create New Identity")); - /* Setup UI helper */ mStateHelper = new UIStateHelper(this); @@ -202,8 +199,6 @@ void IdEditDialog::setAvatar(const QPixmap &avatar) void IdEditDialog::setupExistingId(const RsGxsGroupId &keyId) { setWindowTitle(tr("Edit identity")); - ui->headerFrame->setHeaderImage(QPixmap(":/icons/png/person.png")); - ui->headerFrame->setHeaderText(tr("Edit identity")); mIsNew = false; mGroupId.clear(); diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.ui b/retroshare-gui/src/gui/Identity/IdEditDialog.ui index 92baf07e1..744610c85 100644 --- a/retroshare-gui/src/gui/Identity/IdEditDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdEditDialog.ui @@ -36,9 +36,6 @@ 0 - - - @@ -515,14 +512,6 @@ - - - HeaderFrame - QFrame -
gui/common/HeaderFrame.h
- 1 - - buttonBox diff --git a/retroshare-gui/src/gui/People/PeopleDialog.ui b/retroshare-gui/src/gui/People/PeopleDialog.ui index bf5b7239f..168fd4f1a 100644 --- a/retroshare-gui/src/gui/People/PeopleDialog.ui +++ b/retroshare-gui/src/gui/People/PeopleDialog.ui @@ -20,7 +20,16 @@ - + + 0 + + + 0 + + + 0 + + 0 @@ -32,7 +41,16 @@ QFrame::Sunken - + + 2 + + + 2 + + + 2 + + 2 diff --git a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp index ba622ed17..9f03b97f6 100644 --- a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp +++ b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp @@ -38,9 +38,6 @@ PostedCreatePostDialog::PostedCreatePostDialog(TokenQueue* tokenQ, RsPosted *pos connect(ui->submitButton, SIGNAL(clicked()), this, SLOT(createPost())); connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(close())); - ui->headerFrame->setHeaderImage(QPixmap(":/images/posted_64.png")); - ui->headerFrame->setHeaderText(tr("Submit a new Post")); - setAttribute ( Qt::WA_DeleteOnClose, true ); /* fill in the available OwnIds for signing */ diff --git a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui index d8128b199..1b0c143d0 100644 --- a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui +++ b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui @@ -30,16 +30,6 @@ 0 - - - QFrame::NoFrame - - - QFrame::Plain - - - - QFrame::StyledPanel @@ -238,12 +228,6 @@ - - HeaderFrame - QFrame -
gui/common/HeaderFrame.h
- 1 - MimeTextEdit QTextEdit diff --git a/retroshare-gui/src/gui/ServicePermissionDialog.cpp b/retroshare-gui/src/gui/ServicePermissionDialog.cpp index e90f08f63..9b8a8a8aa 100644 --- a/retroshare-gui/src/gui/ServicePermissionDialog.cpp +++ b/retroshare-gui/src/gui/ServicePermissionDialog.cpp @@ -36,9 +36,6 @@ ServicePermissionDialog::ServicePermissionDialog() : Settings->loadWidgetInformation(this); - ui->headerFrame->setHeaderImage(QPixmap(":/images/user/servicepermissions64.png")); - ui->headerFrame->setHeaderText(tr("Service Permissions")); - connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(setPermissions())); connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject())); diff --git a/retroshare-gui/src/gui/ServicePermissionDialog.ui b/retroshare-gui/src/gui/ServicePermissionDialog.ui index 0acd51c75..2b8473593 100644 --- a/retroshare-gui/src/gui/ServicePermissionDialog.ui +++ b/retroshare-gui/src/gui/ServicePermissionDialog.ui @@ -17,26 +17,22 @@ true - + + 0 + + + 0 + + + 0 + + 0 0 - - - QFrame::NoFrame - - - QFrame::Raised - - - 1 - - - - QFrame::StyledPanel @@ -69,16 +65,8 @@ - frame - headerFrame - - HeaderFrame - QFrame -
gui/common/HeaderFrame.h
- 1 - FriendSelectionWidget QWidget @@ -86,8 +74,6 @@ 1 - - - + diff --git a/retroshare-gui/src/gui/ShareManager.cpp b/retroshare-gui/src/gui/ShareManager.cpp index c0b234999..420fda297 100644 --- a/retroshare-gui/src/gui/ShareManager.cpp +++ b/retroshare-gui/src/gui/ShareManager.cpp @@ -57,9 +57,6 @@ ShareManager::ShareManager() /* Invoke Qt Designer generated QObject setup routine */ ui.setupUi(this); - ui.headerFrame->setHeaderImage(QPixmap(":/images/fileshare64.png")); - ui.headerFrame->setHeaderText(tr("Share Manager")); - isLoading = false; Settings->loadWidgetInformation(this); diff --git a/retroshare-gui/src/gui/ShareManager.ui b/retroshare-gui/src/gui/ShareManager.ui index 88a7030c9..a0f31ce74 100644 --- a/retroshare-gui/src/gui/ShareManager.ui +++ b/retroshare-gui/src/gui/ShareManager.ui @@ -11,7 +11,7 @@ - RetroShare Share Manager + Share Manager @@ -34,19 +34,6 @@ 0 - - - QFrame::NoFrame - - - QFrame::Raised - - - 1 - - - - QFrame::NoFrame @@ -279,12 +266,6 @@ QLabel
gui/common/StyledLabel.h
 - - HeaderFrame - QFrame -
gui/common/HeaderFrame.h
- 1 - diff --git a/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp b/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp index 1aeb96366..940b499f1 100644 --- a/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp +++ b/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp @@ -40,9 +40,6 @@ CreateLobbyDialog::CreateLobbyDialog(const std::set& peer_list, int pr ui = new Ui::CreateLobbyDialog() ; ui->setupUi(this); - ui->headerFrame->setHeaderImage(QPixmap(":/icons/png/chat-lobbies.png")); - ui->headerFrame->setHeaderText(tr("Create Chat Room")); - RsGxsId default_identity ; rsMsgs->getDefaultIdentityForChatLobby(default_identity) ; diff --git a/retroshare-gui/src/gui/chat/CreateLobbyDialog.ui b/retroshare-gui/src/gui/chat/CreateLobbyDialog.ui index 77aab56ea..76c0b4256 100644 --- a/retroshare-gui/src/gui/chat/CreateLobbyDialog.ui +++ b/retroshare-gui/src/gui/chat/CreateLobbyDialog.ui @@ -33,20 +33,90 @@ 0 - - - + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 178 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 178 + + + + + + + + + 255 + 255 + 178 + + + + + + + 255 + 255 + 178 + + + + + + + + true + + + QFrame::Box + A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right. true + + 4 + @@ -235,12 +305,6 @@ QLabel
gui/common/StyledLabel.h
- - HeaderFrame - QFrame -
gui/common/HeaderFrame.h
- 1 - FriendSelectionWidget QWidget diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp index f5ed43c8b..e8e0b617b 100644 --- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp +++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp @@ -140,20 +140,15 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName setWindowFlags(windowFlags() & ~Qt::WindowMinimizeButtonHint); setWindowTitle(QString("%1 - %2").arg(windowTitle()).arg(QFileInfo(_fileName).completeBaseName())); - - - ui.headerFrame->setHeaderImage(QPixmap(":/images/library64.png")); if(creation) { - ui.headerFrame->setHeaderText(tr("Collection Editor")); ui.downloadFolder_LE->hide(); ui.downloadFolder_LB->hide(); ui.destinationDir_TB->hide(); } else { - ui.headerFrame->setHeaderText(tr("Download files")); ui.downloadFolder_LE->show(); ui.downloadFolder_LB->show(); ui.label_filename->hide(); diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.ui b/retroshare-gui/src/gui/common/RsCollectionDialog.ui index 7595413ca..b5cd7e8d1 100644 --- a/retroshare-gui/src/gui/common/RsCollectionDialog.ui +++ b/retroshare-gui/src/gui/common/RsCollectionDialog.ui @@ -40,16 +40,6 @@ 0 - - - QFrame::StyledPanel - - - QFrame::Raised - - - - QFrame::StyledPanel @@ -498,8 +488,6 @@ - frame - headerFrame @@ -508,16 +496,10 @@
gui/common/HashBox.h
1 - - HeaderFrame - QFrame -
gui/common/HeaderFrame.h
- 1 - - + diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp index 907e765cf..12261bc7c 100644 --- a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp +++ b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp @@ -83,8 +83,6 @@ ConfCertDialog::ConfCertDialog(const RsPeerId& id, const RsPgpId &pgp_id, QWidge /* Invoke Qt Designer generated QObject setup routine */ ui.setupUi(this); Settings->loadWidgetInformation(this); - ui.headerFrame->setHeaderImage(QPixmap(":/images/user/identityinfo64.png")); - //ui.headerFrame->setHeaderText(tr("Friend node details")); //ui._chat_CB->hide() ; @@ -140,7 +138,7 @@ void ConfCertDialog::load() nameAndLocation = QString("%1 (%2)").arg(QString::fromUtf8(detail.name.c_str())).arg(QString::fromUtf8(detail.location.c_str())); - ui.headerFrame->setHeaderText(nameAndLocation); + setWindowTitle(nameAndLocation); RetroShareLink link = RetroShareLink::createPerson(detail.gpg_id); diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.ui b/retroshare-gui/src/gui/connect/ConfCertDialog.ui index 6a7082e17..d7fe67b41 100644 --- a/retroshare-gui/src/gui/connect/ConfCertDialog.ui +++ b/retroshare-gui/src/gui/connect/ConfCertDialog.ui @@ -37,16 +37,6 @@ 0 - - - QFrame::NoFrame - - - QFrame::Plain - - - - QFrame::StyledPanel @@ -432,12 +422,6 @@
gui/common/AvatarWidget.h
1 - - HeaderFrame - QFrame -
gui/common/HeaderFrame.h
- 1 - diff --git a/retroshare-gui/src/gui/connect/ConnectProgressDialog.cpp b/retroshare-gui/src/gui/connect/ConnectProgressDialog.cpp index 580e1144e..8e7401733 100755 --- a/retroshare-gui/src/gui/connect/ConnectProgressDialog.cpp +++ b/retroshare-gui/src/gui/connect/ConnectProgressDialog.cpp @@ -56,9 +56,6 @@ ConnectProgressDialog::ConnectProgressDialog(const RsPeerId& id, QWidget *parent ui->setupUi(this); setAttribute(Qt::WA_DeleteOnClose, true); - ui->headerFrame->setHeaderImage(QPixmap(":/images/user/identityinfo64.png")); - ui->headerFrame->setHeaderText(tr("Connection Assistant")); - connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(stopAndClose())); mAmIHiddenNode = rsPeers->isHiddenNode(rsPeers->getOwnId()) ; diff --git a/retroshare-gui/src/gui/connect/ConnectProgressDialog.ui b/retroshare-gui/src/gui/connect/ConnectProgressDialog.ui index 8666655b6..47fe7a868 100644 --- a/retroshare-gui/src/gui/connect/ConnectProgressDialog.ui +++ b/retroshare-gui/src/gui/connect/ConnectProgressDialog.ui @@ -33,16 +33,6 @@ 0 - - - - QFrame::NoFrame - - - QFrame::Plain - - - @@ -292,7 +282,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:13pt;">This Widget shows the progress of your connection to your new peer.</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:13pt;">It is helpful for problem-solving.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;"><br /></p> @@ -330,14 +320,6 @@ p, li { white-space: pre-wrap; } - - - HeaderFrame - QFrame -
gui/common/HeaderFrame.h
- 1 - - diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp b/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp index d27e779fd..d6f2123aa 100644 --- a/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp +++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp @@ -73,9 +73,6 @@ PGPKeyDialog::PGPKeyDialog(const RsPeerId& id, const RsPgpId &pgp_id, QWidget *p // ui._useOldFormat_CB->setEnabled(false) ; // } - ui.headerFrame->setHeaderImage(QPixmap(":/images/user/identityinfo64.png")); - ui.headerFrame->setHeaderText(tr("Retroshare profile")); - //ui._chat_CB->hide() ; setAttribute(Qt::WA_DeleteOnClose, true); diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui index 81308a307..feec38dca 100644 --- a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui +++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui @@ -11,19 +11,9 @@ - Dialog + Retroshare profile - - - - QFrame::NoFrame - - - QFrame::Plain - - - @@ -462,17 +452,8 @@ p, li { white-space: pre-wrap; } - stabWidget - headerFrame - buttonBox - - HeaderFrame - QFrame -
gui/common/HeaderFrame.h
- 1 - RSTextBrowser QTextBrowser diff --git a/retroshare-gui/src/gui/groups/CreateGroup.cpp b/retroshare-gui/src/gui/groups/CreateGroup.cpp index b7c01564d..b55c0e482 100644 --- a/retroshare-gui/src/gui/groups/CreateGroup.cpp +++ b/retroshare-gui/src/gui/groups/CreateGroup.cpp @@ -40,8 +40,6 @@ CreateGroup::CreateGroup(const RsNodeGroupId &groupId, QWidget *parent) mIsStandard = false; - ui.headerFrame->setHeaderImage(QPixmap(":/images/user/add_group256.png")); - mGroupId = groupId; if (!mGroupId.isNull()) @@ -68,8 +66,6 @@ CreateGroup::CreateGroup(const RsNodeGroupId &groupId, QWidget *parent) } setWindowTitle(tr("Edit Group")); - ui.headerFrame->setHeaderImage(QPixmap(":/images/user/edit_group64.png")); - ui.headerFrame->setHeaderText(tr("Edit Group")); ui.groupName->setDisabled(mIsStandard); @@ -79,7 +75,7 @@ CreateGroup::CreateGroup(const RsNodeGroupId &groupId, QWidget *parent) mGroupId.clear(); } } else { - ui.headerFrame->setHeaderText(tr("Create a Group")); + setWindowTitle(tr("Create a Group")); } std::list groupInfoList; diff --git a/retroshare-gui/src/gui/groups/CreateGroup.ui b/retroshare-gui/src/gui/groups/CreateGroup.ui index 7abcd5a4e..3d5094f3c 100644 --- a/retroshare-gui/src/gui/groups/CreateGroup.ui +++ b/retroshare-gui/src/gui/groups/CreateGroup.ui @@ -14,16 +14,25 @@ Create a Group + + 0 + + + 0 + + + 0 + + + 0 + 6 0 - - 0 - - + QFrame::StyledPanel @@ -84,18 +93,9 @@ - - - - - HeaderFrame - QFrame -
gui/common/HeaderFrame.h
- 1 - FriendSelectionWidget QWidget diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp index 4bf950a5e..6c803a317 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp @@ -167,7 +167,6 @@ QIcon GxsGroupDialog::serviceWindowIcon() void GxsGroupDialog::showEvent(QShowEvent*) { - ui.headerFrame->setHeaderImage(serviceImage()); setWindowIcon(serviceWindowIcon()); initUi(); @@ -179,7 +178,6 @@ void GxsGroupDialog::setUiText(UiType uiType, const QString &text) { case UITYPE_SERVICE_HEADER: setWindowTitle(text); - ui.headerFrame->setHeaderText(text); break; case UITYPE_KEY_SHARE_CHECKBOX: ui.pubKeyShare_cb->setText(text); @@ -481,9 +479,9 @@ void GxsGroupDialog::updateFromExistingMeta(const QString &description) } break; case MODE_SHOW:{ - ui.headerFrame->setHeaderText(QString::fromUtf8(mGrpMeta.mGroupName.c_str())); - if (!mPicture.isNull()) - ui.headerFrame->setHeaderImage(mPicture); + //ui.headerFrame->setHeaderText(QString::fromUtf8(mGrpMeta.mGroupName.c_str())); + //if (!mPicture.isNull()) + // ui.headerFrame->setHeaderImage(mPicture); } break; case MODE_EDIT:{ diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui index 3cd4a50c6..5c776fc08 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui @@ -33,9 +33,6 @@ 0 - - - QFrame::NoFrame @@ -49,7 +46,7 @@ - 0 + 9 @@ -606,7 +603,7 @@ - 0 + 9 @@ -807,7 +804,7 @@ - + QFrame::StyledPanel @@ -843,37 +840,31 @@ - GxsIdLabel - QLabel -
gui/gxs/GxsIdLabel.h
+ FriendSelectionWidget + QWidget +
gui/common/FriendSelectionWidget.h
+ 1 GxsIdChooser QComboBox
gui/gxs/GxsIdChooser.h
 - - GxsCircleChooser - QComboBox -
gui/gxs/GxsCircleChooser.h
- - - HeaderFrame - QFrame -
gui/common/HeaderFrame.h
- 1 - - - FriendSelectionWidget - QWidget -
gui/common/FriendSelectionWidget.h
- 1 - MimeTextEdit QTextEdit
gui/common/MimeTextEdit.h
 + + GxsIdLabel + QLabel +
gui/gxs/GxsIdLabel.h
+ + + GxsCircleChooser + QComboBox +
gui/gxs/GxsCircleChooser.h
+ GroupChooser QComboBox diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp index 6ca6a4613..588ca278a 100644 --- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp +++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp @@ -53,12 +53,8 @@ CreateGxsChannelMsg::CreateGxsChannelMsg(const RsGxsGroupId &cId, RsGxsMessageId Settings->loadWidgetInformation(this); mChannelQueue = new TokenQueue(rsGxsChannels->getTokenService(), this); - headerFrame->setHeaderImage(QPixmap(":/images/channels.png")); - if(!existing_post.isNull()) - headerFrame->setHeaderText(tr("Edit Channel Post")); - else - headerFrame->setHeaderText(tr("New Channel Post")); + setWindowTitle(tr("Edit Channel Post")); setAttribute ( Qt::WA_DeleteOnClose, true ); diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui index 3f4cd7d4b..ea1767308 100644 --- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui +++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui @@ -37,9 +37,6 @@ 0 - - - QFrame::StyledPanel @@ -302,8 +299,8 @@ p, li { white-space: pre-wrap; } 0 0 - 767 - 42 + 812 + 24 @@ -390,12 +387,6 @@ p, li { white-space: pre-wrap; } - - HeaderFrame - QFrame -
gui/common/HeaderFrame.h
- 1 - MimeTextEdit QTextEdit diff --git a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp index 1e1b7c43f..3b0efd9a1 100644 --- a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp +++ b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp @@ -86,9 +86,6 @@ CreateGxsForumMsg::CreateGxsForumMsg(const RsGxsGroupId &fId, const RsGxsMessage QString text = mOId.isNull()?(pId.isNull() ? tr("Start New Thread") : tr("Post Forum Message")):tr("Edit Message"); setWindowTitle(text); - ui.headerFrame->setHeaderImage(QPixmap(":/icons/png/forums.png")); - ui.headerFrame->setHeaderText(text); - ui.generateSpinBox->setEnabled(false); Settings->loadWidgetInformation(this); diff --git a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui index 37b11b308..1d2abfcec 100644 --- a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui +++ b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui @@ -33,9 +33,6 @@ 0 - - - @@ -359,16 +356,10 @@ p, li { white-space: pre-wrap; } QComboBox
gui/gxs/GxsIdChooser.h
 - - HeaderFrame - QFrame -
gui/common/HeaderFrame.h
- 1 - - + diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index 97e84efc8..54c93ef31 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -647,12 +647,6 @@ IdDialog QFrame#headerFramePerson { border-radius: 4px; } -IdDialog QFrame#headerFrameCircle { - background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #9BDBF9, stop:1 #1592CD); - border: 1px; - border-radius: 4px; -} - IdDialog QLabel#headerTextLabel { color: rgb(255, 255, 255); } diff --git a/retroshare-gui/src/gui/qss/stylesheet/qss.default b/retroshare-gui/src/gui/qss/stylesheet/qss.default index 3c33a202e..f53429cce 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/qss.default +++ b/retroshare-gui/src/gui/qss/stylesheet/qss.default @@ -89,11 +89,6 @@ GxsChannelPostsWidget QLabel#nameLabel qproperty-fontSizeFactor: 250; } -CreateLobbyDialog QLabel#lobbyInfoLabel -{ - qproperty-fontSizeFactor: 150; -} - HeaderFrame QLabel#headerLabel { qproperty-fontSizeFactor: 225; @@ -109,11 +104,6 @@ ConnectFrientWizard QLabel#requestinfolabel qproperty-fontSizeFactor: 125; } -ShareManager QLabel#labelInstructions -{ - qproperty-fontSizeFactor: 125; -} - CryptoPage QLabel#publicLabel, CryptoPage QLabel#otherLabel { qproperty-fontSizeFactor: 125; @@ -124,11 +114,6 @@ ProfileWidget QLabel#publicLabel, ProfileWidget QLabel#otherLabel, ProfileWidget qproperty-fontSizeFactor: 125; } -PostedCreatePostDialog QLabel#info_label -{ - qproperty-fontSizeFactor: 125; -} - /* Color definitions */ ForumsDialog, GxsForumThreadWidget