root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-02-17 16:20:48 +01:00
Code Issues Projects Releases Activity

Now consistently using QT OS defines

Browse Source
This commit is contained in:
Martin Tůma 2015-12-01 23:13:20 +01:00
parent 413a9b25c4
commit e583158492
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui.cpp
View File

@ -204,10 +204,10 @@ void GUI::createMenus()
_fileMenu->addAction(_reloadFileAction); _fileMenu->addAction(_reloadFileAction);
_fileMenu->addSeparator(); _fileMenu->addSeparator();
_fileMenu->addAction(_closeFileAction); _fileMenu->addAction(_closeFileAction);
#ifndef __APPLE__ #ifndef Q_OS_MAC
_fileMenu->addSeparator(); _fileMenu->addSeparator();
_fileMenu->addAction(_exitAction); _fileMenu->addAction(_exitAction);
#endif // __APPLE__ #endif // Q_OS_MAC
_mapMenu = menuBar()->addMenu(tr("Map")); _mapMenu = menuBar()->addMenu(tr("Map"));
_mapMenu->addActions(_mapActions); _mapMenu->addActions(_mapActions);
@ -237,16 +237,16 @@ void GUI::createToolBars()
_fileToolBar->addAction(_saveFileAction); _fileToolBar->addAction(_saveFileAction);
_fileToolBar->addAction(_reloadFileAction); _fileToolBar->addAction(_reloadFileAction);
_fileToolBar->addAction(_closeFileAction); _fileToolBar->addAction(_closeFileAction);
#ifdef __APPLE__ #ifdef Q_OS_MAC
_fileToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); _fileToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
#endif // __APPLE__ #endif // Q_OS_MAC
_showToolBar = addToolBar(tr("Show")); _showToolBar = addToolBar(tr("Show"));
_showToolBar->addAction(_showPOIAction); _showToolBar->addAction(_showPOIAction);
_showToolBar->addAction(_showMapAction); _showToolBar->addAction(_showMapAction);
#ifdef __APPLE__ #ifdef Q_OS_MAC
_showToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); _showToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
#endif // __APPLE__ #endif // Q_OS_MAC
} }
void GUI::createTrackView() void GUI::createTrackView()

4
src/main.cpp
View File

@ -13,9 +13,9 @@ int main(int argc, char *argv[])
QTranslator translator; QTranslator translator;
translator.load(QString(":/lang/gpxsee_") + locale); translator.load(QString(":/lang/gpxsee_") + locale);
app.installTranslator(&translator); app.installTranslator(&translator);
#ifdef __APPLE__ #ifdef Q_OS_MAC
app.setAttribute(Qt::AA_DontShowIconsInMenus); app.setAttribute(Qt::AA_DontShowIconsInMenus);
#endif // __APPLE__ #endif // Q_OS_MAC
GUI gui; GUI gui;
gui.setWindowIcon(QIcon(QPixmap(APP_ICON))); gui.setWindowIcon(QIcon(QPixmap(APP_ICON)));