Skip to content

Commit 8d1c744

Browse files
committed
remove converter
1 parent 099585c commit 8d1c744

File tree

10 files changed

+4
-836
lines changed

10 files changed

+4
-836
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
qt6-qpa-plugins qt6-image-formats-plugins qt6-l10n-tools qt6-webengine-dev qt6-webengine-dev-tools libqt6charts6-dev \
6868
libqt6charts6 libqt6opengl6-dev libqt6positioning6-plugins libqt6serialport6-dev qt6-base-dev libqt6webenginecore6-bin \
6969
libqt6webengine6-data libexiv2-dev libnlopt-cxx-dev zlib1g-dev libgl1-mesa-dev libdrm-dev libglx-dev libxkbcommon-x11-dev \
70-
libgps-dev libmd4c-dev libmd4c-html0-dev cmake gettext libgettextpo-dev libtidy-dev
70+
libgps-dev libmd4c-dev libmd4c-html0-dev
7171
7272
- name: Checkout repository
7373
uses: actions/checkout@v4
@@ -201,7 +201,7 @@ jobs:
201201
export PATH="/usr/local/opt/qt@6/bin:$PATH"
202202
mkdir -p build
203203
cd build
204-
cmake -DCMAKE_PREFIX_PATH="/usr/local/opt/qt@6;/usr/local/opt/tidy-html5" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTELLARIUM_RELEASE_BUILD=Off -DENABLE_TESTING=On ${{ github.workspace }}
204+
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTELLARIUM_RELEASE_BUILD=Off -DENABLE_TESTING=On ${{ github.workspace }}
205205
206206
- name: Compile
207207
working-directory: build
@@ -232,7 +232,7 @@ jobs:
232232
run: |
233233
# brew update
234234
# brew upgrade
235-
brew install qt@6 nlopt exiv2 tidy-html5
235+
brew install qt@6 nlopt exiv2
236236
237237
- name: Checkout repository
238238
uses: actions/checkout@v4
@@ -310,7 +310,7 @@ jobs:
310310
# When using rsync, you can define copyback: false to not copy files back from the VM in to the host.
311311
copyback: false
312312
prepare: |
313-
pkg install -y cmake git eigen glm exiv2 nlopt fast_float md4c qxlsx-qt6 perl5 xorg-vfbserver gettext qt6 tidy-html5
313+
pkg install -y cmake git eigen glm exiv2 nlopt fast_float md4c qxlsx-qt6 perl5 xorg-vfbserver gettext qt6
314314
315315
run: |
316316
set -e -x

plugins/SkyCultureMaker/CMakeLists.txt

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,6 @@
11
# This is the cmake config file for the Sky Culture Maker plugin
22
SET(SCM_VERSION "1.0.0")
33

4-
# Option to manually control converter, defaults to TRUE, but overridden by Qt version
5-
OPTION(SCM_SHOULD_ENABLE_CONVERTER "Attempt to enable Sky Culture Converter" TRUE)
6-
SET(SCM_CONVERTER_ENABLED FALSE) # Default to disabled
7-
8-
IF(SCM_SHOULD_ENABLE_CONVERTER AND NOT (QT_VERSION_MAJOR EQUAL "5"))
9-
SET(SCM_CONVERTER_ENABLED TRUE)
10-
MESSAGE(STATUS "Sky Culture Converter will be enabled.")
11-
12-
# On macOS, Homebrew is a common way to install dependencies.
13-
# We should look for it in the default locations for Apple Silicon and Intel macs
14-
# to find the correct version of libtidy. Otherwise a system library might be used.
15-
IF(APPLE)
16-
LIST(APPEND CMAKE_PREFIX_PATH "/opt/homebrew" "/usr/local")
17-
ENDIF()
18-
19-
# download https://github.com/Stellarium/stellarium-skyculture-converter
20-
CPMAddPackage(
21-
NAME StellariumSkyCultureConverter
22-
GITHUB_REPOSITORY Stellarium/stellarium-skyculture-converter
23-
GIT_TAG master
24-
OPTIONS
25-
"SKYCULTURE_CONVERTER_BUILD_TESTS OFF"
26-
)
27-
28-
# download https://github.com/selmf/unarr for archives
29-
CPMAddPackage(
30-
NAME unarr
31-
GITHUB_REPOSITORY selmf/unarr
32-
GIT_TAG v1.1.1
33-
OPTIONS
34-
"USE_SYSTEM_BZ2 OFF"
35-
"USE_SYSTEM_LZMA OFF"
36-
)
37-
38-
IF(WIN32)
39-
# Patch unarr's common/stream.c to include <objidl.h> after windows.h
40-
# Ensure this runs after unarr source is available
41-
IF(TARGET unarr AND EXISTS "${unarr_SOURCE_DIR}/common/stream.c")
42-
FILE(READ "${unarr_SOURCE_DIR}/common/stream.c" _stream_c_content)
43-
STRING(REPLACE "#define COBJMACROS\n#include <windows.h>\n"
44-
"#define COBJMACROS\n#include <windows.h>\n#include <objidl.h>\n"
45-
_stream_c_content "${_stream_c_content}")
46-
FILE(WRITE "${unarr_SOURCE_DIR}/common/stream.c" "${_stream_c_content}")
47-
ELSE()
48-
MESSAGE(WARNING "unarr source directory or stream.c not found for patching. This might be an issue on Windows if the converter is enabled.")
49-
ENDIF()
50-
ENDIF(WIN32)
51-
ADD_DEFINITIONS(-DSCM_CONVERTER_ENABLED_CPP) # Define for C++
52-
ELSE()
53-
MESSAGE(STATUS "Sky Culture Converter is DISABLED (Qt version 5 or SCM_SHOULD_ENABLE_CONVERTER is OFF). Please ensure you are using Qt 6 or later to enable it.")
54-
ENDIF()
55-
564
ADD_DEFINITIONS(-DSKYCULTUREMAKER_PLUGIN_VERSION="${SCM_VERSION}")
575
ADD_DEFINITIONS(-DSKYCULTUREMAKER_PLUGIN_LICENSE="GNU GPLv2 or later")
586

plugins/SkyCultureMaker/src/CMakeLists.txt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,6 @@ SET( SCM_UIS
5353
gui/scmStartDialog.ui
5454
)
5555

56-
if(SCM_CONVERTER_ENABLED)
57-
list(APPEND SkyCultureMaker_SRCS
58-
gui/ScmConvertDialog.hpp
59-
gui/ScmConvertDialog.cpp
60-
)
61-
list(APPEND SCM_UIS
62-
gui/scmConvertDialog.ui
63-
)
64-
endif()
65-
6656
################# compiles resources files ############
6757
SET(SkyCultureMaker_RES ../resources/SkyCultureMaker.qrc)
6858
IF (${QT_VERSION_MAJOR} EQUAL "5")
@@ -77,10 +67,6 @@ ADD_LIBRARY(SkyCultureMaker-static STATIC ${SkyCultureMaker_SRCS} ${SkyCultureMa
7767
SET_TARGET_PROPERTIES(SkyCultureMaker-static PROPERTIES OUTPUT_NAME "SkyCultureMaker")
7868

7969
list(APPEND SKYMAKER_PLUGIN_LINK_LIBS Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Widgets)
80-
# SCM_CONVERTER_ENABLED is inherited from the parent CMakeLists.txt scope
81-
if(SCM_CONVERTER_ENABLED)
82-
list(APPEND SKYMAKER_PLUGIN_LINK_LIBS skyculture_converter_lib unarr)
83-
endif()
8470

8571
TARGET_LINK_LIBRARIES(SkyCultureMaker-static ${SKYMAKER_PLUGIN_LINK_LIBS})
8672
SET_TARGET_PROPERTIES(SkyCultureMaker-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")

plugins/SkyCultureMaker/src/SkyCultureMaker.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -214,18 +214,6 @@ void SkyCultureMaker::stopScmProcess()
214214
return;
215215
}
216216

217-
// If the converter dialog is visible, hide it
218-
if (scmStartDialog->isConverterDialogVisible())
219-
{
220-
scmStartDialog->setConverterDialogVisibility(false);
221-
if (isScmEnabled)
222-
{
223-
isScmEnabled = false;
224-
emit eventIsScmEnabled(false);
225-
setToolbarButtonState(false); // Toggle the toolbar button to disabled
226-
}
227-
}
228-
229217
// If any other dialog is visible, don't stop the process — just keep UI state ON
230218
if (isAnyDialogVisible())
231219
{

0 commit comments

Comments
 (0)