diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumItem.cpp b/retroshare-gui/src/gui/PhotoShare/AlbumItem.cpp index 5626bd7d7..a28b500e5 100644 --- a/retroshare-gui/src/gui/PhotoShare/AlbumItem.cpp +++ b/retroshare-gui/src/gui/PhotoShare/AlbumItem.cpp @@ -81,7 +81,7 @@ void AlbumItem::setSelected(bool on) } else { - ui->albumFrame->setStyleSheet("QFrame#albumFrame{border: 2px solid #CCCCCC;\nbackground: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #EEEEEE, stop: 1 #CCCCCC);\nborder-radius: 10px}"); + ui->albumFrame->setStyleSheet(""); } update(); } diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumItem.ui b/retroshare-gui/src/gui/PhotoShare/AlbumItem.ui index 9e5d36378..762b233a5 100644 --- a/retroshare-gui/src/gui/PhotoShare/AlbumItem.ui +++ b/retroshare-gui/src/gui/PhotoShare/AlbumItem.ui @@ -17,10 +17,7 @@ - QFrame#albumFrame{border: 2px solid #CCCCCC; -background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #EEEEEE, stop: 1 #CCCCCC); -border-radius: 10px} + QFrame::StyledPanel @@ -52,6 +49,9 @@ border-radius: 10px} TextLabel + + Qt::AlignCenter + diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp b/retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp index 09213b7d7..57627a30c 100644 --- a/retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp +++ b/retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp @@ -73,6 +73,8 @@ void PhotoDialog::setUp() // Fixed %, then manually scale to that, with scroll area. ui->lineEdit_Title->setText(QString::fromStdString(mPhotoDetails.mMeta.mMsgName)); + ui->albumGroup->setTitle( tr("Album") + " / " + QString::fromStdString(mPhotoDetails.mMeta.mMsgName)); + ui->frame_comments->setVisible(false); ui->frame_details->setVisible(false); } diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoDialog.ui b/retroshare-gui/src/gui/PhotoShare/PhotoDialog.ui index 8a0adf7c9..cf809286c 100644 --- a/retroshare-gui/src/gui/PhotoShare/PhotoDialog.ui +++ b/retroshare-gui/src/gui/PhotoShare/PhotoDialog.ui @@ -24,6 +24,18 @@ + + 0 + + + 0 + + + 0 + + + 0 + @@ -52,7 +64,7 @@ 0 0 - 540 + 558 318 @@ -167,7 +179,7 @@ - <N> Comments >> + Comments diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoItem.cpp b/retroshare-gui/src/gui/PhotoShare/PhotoItem.cpp index ae16513be..8b3ad5b5e 100644 --- a/retroshare-gui/src/gui/PhotoShare/PhotoItem.cpp +++ b/retroshare-gui/src/gui/PhotoShare/PhotoItem.cpp @@ -101,11 +101,11 @@ void PhotoItem::setSelected(bool selected) if (mSelected) { - ui->photoFrame->setStyleSheet("QFrame#photoFrame{border: 2px solid #9562B8;\nbackground: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #55EE55, stop: 1 " + bottomColor + ");\nborder-radius: 10px}"); + ui->photoFrame->setStyleSheet("QFrame#photoFrame{border: 2px solid #9562B8;\nbackground: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #308dc7, stop: 1 " + bottomColor + ");\nborder-radius: 10px}"); } else { - ui->photoFrame->setStyleSheet("QFrame#photoFrame{border: 2px solid #CCCCCC;\nbackground: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #EEEEEE, stop: 1 " + bottomColor + ");\nborder-radius: 10px}"); + ui->photoFrame->setStyleSheet(""); } update(); } @@ -152,8 +152,8 @@ void PhotoItem::setUp() mTitleLabel->setText(QString::fromStdString(mPhotoDetails.mMeta.mMsgName)); - ui->editLayOut->addWidget(mPhotoGrapherLabel); ui->editLayOut->addWidget(mTitleLabel); + ui->editLayOut->addWidget(mPhotoGrapherLabel); updateImage(mPhotoDetails.mLowResImage); } @@ -203,3 +203,4 @@ void PhotoItem::mousePressEvent(QMouseEvent *event) QWidget::mousePressEvent(event); } + diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoItem.ui b/retroshare-gui/src/gui/PhotoShare/PhotoItem.ui index 4073c8393..116c8097a 100644 --- a/retroshare-gui/src/gui/PhotoShare/PhotoItem.ui +++ b/retroshare-gui/src/gui/PhotoShare/PhotoItem.ui @@ -6,21 +6,18 @@ 0 0 - 253 - 233 + 205 + 228 Form - - + + - QFrame#photoFrame{border: 2px solid #CCCCCC; -background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #EEEEEE, stop: 1 #CCCCCC); -border-radius: 10px} + QFrame::StyledPanel @@ -30,11 +27,44 @@ border-radius: 10px} - - - TextLabel - - + + + + + Qt::Horizontal + + + + 17 + 20 + + + + + + + + TextLabel + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + + 13 + 20 + + + + + diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoShare.cpp b/retroshare-gui/src/gui/PhotoShare/PhotoShare.cpp index 584433d42..21cd0a7c8 100644 --- a/retroshare-gui/src/gui/PhotoShare/PhotoShare.cpp +++ b/retroshare-gui/src/gui/PhotoShare/PhotoShare.cpp @@ -34,6 +34,7 @@ #include "AlbumGroupDialog.h" #include "AlbumItem.h" #include "PhotoItem.h" +#include "gui/common/FilesDefs.h" /****** * #define PHOTO_DEBUG 1 @@ -351,8 +352,9 @@ void PhotoShare::updateAlbums() if (ui.pushButton_YourAlbums->isChecked()) { ui.toolButton_ViewEditAlbum->setText("Edit Album Details"); + ui.toolButton_ViewEditAlbum->setIcon(FilesDefs::getPixmapFromQtResourcePath(":/images/kview_64.png")); ui.toolButton_subscribe->setText("Delete Album"); - ui.toolButton_subscribe->setIcon(QIcon(":/images/album_unsubscribe.png")); + ui.toolButton_subscribe->setIcon(FilesDefs::getPixmapFromQtResourcePath(":/images/album_unsubscribe.png")); while (sit.hasNext()) { @@ -368,8 +370,9 @@ void PhotoShare::updateAlbums() { ui.toolButton_ViewEditAlbum->setText("View Album Details"); + ui.toolButton_ViewEditAlbum->setIcon(FilesDefs::getPixmapFromQtResourcePath(":/images/kview_64.png")); ui.toolButton_subscribe->setText("Unsubscribe From Album"); - ui.toolButton_subscribe->setIcon(QIcon(":/images/album_unsubscribe.png")); + ui.toolButton_subscribe->setIcon(FilesDefs::getPixmapFromQtResourcePath(":/images/album_unsubscribe.png")); while (sit.hasNext()) { @@ -385,7 +388,7 @@ void PhotoShare::updateAlbums() { ui.toolButton_ViewEditAlbum->setText("View Album Details"); ui.toolButton_subscribe->setText("Subscribe To Album"); - ui.toolButton_subscribe->setIcon(QIcon(":/images/album_subscribe.png")); + ui.toolButton_subscribe->setIcon(FilesDefs::getPixmapFromQtResourcePath(":/images/album_subscribe.png")); while (sit.hasNext()){ diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.cpp b/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.cpp index 5213adc52..1dc23772c 100644 --- a/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.cpp +++ b/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.cpp @@ -21,6 +21,7 @@ #include "gui/PhotoShare/PhotoSlideShow.h" #include "gui/PhotoShare/PhotoDrop.h" #include "gui/gxs/GxsIdDetails.h" +#include "gui/common/FilesDefs.h" #define IMAGE_FULLSCREEN ":/icons/fullscreen.png" #define IMAGE_FULLSCREENEXIT ":/icons/fullscreen-exit.png" @@ -33,23 +34,31 @@ PhotoSlideShow::PhotoSlideShow(const RsPhotoAlbum& album, QWidget *parent) { ui.setupUi(this); - connect(ui.pushButton_ShiftLeft, SIGNAL( clicked( void ) ), this, SLOT( moveLeft( void ) ) ); - connect(ui.pushButton_ShiftRight, SIGNAL( clicked( void ) ), this, SLOT( moveRight( void ) ) ); + connect(ui.toolButton_ShiftLeft, SIGNAL( clicked( void ) ), this, SLOT( moveLeft( void ) ) ); + connect(ui.toolButton_ShiftRight, SIGNAL( clicked( void ) ), this, SLOT( moveRight( void ) ) ); connect(ui.pushButton_ShowDetails, SIGNAL( clicked( void ) ), this, SLOT( showPhotoDetails( void ) ) ); connect(ui.pushButton_StartStop, SIGNAL( clicked( void ) ), this, SLOT( StartStop( void ) ) ); connect(ui.pushButton_Close, SIGNAL( clicked( void ) ), this, SLOT( closeShow( void ) ) ); connect(ui.fullscreenButton, SIGNAL(clicked()),this, SLOT(setFullScreen())); - mPhotoQueue = new TokenQueue(rsPhoto->getTokenService(), this); + ui.toolButton_ShiftLeft->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/arrow-left.png"))); + ui.toolButton_ShiftRight->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/arrow-right.png"))); + + ui.albumLabel->setText(QString::fromStdString(mAlbum.mMeta.mGroupName)); + + mPhotoQueue = new TokenQueue(rsPhoto->getTokenService(), this); mRunning = true; mShotActive = true; mImageIdx = 0; - requestPhotos(); - loadImage(); - //QTimer::singleShot(5000, this, SLOT(timerEvent())); + requestPhotos(); + loadImage(); + //QTimer::singleShot(5000, this, SLOT(timerEvent())); + + // not yet functional + ui.pushButton_ShowDetails->hide(); } PhotoSlideShow::~PhotoSlideShow() @@ -199,20 +208,20 @@ void PhotoSlideShow::updateMoveButtons(uint32_t status) switch(status) { case PHOTO_SHIFT_NO_BUTTONS: - ui.pushButton_ShiftLeft->setEnabled(false); - ui.pushButton_ShiftRight->setEnabled(false); + ui.toolButton_ShiftLeft->setEnabled(false); + ui.toolButton_ShiftRight->setEnabled(false); break; case PHOTO_SHIFT_LEFT_ONLY: - ui.pushButton_ShiftLeft->setEnabled(true); - ui.pushButton_ShiftRight->setEnabled(false); + ui.toolButton_ShiftLeft->setEnabled(true); + ui.toolButton_ShiftRight->setEnabled(false); break; case PHOTO_SHIFT_RIGHT_ONLY: - ui.pushButton_ShiftLeft->setEnabled(false); - ui.pushButton_ShiftRight->setEnabled(true); + ui.toolButton_ShiftLeft->setEnabled(false); + ui.toolButton_ShiftRight->setEnabled(true); break; case PHOTO_SHIFT_BOTH: - ui.pushButton_ShiftLeft->setEnabled(true); - ui.pushButton_ShiftRight->setEnabled(true); + ui.toolButton_ShiftLeft->setEnabled(true); + ui.toolButton_ShiftRight->setEnabled(true); break; } } diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.ui b/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.ui index 50d031e4e..b8509703e 100644 --- a/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.ui +++ b/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.ui @@ -107,7 +107,7 @@ - + << @@ -124,7 +124,7 @@ - + >> diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index 81780ed4b..358be3a58 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -1140,3 +1140,26 @@ WireGroupDialog QFrame#frame { background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #9BDBF9, stop:1 #1592CD); border: 0px; } + +PhotoShare QPushButton#pushButton_YourAlbums, QPushButton#pushButton_SubscribedAlbums, +QPushButton#pushButton_SharedAlbums { + font-size: 12pt; +} + +AlbumItem QFrame#albumFrame { + border: 2px solid #CCCCCC; + border-radius: 10px +} + +PhotoItem QFrame#photoFrame { + border: 2px solid #CCCCCC; + border-radius: 10px +} + +PhotoItem QWidget:hover { + background-color: #7ecbfb; +} + +PhotoSlideShow QLabel#albumLabel { + font-size: 12pt; +} diff --git a/retroshare-gui/src/qss/qdarkstyle.qss b/retroshare-gui/src/qss/qdarkstyle.qss index 91f36d55c..f7cd0215e 100644 --- a/retroshare-gui/src/qss/qdarkstyle.qss +++ b/retroshare-gui/src/qss/qdarkstyle.qss @@ -1284,7 +1284,7 @@ PulseViewGroup QToolButton#toolButton_follow { color: white; background: #0099cc; border-radius: 4px; - max-height: 27px; + max-height: 20px; min-width: 4em; padding: 2px; padding-left: 6px; @@ -1299,7 +1299,8 @@ PulseTopLevel QToolButton#toolButton_follow:hover, PulseViewGroup QToolButton#to background: #03b1f3; border-radius: 4px; min-width: 4em; - padding: 2px; + padding-left: 6px; + padding-right: 6px; } CreateGxsForumMsg QPushButton#postButton:disabled, PostedCreatePostDialog QPushButton#submitButton:disabled, @@ -1310,9 +1311,11 @@ PulseAddDialog QPushButton#pushButton_Post:disabled { color: white; background: #d40000; border-radius: 4px; - max-height: 27px; + max-height: 20px; min-width: 4em; padding: 2px; + padding-left: 6px; + padding-right: 6px; } ShareManager QPushButton#closeButton { @@ -1479,6 +1482,10 @@ WireGroupItem QFrame#wire_frame background: transparent; } +PulseReply #line_replyLine , PulseMessage #line{ + color: #38444d; +} + RSTextBrowser, MimeTextEdit { /*qproperty-textColorQuote: rgb(125, 125, 255);*/ @@ -1499,10 +1506,16 @@ MainWindow QListWidget { font-size: 12pt; } -ChatLobbyWidget QTreeWidget#lobbyTreeWidget{ - font-size: 10pt; +PhotoShare QPushButton#pushButton_YourAlbums, QPushButton#pushButton_SubscribedAlbums, +QPushButton#pushButton_SharedAlbums { + font-size: 12pt; } -NewFriendList QTreeView#peerTreeWidget { - font-size: 12pt; +PhotoItem QFrame#photoFrame{ + border: 2px solid #3A3939; +} + +AlbumItem QFrame#albumFrame { + border: 2px solid #3A3939; + border-radius: 10px } diff --git a/retroshare-gui/src/util/ClickableLabel.h b/retroshare-gui/src/util/ClickableLabel.h index de4dcce92..54b3499d8 100644 --- a/retroshare-gui/src/util/ClickableLabel.h +++ b/retroshare-gui/src/util/ClickableLabel.h @@ -40,7 +40,7 @@ protected: void mousePressEvent(QMouseEvent* event) override; void enterEvent(QEvent * /* ev */ ) override { if(mUseStyleSheet) setStyleSheet("QLabel { border: 2px solid #039bd5; }");} - void leaveEvent(QEvent * /* ev */ ) override { if(mUseStyleSheet) setStyleSheet("QLabel { border: 2px solid #CCCCCC; border-radius: 3px; }");} + void leaveEvent(QEvent * /* ev */ ) override { if(mUseStyleSheet) setStyleSheet("");} bool mUseStyleSheet; };