From 14a5c824421a3af45ff73a895c301356e4b524d2 Mon Sep 17 00:00:00 2001 From: defnax Date: Sat, 12 Sep 2020 14:08:18 +0200 Subject: [PATCH] Fixing layout issues & added to store ratio combox * Fixing layout issues * Added to store/load ratio combox --- .../gui/gxschannels/CreateGxsChannelMsg.cpp | 35 +- .../src/gui/gxschannels/CreateGxsChannelMsg.h | 1 + .../gui/gxschannels/CreateGxsChannelMsg.ui | 401 ++++++++---------- 3 files changed, 221 insertions(+), 216 deletions(-) diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp index 588bff379..80ac09bfb 100644 --- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp +++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp @@ -72,13 +72,18 @@ CreateGxsChannelMsg::CreateGxsChannelMsg(const RsGxsGroupId &cId, RsGxsMessageId connect(addFileButton, SIGNAL(clicked() ), this , SLOT(addExtraFile())); connect(addfilepushButton, SIGNAL(clicked() ), this , SLOT(addExtraFile())); - connect(subjectEdit,SIGNAL(textChanged(const QString&)),this,SLOT(updatePreviewText(const QString&))); + connect(subjectEdit,SIGNAL(textChanged(const QString&)),this,SLOT(updatePreviewText(const QString&))); connect(addThumbnailButton, SIGNAL(clicked() ), this , SLOT(addThumbnail())); connect(thumbNailCb, SIGNAL(toggled(bool)), this, SLOT(allowAutoMediaThumbNail(bool))); connect(stackedWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenu(QPoint))); connect(generateCheckBox, SIGNAL(toggled(bool)), generateSpinBox, SLOT(setEnabled(bool))); - connect(aspectRatio_CB,SIGNAL(currentIndexChanged(int)),this,SLOT(changeAspectRatio(int))); + connect(aspectRatio_CB,SIGNAL(currentIndexChanged(int)),this,SLOT(changeAspectRatio(int))); + + channelpostButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/icons/png/comment.png")); + attachmentsButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/icons/png/attachements.png")); + addThumbnailButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/icons/png/add-image.png")); + addfilepushButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/icons/png/add-file.png")); aspectRatio_CB->setItemIcon(0,FilesDefs::getIconFromQtResourcePath(":/icons/svg/ratio-auto.svg")); aspectRatio_CB->setItemIcon(1,FilesDefs::getIconFromQtResourcePath(":/icons/svg/ratio-1-1.svg")); @@ -106,6 +111,9 @@ CreateGxsChannelMsg::CreateGxsChannelMsg(const RsGxsGroupId &cId, RsGxsMessageId generateCheckBox->hide(); generateSpinBox->hide(); #endif + + /* load settings */ + processSettings(true); } CreateGxsChannelMsg::~CreateGxsChannelMsg() @@ -114,6 +122,29 @@ CreateGxsChannelMsg::~CreateGxsChannelMsg() #ifdef CHANNELS_FRAME_CATCHER delete fCatcher; #endif + + // save settings + processSettings(false); +} + +void CreateGxsChannelMsg::processSettings(bool load) +{ + Settings->beginGroup(QString("CreateGxsChannelMsg")); + + if (load) { + // load settings + + // state of Ratio combobox + int index = Settings->value("aspectRatio_CB", 0).toInt(); + aspectRatio_CB->setCurrentIndex(index); + } else { + // save settings + + // state of Ratio combobox + Settings->setValue("aspectRatio_CB", aspectRatio_CB->currentIndex()); + } + + Settings->endGroup(); } void CreateGxsChannelMsg::changeAspectRatio(int s) diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.h b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.h index f33a83ad0..8f8b6e41c 100644 --- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.h +++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.h @@ -72,6 +72,7 @@ private slots: void on_channelpostButton_clicked(); void on_attachmentsButton_clicked(); private: + void processSettings(bool load); void loadChannelInfo(); void loadOriginalChannelPostInfo(); void saveChannelInfo(const RsGroupMetaData &group); diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui index 6041dc13e..9d296666c 100644 --- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui +++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui @@ -7,7 +7,7 @@ 0 0 881 - 383 + 328 @@ -39,13 +39,6 @@ 0 - - - - QFrame::Plain - - - @@ -64,6 +57,19 @@ 0 + + + + Attachments + + + + 24 + 24 + + + + @@ -79,207 +85,188 @@ 0 - - - + + + 0 + + + 0 + + + - - - - - - 0 - 0 - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - + + + + 0 + 0 + + + - - - 6 + + + Qt::Vertical - - - - 6 - - - - - - 0 - 0 - - - - - 75 - true - - - - Channel Post to: - - - - - - - true - - - true - - - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + + + 20 + 1 + + + + + + + + + + 6 + + + + + + 0 + 0 + + + + + 75 + true + + + + Channel Post to: + + + + + + + true + + + true + + + + + + + + + <!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:'Ubuntu'; font-size:11pt; 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:10pt; font-weight:600;">Attachments:</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><img src=":/images/feedback_arrow.png" /><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;"> Use Drag and Drop / Add Files button, to Hash new files.</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><img src=":/images/feedback_arrow.png" /><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;"> Copy/Paste RetroShare links from your shares</span></p></body></html> - - + + + + + + + + + Add Channel Thumbnail + + + + 24 + 24 + + + + + + + + + 24 + 24 + + + + + Auto + - - - - - Add Channel Thumbnail - - - - :/icons/png/add-image.png:/icons/png/add-image.png - - - - 24 - 24 - - - - - - - - - 24 - 24 - - - - - Auto - - - - - 1:1 - - - - - 3:4 - - - - - 16:9 - - - - - - - - Add File to Attach - - - - :/icons/png/add-file.png:/icons/png/add-file.png - - - - 24 - 24 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 40 - 20 - - - - - + + 1:1 + - - - 9 - - - - - Title - - - - + + 3:4 + - - - Qt::Vertical - - - - 20 - 1 - - - + + 16:9 + - + + + + + + Add File to Attach + + + + 24 + 24 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + - - + + + + 9 + + + + + Title + + + + + + + + + + 0 + 0 + + + @@ -342,7 +329,7 @@ p, li { white-space: pre-wrap; } 0 0 - 84 + 842 24 @@ -416,23 +403,6 @@ p, li { white-space: pre-wrap; } - - - - Channel Post - - - - :/icons/png/comment.png:/icons/png/comment.png - - - - 24 - 24 - - - - @@ -446,14 +416,10 @@ p, li { white-space: pre-wrap; } - - + + - Attachments - - - - :/icons/png/attachements.png:/icons/png/attachements.png + Channel Post @@ -500,6 +466,13 @@ p, li { white-space: pre-wrap; } + + + + QFrame::Plain + + +