diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp index 9f45ab925..0d8fc057d 100644 --- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp +++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp @@ -134,6 +134,10 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName setWindowFlags(windowFlags() & ~Qt::WindowMinimizeButtonHint); setWindowTitle(QString("%1 - %2").arg(windowTitle()).arg(QFileInfo(_fileName).completeBaseName())); + + + ui.headerFrame->setHeaderImage(QPixmap(":/images/library64.png")); + ui.headerFrame->setHeaderText(tr("Collection Editor")); // 1 - add all elements to the list. diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.ui b/retroshare-gui/src/gui/common/RsCollectionDialog.ui index b5bf4e88b..9aaaacfc4 100644 --- a/retroshare-gui/src/gui/common/RsCollectionDialog.ui +++ b/retroshare-gui/src/gui/common/RsCollectionDialog.ui @@ -3,394 +3,436 @@ RsCollectionDialog - - 0 - 0 - 693 - 331 - - - + + 0 + 0 + 693 + 525 + + + Collection :/images/mimetypes/rscollection-16.png:/images/mimetypes/rscollection-16.png - - true - - - - - - Qt::Vertical - - - - QFrame::NoFrame - - - QFrame::Plain - - - - 0 - - - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Plain - - - 0 - - - - 0 - - - 0 - - - - - QLayout::SetDefaultConstraint - - - - - - - File name : - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Total size : - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Selected files : - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - - - - TextLabel - - - - - - - - 21 - 14 - - - - <html><head/><body><p>Change the file were collection will be saved.</p><p>If you select an existing file, you could merge it.</p></body></html> - - - ... - - - - - - - - - TextLabel - - - - - - - TextLabel - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - 0 - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - - 0 - - - - - QAbstractItemView::NoEditTriggers - - - QAbstractItemView::ExtendedSelection - - - true - - - - - - - - - - 21 - 21 - - - - - 17 - 21 - - - - <html><head/><body><p>Add selected item to collection one by one.</p><p>Select parent dir to add this too.</p><p><span style=" font-style:italic; vertical-align:sub;">&lt;Enter&gt;</span></p></body></html> - - - > - - - - - - - - 21 - 21 - - - - - 21 - 21 - - - - <html><head/><body><p>Add selected item to collection.</p><p>If a directory is selected, all of his children will be added.</p><p><span style=" text-decoration: underline; vertical-align:sub;">&lt;Shift + Enter&gt;</span></p></body></html> - - - >> - - - - - - - - 21 - 21 - - - - - 21 - 21 - - - - <html><head/><body><p>Remove selected item of collection.</p><p><span style=" font-style:italic; vertical-align:sub;">&lt;Del&gt;</span></p></body></html> - - - < - - - - - - - - 21 - 21 - - - - - 21 - 21 - - - - <html><head/><body><p>Make a new directory in the collection.</p><p><span style=" font-style:italic; vertical-align:sub;">&lt;+&gt;</span></p></body></html> - - - + - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - QAbstractItemView::NoEditTriggers - - - true - - - QAbstractItemView::ExtendedSelection - - - false + + true + + + + 0 + + + 0 + + + + + QFrame::StyledPanel - - true - - - - 1 - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Cancel - - - - - - - Save - - - - - - - Download! - - - - - - - - - - true - - - - - - - - - HashBox - QScrollArea -
gui/common/HashBox.h
- 1 -
-
- - - + + QFrame::Raised + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + Qt::Vertical + + + + QFrame::NoFrame + + + QFrame::Plain + + + + 0 + + + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Plain + + + 0 + + + + 0 + + + 0 + + + + + QLayout::SetDefaultConstraint + + + + + + + File name : + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Total size : + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Selected files : + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + + + + TextLabel + + + + + + + + 21 + 14 + + + + <html><head/><body><p>Change the file were collection will be saved.</p><p>If you select an existing file, you could merge it.</p></body></html> + + + ... + + + + + + + + + TextLabel + + + + + + + TextLabel + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + 0 + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + + 0 + + + + + QAbstractItemView::NoEditTriggers + + + QAbstractItemView::ExtendedSelection + + + true + + + + + + + + + + 21 + 21 + + + + + 17 + 21 + + + + <html><head/><body><p>Add selected item to collection one by one.</p><p>Select parent dir to add this too.</p><p><span style=" font-style:italic; vertical-align:sub;">&lt;Enter&gt;</span></p></body></html> + + + > + + + + + + + + 21 + 21 + + + + + 21 + 21 + + + + <html><head/><body><p>Add selected item to collection.</p><p>If a directory is selected, all of his children will be added.</p><p><span style=" text-decoration: underline; vertical-align:sub;">&lt;Shift + Enter&gt;</span></p></body></html> + + + >> + + + + + + + + 21 + 21 + + + + + 21 + 21 + + + + <html><head/><body><p>Remove selected item of collection.</p><p><span style=" font-style:italic; vertical-align:sub;">&lt;Del&gt;</span></p></body></html> + + + < + + + + + + + + 21 + 21 + + + + + 21 + 21 + + + + <html><head/><body><p>Make a new directory in the collection.</p><p><span style=" font-style:italic; vertical-align:sub;">&lt;+&gt;</span></p></body></html> + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + QAbstractItemView::NoEditTriggers + + + true + + + QAbstractItemView::ExtendedSelection + + + false + + + true + + + + 1 + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Cancel + + + + + + + Save + + + + + + + Download! + + + + + + + + + + true + + + + + + + + _mainSplitter + _listSplitter + + _mainSplitter + + + + frame + headerFrame + + + + HashBox + QScrollArea +
gui/common/HashBox.h
+ 1 +
+ + HeaderFrame + QFrame +
gui/common/HeaderFrame.h
+ 1 +
+
+ + + diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index eb7de4ef4..54f873ae3 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -686,5 +686,6 @@ images/library_edit.png images/library_view.png images/library_add.png + images/library64.png diff --git a/retroshare-gui/src/gui/images/library64.png b/retroshare-gui/src/gui/images/library64.png new file mode 100644 index 000000000..8aec71cf2 Binary files /dev/null and b/retroshare-gui/src/gui/images/library64.png differ