From 33515e565f6a25d9fd647fdb636122ec4a2c9a8c Mon Sep 17 00:00:00 2001 From: mark mitchell Date: Tue, 27 Oct 2015 01:03:39 -0700 Subject: [PATCH 1/3] Fixed title bar buttons for issue #22 and issue #24 --- ...tchell => engauge.pro.user.mmitchell.linux | 0 engauge.pro.user.mmitchell.windows | 260 ++++++++++++++++++ src/main/MainWindow.cpp | 2 +- 3 files changed, 261 insertions(+), 1 deletion(-) rename engauge.pro.user.mmitchell => engauge.pro.user.mmitchell.linux (100%) create mode 100644 engauge.pro.user.mmitchell.windows diff --git a/engauge.pro.user.mmitchell b/engauge.pro.user.mmitchell.linux similarity index 100% rename from engauge.pro.user.mmitchell rename to engauge.pro.user.mmitchell.linux diff --git a/engauge.pro.user.mmitchell.windows b/engauge.pro.user.mmitchell.windows new file mode 100644 index 00000000..a2e79107 --- /dev/null +++ b/engauge.pro.user.mmitchell.windows @@ -0,0 +1,260 @@ + + + + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + true + 1 + true + 0 + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop + Desktop + {9a861ed4-1705-4ff4-93e4-2b4eb1226fbf} + 0 + 0 + 0 + + + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 2 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + + false + true + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + engauge + + Qt4ProjectManager.Qt4RunConfiguration:/home/mark/engauge6/engauge.pro + -debug + engauge.pro + false + false + + 3768 + true + false + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.EnvironmentId + {678e5f8c-72e6-4af0-8c8d-0f1d7ec5995b} + + + ProjectExplorer.Project.Updater.FileVersion + 15 + + diff --git a/src/main/MainWindow.cpp b/src/main/MainWindow.cpp index 471cb22d..dce17ee8 100644 --- a/src/main/MainWindow.cpp +++ b/src/main/MainWindow.cpp @@ -131,7 +131,7 @@ MainWindow::MainWindow(const QString &errorReportFile, setCurrentFile (""); createIcons(); - setWindowFlags (Qt::WindowContextHelpButtonHint); + setWindowFlags (Qt::WindowContextHelpButtonHint | windowFlags ()); // Add help to default buttons setWindowTitle (engaugeWindowTitle ()); createCentralWidget(); From 213b340ecdf81c41968efa3aacd6b26bab4bb37f Mon Sep 17 00:00:00 2001 From: mark mitchell Date: Tue, 27 Oct 2015 01:36:23 -0700 Subject: [PATCH 2/3] Tests execute in Windows --- src/.gitignore | 2 +- src/build_and_run_all_tests | 3 +++ src/engauge_test_template.pro | 10 ++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/.gitignore b/src/.gitignore index c7246293..ba12e818 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -12,5 +12,5 @@ engauge_test.log* engauge_test.pro engauge_test.pro.user Makefile* -object_script.engauge +object_script.* qrc_* diff --git a/src/build_and_run_all_tests b/src/build_and_run_all_tests index d6bc0c45..bc81390e 100755 --- a/src/build_and_run_all_tests +++ b/src/build_and_run_all_tests @@ -5,6 +5,9 @@ tests=(TestCorrelation TestFormats TestGraphCoords TestProjectedPoint TestSpline echo "Available tests: " ${tests[*]} +# Need gcc 4 at /C/cygwin/bin rather than gcc 3 at /usr/bin to prevent 'unrecognized command line +# option -fno-keep-inline-dllexport' +PATH=/C/QtOpenSource/Qt5.5.1/Tools/mingw492_32/bin:$PATH argcount="$#" if [ $argcount -gt 0 ] diff --git a/src/engauge_test_template.pro b/src/engauge_test_template.pro index 6a2c53b6..dce5f41f 100644 --- a/src/engauge_test_template.pro +++ b/src/engauge_test_template.pro @@ -484,6 +484,11 @@ TARGET = ../bin/TEST QT += core gui network printsupport testlib widgets xml help +win32-g++* { +CONFIG += windows +LIBS += -L$$(LOG4CPP_HOME)/lib -L$$(FFTW_HOME)/lib +} + LIBS += -llog4cpp -lfftw3 INCLUDEPATH += Background \ Callback \ @@ -525,6 +530,11 @@ INCLUDEPATH += Background \ util \ View +win32-g++* { +INCLUDEPATH += $$(FFTW_HOME)/include \ + $$(LOG4CPP_HOME)/include +} + RESOURCES += \ engauge.qrc From 591a3c1ea108749f3222b1fdebc998d45754b2e9 Mon Sep 17 00:00:00 2001 From: mark mitchell Date: Thu, 29 Oct 2015 22:37:06 -0700 Subject: [PATCH 3/3] Removed text from icons. Version number is checked when building release. Windows release is labeled as 32 bit --- src/img/digitizer.ico | Bin 34498 -> 32687 bytes src/main/MainWindow.cpp | 2 -- src/util/Version.cpp | 2 ++ windows/.gitignore | 3 ++- windows/build_msi | 10 +++++++--- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/img/digitizer.ico b/src/img/digitizer.ico index fa33e64b6b823650e560b4fa3738dec3e74cca87..74a8d0b46df4c1a041261e46221bfe7fc8071621 100644 GIT binary patch delta 4115 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 delta 6646 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