From 94211340b5dc777fb09f3b60dd64f04cf10ea68f Mon Sep 17 00:00:00 2001 From: Bay Dam Date: Sat, 26 Mar 2016 18:34:22 +0100 Subject: [PATCH] Preparing for windows package --- .gitignore | 4 +++ MainWindow.cpp | 10 +++++++ mapmap.pro | 33 +++++++++++++--------- mapmap_resource.rc | 39 ++++++++++++++++++++++++++ resources/images/logo/mapmap-logo.ico | Bin 0 -> 99678 bytes 5 files changed, 72 insertions(+), 14 deletions(-) create mode 100644 mapmap_resource.rc create mode 100644 resources/images/logo/mapmap-logo.ico 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 0000000000000000000000000000000000000000..db8b4600af80d19e36d9a9af84254b7737b15e49 GIT binary patch literal 99678 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 wk`I)8pyUH3A1L`i$p=b4Q1XG24^(j