Merge pull request #53 from rodlie/master

Beta2

AUTHORS

@@ -1,9 +1,12 @@
 Developers:
 
-Ole-André Rodlie (5.2018) <[email protected]>
-Michal Rost (8.2012 - 5.2013) <[email protected]>
-Wittfella (5.2010 - 8.2012) <[email protected]>
+ * 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>
+ * psikoz <https://github.com/psikoz>

README.md

@@ -1,11 +1,11 @@
-<p align="left"><img src="share/icons/hicolor/scalable/apps/qtfm.svg" alt="QList" height="100px"></p>
+<p align="left"><img src="fm/hicolor/scalable/apps/qtfm.svg" alt="QList" height="100px"></p>
 
 [![GitHub release](https://img.shields.io/github/release/rodlie/qtfm.svg)](https://github.com/rodlie/qtfm/releases)
 [![Github commits (since latest release)](https://img.shields.io/github/commits-since/rodlie/qtfm/latest.svg)](https://github.com/rodlie/qtfm)
 [![Build Status](https://travis-ci.org/rodlie/qtfm.svg?branch=master)](https://travis-ci.org/rodlie/qtfm)
 [![Github All Releases](https://img.shields.io/github/downloads/rodlie/qtfm/total.svg)](https://github.com/rodlie/qtfm/releases)
 
-![screenshot1](fm/screenshot.png)
+![screenshot1](fm/images/screenshot.png)
 
 Lightweight file manager using Qt.
 
@@ -16,7 +16,7 @@ Lightweight file manager using Qt.
  * Drag & drop functionality
  * Tabs
  * Udisks support
- * System tray daemon
+ * [System tray daemon](tray/README.md)
    * Mount/Unmount devices
    * Auto play CD/DVD
 
@@ -25,7 +25,7 @@ Lightweight file manager using Qt.
  * [Releases](https://github.com/rodlie/qtfm/releases)
  * [Milestones](https://github.com/rodlie/qtfm/milestones)
  * [Issues](https://github.com/rodlie/qtfm/issues)
- 
+
 ## Default shortcuts
 
 | Action                      | Shortcut    |
@@ -46,8 +46,8 @@ Lightweight file manager using Qt.
 | Zoom Out                    | [ctrl+-]    |
 | Zoom In                     | [ctrl++]    |
 | Focus Path                  | [ctrl+l]    |
-| Toogle Icon View            | [F3]        |
-| Toogle Detail View          | [F4]        |
+| Toggle Icon View            | [F3]        |
+| Toggle Detail View          | [F4]        |
 | Drag and Drop Move Modifier | [shift]     |
 | Drag and Drop Copy Modifier | [ctrl]      |
 | Drag and Drop Ask Action    | [alt]       |
@@ -89,16 +89,13 @@ Optional build options:
 
  * ``CONFIG+=no_udisks`` : This will disable udisks support in QtFM
  * ``CONFIG+=no_tray`` : This will disable qtfm-tray
- * ``CONFIG+=no_appdock``: This will disable the application launcher in QtFM
  * ``CONFIG+=no_dbus`` : This will disable D-Bus session features in QtFM
  * ``CONFIG+=release`` : Disable debug output (recommended)
  * ``PREFIX=`` : Install prefix, where things are installed when running ``make install``
  * ``DOCDIR=`` : Location for documentation (default is PREFIX/share/doc)
  * ``MANDIR=`` : Location for man pages (default is PREFIX/share/man)
  * ``XDGDIR=`` : Location of XDG (default is /etc/xdg or PREFIX/etc/xdg)
 
- You can disable additional features (udisks/tray/applauncher) with ``CONFIG+=basic``
-
 Doing a normal build:
 ```
 mkdir build && cd build
@@ -126,16 +123,16 @@ make INSTALL_ROOT=/package_temp_path install
 
 ## License
 
- * QtFM is licenced under the GPL-2.0 License
- * libdisks is licenced under a BSD 3-Clause License
+ * QtFM is licensed under the GPL-2.0 License
+ * libdisks is licensed under a BSD 3-Clause License
  * libfm is a mix of GPL-2.0 and BSD 3-Clause License (goal is BSD 3-Clause License)
- * qtfm-tray is licenced under a BSD 3-Clause License (but depends on libfm that includes GPL-2.0 code)
- 
+ * qtfm-tray is licensed under a BSD 3-Clause License (but depends on libfm that includes GPL-2.0 code)
+
  All new source code will be BSD 3-Clause License, modifications to existing source code in fm/ will be GPL-2.0.
- 
+
 ## Related
 
  * **[powerdwarf](https://github.com/rodlie/powerdwarf)** : Desktop Independent Power Manager.
- * **[Openbox](http://openbox.org/wiki/Main_Page)** : Openbox is a highly configurable, next generation window manager with extensive standards support. 
+ * **[Openbox](http://openbox.org/wiki/Main_Page)** : Openbox is a highly configurable, next generation window manager with extensive standards support.
  * **[tint2](https://gitlab.com/o9000/tint2)** : A lightweight panel/taskbar for Linux and BSD.
  * **[qterminal](https://github.com/lxqt/qterminal)** : A lightweight Qt-based terminal emulator.

fm/fm.pro

@@ -3,7 +3,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 include(../qtfm.pri)
 
 CONFIG(basic) {
-    CONFIG += no_udisks no_tray no_appdock no_dbus
+    CONFIG += no_udisks no_tray no_dbus
 }
 
 TARGET = $${QTFM_TARGET}
@@ -26,7 +26,6 @@ HEADERS += src/mainwindow.h \
     src/customactionsmanager.h \
     src/processdialog.h \
     src/applicationdialog.h
-!CONFIG(no_appdock): HEADERS += applicationdock.h
 SOURCES += src/main.cpp \
     src/mainwindow.cpp \
     src/mymodel.cpp \
@@ -41,10 +40,9 @@ SOURCES += src/main.cpp \
     src/applicationdialog.cpp \
     src/actiondefs.cpp \
     src/actiontriggers.cpp
-!CONFIG(no_appdock): SOURCES += applicationdock.cpp
 
 OTHER_FILES += $${TARGET}.desktop
-RESOURCES += $${TARGET}.qrc
+RESOURCES += ../$${TARGET}.qrc
 
 DEFINES += APP=\"\\\"$${TARGET}\\\"\"
 DEFINES += APP_NAME=\"\\\"$${TARGET_NAME}\\\"\"
@@ -61,42 +59,42 @@ target.path = $${PREFIX}/bin
 desktop.files += $${TARGET}.desktop
 desktop.path += $${PREFIX}/share/applications
 docs.path += $${DOCDIR}/$${TARGET}-$${VERSION}
-docs.files += ../LICENSE ../README.md ../AUTHORS
+docs.files += ../LICENSE ../README.md ../AUTHORS ../ChangeLog
 man.files += qtfm.8
 man.path += $${MANDIR}/man8
 INSTALLS += target desktop docs man
 
-icon128.files = ../share/icons/hicolor/128x128/apps/qtfm.png
+icon128.files = hicolor/128x128/apps/qtfm.png
 icon128.path = $${PREFIX}/share/icons/hicolor/128x128/apps
-icon160.files = ../share/icons/hicolor/160x160/apps/qtfm.png
+icon160.files = hicolor/160x160/apps/qtfm.png
 icon160.path = $${PREFIX}/share/icons/hicolor/160x160/apps
-icon16.files = ../share/icons/hicolor/16x16/apps/qtfm.png
+icon16.files = hicolor/16x16/apps/qtfm.png
 icon16.path = $${PREFIX}/share/icons/hicolor/16x16/apps
-icon192.files = ../share/icons/hicolor/192x192/apps/qtfm.png
+icon192.files = hicolor/192x192/apps/qtfm.png
 icon192.path = $${PREFIX}/share/icons/hicolor/192x192/apps
-icon20.files = ../share/icons/hicolor/20x20/apps/qtfm.png
+icon20.files = hicolor/20x20/apps/qtfm.png
 icon20.path = $${PREFIX}/share/icons/hicolor/20x20/apps
-icon22.files = ../share/icons/hicolor/22x22/apps/qtfm.png
+icon22.files = hicolor/22x22/apps/qtfm.png
 icon22.path = $${PREFIX}/share/icons/hicolor/22x22/apps
-icon24.files = ../share/icons/hicolor/24x24/apps/qtfm.png
+icon24.files = hicolor/24x24/apps/qtfm.png
 icon24.path = $${PREFIX}/share/icons/hicolor/24x24/apps
-icon256.files = ../share/icons/hicolor/256x256/apps/qtfm.png
+icon256.files = hicolor/256x256/apps/qtfm.png
 icon256.path = $${PREFIX}/share/icons/hicolor/256x256/apps
-icon32.files = ../share/icons/hicolor/32x32/apps/qtfm.png
+icon32.files = hicolor/32x32/apps/qtfm.png
 icon32.path = $${PREFIX}/share/icons/hicolor/32x32/apps
-icon36.files = ../share/icons/hicolor/36x36/apps/qtfm.png
+icon36.files = hicolor/36x36/apps/qtfm.png
 icon36.path = $${PREFIX}/share/icons/hicolor/36x36/apps
-icon48.files = ../share/icons/hicolor/48x48/apps/qtfm.png
+icon48.files = hicolor/48x48/apps/qtfm.png
 icon48.path = $${PREFIX}/share/icons/hicolor/48x48/apps
-icon512.files = ../share/icons/hicolor/512x512/apps/qtfm.png
+icon512.files = hicolor/512x512/apps/qtfm.png
 icon512.path = $${PREFIX}/share/icons/hicolor/512x512/apps
-icon64.files = ../share/icons/hicolor/64x64/apps/qtfm.png
+icon64.files = hicolor/64x64/apps/qtfm.png
 icon64.path = $${PREFIX}/share/icons/hicolor/64x64/apps
-icon72.files = ../share/icons/hicolor/72x72/apps/qtfm.png
+icon72.files = hicolor/72x72/apps/qtfm.png
 icon72.path = $${PREFIX}/share/icons/hicolor/72x72/apps
-icon96.files = ../share/icons/hicolor/96x96/apps/qtfm.png
+icon96.files = hicolor/96x96/apps/qtfm.png
 icon96.path = $${PREFIX}/share/icons/hicolor/96x96/apps
-iconSVG.files = ../share/icons/hicolor/scalable/apps/qtfm.svg
+iconSVG.files = hicolor/scalable/apps/qtfm.svg
 iconSVG.path = $${PREFIX}/share/icons/hicolor/scalable/apps
 
 INSTALLS += icon128 icon160 icon16 icon192 icon20 icon22 \
@@ -112,11 +110,9 @@ INSTALLS += icon128 icon160 icon16 icon192 icon20 icon22 \
         PKGCONFIG += Disks
     }
 }
-CONFIG(no_udisks): DEFINES += NO_UDISKS
-CONFIG(no_appdock): DEFINES += NO_APPDOCK
-CONFIG(no_dbus) : DEFINES += NO_DBUS
 
 lessThan(QT_MAJOR_VERSION, 5): LIBS += -lmagic
 CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT
-
 CONFIG(deploy) : DEFINES += DEPLOY
+CONFIG(no_udisks): DEFINES += NO_UDISKS
+CONFIG(no_dbus) : DEFINES += NO_DBUS