Skip to content

Commit

Permalink
adapt to new logo #36
Browse files Browse the repository at this point in the history
  • Loading branch information
rodlie committed Jul 16, 2018
1 parent 01c68fc commit 9f096d1
Show file tree
Hide file tree
Showing 22 changed files with 48 additions and 5 deletions.
6 changes: 6 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Developers:

Ole-André Rodlie (5.2018) <[email protected]>
Michal Rost (8.2012 - 5.2013) <[email protected]>
Wittfella (5.2010 - 8.2012) <[email protected]>

Artists:

psikoz <https://github.com/psikoz>
37 changes: 37 additions & 0 deletions fm/fm.pro
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,43 @@ man.files += qtfm.8
man.path += $${MANDIR}/man8
INSTALLS += target desktop docs man

icon128.files = ../share/icons/hicolor/128x128/apps/qtfm.png
icon128.path = $${PREFIX}/share/icons/hicolor/128x128/apps
icon160.files = ../share/icons/hicolor/160x160/apps/qtfm.png
icon160.path = $${PREFIX}/share/icons/hicolor/160x160/apps
icon16.files = ../share/icons/hicolor/16x16/apps/qtfm.png
icon16.path = $${PREFIX}/share/icons/hicolor/16x16/apps
icon192.files = ../share/icons/hicolor/192x192/apps/qtfm.png
icon192.path = $${PREFIX}/share/icons/hicolor/192x192/apps
icon20.files = ../share/icons/hicolor/20x20/apps/qtfm.png
icon20.path = $${PREFIX}/share/icons/hicolor/20x20/apps
icon22.files = ../share/icons/hicolor/22x22/apps/qtfm.png
icon22.path = $${PREFIX}/share/icons/hicolor/22x22/apps
icon24.files = ../share/icons/hicolor/24x24/apps/qtfm.png
icon24.path = $${PREFIX}/share/icons/hicolor/24x24/apps
icon256.files = ../share/icons/hicolor/256x256/apps/qtfm.png
icon256.path = $${PREFIX}/share/icons/hicolor/256x256/apps
icon32.files = ../share/icons/hicolor/32x32/apps/qtfm.png
icon32.path = $${PREFIX}/share/icons/hicolor/32x32/apps
icon36.files = ../share/icons/hicolor/36x36/apps/qtfm.png
icon36.path = $${PREFIX}/share/icons/hicolor/36x36/apps
icon48.files = ../share/icons/hicolor/48x48/apps/qtfm.png
icon48.path = $${PREFIX}/share/icons/hicolor/48x48/apps
icon512.files = ../share/icons/hicolor/512x512/apps/qtfm.png
icon512.path = $${PREFIX}/share/icons/hicolor/512x512/apps
icon64.files = ../share/icons/hicolor/64x64/apps/qtfm.png
icon64.path = $${PREFIX}/share/icons/hicolor/64x64/apps
icon72.files = ../share/icons/hicolor/72x72/apps/qtfm.png
icon72.path = $${PREFIX}/share/icons/hicolor/72x72/apps
icon96.files = ../share/icons/hicolor/96x96/apps/qtfm.png
icon96.path = $${PREFIX}/share/icons/hicolor/96x96/apps
iconSVG.files = ../share/icons/hicolor/scalable/apps/qtfm.svg
iconSVG.path = $${PREFIX}/share/icons/hicolor/scalable/apps

INSTALLS += icon128 icon160 icon16 icon192 icon20 icon22 \
icon24 icon256 icon32 icon36 icon48 icon512 icon64 \
icon72 icon96 iconSVG

!CONFIG(no_udisks) {
exists(../libdisks/libdisks.pro) {
INCLUDEPATH += ../libdisks
Expand Down
Binary file modified fm/images/qtfm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion fm/qtfm.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Name=QtFM
GenericName=Qt File Manager
Comment=Qt File Manager
Type=Application
Icon=folder
Icon=qtfm
Exec=qtfm
Terminal=false
MimeType=application/x-directory;inode/directory
Expand Down
2 changes: 1 addition & 1 deletion fm/src/actiontriggers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,7 @@ void MainWindow::showAboutBox()
box.setStyleSheet("QLabel { padding:0;margin:0;min-width:300px; }");
#endif
box.setWindowTitle(tr("About %1").arg(APP_NAME));
box.setWindowIcon(QIcon::fromTheme("user-home"));
box.setWindowIcon(QIcon::fromTheme("qtfm", QIcon(":/images/qtfm.png")));
box.setText(QString("<p style=\"text-align:center;\">"
"<img src=\":/images/qtfm.png\">"
"<h1>%1 %2</h1>"
Expand Down
4 changes: 2 additions & 2 deletions fm/src/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ MainWindow::MainWindow()
createToolBars();
createMenus();

setWindowIcon(QIcon::fromTheme("folder"));
setWindowIcon(QIcon::fromTheme("qtfm", QIcon(":/images/qtfm.png")));
setWindowTitle(APP_NAME);

// Create custom action manager
Expand Down Expand Up @@ -969,7 +969,7 @@ void MainWindow::dragLauncher(const QMimeData *data, const QString &newPath,
if (currentDragMode == Common::DM_UNKNOWN) {
QMessageBox box;
box.setWindowTitle(tr("Select file action"));
box.setWindowIcon(QIcon::fromTheme("folder"));
box.setWindowIcon(QIcon::fromTheme("qtfm", QIcon(":/images/qtfm.png")));
box.setIconPixmap(QIcon::fromTheme("dialog-information").pixmap(QSize(32, 32)));
box.setText(tr("<h3>What do you want to do?</h3>"));
if (!extraText.isEmpty()) {
Expand Down
Binary file added share/icons/hicolor/128x128/apps/qtfm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added share/icons/hicolor/160x160/apps/qtfm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added share/icons/hicolor/16x16/apps/qtfm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added share/icons/hicolor/192x192/apps/qtfm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added share/icons/hicolor/20x20/apps/qtfm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added share/icons/hicolor/22x22/apps/qtfm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added share/icons/hicolor/24x24/apps/qtfm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added share/icons/hicolor/256x256/apps/qtfm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added share/icons/hicolor/32x32/apps/qtfm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added share/icons/hicolor/36x36/apps/qtfm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added share/icons/hicolor/48x48/apps/qtfm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added share/icons/hicolor/512x512/apps/qtfm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added share/icons/hicolor/64x64/apps/qtfm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added share/icons/hicolor/72x72/apps/qtfm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added share/icons/hicolor/96x96/apps/qtfm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion tray/qtfm-tray.desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=QtFM Device Manager
Comment=QtFM Device Manager
Icon=drive-removable-media
Icon=qtfm
Exec=qtfm-tray
Terminal=false
Type=Application
Expand Down

0 comments on commit 9f096d1

Please sign in to comment.