icon for analyzer, more datails for builds

picts/chart-icon.rc

+IDI_ICON1               ICON    DISCARDABLE     "chart.ico"

src/CMakeLists.txt

@@ -9,6 +9,15 @@ set(CMAKE_AUTOMOC ON)
 
 find_package(Qt5Widgets)
 
+if(UNIX AND NOT APPLE)
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro")
+        set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro")
+        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,relro")
+else(UNIX AND NOT APPLE)
+	if (WIN32)
+				set(CMAKE_CXX_FLAGS "-O2 -march=pentium3m") # SoundTouch require it
+	endif(WIN32)
+endif(UNIX AND NOT APPLE)
 
 # libNootkaCore
 add_subdirectory( libs/core )

src/charts/CMakeLists.txt

@@ -25,6 +25,15 @@ set(ANALYZER_SRC
 	tyaxis.cpp
 )
 
+if(MINGW)
+		# dress up win executable in nice nootka icon ONLY FOR MINGW !!!!!!!!!!!!!
+		add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/chartico.o
+												COMMAND windres.exe -I${CMAKE_CURRENT_SOURCE_DIR} -i${CMAKE_CURRENT_SOURCE_DIR}/../picts/chart-icon.rc
+														-o ${CMAKE_CURRENT_BINARY_DIR}/chartico.o )
+		set(ANALYZER_SRC ${ANALYZER_SRC} ${CMAKE_CURRENT_BINARY_DIR}/chartico.o)
+endif(MINGW)
 
-add_executable(nootka-analyzer ${ANALYZER_SRC} )
+
+add_executable(nootka-analyzer WIN32 ${ANALYZER_SRC} )
 target_link_libraries(nootka-analyzer NootkaCore Qt5::Widgets)
+

src/libs/core/graphics/tgraphicstexttip.cpp

@@ -96,18 +96,16 @@ TgraphicsTextTip::~TgraphicsTextTip() {}
 void TgraphicsTextTip::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) {
   if (m_bgColor != -1) {
     QRectF rect = boundingRect();
-//     painter->setPen(Qt::NoPen);
     QColor startColor = m_bgColor;
     startColor.setAlpha(25);
     QColor endColor = startColor;
     endColor.setAlpha(75);
     painter->setPen(QPen(endColor, 1));
-//     painter->setBrush(QBrush(TquestionPoint::bgColor())); TODO
 		painter->setBrush(QBrush(widget->palette().base().color()));
     painter->drawRoundedRect(rect, 5, 5);
     QLinearGradient grad(rect.topLeft(), rect.bottomRight());
-    grad.setColorAt(0.1, startColor);
-    grad.setColorAt(0.9, endColor);
+    grad.setColorAt(0.2, startColor);
+    grad.setColorAt(0.95, endColor);
     painter->setBrush(QBrush(grad));
     painter->drawRoundedRect(rect, 5, 5);
   }

src/updater/CMakeLists.txt

@@ -15,37 +15,13 @@ if(ENABLE_UPDATER)
       tupdatesummary.cpp
 		)
 
-    if(UNIX AND NOT APPLE)
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro")
-        set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro")
-        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,relro")
-    endif(UNIX AND NOT APPLE)
-
-
 	if(MINGW)
 		# dress up win executable in nice nootka icon ONLY FOR MINGW !!!!!!!!!!!!!
 		#     ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/nootico.o
 		#                        COMMAND windres.exe -I${CMAKE_CURRENT_SOURCE_DIR} -i${CMAKE_CURRENT_SOURCE_DIR}/../picts/nootka-icon.rc
 		#                             -o ${CMAKE_CURRENT_BINARY_DIR}/nootico.o )
 		#     SET(UPDATER_SRCS ${UPDATER_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/nootico.o)
-        ADD_EXECUTABLE( nootka-updater 
-          WIN32 
-          ${UPDATER_SRCS} 
-          ${UPDATER_MOCS} 
-        )
-      TARGET_LINK_LIBRARIES(nootka-updater
-            ${QT_QTCORE_LIBRARY}
-            ${QT_QTGUI_LIBRARY}
-            ${QT_QTNETWORK_LIBRARY}
-      )
 	endif(MINGW)
-
-    if(UNIX AND NOT APPLE) #Linux
-			ADD_EXECUTABLE( nootka-updater ${UPDATER_SRCS} )
-			qt5_use_modules( nootka-updater Widgets Network )
-#       TARGET_LINK_LIBRARIES( nootka-updater Qt5::Widgets Qt5::Network )
-    endif(UNIX AND NOT APPLE)
-
 	if(APPLE)
 		#     set (MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/packaging/mac/info.plist")
 		#    set (ExeUpName nootka-updater MACOSX_BUNDLE)
@@ -57,18 +33,11 @@ if(ENABLE_UPDATER)
 		#    set (MACOSX_BUNDLE_SHORT_VERSION_STRING ${Nootka_VERSION_FULL})
 		#    set (MACOSX_BUNDLE_BUNDLE_VERSION ${Nootka_VERSION_FULL})
 		#    set (MACOSX_BUNDLE_COPYRIGHT nootka.sf.net)
-        ADD_EXECUTABLE( nootka-updater # ${ExeUpName} # nootka-updater # ${ExeName}
-            ${UPDATER_SRCS}
-            ${UPDATER_MOCS}
-        )
-      TARGET_LINK_LIBRARIES(nootka-updater
-            ${QT_QTCORE_LIBRARY}
-            ${QT_QTGUI_LIBRARY}
-            ${QT_QTNETWORK_LIBRARY}
-      )
 	endif(APPLE)
 
     
+	ADD_EXECUTABLE( nootka-updater WIN32 ${UPDATER_SRCS} )
+	qt5_use_modules( nootka-updater Widgets Network )
 
 
 	if(UNIX AND NOT APPLE) 	# Linux path for Nootka binary