From 9e30148c63c854bc22f2a6e5d284d8c4ab09e5c3 Mon Sep 17 00:00:00 2001 From: defnax Date: Wed, 21 Nov 2012 15:46:08 +0000 Subject: [PATCH] Added Header Images and Text for Albums Dialogs Enabled always "Create Album" functionality, not only when own Album is selected. git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5866 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- .../src/gui/PhotoShare/AlbumCreateDialog.ui | 19 +++++- .../src/gui/PhotoShare/AlbumDialog.cpp | 3 + .../src/gui/PhotoShare/AlbumDialog.ui | 56 +++++++++++++----- .../src/gui/PhotoShare/PhotoShare.cpp | 4 +- .../src/gui/PhotoShare/PhotoShare.ui | 24 +++++--- .../src/gui/PhotoShare/Photo_images.qrc | 2 + .../src/gui/PhotoShare/images/album_64.png | Bin 0 -> 4596 bytes 7 files changed, 82 insertions(+), 26 deletions(-) create mode 100644 retroshare-gui/src/gui/PhotoShare/images/album_64.png diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.ui b/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.ui index 68b88a61b..978b6e4d1 100644 --- a/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.ui +++ b/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.ui @@ -350,5 +350,22 @@ border-radius: 10px; - + + + buttonBox + rejected() + AlbumCreateDialog + close() + + + 398 + 466 + + + 264 + 243 + + + + diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumDialog.cpp b/retroshare-gui/src/gui/PhotoShare/AlbumDialog.cpp index 4d9234ee8..fefe8b261 100644 --- a/retroshare-gui/src/gui/PhotoShare/AlbumDialog.cpp +++ b/retroshare-gui/src/gui/PhotoShare/AlbumDialog.cpp @@ -9,6 +9,9 @@ AlbumDialog::AlbumDialog(const RsPhotoAlbum& album, TokenQueue* photoQueue, RsPh ui(new Ui::AlbumDialog), mRsPhoto(rs_Photo), mPhotoQueue(photoQueue), mAlbum(album), mPhotoSelected(NULL) { ui->setupUi(this); + + ui->headerFrame->setHeaderImage(QPixmap(":/images/kview_64.png")); + ui->headerFrame->setHeaderText(tr("Album")); connect(ui->pushButton_PublishPhotos, SIGNAL(clicked()), this, SLOT(updateAlbumPhotos())); connect(ui->pushButton_DeletePhoto, SIGNAL(clicked()), this, SLOT(deletePhoto())); diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumDialog.ui b/retroshare-gui/src/gui/PhotoShare/AlbumDialog.ui index 0acc5793d..c0b45cb68 100644 --- a/retroshare-gui/src/gui/PhotoShare/AlbumDialog.ui +++ b/retroshare-gui/src/gui/PhotoShare/AlbumDialog.ui @@ -27,16 +27,6 @@ 0 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - @@ -310,7 +300,7 @@ p, li { white-space: pre-wrap; } 0 0 625 - 103 + 112 @@ -360,6 +350,13 @@ p, li { white-space: pre-wrap; } + + + + QDialogButtonBox::Cancel + + + @@ -372,9 +369,17 @@ p, li { white-space: pre-wrap; } + + + + QFrame::StyledPanel + + + QFrame::Raised + + + - frame - headerFrame @@ -383,9 +388,32 @@ p, li { white-space: pre-wrap; }
gui/PhotoShare/PhotoDrop.h
1 + + HeaderFrame + QFrame +
gui/common/headerframe.h
+ 1 + - + + + buttonBox + rejected() + AlbumDialog + close() + + + 481 + 413 + + + 324 + 217 + + + + diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoShare.cpp b/retroshare-gui/src/gui/PhotoShare/PhotoShare.cpp index b2ea8a63a..dcef37533 100644 --- a/retroshare-gui/src/gui/PhotoShare/PhotoShare.cpp +++ b/retroshare-gui/src/gui/PhotoShare/PhotoShare.cpp @@ -331,7 +331,7 @@ void PhotoShare::updateAlbums() ui.toolButton_subscribe->setEnabled(true); ui.toolButton_subscribe->setText("Unsubscribe From Album"); ui.toolButton_subscribe->setIcon(QIcon(":/images/album_unsubscribe.png")); - ui.toolButton_NewAlbum->setEnabled(false); + //ui.toolButton_NewAlbum->setEnabled(false); ui.toolButton_SlideShow->setEnabled(true); while(sit.hasNext()){ @@ -349,7 +349,7 @@ void PhotoShare::updateAlbums() ui.toolButton_subscribe->setEnabled(true); ui.toolButton_subscribe->setText("Subscribe To Album"); ui.toolButton_subscribe->setIcon(QIcon(":/images/album_subscribe.png")); - ui.toolButton_NewAlbum->setEnabled(false); + //ui.toolButton_NewAlbum->setEnabled(false); ui.toolButton_SlideShow->setEnabled(false); while(sit.hasNext()){ diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui b/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui index 0662f0f7e..ba24bf785 100644 --- a/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui +++ b/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui @@ -206,20 +206,13 @@ 0 0 804 - 230 + 225 QWidget#scrollAreaWidgetContents{border: none;} - - - - - - - @@ -249,7 +242,7 @@ 0 0 804 - 230 + 224 @@ -287,6 +280,19 @@ View Photo + + + :/images/kview_24.png:/images/kview_24.png + + + + 24 + 24 + + + + Qt::ToolButtonTextBesideIcon + diff --git a/retroshare-gui/src/gui/PhotoShare/Photo_images.qrc b/retroshare-gui/src/gui/PhotoShare/Photo_images.qrc index 5851b35e0..bf435030e 100644 --- a/retroshare-gui/src/gui/PhotoShare/Photo_images.qrc +++ b/retroshare-gui/src/gui/PhotoShare/Photo_images.qrc @@ -2,6 +2,8 @@ images/kuickshow.png images/kview_24.png + images/kview_64.png + images/album_64.png images/album_subscribe.png images/album_unsubscribe.png images/album_create_64.png diff --git a/retroshare-gui/src/gui/PhotoShare/images/album_64.png b/retroshare-gui/src/gui/PhotoShare/images/album_64.png new file mode 100644 index 0000000000000000000000000000000000000000..12207ba89f3096827cdb39debbc65188b348374f GIT binary patch literal 4596 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