From c8e2918cf65c95eb013887cad7de104a12c0c4cc Mon Sep 17 00:00:00 2001
From: SeeLook <945374+SeeLook@users.noreply.github.com>
Date: Thu, 18 Dec 2014 07:25:31 +0100
Subject: [PATCH] Windows runintime target rules, changelog view improvements
---
TODO | 1 -
changes | 7 ++++++-
packaging/CMakeLists.txt | 8 ++++++++
src/libs/misc/taboutnootka.cpp | 9 ++-------
4 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/TODO b/TODO
index b6edd1c00..a0dea2f6a 100755
--- a/TODO
+++ b/TODO
@@ -33,7 +33,6 @@ Scaling issues:
- Windows has problems with tool bar scaling and single mode note name size
- piano brace size/position
-- check setAmbitus of TsimpleScore - is it working properly with piano staff
- There is unused class TnotePixmap only with default clef - use it or delete
- vertical name layout is probably unused - clear it then
- TpitchView could react on TaudioIN state to be automatically enabled/disabled
diff --git a/changes b/changes
index 8bce4834e..5d06f5aab 100644
--- a/changes
+++ b/changes
@@ -1,3 +1,8 @@
+ BUGS FIXES
+ - fixed a lot of small glitches
+ Under the hood
+ - removed all 'extern' statements from libraries
+
1.1.3 alpha
- There is an option for using JACK (Linux) and ASIO (Windows)
- pitch detection range is set dynamically instead of settings
@@ -39,7 +44,7 @@
- merged audio input and output callback methods
- ported binary format of *.nel files to XML
-================================================================
+======
1.0.1
- finished German translation
diff --git a/packaging/CMakeLists.txt b/packaging/CMakeLists.txt
index 0f4e01025..48c013aa8 100755
--- a/packaging/CMakeLists.txt
+++ b/packaging/CMakeLists.txt
@@ -167,6 +167,7 @@ if(WIN32)
find_package(Qt5Core)
get_target_property(QtCore_location_Release Qt5::Core LOCATION_Release)
get_filename_component(QT_BINARY_DIR "${QtCore_location_Release}" DIRECTORY)
+ file(GLOB ICU_DLLS "${QT_BINARY_DIR}/icu*.dll") # icudtXX.dll icuinXX.dll icuucXX.dll
add_custom_target(runinplace
COMMAND echo " "
COMMAND echo Copying libraries...
@@ -175,6 +176,13 @@ if(WIN32)
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${QT_BINARY_DIR}/Qt5Widgets.dll ${CMAKE_BINARY_DIR}/src/.
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${QT_BINARY_DIR}/Qt5Network.dll ${CMAKE_BINARY_DIR}/src/.
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${QT_BINARY_DIR}/Qt5PrintSupport.dll ${CMAKE_BINARY_DIR}/src/.
+# foreach(ICU ${ICU_DLLS})
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ICU_DLLS} ${CMAKE_BINARY_DIR}/src/.
+# endforeach()
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/src/plugins
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/src/plugins/platforms
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${QT_BINARY_DIR}/../plugins/platforms/qwindows.dll ${CMAKE_BINARY_DIR}/src/plugins/platforms/.
+
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${FFTW3_LIBRARIES} ${CMAKE_BINARY_DIR}/src/.
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${VORBIS_LIBRARIES} ${CMAKE_BINARY_DIR}/src/. #libvorbisfile.dll
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${VORBIS_DIR}/libvorbis.dll ${CMAKE_BINARY_DIR}/src/.
diff --git a/src/libs/misc/taboutnootka.cpp b/src/libs/misc/taboutnootka.cpp
index 3e74362d8..2152cde76 100644
--- a/src/libs/misc/taboutnootka.cpp
+++ b/src/libs/misc/taboutnootka.cpp
@@ -183,22 +183,17 @@ TaboutNootka::TaboutNootka(QWidget *parent) :
for (int i = 0; i < htmlText.size(); i++) {
if (htmlText[i].contains("0."))
htmlText[i] = "<u><b> " + htmlText[i] + "</b></u>";
+ else if (htmlText[i].contains("======"))
+ htmlText[i] = "<br><hr><b><big><center>Nootka ONE</big></b></center><hr>";
else if (htmlText[i].contains("BUG"))
htmlText[i] = " <u>BUG FIXES</u>";
else if (htmlText[i].contains("Under the hood"))
htmlText[i] = " <u>Under the hood</u>";
else if (!htmlText[i].contains(" - "))
htmlText[i] = "<b>" + htmlText[i] + "</b>";
-// if (htmlText[i].isEmpty())
-// htmlText[i].append("<hr>");
-// else
htmlText[i].append("<br>");
}
-// htmlText.prepend(QString("<div style=\"color: %1; background-color: %2;\">").
-// arg(palette().highlightedText().color().name()).arg(palette().highlight().color().name()));
-// htmlText.append("</div>");
chLogTxt->setHtml(htmlText.join(""));
-// chLogTxt->setPlainText(htmlText.join(""));
}
chfile.close();
--
GitLab