Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-29 01:16:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2210 from defnax/wiki-fixes

Browse Source 
Added to store the splitter position for Wire Dialog & stylesheet fixes
This commit is contained in:
defnax 2021-01-08 19:18:16 +01:00 committed by GitHub
commit cc15593202
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
retroshare-gui/src/gui/TheWire/WireDialog.cpp
View File

@ -22,6 +22,7 @@
#include "WireGroupDialog.h" #include "WireGroupDialog.h"
#include "WireGroupItem.h" #include "WireGroupItem.h"
#include "gui/settings/rsharesettings.h"
#include "PulseViewGroup.h" #include "PulseViewGroup.h"
#include "PulseReplySeperator.h" #include "PulseReplySeperator.h"
@ -87,6 +88,36 @@ WireDialog::WireDialog(QWidget *parent)
// just for testing // just for testing
postTestTwitterView(); postTestTwitterView();
// load settings
processSettings(true);
}
WireDialog::~WireDialog()
{
// save settings
processSettings(false);
delete(mWireQueue);
}
void WireDialog::processSettings(bool load)
{
Settings->beginGroup("WireDialog");
if (load) {
// load settings
// state of splitter
ui.splitter->restoreState(Settings->value("SplitterWire").toByteArray());
} else {
// save settings
// state of splitter
Settings->setValue("SplitterWire", ui.splitter->saveState());
}
Settings->endGroup();
} }
void WireDialog::refreshGroups() void WireDialog::refreshGroups()
@ -94,7 +125,6 @@ void WireDialog::refreshGroups()
requestGroupData(); requestGroupData();
} }
void WireDialog::addGroup(QWidget *item) void WireDialog::addGroup(QWidget *item)
{ {
QLayout *alayout = ui.scrollAreaWidgetContents_groups->layout(); QLayout *alayout = ui.scrollAreaWidgetContents_groups->layout();

3
retroshare-gui/src/gui/TheWire/WireDialog.h
View File

@ -74,6 +74,7 @@ class WireDialog : public MainPage, public TokenResponse, public WireGroupHolder
public: public:
WireDialog(QWidget *parent = 0); WireDialog(QWidget *parent = 0);
~WireDialog();
virtual QIcon iconPixmap() const { return QIcon(IMAGE_WIRE) ; } virtual QIcon iconPixmap() const { return QIcon(IMAGE_WIRE) ; }
virtual QString pageName() const { return tr("The Wire") ; } virtual QString pageName() const { return tr("The Wire") ; }
@ -142,6 +143,8 @@ private:
void showSelectedGroups(); void showSelectedGroups();
void updateGroups(std::vector<RsWireGroup> &groups); void updateGroups(std::vector<RsWireGroup> &groups);
void processSettings(bool load);
// utils. // utils.
rstime_t getFilterTimestamp(); rstime_t getFilterTimestamp();

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

@ -137,7 +137,7 @@ CreateCircleDialog QPushButton#createButton, CreateLobbyDialog QPushButton#creat
IdEditDialog QPushButton#createButton, CreateGxsForumMsg QPushButton#postButton, IdEditDialog QPushButton#createButton, CreateGxsForumMsg QPushButton#postButton,
GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#createButton, GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#createButton,
PulseAddDialog QPushButton#pushButton_Post, PulseTopLevel QToolButton#toolButton_follow, PulseAddDialog QPushButton#pushButton_Post, PulseTopLevel QToolButton#toolButton_follow,
PulseViewGroup QToolButton#toolButton_follow{ PulseViewGroup QToolButton#toolButton_follow, WikiEditDialog QPushButton#pushButton_Submit{
font: bold; font: bold;
font-size: 15px; font-size: 15px;
color: white; color: white;
@ -154,7 +154,8 @@ CreateCircleDialog QPushButton#createButton:hover, CreateLobbyDialog QPushButton
IdEditDialog QPushButton#createButton:hover, CreateGxsForumMsg QPushButton#postButton:hover, IdEditDialog QPushButton#createButton:hover, CreateGxsForumMsg QPushButton#postButton:hover,
GxsCreateCommentDialog QPushButton#postButton:hover, GxsGroupDialog QPushButton#createButton:hover, GxsCreateCommentDialog QPushButton#postButton:hover, GxsGroupDialog QPushButton#createButton:hover,
ShareManager QPushButton#closeButton:hover, PulseAddDialog QPushButton#pushButton_Post:hover, ShareManager QPushButton#closeButton:hover, PulseAddDialog QPushButton#pushButton_Post:hover,
PulseTopLevel QToolButton#toolButton_follow:hover, PulseViewGroup QToolButton#toolButton_follow:hover{ PulseTopLevel QToolButton#toolButton_follow:hover, PulseViewGroup QToolButton#toolButton_follow:hover,
WikiEditDialog QPushButton#pushButton_Submit:hover{
background: #03b1f3; background: #03b1f3;
border-radius: 4px; border-radius: 4px;
min-width: 4em; min-width: 4em;
@ -214,7 +215,7 @@ SearchDialog QPushButton#pushButtonSearch:hover{
CreateGxsForumMsg QPushButton#postButton:disabled, PostedCreatePostDialog QPushButton#submitButton:disabled, CreateGxsForumMsg QPushButton#postButton:disabled, PostedCreatePostDialog QPushButton#submitButton:disabled,
CreateGxsChannelMsg QPushButton#postButton:disabled, GxsCreateCommentDialog QPushButton#postButton:disabled, CreateGxsChannelMsg QPushButton#postButton:disabled, GxsCreateCommentDialog QPushButton#postButton:disabled,
PulseAddDialog QPushButton#pushButton_Post:disabled { PulseAddDialog QPushButton#pushButton_Post:disabled, WikiEditDialog QPushButton#pushButton_Submit:disabled {
font: bold; font: bold;
font-size: 15px; font-size: 15px;
color: white; color: white;
@ -1105,13 +1106,12 @@ MainWindow QListWidget {
} }
PulseTopLevel QFrame#frame, PulseViewGroup QFrame#frame, PulseReply QFrame#frame { PulseTopLevel QFrame#frame, PulseViewGroup QFrame#frame, PulseReply QFrame#frame {
border: 2px solid #7ecbfb; border: 2px solid #c4cfd6;
border-radius: 6px;
background: white; background: white;
} }
PulseAddDialog QTextEdit#textEdit_Pulse { PulseAddDialog QTextEdit#textEdit_Pulse {
border: 2px solid #7ecbfb; border: 2px solid #c4cfd6;
border-radius: 6px; border-radius: 6px;
background: white; background: white;
} }
@ -1125,7 +1125,7 @@ PulseAddDialog QLabel#label_groupName {
} }
PulseReply #line_replyLine , PulseMessage #line{ PulseReply #line_replyLine , PulseMessage #line{
color: #7ecbfb; color: #c4cfd6;
} }
PulseReply QLabel#label_groupName{ PulseReply QLabel#label_groupName{