cleanup, man, build ...

.travis.yml

@@ -9,7 +9,7 @@ matrix:
       osx_image: xcode8
 
 script:
-  - sh ci.sh
+  - sh share/ci.sh
 
 deploy:
   provider: releases

README.md

@@ -4,20 +4,21 @@
 [![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)
 
-![screenshot1](fm/images/screenshot.png)
+![screenshot1](docs/screenshot.png)
 
 Lightweight file manager using Qt.
 
- * Desktop (theme/applications/mime) integration
- * Customizable interface
- * Powerful custom command system
- * Customizable key bindings
- * Drag & drop functionality
- * Tabs
- * Udisks support
- * [System tray daemon](tray/README.md)
-   * Mount/Unmount devices
-   * Auto play CD/DVD
+  * Desktop (theme/applications/mime) integration
+  * Customizable interface
+  * Powerful custom command system
+  * Customizable key bindings
+  * Drag & drop functionality
+  * Tabs
+  * Udisks support
+  * System tray daemon (qtfm-tray, see man for more info)
+    * Show available storage/optical devices in system tray
+    * Auto mount storage/optical devices when added (not default)
+    * Auto play audio CD and video/audio DVD (not default)
 
 ## Links
 

fm/fm.pro

@@ -1,17 +1,20 @@
+include($${top_srcdir}/share/qtfm.pri)
+
 QT+= widgets concurrent
-include(../qtfm.pri)
 
 TARGET = $${QTFM_TARGET}
 TARGET_NAME = $${QTFM_TARGET_NAME}
 VERSION = $${QTFM_MAJOR}.$${QTFM_MINOR}.$${QTFM_PATCH}
 TEMPLATE = app
 
-DEPENDPATH += . src
-INCLUDEPATH += . src $${top_srcdir}/libfm
+INCLUDEPATH += src $${top_srcdir}/libfm
+
+DEFINES += APP=\"\\\"$${TARGET}\\\"\"
+DEFINES += APP_NAME=\"\\\"$${TARGET_NAME}\\\"\"
+DEFINES += APP_VERSION=\"\\\"$${VERSION}\\\"\"
 
 HEADERS += \
     src/mainwindow.h \
-    src/bookmarkmodel.h \
     src/tabbar.h \
     src/settingsdialog.h
 
@@ -24,8 +27,7 @@ SOURCES += \
     src/actiondefs.cpp \
     src/actiontriggers.cpp
 
-OTHER_FILES += $${TARGET}.desktop
-RESOURCES += ../$${TARGET}.qrc
+RESOURCES += $${top_srcdir}/$${TARGET}.qrc
 
 macx {
     LIBS += -L$${top_builddir}/libfm -lQtFM
@@ -35,24 +37,19 @@ macx {
     QMAKE_INFO_PLIST = Info.plist
 }
 
-DEFINES += APP=\"\\\"$${TARGET}\\\"\"
-DEFINES += APP_NAME=\"\\\"$${TARGET_NAME}\\\"\"
-DEFINES += APP_VERSION=\"\\\"$${VERSION}\\\"\"
-
 unix:!macx {
     DESTDIR = $${top_builddir}/bin
     OBJECTS_DIR = $${DESTDIR}/.obj_fm
     MOC_DIR = $${DESTDIR}/.moc_fm
     RCC_DIR = $${DESTDIR}/.qrc_fm
     LIBS += -L$${top_builddir}/lib$${LIBSUFFIX} -lQtFM
+
     target.path = $${PREFIX}/bin
     desktop.files += $${TARGET}.desktop
     desktop.path += $${PREFIX}/share/applications
-    docs.path += $${DOCDIR}/$${TARGET}-$${VERSION}
-    docs.files += ../LICENSE ../README.md ../AUTHORS ../ChangeLog
     man.files += qtfm.1
     man.path += $${MANDIR}/man1
-    INSTALLS += target desktop docs man
+    INSTALLS += target desktop man
 
     hicolor.files = hicolor
     hicolor.path = $${PREFIX}/share/icons

fm/qtfm.1

@@ -1,4 +1,4 @@
-.TH qtfm 1 "01 August 2018" "6.1" "QtFM documentation"
+.TH qtfm 1 "01 August 2018" "6.2" "QtFM documentation"
 .SH NAME
 QtFM -\ desktop independent file manager
 .SH SYNOPSIS

fm/src/actiondefs.cpp

@@ -352,9 +352,7 @@ void MainWindow::createActions() {
   actionList->append(aboutAct);
 
   aboutQtAct = new QAction(tr("About Qt"), this);
-#if QT_VERSION >= 0x050000
   aboutQtAct->setIcon(QIcon::fromTheme("qt-logo"));
-#endif
   connect(aboutQtAct, SIGNAL(triggered(bool)), qApp, SLOT(aboutQt()));
   actionList->append(aboutQtAct);
 
@@ -708,7 +706,7 @@ void MainWindow::addressChanged(int old, int now)
         QApplication::clipboard()->blockSignals(1);
         QApplication::clipboard()->clear(QClipboard::Selection);        //don't paste stuff
 
-        pathEdit->setCompleter(0);
+        pathEdit->setCompleter(Q_NULLPTR);
         tree->setCurrentIndex(modelTree->mapFromSource(modelList->index(temp.left(pos))));
 
         QTimer::singleShot(500,this,SLOT(focusAction()));

fm/src/actiontriggers.cpp

@@ -1,7 +1,5 @@
 #include "mainwindow.h"
-//#include "aboutdialog.h"
 #include "settingsdialog.h"
-
 #include <QApplication>
 #include <QInputDialog>
 #include <QMessageBox>
@@ -120,7 +118,7 @@ void MainWindow::openFile()
         DesktopFile df = DesktopFile(desktop);
         if (df.getExec().isEmpty()) { continue; }
         QStringList fileList = i_launch.value();
-        if (df.getExec().contains("%F") || df.getExec().contains("%U")) { // app suports multiple files
+        if (df.getExec().contains("%F") || df.getExec().contains("%U")) { // app supports multiple files
             mimeUtils->openFilesInApp(df.getExec(), fileList, df.isTerminal()?term:"");
         } else { // launch new instance for each file
             for (int i=0;i<i_launch.value().size();++i) {
@@ -210,7 +208,7 @@ void MainWindow::newDir() {
   // Check whether current directory is writeable
   QModelIndex newDir;
   if (!QFileInfo(pathEdit->itemText(0)).isWritable()) {
-    status->showMessage(tr("Read only...cannot create folder"));
+    status->showMessage(tr("The current directory is not writable, unable to create new folder."));
     return;
   }
 
@@ -234,7 +232,7 @@ void MainWindow::newFile() {
   // Check whether current directory is writeable
   QModelIndex fileIndex;
   if (!QFileInfo(pathEdit->itemText(0)).isWritable()) {
-    status->showMessage(tr("Read only...cannot create file"));
+    status->showMessage(tr("The current directory is not writable, unable to create new file."));
     return;
   }
 
@@ -280,7 +278,7 @@ void MainWindow::deleteFile() {
   // Display confirmation message box
   if (settings->value("confirmDelete").isNull()) {
     QString title = tr("Delete confirmation");
-    QString msg = tr("Do you want to confirm all delete operations?");
+    QString msg = tr("Confirm all delete operations?");
     QMessageBox::StandardButtons btns = QMessageBox::Yes | QMessageBox::No;
     if (QMessageBox::question(this, title, msg, btns) == QMessageBox::Yes) {
       confirm = 1;
@@ -320,8 +318,7 @@ void MainWindow::deleteFile() {
   // Display error message if deletion failed
   if(!ok) {
     QString title = tr("Failed");
-    QString msg = tr("Failed to delete some items... Do you have the right "
-                     "permissions?");
+    QString msg = tr("Some files where not deleted. You may not have the proper permissions or maybe the file system is read-only.");
     QMessageBox::warning(this, title, msg);
   }
 
@@ -371,8 +368,7 @@ void MainWindow::trashFile()
     }
     if(!ok) {
       QString title = tr("Failed");
-      QString msg = tr("Could not move some items...do you have the right "
-                       "permissions?");
+      QString msg = tr("Some files where not moved. You may not have the proper permissions or maybe the file system is read-only.");
       QMessageBox::warning(this, title, msg);
     }
 }