Improved file browsing

gpxsee.pro

@@ -22,7 +22,8 @@ HEADERS += src/config.h \
     src/infoitem.h \
     src/elevationgraph.h \
     src/speedgraph.h \
-    src/sliderinfoitem.h
+    src/sliderinfoitem.h \
+    src/filebrowser.h
 SOURCES += src/main.cpp \
     src/gui.cpp \
     src/gpx.cpp \
@@ -39,7 +40,8 @@ SOURCES += src/main.cpp \
     src/infoitem.cpp \
     src/elevationgraph.cpp \
     src/speedgraph.cpp \
-    src/sliderinfoitem.cpp
+    src/sliderinfoitem.cpp \
+    src/filebrowser.cpp
 RESOURCES += gpxsee.qrc
 TRANSLATIONS = lang/gpxsee_cs.ts
 macx:ICON = icons/gpxsee.icns

gpxsee.qrc

@@ -1,5 +1,5 @@
 <RCC>
-    <qresource>
+    <qresource prefix="/">
         <file>icons/dialog-close.png</file>
         <file>icons/document-open.png</file>
         <file>icons/document-save-as.png</file>
@@ -7,9 +7,7 @@
         <file>icons/flag.png</file>
         <file>icons/gpxsee.png</file>
         <file>icons/application-exit.png</file>
-    </qresource>
-
-    <qresource>
+        <file>icons/view-refresh.png</file>
         <file>lang/gpxsee_cs.qm</file>
     </qresource>
 </RCC>

src/filebrowser.cpp

@@ -0,0 +1,69 @@
+#include <QFileSystemWatcher>
+#include <QDir>
+#include "filebrowser.h"
+
+#include <QDebug>
+
+
+FileBrowser::FileBrowser(QObject *parent) : QObject(parent)
+{
+	_watcher = new QFileSystemWatcher(this);
+
+	connect(_watcher, SIGNAL(directoryChanged(const QString &)), this,
+	  SLOT(reloadDirectory(const QString &)));
+
+	_index = -1;
+}
+
+FileBrowser::~FileBrowser()
+{
+	delete _watcher;
+}
+
+void FileBrowser::setCurrent(const QString &path)
+{
+	QFileInfo file(path);
+	QDir dir = file.absoluteDir();
+
+	if (_files.isEmpty() || _files.last().canonicalPath()
+	  != dir.canonicalPath()) {
+		if (!_watcher->directories().isEmpty())
+			_watcher->removePaths(_watcher->directories());
+		_watcher->addPath(dir.canonicalPath());
+		_files = dir.entryInfoList(_filter, QDir::Files);
+	}
+
+	_index = _files.empty() ? -1 : _files.indexOf(file);
+}
+
+void FileBrowser::setFilter(const QStringList &filter)
+{
+	_filter = filter;
+	if (!_files.isEmpty())
+		reloadDirectory(_files.last().canonicalPath());
+}
+
+QString FileBrowser::next()
+{
+	if (_index < 0 || _index == _files.size() - 1)
+		return QString();
+
+	return _files.at(++_index).absoluteFilePath();
+}
+
+QString FileBrowser::prev()
+{
+	if (_index <= 0)
+		return QString();
+
+	return _files.at(--_index).absoluteFilePath();
+}
+
+void FileBrowser::reloadDirectory(const QString &path)
+{
+	QDir dir(path);
+	QFileInfo current = _files.at(_index);
+
+	_files = dir.entryInfoList(_filter, QDir::Files);
+	_index = _files.empty() ? -1 : _files.indexOf(current);
+}

src/filebrowser.h

@@ -0,0 +1,34 @@
+#ifndef FILEBROWSER_H
+#define FILEBROWSER_H
+
+#include <QObject>
+#include <QFileInfo>
+#include <QStringList>
+
+class QFileSystemWatcher;
+
+class FileBrowser : public QObject
+{
+	Q_OBJECT
+
+public:
+	FileBrowser(QObject *parent = 0);
+	~FileBrowser();
+
+	void setFilter(const QStringList &filter);
+	void setCurrent(const QString &path);
+
+	QString next();
+	QString prev();
+
+private slots:
+	void reloadDirectory(const QString &path);
+
+private:
+	QFileSystemWatcher *_watcher;
+	QStringList _filter;
+	QFileInfoList _files;
+	int _index;
+};
+
+#endif // FILEBROWSER_H

src/gui.cpp

@@ -16,12 +16,12 @@
 #include "speedgraph.h"
 #include "track.h"
 #include "infoitem.h"
+#include "filebrowser.h"
 #include "gui.h"
 
 #include <QDebug>
 
 
-
 static QString timeSpan(qreal time)
 {
 	unsigned h, m, s;
@@ -34,6 +34,7 @@ static QString timeSpan(qreal time)
 	  .arg(s,2, 10, QChar('0'));
 }
 
+
 GUI::GUI()
 {
 	createActions();
@@ -48,6 +49,9 @@ GUI::GUI()
 	connect(_speedGraph, SIGNAL(sliderPositionChanged(qreal)), _track,
 	  SLOT(movePositionMarker(qreal)));
 
+	_browser = new FileBrowser(this);
+	_browser->setFilter(QStringList("*.gpx"));
+
 	QVBoxLayout *layout = new QVBoxLayout;
 	layout->addWidget(_track);
 	layout->addWidget(_trackGraphs);
@@ -59,8 +63,6 @@ GUI::GUI()
 	setWindowTitle(APP_NAME);
 	setUnifiedTitleAndToolBarOnMac(true);
 
-	_dirIndex = -1;
-	_files = 0;
 	_distance = 0;
 	_time = 0;
 
@@ -106,6 +108,11 @@ void GUI::createActions()
 	_closeFileAction->setShortcut(QKeySequence::Close);
 	_closeFileAction->setActionGroup(_fileActionGroup);
 	connect(_closeFileAction, SIGNAL(triggered()), this, SLOT(closeFile()));
+	_reloadFileAction = new QAction(QIcon(QPixmap(RELOAD_FILE_ICON)),
+	  tr("Reload"), this);
+	_reloadFileAction->setShortcut(QKeySequence::Refresh);
+	_reloadFileAction->setActionGroup(_fileActionGroup);
+	connect(_reloadFileAction, SIGNAL(triggered()), this, SLOT(reloadFile()));
 
 	// POI actions
 	_openPOIAction = new QAction(QIcon(QPixmap(OPEN_FILE_ICON)),
@@ -125,6 +132,8 @@ void GUI::createMenus()
 	_fileMenu->addAction(_saveFileAction);
 	_fileMenu->addAction(_saveAsAction);
 	_fileMenu->addSeparator();
+	_fileMenu->addAction(_reloadFileAction);
+	_fileMenu->addSeparator();
 	_fileMenu->addAction(_closeFileAction);
 #ifndef __APPLE__
 	_fileMenu->addSeparator();
@@ -145,6 +154,7 @@ void GUI::createToolBars()
 	_fileToolBar = addToolBar(tr("File"));
 	_fileToolBar->addAction(_openFileAction);
 	_fileToolBar->addAction(_saveFileAction);
+	_fileToolBar->addAction(_reloadFileAction);
 	_fileToolBar->addAction(_closeFileAction);
 #ifdef __APPLE__
 	_fileToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
@@ -207,43 +217,46 @@ void GUI::openFile()
 {
 	QStringList files = QFileDialog::getOpenFileNames(this, tr("Open file"));
 	QStringList list = files;
-	QString lastFile;
 
 	for (QStringList::Iterator it = list.begin(); it != list.end(); it++)
-		if (openFile(*it))
-			lastFile = *it;
-
-	if (!lastFile.isEmpty())
-		setDir(lastFile);
+		openFile(*it);
 }
 
 bool GUI::openFile(const QString &fileName)
+{
+	if (fileName.isEmpty() || _files.contains(fileName))
+		return false;
+
+	if (loadFile(fileName)) {
+		_files.append(fileName);
+		_browser->setCurrent(fileName);
+		updateStatusBarInfo();
+		_fileActionGroup->setEnabled(true);
+		return true;
+	} else
+		return false;
+}
+
+bool GUI::loadFile(const QString &fileName)
 {
 	GPX gpx;
 
-	if (!fileName.isEmpty()) {
-		if (gpx.loadFile(fileName)) {
-			_elevationGraph->loadGPX(gpx);
-			_speedGraph->loadGPX(gpx);
-			_track->loadGPX(gpx);
-			if (_showPOIAction->isChecked())
-				_track->loadPOI(_poi);
+	if (gpx.loadFile(fileName)) {
+		_elevationGraph->loadGPX(gpx);
+		_speedGraph->loadGPX(gpx);
+		_track->loadGPX(gpx);
+		if (_showPOIAction->isChecked())
+			_track->loadPOI(_poi);
 
-			_distance += gpx.distance();
-			_time += gpx.time();
+		_distance += gpx.distance();
+		_time += gpx.time();
 
-			updateStatusBarInfo(fileName);
-
-			_fileActionGroup->setEnabled(true);
-
-			return true;
-		} else {
-			QMessageBox::critical(this, tr("Error"), fileName + QString("\n\n")
-			  + tr("Error loading GPX file:\n%1").arg(gpx.errorString()));
-		}
+		return true;
+	} else {
+		QMessageBox::critical(this, tr("Error"), fileName + QString("\n\n")
+		  + tr("Error loading GPX file:\n%1").arg(gpx.errorString()));
+		return false;
 	}
-
-	return false;
 }
 
 void GUI::openPOIFile()
@@ -314,20 +327,42 @@ void GUI::saveFile(const QString &fileName)
 	p.end();
 }
 
-void GUI::closeFile()
+void GUI::reloadFile()
 {
-	_files = 0;
 	_distance = 0;
 	_time = 0;
 
 	_elevationGraph->clear();
 	_speedGraph->clear();
 	_track->clear();
-	_fileNameLabel->clear();
-	_distanceLabel->clear();
-	_timeLabel->clear();
+
+	for (int i = 0; i < _files.size(); i++) {
+		if (!loadFile(_files.at(i))) {
+			_files.removeAt(i);
+			i--;
+		}
+	}
+
+	updateStatusBarInfo();
+	if (_files.isEmpty())
+		_fileActionGroup->setEnabled(false);
+	else
+		_browser->setCurrent(_files.last());
+}
+
+void GUI::closeFile()
+{
+	_distance = 0;
+	_time = 0;
+
+	_elevationGraph->clear();
+	_speedGraph->clear();
+	_track->clear();
+
+	_files.clear();
 
 	_fileActionGroup->setEnabled(false);
+	updateStatusBarInfo();
 }
 
 void GUI::showPOI()
@@ -338,12 +373,20 @@ void GUI::showPOI()
 		_track->clearPOI();
 }
 
-void GUI::updateStatusBarInfo(const QString &fileName)
+
+void GUI::updateStatusBarInfo()
 {
-	if (++_files > 1)
-		_fileNameLabel->setText(tr("%1 tracks").arg(_files));
+	int files = _files.size();
+
+	if (files == 0) {
+		_fileNameLabel->clear();
+		_distanceLabel->clear();
+		_timeLabel->clear();
+		return;
+	} else if (files == 1)
+		_fileNameLabel->setText(_files.at(0));
 	else
-		_fileNameLabel->setText(fileName);
+		_fileNameLabel->setText(tr("%1 tracks").arg(_files.size()));
 
 	_distanceLabel->setText(QString::number(_distance / 1000, 'f', 1)
 	  + " " + tr("km"));
@@ -361,26 +404,16 @@ void GUI::graphChanged(int index)
 
 void GUI::keyPressEvent(QKeyEvent *event)
 {
-	if (_dirIndex < 0 || _dirFiles.count() == 1)
-		return;
+	QString file;
 
-	if (event->key() == PREV_KEY) {
-		if (_dirIndex == 0)
-			return;
-		closeFile();
-		openFile(_dirFiles.at(--_dirIndex).absoluteFilePath());
-	}
-	if (event->key() == NEXT_KEY) {
-		if (_dirIndex == _dirFiles.size() - 1)
-			return;
-		closeFile();
-		openFile(_dirFiles.at(++_dirIndex).absoluteFilePath());
+	if (event->key() == PREV_KEY)
+		file = _browser->prev();
+	if (event->key() == NEXT_KEY)
+		file = _browser->next();
+
+	if (!file.isNull()) {
+		if (!(event->modifiers() & MODIFIER))
+			closeFile();
+		openFile(file);
 	}
 }
-
-void GUI::setDir(const QString &file)
-{
-	QDir dir = QFileInfo(file).absoluteDir();
-	_dirFiles = dir.entryInfoList(QStringList("*.gpx"), QDir::Files);
-	_dirIndex = _dirFiles.empty() ? -1 : _dirFiles.indexOf(file);
-}

src/gui.h

@@ -12,6 +12,8 @@
 #include <QFileInfoList>
 #include "poi.h"
 
+
+class FileBrowser;
 class ElevationGraph;
 class SpeedGraph;
 class Track;
@@ -24,7 +26,6 @@ public:
 	GUI();
 
 	bool openFile(const QString &fileName);
-	void setDir(const QString &file);
 
 private slots:
 	void about();
@@ -32,8 +33,10 @@ private slots:
 	void saveAs();
 	void openFile();
 	void closeFile();
+	void reloadFile();
 	void openPOIFile();
 	void showPOI();
+
 	void graphChanged(int);
 
 private:
@@ -44,8 +47,9 @@ private:
 	void createTrackView();
 	void createTrackGraphs();
 
+	bool loadFile(const QString &fileName);
 	void saveFile(const QString &fileName);
-	void updateStatusBarInfo(const QString &fileName);
+	void updateStatusBarInfo();
 
 	void keyPressEvent(QKeyEvent * event);
 
@@ -65,6 +69,7 @@ private:
 	QAction *_saveAsAction;
 	QAction *_openFileAction;
 	QAction *_closeFileAction;
+	QAction *_reloadFileAction;
 	QAction *_openPOIAction;
 	QAction *_showPOIAction;
 
@@ -78,11 +83,9 @@ private:
 
 	POI _poi;
 
-	QFileInfoList _dirFiles;
-	int _dirIndex;
-
+	FileBrowser *_browser;
+	QList<QString> _files;
 	QString _saveFileName;
-	unsigned _files;
 
 	qreal _distance;
 	qreal _time;

src/icons.h

@@ -1,12 +1,13 @@
 #ifndef ICONS_H
 #define ICONS_H
 
-#define APP_ICON        ":/icons/gpxsee.png"
-#define OPEN_FILE_ICON  ":/icons/document-open.png"
-#define SAVE_FILE_ICON  ":/icons/document-save.png"
-#define SAVE_AS_ICON    ":/icons/document-save-as.png"
-#define CLOSE_FILE_ICON ":/icons/dialog-close.png"
-#define SHOW_POI_ICON   ":/icons/flag.png"
-#define QUIT_ICON       ":/icons/application-exit.png"
+#define APP_ICON         ":/icons/gpxsee.png"
+#define OPEN_FILE_ICON   ":/icons/document-open.png"
+#define SAVE_FILE_ICON   ":/icons/document-save.png"
+#define SAVE_AS_ICON     ":/icons/document-save-as.png"
+#define CLOSE_FILE_ICON  ":/icons/dialog-close.png"
+#define SHOW_POI_ICON    ":/icons/flag.png"
+#define QUIT_ICON        ":/icons/application-exit.png"
+#define RELOAD_FILE_ICON ":/icons/view-refresh.png"
 
 #endif /* ICONS_H */

src/keys.h

@@ -3,5 +3,6 @@
 
 #define NEXT_KEY         Qt::Key_Space
 #define PREV_KEY         Qt::Key_Backspace
+#define MODIFIER         Qt::ShiftModifier
 
 #endif // KEYS_H

src/main.cpp

@@ -24,8 +24,5 @@ int main(int argc, char *argv[])
 	for (int i = 1; i < argc; i++)
 		gui.openFile(argv[i]);
 
-	if (argc > 1)
-		gui.setDir(QString(argv[argc - 1]));
-
 	return app.exec();
 }