mirror of
https://github.com/tumic0/GPXSee.git
synced 2024-11-24 03:35:53 +01:00
Now consistently using QT OS defines
This commit is contained in:
parent
413a9b25c4
commit
e583158492
12
src/gui.cpp
12
src/gui.cpp
@ -204,10 +204,10 @@ void GUI::createMenus()
|
||||
_fileMenu->addAction(_reloadFileAction);
|
||||
_fileMenu->addSeparator();
|
||||
_fileMenu->addAction(_closeFileAction);
|
||||
#ifndef __APPLE__
|
||||
#ifndef Q_OS_MAC
|
||||
_fileMenu->addSeparator();
|
||||
_fileMenu->addAction(_exitAction);
|
||||
#endif // __APPLE__
|
||||
#endif // Q_OS_MAC
|
||||
|
||||
_mapMenu = menuBar()->addMenu(tr("Map"));
|
||||
_mapMenu->addActions(_mapActions);
|
||||
@ -237,16 +237,16 @@ void GUI::createToolBars()
|
||||
_fileToolBar->addAction(_saveFileAction);
|
||||
_fileToolBar->addAction(_reloadFileAction);
|
||||
_fileToolBar->addAction(_closeFileAction);
|
||||
#ifdef __APPLE__
|
||||
#ifdef Q_OS_MAC
|
||||
_fileToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
|
||||
#endif // __APPLE__
|
||||
#endif // Q_OS_MAC
|
||||
|
||||
_showToolBar = addToolBar(tr("Show"));
|
||||
_showToolBar->addAction(_showPOIAction);
|
||||
_showToolBar->addAction(_showMapAction);
|
||||
#ifdef __APPLE__
|
||||
#ifdef Q_OS_MAC
|
||||
_showToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
|
||||
#endif // __APPLE__
|
||||
#endif // Q_OS_MAC
|
||||
}
|
||||
|
||||
void GUI::createTrackView()
|
||||
|
@ -13,9 +13,9 @@ int main(int argc, char *argv[])
|
||||
QTranslator translator;
|
||||
translator.load(QString(":/lang/gpxsee_") + locale);
|
||||
app.installTranslator(&translator);
|
||||
#ifdef __APPLE__
|
||||
#ifdef Q_OS_MAC
|
||||
app.setAttribute(Qt::AA_DontShowIconsInMenus);
|
||||
#endif // __APPLE__
|
||||
#endif // Q_OS_MAC
|
||||
|
||||
GUI gui;
|
||||
gui.setWindowIcon(QIcon(QPixmap(APP_ICON)));
|
||||
|
Loading…
Reference in New Issue
Block a user