From 11a9d75d8f3d3e06ad217c29eadd4ee4424860cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Mon, 11 Apr 2016 22:08:00 +0200 Subject: [PATCH] Yet another graph tabs polishing Code cleanup --- src/config.h | 3 +++ src/gui.cpp | 37 ++++++++++++++++++++++--------------- src/keys.h | 26 +++++++++++++++++++++----- 3 files changed, 46 insertions(+), 20 deletions(-) diff --git a/src/config.h b/src/config.h index eb35f27a..52ecca13 100644 --- a/src/config.h +++ b/src/config.h @@ -2,6 +2,9 @@ #define CONFIG_H #include +#include +#include +#include #define APP_NAME "GPXSee" #define APP_HOMEPAGE "http://tumic.wz.cz/gpxsee" diff --git a/src/gui.cpp b/src/gui.cpp index 35582778..34cf7e37 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -178,7 +178,7 @@ void GUI::createActions() // General actions _exitAction = new QAction(QIcon(QPixmap(QUIT_ICON)), tr("Quit"), this); - _exitAction->setShortcut(QKeySequence::Quit); + _exitAction->setShortcut(QUIT_SHORTCUT); connect(_exitAction, SIGNAL(triggered()), this, SLOT(close())); addAction(_exitAction); @@ -196,30 +196,30 @@ void GUI::createActions() // File related actions _openFileAction = new QAction(QIcon(QPixmap(OPEN_FILE_ICON)), tr("Open"), this); - _openFileAction->setShortcut(QKeySequence::Open); + _openFileAction->setShortcut(OPEN_SHORTCUT); connect(_openFileAction, SIGNAL(triggered()), this, SLOT(openFile())); addAction(_openFileAction); _saveFileAction = new QAction(QIcon(QPixmap(SAVE_FILE_ICON)), tr("Save"), this); - _saveFileAction->setShortcut(QKeySequence::Save); + _saveFileAction->setShortcut(SAVE_SHORTCUT); _saveFileAction->setActionGroup(_fileActionGroup); connect(_saveFileAction, SIGNAL(triggered()), this, SLOT(saveFile())); addAction(_saveFileAction); _saveAsAction = new QAction(QIcon(QPixmap(SAVE_AS_ICON)), tr("Save as"), this); - _saveAsAction->setShortcut(QKeySequence::SaveAs); + _saveAsAction->setShortcut(SAVE_AS_SHORTCUT); _saveAsAction->setActionGroup(_fileActionGroup); connect(_saveAsAction, SIGNAL(triggered()), this, SLOT(saveAs())); addAction(_saveAsAction); _closeFileAction = new QAction(QIcon(QPixmap(CLOSE_FILE_ICON)), tr("Close"), this); - _closeFileAction->setShortcut(QKeySequence::Close); + _closeFileAction->setShortcut(CLOSE_SHORTCUT); _closeFileAction->setActionGroup(_fileActionGroup); connect(_closeFileAction, SIGNAL(triggered()), this, SLOT(closeAll())); addAction(_closeFileAction); _reloadFileAction = new QAction(QIcon(QPixmap(RELOAD_FILE_ICON)), tr("Reload"), this); - _reloadFileAction->setShortcut(QKeySequence::Refresh); + _reloadFileAction->setShortcut(RELOAD_SHORTCUT); _reloadFileAction->setActionGroup(_fileActionGroup); connect(_reloadFileAction, SIGNAL(triggered()), this, SLOT(reloadFile())); addAction(_reloadFileAction); @@ -234,7 +234,7 @@ void GUI::createActions() _showPOIAction = new QAction(QIcon(QPixmap(SHOW_POI_ICON)), tr("Show POIs"), this); _showPOIAction->setCheckable(true); - _showPOIAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_P)); + _showPOIAction->setShortcut(SHOW_POI_SHORTCUT); connect(_showPOIAction, SIGNAL(triggered(bool)), this, SLOT(showPOI(bool))); addAction(_showPOIAction); createPOIFilesActions(); @@ -243,7 +243,7 @@ void GUI::createActions() _showMapAction = new QAction(QIcon(QPixmap(SHOW_MAP_ICON)), tr("Show map"), this); _showMapAction->setCheckable(true); - _showMapAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_M)); + _showMapAction->setShortcut(SHOW_MAP_SHORTCUT); connect(_showMapAction, SIGNAL(triggered(bool)), this, SLOT(showMap(bool))); addAction(_showMapAction); _clearMapCacheAction = new QAction(tr("Clear tile cache"), this); @@ -257,11 +257,11 @@ void GUI::createActions() _showMapAction->setChecked(true); _nextMapAction = new QAction(tr("Next map"), this); - _nextMapAction->setShortcut(QKeySequence::Forward); + _nextMapAction->setShortcut(NEXT_MAP_SHORTCUT); connect(_nextMapAction, SIGNAL(triggered()), this, SLOT(nextMap())); addAction(_nextMapAction); _prevMapAction = new QAction(tr("Next map"), this); - _prevMapAction->setShortcut(QKeySequence::Back); + _prevMapAction->setShortcut(PREV_MAP_SHORTCUT); connect(_prevMapAction, SIGNAL(triggered()), this, SLOT(prevMap())); addAction(_prevMapAction); } @@ -270,7 +270,7 @@ void GUI::createActions() _showGraphsAction = new QAction(tr("Show graphs"), this); _showGraphsAction->setCheckable(true); _showGraphsAction->setChecked(true); - _showGraphsAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_G)); + _showGraphsAction->setShortcut(SHOW_GRAPHS_SHORTCUT); connect(_showGraphsAction, SIGNAL(triggered(bool)), this, SLOT(showGraphs(bool))); addAction(_showGraphsAction); @@ -295,7 +295,7 @@ void GUI::createActions() _fullscreenAction = new QAction(QIcon(QPixmap(FULLSCREEN_ICON)), tr("Fullscreen mode"), this); _fullscreenAction->setCheckable(true); - _fullscreenAction->setShortcut(QKeySequence("F11")); + _fullscreenAction->setShortcut(FULLSCREEN_SHORTCUT); connect(_fullscreenAction, SIGNAL(triggered(bool)), this, SLOT(showFullscreen(bool))); addAction(_fullscreenAction); @@ -406,8 +406,11 @@ void GUI::createTrackView() void GUI::createTrackGraphs() { _elevationGraph = new ElevationGraph; + _elevationGraph->setFrameShape(QFrame::NoFrame); _speedGraph = new SpeedGraph; + _speedGraph->setFrameShape(QFrame::NoFrame); _heartRateGraph = new HeartRateGraph; + _heartRateGraph->setFrameShape(QFrame::NoFrame); _trackGraphs = new QTabWidget; connect(_trackGraphs, SIGNAL(currentChanged(int)), this, @@ -416,9 +419,6 @@ void GUI::createTrackGraphs() _trackGraphs->setFixedHeight(200); _trackGraphs->setSizePolicy( QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed)); -#ifndef Q_OS_MAC - _trackGraphs->setDocumentMode(true); -#endif // Q_OS_MAC } void GUI::createStatusBar() @@ -1028,6 +1028,13 @@ void GUI::keyPressEvent(QKeyEvent *event) case LAST_KEY: file = _browser->last(); break; + + case Qt::Key_Escape: + if (_fullscreenAction->isChecked()) { + _fullscreenAction->setChecked(false); + showFullscreen(false); + } + break; } if (!file.isNull()) { diff --git a/src/keys.h b/src/keys.h index 57576565..5c9c9d96 100644 --- a/src/keys.h +++ b/src/keys.h @@ -1,10 +1,26 @@ #ifndef KEYS_H #define KEYS_H -#define NEXT_KEY Qt::Key_Space -#define PREV_KEY Qt::Key_Backspace -#define FIRST_KEY Qt::Key_Home -#define LAST_KEY Qt::Key_End -#define MODIFIER Qt::ShiftModifier +#include +#include + +#define NEXT_KEY Qt::Key_Space +#define PREV_KEY Qt::Key_Backspace +#define FIRST_KEY Qt::Key_Home +#define LAST_KEY Qt::Key_End +#define MODIFIER Qt::ShiftModifier + +#define QUIT_SHORTCUT QKeySequence::Quit +#define OPEN_SHORTCUT QKeySequence::Open +#define SAVE_SHORTCUT QKeySequence::Save +#define SAVE_AS_SHORTCUT QKeySequence::SaveAs +#define CLOSE_SHORTCUT QKeySequence::Close +#define RELOAD_SHORTCUT QKeySequence::Refresh +#define SHOW_POI_SHORTCUT QKeySequence(Qt::CTRL + Qt::Key_P) +#define SHOW_MAP_SHORTCUT QKeySequence(Qt::CTRL + Qt::Key_M) +#define NEXT_MAP_SHORTCUT QKeySequence::Forward +#define PREV_MAP_SHORTCUT QKeySequence::Back +#define SHOW_GRAPHS_SHORTCUT QKeySequence(Qt::CTRL + Qt::Key_G) +#define FULLSCREEN_SHORTCUT QKeySequence(Qt::Key_F11) #endif // KEYS_H