Spaceball settings tabs removal from the Customize panel (#14589)

* Removed Spaceball tabs for NavLib integration

* Added missing CMake variable for MacOS/Linux platform

---------

Co-authored-by: Patryk Skowroński <pskowronski@3dconnexion.com>
This commit is contained in:
Patryk Skowroński
2024-06-24 18:06:25 +02:00
committed by GitHub
parent 8465ea881a
commit fefd3851ac
3 changed files with 26 additions and 10 deletions

View File

@@ -142,8 +142,10 @@ macro(InitializeFreeCADBuildOptions)
option(ENABLE_DEVELOPER_TESTS "Build the FreeCAD unit tests suit" ON)
if(MSVC)
set(FREECAD_3CONNEXION_SUPPORT "NavLib" CACHE STRING "Select version of the 3Dconnexion device integration")
set_property(CACHE FREECAD_3CONNEXION_SUPPORT PROPERTY STRINGS "NavLib" "SpNav")
set(FREECAD_3DCONNEXION_SUPPORT "NavLib" CACHE STRING "Select version of the 3Dconnexion device integration")
set_property(CACHE FREECAD_3DCONNEXION_SUPPORT PROPERTY STRINGS "NavLib" "Raw input")
else(MSVC)
set(FREECAD_3DCONNEXION_SUPPORT "Raw input")
endif(MSVC)
if(MSVC)
@@ -165,7 +167,7 @@ macro(InitializeFreeCADBuildOptions)
option(FREECAD_USE_PCL "Build the features that use PCL libs" OFF)
endif(NOT MSVC)
if(FREECAD_3CONNEXION_SUPPORT STREQUAL "NavLib" AND FREECAD_USE_3DCONNEXION)
if(FREECAD_3DCONNEXION_SUPPORT STREQUAL "NavLib" AND FREECAD_USE_3DCONNEXION)
set(FREECAD_USE_3DCONNEXION_NAVLIB ON)
set(FREECAD_USE_3DCONNEXION OFF)
endif()

View File

@@ -317,7 +317,6 @@ SET(Gui_UIC_SRCS
DlgAuthorization.ui
DlgChooseIcon.ui
DlgCreateNewPreferencePack.ui
DlgCustomizeSpNavSettings.ui
DlgInputDialog.ui
DlgKeyboard.ui
DlgMacroExecute.ui
@@ -375,6 +374,10 @@ SET(Gui_UIC_SRCS
VectorListEditor.ui
)
if(FREECAD_3DCONNEXION_SUPPORT STREQUAL "Raw input")
list(APPEND Gui_UIC_SRCS DlgCustomizeSpNavSettings.ui)
endif(FREECAD_3DCONNEXION_SUPPORT STREQUAL "Raw input")
set (FreeCAD_TR_QRC ${CMAKE_CURRENT_BINARY_DIR}/Language/FreeCAD_translation.qrc)
qt_find_and_add_translation(QM_SRCS "Language/FreeCAD_*.ts"
${CMAKE_CURRENT_BINARY_DIR}/Language)
@@ -550,8 +553,6 @@ SOURCE_GROUP("Dialog" FILES ${Dialog_SRCS})
SET(Dialog_Customize_CPP_SRCS
DlgActionsImp.cpp
DlgCustomizeImp.cpp
DlgCustomizeSpaceball.cpp
DlgCustomizeSpNavSettings.cpp
DlgKeyboardImp.cpp
DlgToolbarsImp.cpp
ListWidgetDragBugFix.cpp
@@ -559,21 +560,29 @@ SET(Dialog_Customize_CPP_SRCS
SET(Dialog_Customize_HPP_SRCS
DlgActionsImp.h
DlgCustomizeImp.h
DlgCustomizeSpaceball.h
DlgCustomizeSpNavSettings.h
DlgKeyboardImp.h
DlgToolbarsImp.h
ListWidgetDragBugFix.h
)
if(FREECAD_3DCONNEXION_SUPPORT STREQUAL "Raw input")
list(APPEND Dialog_Customize_CPP_SRCS DlgCustomizeSpaceball.cpp DlgCustomizeSpNavSettings.cpp)
list(APPEND Dialog_Customize_HPP_SRCS DlgCustomizeSpaceball.h DlgCustomizeSpNavSettings.h)
endif(FREECAD_3DCONNEXION_SUPPORT STREQUAL "Raw input")
SET(Dialog_Customize_SRCS
${Dialog_Customize_CPP_SRCS}
${Dialog_Customize_HPP_SRCS}
DlgActions.ui
DlgChooseIcon.ui
DlgCustomizeSpNavSettings.ui
DlgKeyboard.ui
DlgToolbars.ui
)
if(FREECAD_3DCONNEXION_SUPPORT STREQUAL "Raw input")
list(APPEND Dialog_Customize_SRCS DlgCustomizeSpNavSettings.ui)
endif(FREECAD_3DCONNEXION_SUPPORT STREQUAL "Raw input")
SOURCE_GROUP("Dialog\\Customize" FILES ${Dialog_Customize_SRCS})
# The settings dialog sources

View File

@@ -50,8 +50,12 @@
#include "DlgToolbarsImp.h"
#include "DlgActionsImp.h"
#include "DlgKeyboardImp.h"
#ifndef USE_3DCONNEXION_NAVLIB
#include "DlgCustomizeSpaceball.h"
#include "DlgCustomizeSpNavSettings.h"
#endif
#include "InputField.h"
#include "QuantitySpinBox.h"
#include "PrefWidgets.h"
@@ -93,9 +97,10 @@ WidgetFactorySupplier::WidgetFactorySupplier()
new CustomPageProducer<DlgCustomKeyboardImp>;
new CustomPageProducer<DlgCustomToolbarsImp>;
new CustomPageProducer<DlgCustomActionsImp>;
#ifndef USE_3DCONNEXION_NAVLIB
new CustomPageProducer<DlgCustomizeSpNavSettings>;
new CustomPageProducer<DlgCustomizeSpaceball>;
#endif
// ADD YOUR PREFERENCE WIDGETS HERE
//
//