diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp index b6da4de7b..482ae39cd 100644 --- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp +++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp @@ -188,6 +188,10 @@ SearchDialog::SearchDialog(QWidget *parent) ui.searchResultWidget->sortItems(SR_NAME_COL, Qt::AscendingOrder); + QFontMetricsF fontMetrics(ui.searchResultWidget->font()); + int iconHeight = fontMetrics.height() * 1.4; + ui.searchResultWidget->setIconSize(QSize(iconHeight, iconHeight)); + /* Set initial size the splitter */ QList sizes; sizes << 250 << width(); // Qt calculates the right sizes diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.ui b/retroshare-gui/src/gui/FileTransfer/SearchDialog.ui index 47fd2179e..f121c16c1 100644 --- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.ui +++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.ui @@ -6,7 +6,7 @@ 0 0 - 783 + 793 511 @@ -64,10 +64,7 @@ 2 - - 0 - - + 0 @@ -343,8 +340,8 @@ Any - - :/images/FileTypeAny.png:/images/FileTypeAny.png + + :/icons/filetype/any.svg:/icons/filetype/any.svg @@ -352,8 +349,8 @@ Archive - - :/images/FileTypeArchive.png:/images/FileTypeArchive.png + + :/icons/filetype/archive.svg:/icons/filetype/archive.svg @@ -361,8 +358,8 @@ Audio - - :/images/FileTypeAudio.png:/images/FileTypeAudio.png + + :/icons/filetype/audio.svg:/icons/filetype/audio.svg @@ -370,8 +367,8 @@ CD-Image - - :/images/FileTypeCDImage.png:/images/FileTypeCDImage.png + + :/icons/filetype/img.svg:/icons/filetype/img.svg @@ -379,8 +376,8 @@ Document - - :/images/FileTypeDocument.png:/images/FileTypeDocument.png + + :/icons/filetype/document.svg:/icons/filetype/document.svg @@ -388,8 +385,8 @@ Picture - - :/images/FileTypePicture.png:/images/FileTypePicture.png + + :/icons/filetype/picture.svg:/icons/filetype/picture.svg @@ -397,8 +394,8 @@ Program - - :/images/FileTypeProgram.png:/images/FileTypeProgram.png + + :/icons/filetype/program.svg:/icons/filetype/program.svg @@ -406,8 +403,8 @@ Video - - :/images/FileTypeVideo.png:/images/FileTypeVideo.png + + :/icons/filetype/video.svg:/icons/filetype/video.svg @@ -415,8 +412,8 @@ Directory - - :/images/foldermail.png:/images/foldermail.png + + :/icons/folder.png:/icons/folder.png diff --git a/retroshare-gui/src/gui/common/FilesDefs.cpp b/retroshare-gui/src/gui/common/FilesDefs.cpp index 4d9f9c903..0baaea837 100644 --- a/retroshare-gui/src/gui/common/FilesDefs.cpp +++ b/retroshare-gui/src/gui/common/FilesDefs.cpp @@ -34,49 +34,53 @@ static QString getInfoFromFilename(const QString& filename, bool anyForUnknown, QString ext = QFileInfo(filename).suffix().toLower(); if (ext == "jpg" || ext == "jpeg" || ext == "tif" || ext == "tiff" || ext == "png" || ext == "gif" || ext == "bmp" || ext == "ico" || ext == "svg") { - return image ? ":/images/FileTypePicture.png" : QApplication::translate("FilesDefs", "Picture"); + return image ? ":/icons/filetype/picture.svg" : QApplication::translate("FilesDefs", "Picture"); } else if (ext == "avi" || ext == "mpg" || ext == "mpeg" || ext == "wmv" || ext == "divx" || ext == "ts" || ext == "mkv" || ext == "mp4" || ext == "flv" || ext == "mov" || ext == "asf" || ext == "xvid" || ext == "vob" || ext == "qt" || ext == "rm" || ext == "3gp" || ext == "ogm") { - return image ? ":/images/FileTypeVideo.png" : QApplication::translate("FilesDefs", "Video"); + return image ? ":/icons/filetype/video.svg" : QApplication::translate("FilesDefs", "Video"); } else if (ext == "ogg" || ext == "mp3" || ext == "mp1" || ext == "mp2" || ext == "wav" || ext == "wma" || ext == "m4a" || ext == "flac" ||ext == "xpm") { - return image ? ":/images/FileTypeAudio.png" : QApplication::translate("FilesDefs", "Audio"); + return image ? ":/icons/filetype/audio.svg" : QApplication::translate("FilesDefs", "Audio"); } else if (ext == "tar" || ext == "bz2" || ext == "zip" || ext == "gz" || ext == "7z" || ext == "msi" || ext == "rar" || ext == "rpm" || ext == "ace" || ext == "jar" || ext == "tgz" || ext == "lha" || ext == "cab" || ext == "cbz"|| ext == "cbr" || ext == "alz" || ext == "sit" || ext == "arj" || ext == "deb") { - return image ? ":/images/FileTypeArchive.png" : QApplication::translate("FilesDefs", "Archive"); + return image ? ":/icons/filetype/archive.svg" : QApplication::translate("FilesDefs", "Archive"); } else if (ext == "app" || ext == "bat" || ext == "cgi" || ext == "com" || ext == "exe" || ext == "js" || ext == "pif" || ext == "py" || ext == "pl" || ext == "sh" || ext == "vb" || ext == "ws") { - return image ? ":/images/FileTypeProgram.png" : QApplication::translate("FilesDefs", "Program"); + return image ? ":/icons/filetype/program.svg" : QApplication::translate("FilesDefs", "Program"); } else if (ext == "iso" || ext == "nrg" || ext == "mdf" || ext == "img" || ext == "dmg" || ext == "bin" || ext == "uif") { - return image ? ":/images/FileTypeCDImage.png" : QApplication::translate("FilesDefs", "CD/DVD-Image"); + return image ? ":/icons/filetype/img.svg" : QApplication::translate("FilesDefs", "CD/DVD-Image"); } else if (ext == "txt" || ext == "ui" || ext == "doc" || ext == "rtf" || ext == "sxw" || ext == "xls" || ext == "pps" || ext == "xml" || ext == "nfo" || ext == "reg" || ext == "sxc" || ext == "odt" || ext == "ods" || ext == "dot" || ext == "ppt" || ext == "css" || ext == "crt" || ext == "html" || ext == "htm" || ext == "php") { - return image ? ":/images/FileTypeDocument.png" : QApplication::translate("FilesDefs", "Document"); + return image ? ":/icons/filetype/document.svg" : QApplication::translate("FilesDefs", "Document"); } else if (ext == "pdf") { - return image ? ":/images/mimetypes/pdf.png" : QApplication::translate("FilesDefs", "Document"); + return image ? ":/icons/filetype/pdf.svg" : QApplication::translate("FilesDefs", "Document"); } else if (ext == RsCollection::ExtensionString) { - return image ? ":/images/mimetypes/rscollection-16.png" : QApplication::translate("FilesDefs", "RetroShare collection file"); + return image ? ":/icons/filetype/collection.svg" : QApplication::translate("FilesDefs", "RetroShare collection file"); } else if (ext == "sub" || ext == "srt") { - return image ? ":/images/FileTypeAny.png" : QApplication::translate("FilesDefs", "Subtitles"); + return image ? ":/icons/filetype/any.svg" : QApplication::translate("FilesDefs", "Subtitles"); } else if (ext == "nds") { - return image ? ":/images/FileTypeAny.png" : QApplication::translate("FilesDefs", "Nintendo DS Rom"); + return image ? ":/icons/filetype/any.svg" : QApplication::translate("FilesDefs", "Nintendo DS Rom"); } else if (ext == "patch" || ext == "diff") { - return image ? ":/images/mimetypes/patch.png" : QApplication::translate("FilesDefs", "Patch"); + return image ? ":/icons/filetype/patch.svg" : QApplication::translate("FilesDefs", "Patch"); } else if (ext == "cpp") { - return image ? ":/images/mimetypes/source_cpp.png" : QApplication::translate("FilesDefs", "C++"); + return image ? ":/icons/filetype/cpp.svg" : QApplication::translate("FilesDefs", "C++"); } else if (ext == "h") { - return image ? ":/images/mimetypes/source_h.png" : QApplication::translate("FilesDefs", "Header"); + return image ? ":/icons/filetype/h.svg" : QApplication::translate("FilesDefs", "Header"); } else if (ext == "c") { - return image ? ":/images/mimetypes/source_c.png" : QApplication::translate("FilesDefs", "C "); + return image ? ":/icons/filetype/c.svg" : QApplication::translate("FilesDefs", "C "); + } else if (ext == "apk") { + return image ? ":/icons/filetype/apk.svg" : QApplication::translate("FilesDefs", "APK "); + } else if (ext == "dll") { + return image ? ":/icons/filetype/dll.svg" : QApplication::translate("FilesDefs", "DLL "); } if (anyForUnknown) { - return image ? ":/images/FileTypeAny.png" : ""; + return image ? ":/icons/filetype/any.svg" : ""; } return ""; diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index d180b5fb1..c5db35fa0 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -362,5 +362,21 @@ icons/svg/calendar-today.svg icons/svg/calendar-week.svg icons/svg/refresh.svg + icons/filetype/any.svg + icons/filetype/archive.svg + icons/filetype/audio.svg + icons/filetype/document.svg + icons/filetype/img.svg + icons/filetype/picture.svg + icons/filetype/program.svg + icons/filetype/video.svg + icons/filetype/c.svg + icons/filetype/cpp.svg + icons/filetype/h.svg + icons/filetype/pdf.svg + icons/filetype/apk.svg + icons/filetype/dll.svg + icons/filetype/collection.svg + icons/filetype/patch.svg diff --git a/retroshare-gui/src/gui/icons/filetype/any.svg b/retroshare-gui/src/gui/icons/filetype/any.svg new file mode 100644 index 000000000..7e0cbf726 --- /dev/null +++ b/retroshare-gui/src/gui/icons/filetype/any.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/icons/filetype/apk.svg b/retroshare-gui/src/gui/icons/filetype/apk.svg new file mode 100644 index 000000000..81b468fc7 --- /dev/null +++ b/retroshare-gui/src/gui/icons/filetype/apk.svg @@ -0,0 +1,54 @@ + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/icons/filetype/archive.svg b/retroshare-gui/src/gui/icons/filetype/archive.svg new file mode 100644 index 000000000..dc7f6ed1a --- /dev/null +++ b/retroshare-gui/src/gui/icons/filetype/archive.svg @@ -0,0 +1,54 @@ + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/icons/filetype/audio.svg b/retroshare-gui/src/gui/icons/filetype/audio.svg new file mode 100644 index 000000000..d56eee2cc --- /dev/null +++ b/retroshare-gui/src/gui/icons/filetype/audio.svg @@ -0,0 +1,54 @@ + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/icons/filetype/c.svg b/retroshare-gui/src/gui/icons/filetype/c.svg new file mode 100644 index 000000000..702863c5e --- /dev/null +++ b/retroshare-gui/src/gui/icons/filetype/c.svg @@ -0,0 +1,54 @@ + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/icons/filetype/collection.svg b/retroshare-gui/src/gui/icons/filetype/collection.svg new file mode 100644 index 000000000..4a6b79ddf --- /dev/null +++ b/retroshare-gui/src/gui/icons/filetype/collection.svg @@ -0,0 +1,190 @@ + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/icons/filetype/cpp.svg b/retroshare-gui/src/gui/icons/filetype/cpp.svg new file mode 100644 index 000000000..fbacc8635 --- /dev/null +++ b/retroshare-gui/src/gui/icons/filetype/cpp.svg @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/icons/filetype/dll.svg b/retroshare-gui/src/gui/icons/filetype/dll.svg new file mode 100644 index 000000000..7dbca1de8 --- /dev/null +++ b/retroshare-gui/src/gui/icons/filetype/dll.svg @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/icons/filetype/document.svg b/retroshare-gui/src/gui/icons/filetype/document.svg new file mode 100644 index 000000000..e2976b503 --- /dev/null +++ b/retroshare-gui/src/gui/icons/filetype/document.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/icons/filetype/h.svg b/retroshare-gui/src/gui/icons/filetype/h.svg new file mode 100644 index 000000000..bf4963ba8 --- /dev/null +++ b/retroshare-gui/src/gui/icons/filetype/h.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/icons/filetype/img.svg b/retroshare-gui/src/gui/icons/filetype/img.svg new file mode 100644 index 000000000..66f8c4018 --- /dev/null +++ b/retroshare-gui/src/gui/icons/filetype/img.svg @@ -0,0 +1,54 @@ + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/icons/filetype/patch.svg b/retroshare-gui/src/gui/icons/filetype/patch.svg new file mode 100644 index 000000000..2df822b37 --- /dev/null +++ b/retroshare-gui/src/gui/icons/filetype/patch.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/icons/filetype/pdf.svg b/retroshare-gui/src/gui/icons/filetype/pdf.svg new file mode 100644 index 000000000..3be7f47a8 --- /dev/null +++ b/retroshare-gui/src/gui/icons/filetype/pdf.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/icons/filetype/picture.svg b/retroshare-gui/src/gui/icons/filetype/picture.svg new file mode 100644 index 000000000..72d6f7c6e --- /dev/null +++ b/retroshare-gui/src/gui/icons/filetype/picture.svg @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/icons/filetype/program.svg b/retroshare-gui/src/gui/icons/filetype/program.svg new file mode 100644 index 000000000..7ae7e7305 --- /dev/null +++ b/retroshare-gui/src/gui/icons/filetype/program.svg @@ -0,0 +1,48 @@ + + + + + + + + + + diff --git a/retroshare-gui/src/gui/icons/filetype/video.svg b/retroshare-gui/src/gui/icons/filetype/video.svg new file mode 100644 index 000000000..0dd6c78c7 --- /dev/null +++ b/retroshare-gui/src/gui/icons/filetype/video.svg @@ -0,0 +1,54 @@ + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index a0c74bb77..de468d270 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -85,14 +85,6 @@ images/closepressed.png images/denied16.png images/filetype-association.png - images/FileTypeAny.png - images/FileTypeArchive.png - images/FileTypeAudio.png - images/FileTypeCDImage.png - images/FileTypeDocument.png - images/FileTypePicture.png - images/FileTypeProgram.png - images/FileTypeVideo.png images/foldermail.png images/folderopen.png images/fileopen.png @@ -284,12 +276,6 @@ images/loader/indicator-32.gif images/loader/circleball-16.gif images/loader/progress.gif - images/mimetypes/pdf.png - images/mimetypes/rscollection-16.png - images/mimetypes/patch.png - images/mimetypes/source_c.png - images/mimetypes/source_cpp.png - images/mimetypes/source_h.png images/thumb-default-video.png images/user/add_user24.png images/user/add_user48.png diff --git a/retroshare-gui/src/gui/images/FileTypeAny.png b/retroshare-gui/src/gui/images/FileTypeAny.png deleted file mode 100644 index 34e64b73c..000000000 Binary files a/retroshare-gui/src/gui/images/FileTypeAny.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/FileTypeArchive.png b/retroshare-gui/src/gui/images/FileTypeArchive.png deleted file mode 100644 index b982beb6c..000000000 Binary files a/retroshare-gui/src/gui/images/FileTypeArchive.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/FileTypeAudio.png b/retroshare-gui/src/gui/images/FileTypeAudio.png deleted file mode 100644 index 988b27bf7..000000000 Binary files a/retroshare-gui/src/gui/images/FileTypeAudio.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/FileTypeCDImage.png b/retroshare-gui/src/gui/images/FileTypeCDImage.png deleted file mode 100644 index cb3ae8289..000000000 Binary files a/retroshare-gui/src/gui/images/FileTypeCDImage.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/FileTypeDocument.png b/retroshare-gui/src/gui/images/FileTypeDocument.png deleted file mode 100644 index 41d20a5c3..000000000 Binary files a/retroshare-gui/src/gui/images/FileTypeDocument.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/FileTypePicture.png b/retroshare-gui/src/gui/images/FileTypePicture.png deleted file mode 100644 index 7e9bb14f6..000000000 Binary files a/retroshare-gui/src/gui/images/FileTypePicture.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/FileTypeProgram.png b/retroshare-gui/src/gui/images/FileTypeProgram.png deleted file mode 100644 index 63b9f6c32..000000000 Binary files a/retroshare-gui/src/gui/images/FileTypeProgram.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/FileTypeVideo.png b/retroshare-gui/src/gui/images/FileTypeVideo.png deleted file mode 100644 index 9bcc41b78..000000000 Binary files a/retroshare-gui/src/gui/images/FileTypeVideo.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/mimetypes/patch.png b/retroshare-gui/src/gui/images/mimetypes/patch.png deleted file mode 100644 index 3925b7c2e..000000000 Binary files a/retroshare-gui/src/gui/images/mimetypes/patch.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/mimetypes/pdf.png b/retroshare-gui/src/gui/images/mimetypes/pdf.png deleted file mode 100644 index 73946b90d..000000000 Binary files a/retroshare-gui/src/gui/images/mimetypes/pdf.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/mimetypes/rscollection-16.png b/retroshare-gui/src/gui/images/mimetypes/rscollection-16.png deleted file mode 100644 index ab6d1686e..000000000 Binary files a/retroshare-gui/src/gui/images/mimetypes/rscollection-16.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/mimetypes/source_c.png b/retroshare-gui/src/gui/images/mimetypes/source_c.png deleted file mode 100644 index 51e7d3976..000000000 Binary files a/retroshare-gui/src/gui/images/mimetypes/source_c.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/mimetypes/source_cpp.png b/retroshare-gui/src/gui/images/mimetypes/source_cpp.png deleted file mode 100644 index 522dc111f..000000000 Binary files a/retroshare-gui/src/gui/images/mimetypes/source_cpp.png and /dev/null differ diff --git a/retroshare-gui/src/gui/images/mimetypes/source_h.png b/retroshare-gui/src/gui/images/mimetypes/source_h.png deleted file mode 100644 index 116790f4e..000000000 Binary files a/retroshare-gui/src/gui/images/mimetypes/source_h.png and /dev/null differ