Merge pull request #2313 from defnax/ui-fixing-v1

Ui fixes
2024-10-01 02:35:48 -04:00 · 2021-02-13 14:08:35 +01:00 · 2021-02-13 14:08:35 +01:00 · a2f4df677c
commit a2f4df677c
parent 5dc2602b39 07aff5cb8f
9 changed files with 107 additions and 68 deletions
--- a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
@ -95,6 +95,7 @@ IdEditDialog::IdEditDialog(QWidget *parent) :
 	ui->pushButton_Tag->hide(); // unfinished
 	ui->plainTextEdit_Tag->hide();
 	ui->label_TagCheck->hide();
+	ui->frame_Tags->setHidden(true);
 }

 IdEditDialog::~IdEditDialog() {}
@ -263,6 +264,9 @@ void IdEditDialog::setupExistingId(const RsGxsGroupId& keyId)

 		}, this );
 	});
+
+    // force resize of dialog, to hide empty space from the hidden recogn tags area
+    adjustSize();
 }

 void IdEditDialog::enforceNoAnonIds()
--- a/retroshare-gui/src/gui/NewsFeed.cpp
+++ b/retroshare-gui/src/gui/NewsFeed.cpp
@ -112,15 +112,18 @@ NewsFeed::NewsFeed(QWidget *parent) : MainPage(parent), ui(new Ui::NewsFeed),
    ui->feedOptionsButton->hide();	// (csoler) Hidden until we repare the system to display a specific settings page.

 QString hlp_str = tr(
- " <h1><img width=\"32\" src=\":/icons/help_64.png\">&nbsp;&nbsp;News Feed</h1>                                                          \
+ " <h1><img width=\"32\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Activity Feed</h1>                                                          \
   <p>The Activity Feed displays the last events on your network, sorted by the time you received them.                \
   This gives you a summary of the activity of your friends.                                                       \
   You can configure which events to show by pressing on <b>Options</b>. </p>                                      \
   <p>The various events shown are:                                                                                \
   <ul>                                                                                                         \
   <li>Connection attempts (useful to make friends with new people and control who's trying to reach you)</li> \
-   <li>Channel and Forum posts</li>                                                                            \
-   <li>New Channels and Forums you can subscribe to</li>                                                       \
+   <li>Channel, Forum and Board posts</li>                                                                            \
+   <li>Circle membership requests and invites</li>                                                                            \
+   <li>New Channels, Forums and Boards you can subscribe to</li>                                                       \
+   <li>Channel and Board comments</li>                                                                 \
+   <li>New Mail messages</li>                                                                 \
   <li>Private messages from your friends</li>                                                                 \
   </ul> </p>                                                                                                      \
 ") ;
--- a/retroshare-gui/src/gui/Posted/PostedItem.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedItem.cpp
@ -437,6 +437,10 @@ void PostedItem::setup()
 	ui->clearButton->hide();
 	ui->readAndClearButton->hide();
 	ui->nameLabel->hide();
+
+	//hide read & new not used
+	ui->readButton->hide();
+	ui->newLabel->hide();
 }

 void PostedItem::makeDownVote()
@ -699,7 +703,7 @@ void PostedItem::setReadStatus(bool isNew, bool isUnread)
 		ui->readButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/message-state-read.png"));
 	}

-	ui->newLabel->setVisible(isNew);
+	//ui->newLabel->setVisible(isNew);

 	ui->mainFrame->setProperty("new", isNew);
 	ui->mainFrame->style()->unpolish(ui->mainFrame);
--- a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
+++ b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
@ -311,8 +311,18 @@ void ConfCertDialog::loadInvitePage()
 QString ConfCertDialog::getCertificateDescription(const RsPeerDetails& detail,bool signatures_included,bool use_short_format,bool include_additional_locators)
 {
    //infotext += tr("<p>Use this certificate to make new friends. Send it by email, or give it hand to hand.</p>") ;
-    QString infotext = QObject::tr("<p>This certificate contains:") ;
-    infotext += "<UL>" ;
+    QString infotext;
+
+	if(use_short_format)
+	{
+		infotext += tr("<p>This Retroshare ID contains:") ;
+	}
+	else
+	{
+		infotext += tr("<p>This certificate contains:") ;
+	}
+	
+	infotext += "<UL>" ;

    if(use_short_format)
    {
@ -350,6 +360,9 @@ QString ConfCertDialog::getCertificateDescription(const RsPeerDetails& detail,bo
    infotext += QString("</p>") ;

    if(rsPeers->getOwnId() == detail.id)
+		if(use_short_format)
+        infotext += tr("<p>You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.</p>") ;
+		else
        infotext += tr("<p>You can use this certificate to make new friends. Send it by email, or give it hand to hand.</p>") ;

    return infotext;
--- a/retroshare-gui/src/gui/feeds/GxsCircleItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsCircleItem.ui
@ -24,7 +24,7 @@
    <number>1</number>
   </property>
   <item row="0" column="0">
-    <widget class="QFrame" name="frame">
+    <widget class="QFrame" name="mainFrame">
     <property name="sizePolicy">
      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
       <horstretch>0</horstretch>
--- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
+++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
@ -981,7 +981,7 @@ void CreateGxsChannelMsg::toggle()

 void CreateGxsChannelMsg::on_removeButton_clicked()
 {
-	preview_W->setPixmap(FilesDefs::getPixmapFromQtResourcePath(ChannelPostThumbnailView::CHAN_DEFAULT_IMAGE),true);
+	preview_W->setPixmap(QPixmap(), false);
 	removeButton->hide();
 }

--- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
@ -501,11 +501,11 @@ GxsChannelPostItem QLabel#logoLabel {
  background-color: black;
 }

-GxsCircleItem QFrame#frame {
+GxsCircleItem QFrame#mainFrame {
 	background-color: white;
 }

-GxsCircleItem QLabel#nameLabel, QLabel#titleLabel {
+GxsCircleItem QLabel#gxsIdLabel, QLabel#nameLabel, QLabel#titleLabel {
 	font: 11pt;
 	font: bold italic;
 }
--- a/retroshare-gui/src/gui/settings/AppearancePage.ui
+++ b/retroshare-gui/src/gui/settings/AppearancePage.ui
@ -249,40 +249,9 @@
         <enum>QFrame::NoFrame</enum>
        </property>
        <layout class="QGridLayout" name="frameToolListStyleGLayout">
-         <item row="1" column="0">
-          <widget class="QComboBox" name="cmboTollButtonsSize">
-           <item>
-            <property name="text">
-             <string>Icon Size = 8x8</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Icon Size = 16x16</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Icon Size = 24x24</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Icon Size = 32x32</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Icon Size = 64x64</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Icon Size = 128x128</string>
-            </property>
-           </item>
-          </widget>
-         </item>
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
         <item row="2" column="0">
          <widget class="QComboBox" name="cmboTollButtonsStyle">
           <item>
@ -333,6 +302,53 @@
           </property>
          </spacer>
         </item>
+         <item row="1" column="0">
+          <widget class="QComboBox" name="cmboTollButtonsSize">
+           <item>
+            <property name="text">
+             <string>Icon Size = 8x8</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Icon Size = 16x16</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Icon Size = 24x24</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Icon Size = 32x32</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Icon Size = 64x64</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Icon Size = 128x128</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+         <item row="1" column="1" rowspan="2">
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
        </layout>
       </widget>
      </item>
--- a/retroshare-gui/src/gui/settings/PluginsPage.ui
+++ b/retroshare-gui/src/gui/settings/PluginsPage.ui
@ -7,28 +7,21 @@
    <x>0</x>
    <y>0</y>
    <width>423</width>
-    <height>514</height>
+    <height>375</height>
   </rect>
  </property>
  <property name="contextMenuPolicy">
   <enum>Qt::NoContextMenu</enum>
  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <item>
-    <widget class="QCheckBox" name="enableAll">
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="groupBox">
     <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
       <horstretch>0</horstretch>
       <verstretch>0</verstretch>
      </sizepolicy>
     </property>
-     <property name="text">
-      <string>Authorize all plugins</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox">
     <property name="title">
      <string>Plugins</string>
     </property>
@ -52,7 +45,7 @@
          <rect>
           <x>0</x>
           <y>0</y>
-           <width>345</width>
+           <width>385</width>
           <height>16</height>
          </rect>
         </property>
@ -85,8 +78,14 @@
     </layout>
    </widget>
   </item>
-   <item>
+   <item row="2" column="0">
    <widget class="QGroupBox" name="groupBox_2">
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>100</height>
+      </size>
+     </property>
     <property name="title">
      <string>Plugin look-up directories</string>
     </property>
@ -104,18 +103,18 @@
     </layout>
    </widget>
   </item>
-   <item>
-    <spacer name="verticalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
+   <item row="0" column="0">
+    <widget class="QCheckBox" name="enableAll">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
+     <property name="text">
+      <string>Authorize all plugins</string>
     </property>
-    </spacer>
+    </widget>
   </item>
  </layout>
 </widget>