Port code to INDI 2.1.0 and update CPM (#3269)

Co-authored-by: Nicolas Benes <[email protected]> Co-authored-by: Alexander V. Wolf <[email protected]> Co-authored-by: Alexander V. Wolf <[email protected]>
Stellarium · Nov 9, 2024 · 701d10c · 701d10c
1 parent 2d65503
commit 701d10c
Show file tree

Hide file tree

Showing 16 changed files with 391 additions and 330 deletions.
diff --git a/data/gui/normalStyle.css b/data/gui/normalStyle.css
@@ -369,6 +369,10 @@ QToolButton#pushButtonGotoSearchSkyObject {
 	icon-size: 24px;
 }
 
+QToolButton#moveUp, QToolButton#moveDown, QToolButton#moveLeft, QToolButton#moveRight {
+	icon-size: 22px;
+}
+
 QToolButton#pushButtonCustomStepsDialog, QToolButton#pushButtonNow, QToolButton#pushButtonExtraEphemerisDialog {
 	icon-size: 20px;
 	min-width: 22px;
@@ -895,7 +899,6 @@ QLineEdit[collision="true"] {
 
 #dateTimeDialogForm QSpinBox,
 #dateTimeDialogForm QDoubleSpinBox {
-	border-image: none;
 	border: 0;
 	background: rgba(0, 0, 0, 0%);
 	padding-top: 16px;

diff --git a/plugins/TelescopeControl/src/CMakeLists.txt b/plugins/TelescopeControl/src/CMakeLists.txt
@@ -5,7 +5,9 @@ add_subdirectory(gui)
 add_subdirectory(Lx200)
 add_subdirectory(NexStar)
 add_subdirectory(Rts2)
-add_subdirectory(INDI)
+IF(NOT WIN32)
+    add_subdirectory(INDI)
+ENDIF()
 if(WIN32 AND (${QT_VERSION_MAJOR} EQUAL "5"))
     add_subdirectory(ASCOM)
 endif(WIN32 AND (${QT_VERSION_MAJOR} EQUAL "5"))
@@ -40,7 +42,6 @@ SET_TARGET_PROPERTIES(TelescopeControl-static PROPERTIES OUTPUT_NAME "TelescopeC
 TARGET_LINK_LIBRARIES(TelescopeControl-static
     TelescopeControl_gui
     TelescopeControl_Lx200
-    TelescopeControl_INDI
     TelescopeControl_NexStar
     TelescopeControl_Rts2
     TelescopeControl_common
@@ -49,6 +50,12 @@ TARGET_LINK_LIBRARIES(TelescopeControl-static
     Qt${QT_VERSION_MAJOR}::SerialPort
     )
 
+IF(NOT WIN32)
+TARGET_LINK_LIBRARIES(TelescopeControl-static
+    TelescopeControl_INDI
+    )
+ENDIF()
+
 # Due to incomprehensible errors between ASCOM and Qt6OpenGL!QOpenGL2PaintEngineEx::setState(), we must disable in QT6-based builds.
 if(WIN32 AND (${QT_VERSION_MAJOR} EQUAL "5"))
 #TARGET_LINK_LIBRARIES(TelescopeControl-static