diff --git a/.gitignore b/.gitignore index 7c99f78..dadf7d5 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,7 @@ prototypes/qgraphicsview contrib/qtpropertybrowser.new contrib/pblazasm-read-only trash + +# Windows +*.Debug +*.Release diff --git a/MainWindow.cpp b/MainWindow.cpp index 57fe72c..c2b2f79 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -1902,6 +1902,11 @@ void MainWindow::createToolBars() // Add toolbars. addToolBar(Qt::TopToolBarArea, mainToolBar); + + // XXX: style hack on Windows +#ifdef WIN32 + mainToolBar->setStyleSheet("border-color: #272a36;"); +#endif } void MainWindow::createStatusBar() @@ -1933,6 +1938,11 @@ void MainWindow::createStatusBar() statusBar()->addPermanentWidget(sourceZoomLabel, 1); statusBar()->addPermanentWidget(destinationZoomLabel, 1); + // XXX: style hack on Windows +#ifdef WIN32 + statusBar()->setStyleSheet("background: #FFF;"); +#endif + // Update the status bar updateStatusBar(); } diff --git a/mapmap.pro b/mapmap.pro index f3d1646..de6ac9c 100644 --- a/mapmap.pro +++ b/mapmap.pro @@ -178,22 +178,27 @@ mac { # Windows-specific: win32 { DEFINES += WIN32 - INCLUDEPATH += C:/gstreamer/1.0/x86/lib/gstreamer-1.0/include \ - C:/gstreamer/1.0/x86/include/glib-2.0 \ - C:/gstreamer/1.0/x86/lib/glib-2.0/include \ - C:/gstreamer/1.0/x86/include/gstreamer-1.0 - LIBS += -LC:/gstreamer/1.0/x86/lib \ - -lgstapp-1.0 \ - -lgstbase-1.0 \ - -lgstpbutils-1.0 \ - -lgstreamer-1.0 \ - -lgobject-2.0 \ - -lglib-2.0 \ + TARGET = Mapmap + GST_HOME = $$quote(C:\gstreamer\1.0\x86) + isEmpty(GST_HOME) { + message(\"C:\gstreamer\1.0\x86\" not detected ...) + } + + INCLUDEPATH += $${GST_HOME}/lib/gstreamer-1.0/include \ + $${GST_HOME}/include/glib-2.0 \ + $${GST_HOME}/lib/glib-2.0/include \ + $${GST_HOME}/include/gstreamer-1.0 + + LIBS += $${GST_HOME}/lib/gstapp-1.0.lib \ + $${GST_HOME}/lib/gstbase-1.0.lib \ + $${GST_HOME}/lib/gstpbutils-1.0.lib \ + $${GST_HOME}/lib/gstreamer-1.0.lib \ + $${GST_HOME}/lib/gobject-2.0.lib \ + $${GST_HOME}/lib/glib-2.0.lib \ -lopengl32 - # Add console to the CONFIG to see debug messages printed in - # the console on Windows - CONFIG += console + RC_FILE = mapmap_resource.rc + QMAKE_CXXFLAGS += -D_USE_MATH_DEFINES } diff --git a/mapmap_resource.rc b/mapmap_resource.rc new file mode 100644 index 0000000..e8e1d8d --- /dev/null +++ b/mapmap_resource.rc @@ -0,0 +1,39 @@ +# if defined(UNDER_CE) +# include +# else +# include +# endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 0,4,0,0 + PRODUCTVERSION 0,4,0,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE 0x0L + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "\0" + VALUE "FileDescription", "\0" + VALUE "FileVersion", "0.4.0.0\0" + VALUE "LegalCopyright", "\0" + VALUE "OriginalFilename", "Mapmap.exe\0" + VALUE "ProductName", "Mapmap\0" + VALUE "ProductVersion", "0.4.0.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0409, 1200 + END + END +/* End of Version info */ + diff --git a/resources/images/logo/mapmap-logo.ico b/resources/images/logo/mapmap-logo.ico new file mode 100644 index 0000000..db8b460 Binary files /dev/null and b/resources/images/logo/mapmap-logo.ico differ