Fixed OS X fullscreen shortcut (F11 collides with a system shortcut)

Yet another GUI polishing

gpxsee.nsi

@@ -65,7 +65,7 @@ Section "GPXSee (required)" SEC_APP
   ; Write the uninstall keys for Windows
   WriteRegStr HKLM "${REGENTRY}" "DisplayName" "GPXSee"
   WriteRegStr HKLM "${REGENTRY}" "Publisher" "Martin Tuma"
-  WriteRegStr HKLM "${REGENTRY}" "DisplayVersion" "2.11"
+  WriteRegStr HKLM "${REGENTRY}" "DisplayVersion" "2.12"
   WriteRegStr HKLM "${REGENTRY}" "UninstallString" '"$INSTDIR\uninstall.exe"'
   WriteRegDWORD HKLM "${REGENTRY}" "NoModify" 1
   WriteRegDWORD HKLM "${REGENTRY}" "NoRepair" 1

gpxsee.pro

@@ -35,7 +35,8 @@ HEADERS += src/config.h \
     src/waypointitem.h \
     src/palette.h \
     src/heartrategraph.h \
-    src/range.h
+    src/range.h \
+    src/cpuarch.h
 SOURCES += src/main.cpp \
     src/gui.cpp \
     src/gpx.cpp \

gpxsee.qrc

@@ -13,6 +13,7 @@
         <file>icons/arrow-right.png</file>
         <file>icons/arrow-left-double.png</file>
         <file>icons/arrow-right-double.png</file>
+        <file>icons/view-fullscreen.png</file>
         <file>lang/gpxsee_cs.qm</file>
     </qresource>
 </RCC>

gpxsee64.nsi

@@ -0,0 +1,159 @@
+!include "MUI2.nsh"
+!include "x64.nsh"
+
+; The name of the installer
+Name "GPXSee"
+
+; The file to write
+OutFile "install.exe"
+
+; Required execution level 
+RequestExecutionLevel admin
+
+; The default installation directory
+InstallDir "$PROGRAMFILES64\GPXSee"
+
+; Registry key to check for directory (so if you install again, it will 
+; overwrite the old one automatically)
+InstallDirRegKey HKLM "Software\GPXSee" "Install_Dir"
+
+; Registry key for uninstaller
+!define REGENTRY "Software\Microsoft\Windows\CurrentVersion\Uninstall\GPXSee" 
+
+; Start menu page configuration
+!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" 
+!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\GPXSee" 
+!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "GPXSee" 
+
+Var StartMenuFolder
+
+;--------------------------------
+
+; Pages
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "licence.txt"
+!insertmacro MUI_PAGE_COMPONENTS
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
+!insertmacro MUI_PAGE_INSTFILES
+
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+;--------------------------------
+
+; Languages
+!insertmacro MUI_LANGUAGE "English"
+
+Function .onInit  
+  ${If} ${RunningX64}
+    SetRegView 64
+  ${Else}  
+    MessageBox MB_OK "The 64b version of GPXSee can not be run on 32b systems."  
+    Abort  
+  ${EndIf}
+FunctionEnd 
+
+; The stuff to install
+Section "GPXSee (required)" SEC_APP
+
+  SectionIn RO
+  
+  ; Set output path to the installation directory.
+  SetOutPath $INSTDIR
+  
+  ; Put the files there
+  File "gpxsee.exe"
+  File "maps.txt"
+  
+  ; Write the installation path into the registry
+  WriteRegStr HKLM SOFTWARE\GPXSee "Install_Dir" "$INSTDIR"
+  
+  ; Write the uninstall keys for Windows
+  WriteRegStr HKLM "${REGENTRY}" "DisplayName" "GPXSee"
+  WriteRegStr HKLM "${REGENTRY}" "Publisher" "Martin Tuma"
+  WriteRegStr HKLM "${REGENTRY}" "DisplayVersion" "2.12"
+  WriteRegStr HKLM "${REGENTRY}" "UninstallString" '"$INSTDIR\uninstall.exe"'
+  WriteRegDWORD HKLM "${REGENTRY}" "NoModify" 1
+  WriteRegDWORD HKLM "${REGENTRY}" "NoRepair" 1
+  WriteUninstaller "$INSTDIR\uninstall.exe"
+
+  ; Create start menu entry and add links
+  SetShellVarContext all
+  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application  
+    CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
+    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
+    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\GPXSee.lnk" "$INSTDIR\gpxsee.exe"
+  !insertmacro MUI_STARTMENU_WRITE_END
+
+SectionEnd
+
+Section "QT libs" SEC_QT
+
+  File "Qt5Core.dll"
+  File "Qt5Gui.dll"
+  File "Qt5Widgets.dll"
+  File "Qt5PrintSupport.dll"
+  File "Qt5Network.dll"
+  File "libGLESv2.dll"
+  File /r "platforms"
+  File /r "imageformats"
+ 
+SectionEnd
+
+Section "MSVC runtime" SEC_MSVC
+
+  DetailPrint "Checking whether Visual C++ 2015 Redistributable is already installed..."
+  ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Installed"
+  StrCmp $R0 "1" 0 +3
+  DetailPrint "Visual C++ 2015 Redistributable is already installed, skipping install."
+  Goto done
+
+  DetailPrint "Installing Visual C++ 2015 Redistributable..."
+  SetOutPath $TEMP
+  File "VC_redist.x64.exe"
+  ExecWait '"$TEMP/VC_redist.x64.exe" /install /quiet /norestart'
+
+  done:
+SectionEnd
+
+;--------------------------------
+
+; Uninstaller
+
+Section "Uninstall"
+  
+  ; Remove registry keys
+  DeleteRegKey HKLM "${REGENTRY}"
+  DeleteRegKey HKLM SOFTWARE\GPXSee
+
+  ; Remove directories used
+  RMDir /r "$INSTDIR"
+
+  ; Remove Start menu entries
+  SetShellVarContext all
+  !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
+  Delete "$SMPROGRAMS\$StartMenuFolder\*.*"
+  RMDir "$SMPROGRAMS\$StartMenuFolder"  
+
+SectionEnd
+
+;-------------------------------
+
+;Descriptions
+
+;Language strings
+LangString DESC_QT ${LANG_ENGLISH} \
+  "QT Library. Unselct only if you have QT already installed!"
+LangString DESC_MSVC ${LANG_ENGLISH} \
+  "Visual C++ 2015 runtime components. Unselct only if you have the runtime already installed!"
+LangString DESC_APP ${LANG_ENGLISH} \
+  "GPXSee application"
+
+;Assign language strings to sections
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_QT} $(DESC_QT)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC) 
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP)
+!insertmacro MUI_FUNCTION_DESCRIPTION_END

lang/gpxsee_cs.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="cs_CZ">
+<TS version="2.1" language="cs_CZ">
 <context>
     <name>ElevationGraph</name>
     <message>
@@ -59,27 +59,22 @@
 <context>
     <name>GUI</name>
     <message>
-        <location filename="../src/gui.cpp" line="192"/>
-        <source>About Qt</source>
-        <translation>O Qt</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="418"/>
+        <location filename="../src/gui.cpp" line="448"/>
         <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source>
         <translation>Program GPXSee je distribuován pod podmínkami licence GNU General Public License verze 3. Pro více informací navštivte stránky programu na adrese </translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="477"/>
+        <location filename="../src/gui.cpp" line="512"/>
         <source>Open file</source>
         <translation>Otevřít soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="206"/>
+        <location filename="../src/gui.cpp" line="208"/>
         <source>Save as</source>
         <translation>Uložit jako</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="548"/>
+        <location filename="../src/gui.cpp" line="583"/>
         <source>Open POI file</source>
         <translation>Otevřít POI soubor</translation>
     </message>
@@ -89,333 +84,350 @@
         <translation>Otevřít</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="180"/>
+        <location filename="../src/gui.cpp" line="181"/>
         <source>Quit</source>
         <translation>Ukončit</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="187"/>
-        <location filename="../src/gui.cpp" line="434"/>
-        <location filename="../src/gui.cpp" line="435"/>
+        <location filename="../src/gui.cpp" line="189"/>
+        <location filename="../src/gui.cpp" line="464"/>
+        <location filename="../src/gui.cpp" line="465"/>
         <source>Keyboard controls</source>
         <translation>Ovládací klávesy</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="201"/>
+        <location filename="../src/gui.cpp" line="202"/>
         <source>Save</source>
         <translation>Uložit</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="211"/>
+        <location filename="../src/gui.cpp" line="214"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="216"/>
+        <location filename="../src/gui.cpp" line="220"/>
         <source>Reload</source>
         <translation>Znovu načíst</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="354"/>
+        <location filename="../src/gui.cpp" line="379"/>
         <source>Show</source>
         <translation>Zobrazit</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="297"/>
-        <location filename="../src/gui.cpp" line="345"/>
+        <location filename="../src/gui.cpp" line="321"/>
+        <location filename="../src/gui.cpp" line="370"/>
         <source>File</source>
         <translation>Soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="185"/>
-        <location filename="../src/gui.cpp" line="452"/>
-        <location filename="../src/gui.cpp" line="453"/>
+        <location filename="../src/gui.cpp" line="187"/>
+        <location filename="../src/gui.cpp" line="487"/>
+        <location filename="../src/gui.cpp" line="488"/>
         <source>Data sources</source>
         <translation>Zdroje dat</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="223"/>
+        <location filename="../src/gui.cpp" line="228"/>
         <source>Load POI file</source>
         <translation>Nahrát POI soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="226"/>
+        <location filename="../src/gui.cpp" line="231"/>
         <source>Close POI files</source>
         <translation>Zavřit POI soubory</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="229"/>
+        <location filename="../src/gui.cpp" line="234"/>
         <source>Show POIs</source>
         <translation>Zobrazit POI</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="236"/>
+        <location filename="../src/gui.cpp" line="242"/>
         <source>Show map</source>
         <translation>Zobrazit mapu</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="241"/>
+        <location filename="../src/gui.cpp" line="248"/>
         <source>Clear tile cache</source>
         <translation>Vymazat mezipaměť dlaždic</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="253"/>
+        <location filename="../src/gui.cpp" line="258"/>
+        <location filename="../src/gui.cpp" line="262"/>
+        <location filename="../src/gui.cpp" line="474"/>
+        <source>Next map</source>
+        <translation>Následující mapa</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="269"/>
         <source>Show graphs</source>
         <translation>Zobrazovat grafy</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="259"/>
+        <location filename="../src/gui.cpp" line="276"/>
         <source>Show toolbars</source>
         <translation>Zobrazovat nástrojové lišty</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="266"/>
+        <location filename="../src/gui.cpp" line="283"/>
         <source>Metric</source>
         <translation>Metrické</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="272"/>
+        <location filename="../src/gui.cpp" line="289"/>
         <source>Imperial</source>
         <translation>Imperiální</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="279"/>
+        <location filename="../src/gui.cpp" line="295"/>
+        <source>Fullscreen mode</source>
+        <translation>Celoobrazovkový režim</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="303"/>
         <source>Next</source>
         <translation>Následující</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="282"/>
+        <location filename="../src/gui.cpp" line="306"/>
         <source>Previous</source>
         <translation>Předchozí</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="286"/>
+        <location filename="../src/gui.cpp" line="310"/>
         <source>Last</source>
         <translation>Poslední</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="289"/>
+        <location filename="../src/gui.cpp" line="313"/>
         <source>First</source>
         <translation>První</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="311"/>
+        <location filename="../src/gui.cpp" line="335"/>
         <source>Map</source>
         <translation>Mapa</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="318"/>
+        <location filename="../src/gui.cpp" line="342"/>
         <source>POI</source>
         <translation>POI</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="319"/>
+        <location filename="../src/gui.cpp" line="343"/>
         <source>POI files</source>
         <translation>POI soubory</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="327"/>
+        <location filename="../src/gui.cpp" line="351"/>
         <source>Settings</source>
         <translation>Nastavení</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="328"/>
+        <location filename="../src/gui.cpp" line="352"/>
         <source>Units</source>
         <translation>Jednotky</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="335"/>
+        <location filename="../src/gui.cpp" line="361"/>
         <source>Help</source>
         <translation>Nápověda</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="756"/>
+        <location filename="../src/gui.cpp" line="476"/>
+        <source>Previous map</source>
+        <translation>Předchozí mapa</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="822"/>
         <source>No GPX files loaded</source>
         <translation>Nejsou načteny žádné GPX soubory</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="838"/>
+        <location filename="../src/gui.cpp" line="922"/>
         <source>Elevation</source>
         <translation>Výška</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="839"/>
+        <location filename="../src/gui.cpp" line="923"/>
         <source>Speed</source>
         <translation>Rychlost</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="840"/>
+        <location filename="../src/gui.cpp" line="924"/>
         <source>Heart rate</source>
         <translation>Tep</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="437"/>
+        <location filename="../src/gui.cpp" line="467"/>
         <source>Next file</source>
         <translation>Následující soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="438"/>
+        <location filename="../src/gui.cpp" line="444"/>
+        <source>Version </source>
+        <translation>Verze </translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="468"/>
         <source>Previous file</source>
         <translation>Předchozí soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="440"/>
+        <location filename="../src/gui.cpp" line="470"/>
         <source>First file</source>
         <translation>První soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="441"/>
+        <location filename="../src/gui.cpp" line="471"/>
         <source>Last file</source>
         <translation>Poslední soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="442"/>
+        <location filename="../src/gui.cpp" line="472"/>
         <source>Append modifier</source>
         <translation>Modifikátor nahradit/přidat</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="456"/>
+        <location filename="../src/gui.cpp" line="491"/>
         <source>Map (tiles) source URLs are read on program startup from the following file:</source>
         <translation>URL mapových zdrojů (dlaždic) jsou načteny při startu programu z následujícího souboru:</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="459"/>
+        <location filename="../src/gui.cpp" line="494"/>
         <source>The file format is one map entry per line, consisting of the map name and tiles URL delimited by a TAB character. The tile X and Y coordinates are replaced with $x and $y in the URL and the zoom level is replaced with $z. An example map file could look like:</source>
         <translation>Formát souboru je jeden mapový záznam na řádku, kde mapový záznam sestává ze jména mapy a URL dlaždic navzájem oddělených tabulátorem. Souřadnice dlaždice jsou v URL nahrazeny řetězci $x a $y, úroven přiblížení (zoom) pak řetězcem $z. Příklad:</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="467"/>
+        <location filename="../src/gui.cpp" line="502"/>
         <source>To make GPXSee load a POI file automatically on startup, add the file to the following directory:</source>
         <translation>POI soubory, které se mají automaticky nahrát při startu programu jsou načítány z následujícího adresáře:</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="478"/>
+        <location filename="../src/gui.cpp" line="513"/>
         <source>GPX files (*.gpx);;All files (*)</source>
         <translation>soubory GPX (*.gpx);;všechny soubory (*)</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="539"/>
-        <location filename="../src/gui.cpp" line="565"/>
+        <location filename="../src/gui.cpp" line="574"/>
+        <location filename="../src/gui.cpp" line="600"/>
         <source>Line: %1</source>
         <translation>Řádka: %1</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="549"/>
+        <location filename="../src/gui.cpp" line="584"/>
         <source>GPX files (*.gpx);;CSV files (*.csv);;All files (*)</source>
         <translation>soubory GPX (*.gpx);;soubory CSV (*.csv);;všechny soubory (*)</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="630"/>
-        <location filename="../src/gui.cpp" line="771"/>
+        <location filename="../src/gui.cpp" line="665"/>
+        <location filename="../src/gui.cpp" line="837"/>
         <source>mi</source>
         <translation>mi</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="633"/>
-        <location filename="../src/gui.cpp" line="635"/>
-        <location filename="../src/gui.cpp" line="637"/>
-        <location filename="../src/gui.cpp" line="639"/>
-        <location filename="../src/gui.cpp" line="768"/>
+        <location filename="../src/gui.cpp" line="668"/>
+        <location filename="../src/gui.cpp" line="670"/>
+        <location filename="../src/gui.cpp" line="672"/>
+        <location filename="../src/gui.cpp" line="674"/>
+        <location filename="../src/gui.cpp" line="834"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="636"/>
-        <location filename="../src/gui.cpp" line="648"/>
+        <location filename="../src/gui.cpp" line="671"/>
+        <location filename="../src/gui.cpp" line="683"/>
         <source>Maximum</source>
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="638"/>
-        <location filename="../src/gui.cpp" line="650"/>
+        <location filename="../src/gui.cpp" line="673"/>
+        <location filename="../src/gui.cpp" line="685"/>
         <source>Minimum</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="190"/>
-        <location filename="../src/gui.cpp" line="414"/>
+        <location filename="../src/gui.cpp" line="192"/>
+        <location filename="../src/gui.cpp" line="442"/>
         <source>About GPXSee</source>
         <translation>O aplikaci GPXSee</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="361"/>
+        <location filename="../src/gui.cpp" line="386"/>
         <source>Navigation</source>
         <translation>Navigace</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="416"/>
-        <source>GPX viewer and analyzer</source>
-        <translation>Prohlížeč a analyzátor GPX</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="455"/>
+        <location filename="../src/gui.cpp" line="490"/>
         <source>Map sources</source>
         <translation>Mapové zdroje</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="466"/>
+        <location filename="../src/gui.cpp" line="501"/>
         <source>POIs</source>
         <translation>POI body</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="629"/>
-        <location filename="../src/gui.cpp" line="641"/>
+        <location filename="../src/gui.cpp" line="664"/>
+        <location filename="../src/gui.cpp" line="676"/>
         <source>Distance</source>
         <translation>Vzdálenost</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="631"/>
-        <location filename="../src/gui.cpp" line="643"/>
+        <location filename="../src/gui.cpp" line="666"/>
+        <location filename="../src/gui.cpp" line="678"/>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="632"/>
-        <location filename="../src/gui.cpp" line="644"/>
+        <location filename="../src/gui.cpp" line="667"/>
+        <location filename="../src/gui.cpp" line="679"/>
         <source>Ascent</source>
         <translation>Stoupání</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="645"/>
-        <location filename="../src/gui.cpp" line="647"/>
-        <location filename="../src/gui.cpp" line="649"/>
-        <location filename="../src/gui.cpp" line="651"/>
-        <location filename="../src/gui.cpp" line="775"/>
+        <location filename="../src/gui.cpp" line="680"/>
+        <location filename="../src/gui.cpp" line="682"/>
+        <location filename="../src/gui.cpp" line="684"/>
+        <location filename="../src/gui.cpp" line="686"/>
+        <location filename="../src/gui.cpp" line="841"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="634"/>
-        <location filename="../src/gui.cpp" line="646"/>
+        <location filename="../src/gui.cpp" line="669"/>
+        <location filename="../src/gui.cpp" line="681"/>
         <source>Descent</source>
         <translation>Klesání</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="763"/>
+        <location filename="../src/gui.cpp" line="829"/>
         <source>%1 tracks</source>
         <translation>Počet tras: %1</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="642"/>
-        <location filename="../src/gui.cpp" line="778"/>
+        <location filename="../src/gui.cpp" line="677"/>
+        <location filename="../src/gui.cpp" line="844"/>
         <source>km</source>
         <translation>km</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="541"/>
-        <location filename="../src/gui.cpp" line="566"/>
+        <location filename="../src/gui.cpp" line="576"/>
+        <location filename="../src/gui.cpp" line="601"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="536"/>
+        <location filename="../src/gui.cpp" line="571"/>
         <source>Error loading GPX file:
 %1</source>
         <translation>Soubor GPX nelze otevřít:
 %1</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="562"/>
+        <location filename="../src/gui.cpp" line="597"/>
         <source>Error loading POI file:
 %1</source>
         <translation>Soubor POI nelze otevřít:

src/config.h

@@ -2,10 +2,13 @@
 #define CONFIG_H
 
 #include <QtGlobal>
+#include <QDir>
+#include <QApplication>
+#include <QString>
 
 #define APP_NAME        "GPXSee"
 #define APP_HOMEPAGE    "http://tumic.wz.cz/gpxsee"
-#define APP_VERSION     "2.11"
+#define APP_VERSION     "2.12"
 
 #define FONT_FAMILY     "Arial"
 #define FONT_SIZE       12

src/cpuarch.h

@@ -0,0 +1,42 @@
+#ifndef CPUARCH_H
+#define CPUARCH_H
+
+#include <QtGlobal>
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
+
+#if defined(__arm64__)
+	#define CPU_ARCH_STR "arm64"
+#elif defined(__arm__) || defined(__TARGET_ARCH_ARM) || defined(_M_ARM)
+	#define CPU_ARCH_STR "arm"
+#elif defined(__x86_64) || defined(__x86_64__) || defined(__amd64) \
+ || defined(_M_X64)
+	#define CPU_ARCH_STR "x86_64"
+#elif defined(__i386) || defined(__i386__) || defined(_M_IX86)
+	#define CPU_ARCH_STR "i386"
+#elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
+	#define CPU_ARCH_STR "ia64"
+#elif defined(_MIPS_ARCH_MIPS64) || defined(__mips64)
+	#define CPU_ARCH_STR "mips64"
+#elif defined(__mips) || defined(__mips__) || defined(_M_MRX000)
+	#define CPU_ARCH_STR "mips"
+#elif defined(__ppc64__) || defined(__powerpc64__) || defined(__64BIT__)
+	#define CPU_ARCH_STR "power64"
+#elif defined(__ppc__) || defined(__ppc) || defined(__powerpc__) \
+  || defined(_ARCH_COM) || defined(_ARCH_PWR) || defined(_ARCH_PPC)  \
+  || defined(_M_MPPC) || defined(_M_PPC)
+	#define CPU_ARCH_STR "power"
+#else
+	#define CPU_ARCH_STR "unknown"
+#endif
+
+#define CPU_ARCH QString(CPU_ARCH_STR)
+
+#else // QT_VERSION < 5.4
+
+#include <QSysInfo>
+#define CPU_ARCH QSysInfo::buildCpuArchitecture()
+
+#endif // QT_VERSION < 5.4
+
+#endif // CPUARCH_H

src/gui.cpp

@@ -26,6 +26,7 @@
 #include "trackview.h"
 #include "infoitem.h"
 #include "filebrowser.h"
+#include "cpuarch.h"
 #include "gui.h"
 
 
@@ -74,6 +75,10 @@ GUI::GUI(QWidget *parent) : QMainWindow(parent)
 	QVBoxLayout *layout = new QVBoxLayout;
 	layout->addWidget(_track);
 	layout->addWidget(_trackGraphs);
+	layout->setContentsMargins(0, 0, 0, 0);
+#ifdef Q_OS_WIN32
+	layout->setSpacing(0);
+#endif // Q_OS_WIN32
 
 	QWidget *widget = new QWidget;
 	widget->setLayout(layout);
@@ -178,8 +183,9 @@ 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);
 
 	// Help & About
 	_dataSourcesAction = new QAction(tr("Data sources"), this);
@@ -189,34 +195,37 @@ void GUI::createActions()
 	_aboutAction = new QAction(QIcon(QPixmap(APP_ICON)),
 	  tr("About GPXSee"), this);
 	connect(_aboutAction, SIGNAL(triggered()), this, SLOT(about()));
-	_aboutQtAction = new QAction(QIcon(QPixmap(QT_ICON)), tr("About Qt"), this);
-	connect(_aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
 
 	// 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);
 
 	// POI actions
 	_openPOIAction = new QAction(QIcon(QPixmap(OPEN_FILE_ICON)),
@@ -228,16 +237,18 @@ 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();
 
 	// Map actions
 	_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);
 	connect(_clearMapCacheAction, SIGNAL(triggered()), this,
 	  SLOT(clearMapCache()));
@@ -247,15 +258,25 @@ void GUI::createActions()
 	} else {
 		createMapActions();
 		_showMapAction->setChecked(true);
+
+		_nextMapAction = new QAction(tr("Next map"), this);
+		_nextMapAction->setShortcut(NEXT_MAP_SHORTCUT);
+		connect(_nextMapAction, SIGNAL(triggered()), this, SLOT(nextMap()));
+		addAction(_nextMapAction);
+		_prevMapAction = new QAction(tr("Next map"), this);
+		_prevMapAction->setShortcut(PREV_MAP_SHORTCUT);
+		connect(_prevMapAction, SIGNAL(triggered()), this, SLOT(prevMap()));
+		addAction(_prevMapAction);
 	}
 
 	// Settings actions
 	_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);
 	_showToolbarsAction = new QAction(tr("Show toolbars"), this);
 	_showToolbarsAction->setCheckable(true);
 	_showToolbarsAction->setChecked(true);
@@ -274,6 +295,13 @@ void GUI::createActions()
 	_imperialUnitsAction->setActionGroup(ag);
 	connect(_imperialUnitsAction, SIGNAL(triggered()), this,
 	  SLOT(setImperialUnits()));
+	_fullscreenAction = new QAction(QIcon(QPixmap(FULLSCREEN_ICON)),
+	  tr("Fullscreen mode"), this);
+	_fullscreenAction->setCheckable(true);
+	_fullscreenAction->setShortcut(FULLSCREEN_SHORTCUT);
+	connect(_fullscreenAction, SIGNAL(triggered(bool)), this,
+	  SLOT(showFullscreen(bool)));
+	addAction(_fullscreenAction);
 
 	// Navigation actions
 	_nextAction = new QAction(QIcon(QPixmap(NEXT_FILE_ICON)), tr("Next"), this);
@@ -331,13 +359,14 @@ void GUI::createMenus()
 	_settingsMenu->addSeparator();
 	_settingsMenu->addAction(_showToolbarsAction);
 	_settingsMenu->addAction(_showGraphsAction);
+	_settingsMenu->addSeparator();
+	_settingsMenu->addAction(_fullscreenAction);
 
 	_helpMenu = menuBar()->addMenu(tr("Help"));
 	_helpMenu->addAction(_dataSourcesAction);
 	_helpMenu->addAction(_keysAction);
 	_helpMenu->addSeparator();
 	_helpMenu->addAction(_aboutAction);
-	_helpMenu->addAction(_aboutQtAction);
 }
 
 void GUI::createToolBars()
@@ -371,6 +400,9 @@ void GUI::createToolBars()
 void GUI::createTrackView()
 {
 	_track = new TrackView(this);
+#ifdef Q_OS_WIN32
+	_track->setFrameShape(QFrame::NoFrame);
+#endif // Q_OS_WIN32
 
 	if (_showMapAction->isChecked())
 		_track->setMap(_currentMap);
@@ -379,8 +411,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,
@@ -389,6 +424,9 @@ void GUI::createTrackGraphs()
 	_trackGraphs->setFixedHeight(200);
 	_trackGraphs->setSizePolicy(
 		QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed));
+#ifdef Q_OS_WIN32
+	_trackGraphs->setDocumentMode(true);
+#endif // Q_OS_WIN32
 }
 
 void GUI::createStatusBar()
@@ -412,8 +450,10 @@ void GUI::about()
 	QMessageBox msgBox(this);
 
 	msgBox.setWindowTitle(tr("About GPXSee"));
-	msgBox.setText(QString("<h3>") + QString(APP_NAME " " APP_VERSION)
-	  + QString("</h3><p>") + tr("GPX viewer and analyzer") + QString("<p/>"));
+	msgBox.setText(QString("<h2>") + QString(APP_NAME) + QString("</h2><p>")
+	  + QString("<p>") + tr("Version ") + APP_VERSION + QString(" (")
+	  + CPU_ARCH + QString(", Qt ") + QString(QT_VERSION_STR)
+	  + QString(")</p>"));
 	msgBox.setInformativeText(QString("<table width=\"300\"><tr><td>")
 	  + tr("GPXSee is distributed under the terms of the GNU General Public "
 	  "License version 3. For more info about GPXSee visit the project "
@@ -438,9 +478,14 @@ void GUI::keys()
 	  + QString("</td><td><i>SPACE</i></td></tr><tr><td>") + tr("Previous file")
 	  + QString("</td><td><i>BACKSPACE</i></td></tr><tr><td>")
 	  + tr("First file") + QString("</td><td><i>HOME</i></td></tr><tr><td>")
-	  + tr("Last file") + QString("</td><td><i>END</i></td></tr><tr><td></td>"
-	  "<td></td></tr><tr><td>") + tr("Append modifier")
-	  + QString("</td><td><i>SHIFT</i></td></tr></table></div>"));
+	  + tr("Last file") + QString("</td><td><i>END</i></td></tr><tr><td>")
+	  + tr("Append modifier") + QString("</td><td><i>SHIFT</i></td></tr>"
+	  "<tr><td></td><td></td></tr><tr><td>")
+	  + tr("Next map") + QString("</td><td><i>")
+	  + _nextMapAction->shortcut().toString() + QString("</i></td></tr><tr><td>")
+	  + tr("Previous map") + QString("</td><td><i>")
+	  + _prevMapAction->shortcut().toString() + QString("</i></td></tr>"
+	  "</table></div>"));
 
 	msgBox.exec();
 }
@@ -744,6 +789,34 @@ void GUI::showToolbars(bool checked)
 	}
 }
 
+void GUI::showFullscreen(bool checked)
+{
+	if (checked) {
+		_frameStyle = _track->frameStyle();
+		_showGraphs = _showGraphsAction->isChecked();
+
+		statusBar()->hide();
+		menuBar()->hide();
+		showToolbars(false);
+		showGraphs(false);
+		_showGraphsAction->setChecked(false);
+		_track->setFrameStyle(QFrame::NoFrame);
+
+		showFullScreen();
+	} else {
+		statusBar()->show();
+		menuBar()->show();
+		if (_showToolbarsAction->isChecked())
+			showToolbars(true);
+		_showGraphsAction->setChecked(_showGraphs);
+		if (_showGraphsAction->isEnabled())
+			showGraphs(_showGraphs);
+		_track->setFrameStyle(_frameStyle);
+
+		showNormal();
+	}
+}
+
 void GUI::clearMapCache()
 {
 	_currentMap->clearCache();
@@ -788,6 +861,24 @@ void GUI::mapChanged(int index)
 		_track->setMap(_currentMap);
 }
 
+void GUI::nextMap()
+{
+	if (_maps.count() < 2)
+		return;
+	int next = (_maps.indexOf(_currentMap) + 1) % _maps.count();
+	_mapActions.at(next)->setChecked(true);
+	mapChanged(next);
+}
+
+void GUI::prevMap()
+{
+	if (_maps.count() < 2)
+		return;
+	int prev = (_maps.indexOf(_currentMap) + _maps.count() - 1) % _maps.count();
+	_mapActions.at(prev)->setChecked(true);
+	mapChanged(prev);
+}
+
 void GUI::poiFileChecked(int index)
 {
 	_poi.enableFile(_poi.files().at(index),
@@ -854,17 +945,14 @@ void GUI::updateGraphTabs()
 			_trackGraphs->insertTab(i, gv, tabs[i].label);
 	}
 
-	for (int i = 0; i < (int)ARRAY_SIZE(tabs); i++) {
-		if (tabs[i].view->count()) {
-			if (_showGraphsAction->isChecked())
-				_trackGraphs->setHidden(false);
-			_showGraphsAction->setEnabled(true);
-			return;
-		}
+	if (_trackGraphs->count()) {
+		if (_showGraphsAction->isChecked())
+			_trackGraphs->setHidden(false);
+		_showGraphsAction->setEnabled(true);
+	} else {
+		_trackGraphs->setHidden(true);
+		_showGraphsAction->setEnabled(false);
 	}
-
-	_trackGraphs->setHidden(true);
-	_showGraphsAction->setEnabled(false);
 }
 
 void GUI::updateTrackView()
@@ -947,6 +1035,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()) {

src/gui.h

@@ -45,7 +45,10 @@ private slots:
 	void showMap(bool checked);
 	void showGraphs(bool checked);
 	void showToolbars(bool checked);
+	void showFullscreen(bool checked);
 	void clearMapCache();
+	void nextMap();
+	void prevMap();
 
 	void mapChanged(int);
 	void graphChanged(int);
@@ -115,6 +118,7 @@ private:
 	QAction *_closePOIAction;
 	QAction *_showPOIAction;
 	QAction *_showMapAction;
+	QAction *_fullscreenAction;
 	QAction *_clearMapCacheAction;
 	QAction *_showGraphsAction;
 	QAction *_showToolbarsAction;
@@ -124,6 +128,8 @@ private:
 	QAction *_firstAction;
 	QAction *_metricUnitsAction;
 	QAction *_imperialUnitsAction;
+	QAction *_nextMapAction;
+	QAction *_prevMapAction;
 	QList<QAction*> _mapActions;
 	QList<QAction*> _poiFilesActions;
 
@@ -151,6 +157,9 @@ private:
 	int _trackCount;
 
 	qreal _sliderPos;
+
+	int _frameStyle;
+	bool _showGraphs;
 };
 
 #endif // GUI_H

src/icons.h

@@ -1,8 +1,6 @@
 #ifndef ICONS_H
 #define ICONS_H
 
-#include <QtGlobal>
-
 #define APP_ICON         ":/icons/gpxsee.png"
 #define OPEN_FILE_ICON   ":/icons/document-open.png"
 #define SAVE_FILE_ICON   ":/icons/document-save.png"
@@ -16,11 +14,6 @@
 #define PREV_FILE_ICON   ":/icons/arrow-left.png"
 #define LAST_FILE_ICON   ":/icons/arrow-right-double.png"
 #define FIRST_FILE_ICON  ":/icons/arrow-left-double.png"
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-#define QT_ICON          ":/trolltech/qmessagebox/images/qtlogo-64.png"
-#else
-#define QT_ICON          ":/qt-project.org/qmessagebox/images/qtlogo-64.png"
-#endif
+#define FULLSCREEN_ICON  ":/icons/view-fullscreen.png"
 
 #endif /* ICONS_H */

src/keys.h

@@ -1,10 +1,30 @@
 #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 <Qt>
+#include <QKeySequence>
+
+#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)
+#ifdef Q_OS_MAC
+#define FULLSCREEN_SHORTCUT   QKeySequence(Qt::META + Qt::CTRL + Qt::Key_F)
+#else // Q_OS_MAC
+#define FULLSCREEN_SHORTCUT   QKeySequence(Qt::Key_F11)
+#endif // Q_OS_MAC
 
 #endif // KEYS_H

src/trackview.cpp

@@ -308,6 +308,13 @@ void TrackView::redraw()
 	resetCachedContent();
 }
 
+void TrackView::rescale()
+{
+	_zoom = qMin(scale2zoom(trackScale()), scale2zoom(waypointScale()));
+	rescale(mapScale(_zoom));
+	_mapScale->setZoom(_zoom);
+}
+
 void TrackView::wheelEvent(QWheelEvent *event)
 {
 	if (_paths.isEmpty() && _locations.isEmpty())
@@ -467,6 +474,8 @@ void TrackView::resizeEvent(QResizeEvent *e)
 	if (_paths.isEmpty() && _locations.isEmpty())
 		return;
 
+	rescale();
+
 	QRectF br = trackBoundingRect() | waypointBoundingRect();
 	QRectF ba = br.adjusted(-TILE_SIZE, -TILE_SIZE, TILE_SIZE, TILE_SIZE);
 

src/trackview.h

@@ -55,6 +55,7 @@ private:
 	qreal waypointScale() const;
 	qreal mapScale(int zoom) const;
 	void rescale(qreal scale);
+	void rescale();
 
 	void showMarkers(bool show);
 	void setTrackLineWidth(qreal width);