Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-03-01 11:21:25 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Ui fixes
This commit is contained in:
defnax 2021-02-13 14:08:35 +01:00 committed by GitHub
commit a2f4df677c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 107 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
retroshare-gui/src/gui/Identity/IdEditDialog.cpp
View File

@ -95,6 +95,7 @@ IdEditDialog::IdEditDialog(QWidget *parent) :
ui->pushButton_Tag->hide(); // unfinished ui->pushButton_Tag->hide(); // unfinished
ui->plainTextEdit_Tag->hide(); ui->plainTextEdit_Tag->hide();
ui->label_TagCheck->hide(); ui->label_TagCheck->hide();
ui->frame_Tags->setHidden(true);
} }
IdEditDialog::~IdEditDialog() {} IdEditDialog::~IdEditDialog() {}
@ -263,6 +264,9 @@ void IdEditDialog::setupExistingId(const RsGxsGroupId& keyId)
}, this ); }, this );
}); });
// force resize of dialog, to hide empty space from the hidden recogn tags area
adjustSize();
} }
void IdEditDialog::enforceNoAnonIds() void IdEditDialog::enforceNoAnonIds()

9
retroshare-gui/src/gui/NewsFeed.cpp
View File

@ -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. ui->feedOptionsButton->hide(); // (csoler) Hidden until we repare the system to display a specific settings page.
QString hlp_str = tr( 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. \ <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. \ 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> \ You can configure which events to show by pressing on <b>Options</b>. </p> \
<p>The various events shown are: \ <p>The various events shown are: \
<ul> \ <ul> \
<li>Connection attempts (useful to make friends with new people and control who's trying to reach you)</li> \ <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>Channel, Forum and Board posts</li> \
<li>New Channels and Forums you can subscribe to</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> \ <li>Private messages from your friends</li> \
</ul> </p> \ </ul> </p> \
") ; ") ;

6
retroshare-gui/src/gui/Posted/PostedItem.cpp
View File

@ -437,6 +437,10 @@ void PostedItem::setup()
ui->clearButton->hide(); ui->clearButton->hide();
ui->readAndClearButton->hide(); ui->readAndClearButton->hide();
ui->nameLabel->hide(); ui->nameLabel->hide();
//hide read & new not used
ui->readButton->hide();
ui->newLabel->hide();
} }
void PostedItem::makeDownVote() 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->readButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/message-state-read.png"));
} }
ui->newLabel->setVisible(isNew); //ui->newLabel->setVisible(isNew);
ui->mainFrame->setProperty("new", isNew); ui->mainFrame->setProperty("new", isNew);
ui->mainFrame->style()->unpolish(ui->mainFrame); ui->mainFrame->style()->unpolish(ui->mainFrame);

15
retroshare-gui/src/gui/connect/ConfCertDialog.cpp
View File

@ -311,7 +311,17 @@ void ConfCertDialog::loadInvitePage()
QString ConfCertDialog::getCertificateDescription(const RsPeerDetails& detail,bool signatures_included,bool use_short_format,bool include_additional_locators) 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>") ; //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:") ; QString infotext;
if(use_short_format)
{
infotext += tr("<p>This Retroshare ID contains:") ;
}
else
{
infotext += tr("<p>This certificate contains:") ;
}
infotext += "<UL>" ; infotext += "<UL>" ;
if(use_short_format) if(use_short_format)
@ -350,6 +360,9 @@ QString ConfCertDialog::getCertificateDescription(const RsPeerDetails& detail,bo
infotext += QString("</p>") ; infotext += QString("</p>") ;
if(rsPeers->getOwnId() == detail.id) 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>") ; 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; return infotext;

2
retroshare-gui/src/gui/feeds/GxsCircleItem.ui
View File

@ -24,7 +24,7 @@
<number>1</number> <number>1</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QFrame" name="frame"> <widget class="QFrame" name="mainFrame">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>

2
retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
View File

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

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

@ -501,11 +501,11 @@ GxsChannelPostItem QLabel#logoLabel {
background-color: black; background-color: black;
} }
GxsCircleItem QFrame#frame { GxsCircleItem QFrame#mainFrame {
background-color: white; background-color: white;
} }
GxsCircleItem QLabel#nameLabel, QLabel#titleLabel { GxsCircleItem QLabel#gxsIdLabel, QLabel#nameLabel, QLabel#titleLabel {
font: 11pt; font: 11pt;
font: bold italic; font: bold italic;
} }

82
retroshare-gui/src/gui/settings/AppearancePage.ui
View File

@ -249,40 +249,9 @@
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
<layout class="QGridLayout" name="frameToolListStyleGLayout"> <layout class="QGridLayout" name="frameToolListStyleGLayout">
<item row="1" column="0"> <property name="leftMargin">
<widget class="QComboBox" name="cmboTollButtonsSize"> <number>0</number>
<item>
<property name="text">
<string>Icon Size = 8x8</string>
</property> </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="2" column="0"> <item row="2" column="0">
<widget class="QComboBox" name="cmboTollButtonsStyle"> <widget class="QComboBox" name="cmboTollButtonsStyle">
<item> <item>
@ -333,6 +302,53 @@
</property> </property>
</spacer> </spacer>
</item> </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> </layout>
</widget> </widget>
</item> </item>

47
retroshare-gui/src/gui/settings/PluginsPage.ui
View File

@ -7,28 +7,21 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>423</width> <width>423</width>
<height>514</height> <height>375</height>
</rect> </rect>
</property> </property>
<property name="contextMenuPolicy"> <property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum> <enum>Qt::NoContextMenu</enum>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item> <item row="1" column="0">
<widget class="QCheckBox" name="enableAll"> <widget class="QGroupBox" name="groupBox">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text">
<string>Authorize all plugins</string>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
<string>Plugins</string> <string>Plugins</string>
</property> </property>
@ -52,7 +45,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>345</width> <width>385</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>
@ -85,8 +78,14 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item row="2" column="0">
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>100</height>
</size>
</property>
<property name="title"> <property name="title">
<string>Plugin look-up directories</string> <string>Plugin look-up directories</string>
</property> </property>
@ -104,18 +103,18 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item row="0" column="0">
<spacer name="verticalSpacer_2"> <widget class="QCheckBox" name="enableAll">
<property name="orientation"> <property name="sizePolicy">
<enum>Qt::Vertical</enum> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="text">
<size> <string>Authorize all plugins</string>
<width>20</width>
<height>40</height>
</size>
</property> </property>
</spacer> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>