diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp index 61e01ab24..9ca80dea4 100644 --- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp +++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp @@ -231,6 +231,10 @@ SharedFilesDialog::SharedFilesDialog(bool remote_mode, QWidget *parent) /* Set Multi Selection */ ui.dirTreeView->setSelectionMode(QAbstractItemView::ExtendedSelection); + QFontMetricsF fontMetrics(ui.dirTreeView->font()); + int iconHeight = fontMetrics.height() * 1.5; + ui.dirTreeView->setIconSize(QSize(iconHeight, iconHeight)); + /* Hide platform specific features */ copylinkAct = new QAction(QIcon(IMAGE_COPYLINK), tr( "Copy retroshare Links to Clipboard" ), this ); connect( copylinkAct , SIGNAL( triggered() ), this, SLOT( copyLink() ) ); diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui index 6915c1c44..4207aa042 100644 --- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui +++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui @@ -352,6 +352,11 @@ border-image: url(:/images/closepressed.png) 0 + + + 11 + + Qt::CustomContextMenu diff --git a/retroshare-gui/src/gui/RemoteDirModel.cpp b/retroshare-gui/src/gui/RemoteDirModel.cpp index 0cfcc9772..a6f31a428 100644 --- a/retroshare-gui/src/gui/RemoteDirModel.cpp +++ b/retroshare-gui/src/gui/RemoteDirModel.cpp @@ -136,7 +136,7 @@ void RetroshareDirModel::treeStyle() { categoryIcon.addPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/folder.png"), QIcon::Normal, QIcon::Off); categoryIcon.addPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/folderopen.png"), QIcon::Normal, QIcon::On); - peerIcon = FilesDefs::getIconFromQtResourcePath(":/images/user/identity16.png"); + peerIcon = FilesDefs::getIconFromQtResourcePath(":/icons/folder-account.svg"); } void TreeStyle_RDM::update() { diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index 48071b201..d28594130 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -340,5 +340,6 @@ icons/notification.png icons/wire.png icons/wire-circle.png + icons/folder-account.svg diff --git a/retroshare-gui/src/gui/icons/folder-account.svg b/retroshare-gui/src/gui/icons/folder-account.svg new file mode 100644 index 000000000..1247cb476 --- /dev/null +++ b/retroshare-gui/src/gui/icons/folder-account.svg @@ -0,0 +1,38 @@ + + + + + + diff --git a/retroshare-gui/src/gui/icons/folder-open.svg b/retroshare-gui/src/gui/icons/folder-open.svg new file mode 100644 index 000000000..2cd0d4905 --- /dev/null +++ b/retroshare-gui/src/gui/icons/folder-open.svg @@ -0,0 +1,38 @@ + + + + + + diff --git a/retroshare-gui/src/gui/icons/folder.png b/retroshare-gui/src/gui/icons/folder.png index 01f942628..50b84dc56 100644 Binary files a/retroshare-gui/src/gui/icons/folder.png and b/retroshare-gui/src/gui/icons/folder.png differ diff --git a/retroshare-gui/src/gui/icons/folder.svg b/retroshare-gui/src/gui/icons/folder.svg new file mode 100644 index 000000000..4989f5d1c --- /dev/null +++ b/retroshare-gui/src/gui/icons/folder.svg @@ -0,0 +1,38 @@ + + + + + + diff --git a/retroshare-gui/src/gui/icons/folderopen.png b/retroshare-gui/src/gui/icons/folderopen.png index 544e5f0b7..9f83b2561 100644 Binary files a/retroshare-gui/src/gui/icons/folderopen.png and b/retroshare-gui/src/gui/icons/folderopen.png differ