Skip to content

Kdabkdock widget #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Murmele wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Kdabkdock widget #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9acfbf3
initial approach to use KDDockWidgets
Murmele Apr 6, 2022
0872917
initial remove of the tabwidget and replace by a dockwidget
Murmele Apr 6, 2022
66ffc6e
make reportDock relative to modelDock so it looks like previous
Murmele Apr 6, 2022
1006c4f
WIP
Murmele Apr 6, 2022
b08fa8b
set up KDDockWidgets
Murmele Apr 7, 2022
fc7c730
when prefix is used, KDAB folder will not be created
Murmele Apr 7, 2022
930816d
cut path was wrong
Murmele Apr 7, 2022
6ede662
WIP
Murmele Apr 7, 2022
fd11de8
remove KDDockWidgets submodule
Murmele Apr 11, 2022
642f8a9
change config path
Murmele Apr 11, 2022
476c924
cached options must not be provided a second time
Murmele Apr 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,16 @@ jobs:
arch: ${{ matrix.env.qt_arch }}
install-deps: true

- name: Install KDDockWidgets
run: |
git clone https://github.com/KDAB/KDDockWidgets.git
cd KDDockWidgets
git checkout 1.6
mkdir build
cd build
cmake -G Ninja -DCMAKE_INSTALL_PREFIX=${{github.workspace}} ..
ninja install

# - name: Build Jemalloc
# if: matrix.env.ninja_platform == 'linux'
# run: |
Expand All @@ -137,7 +147,7 @@ jobs:
run: |
mkdir -p build
cd build
cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=ON -DWITH_TCMALLOC=OFF -DWITH_JEMALLOC=OFF -DWITH_COVERAGE=OFF -DWITH_PROFILE=OFF -D "BOOST_ROOT=${{ matrix.env.boost_install_path }}/boost" -D "BOOST_LIBRARYDIR=${{ matrix.env.boost_install_path }}/boost/stage/x64/Release/lib" ${{ env.CMAKE_FLAGS }} -DCMAKE_INSTALL_PREFIX=../install ..
cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=ON -DWITH_TCMALLOC=OFF -DWITH_JEMALLOC=OFF -DWITH_COVERAGE=OFF -DWITH_PROFILE=OFF -D "BOOST_ROOT=${{ matrix.env.boost_install_path }}/boost" -D "BOOST_LIBRARYDIR=${{ matrix.env.boost_install_path }}/boost/stage/x64/Release/lib" ${{ env.CMAKE_FLAGS }} -DCMAKE_INSTALL_PREFIX=../install -DKDDockWidgets_DIR=${{github.workspace}}/lib/cmake/KDDockWidgets ..

- name: Configure Release Windows
if: matrix.env.ninja_platform == 'win'
Expand All @@ -147,13 +157,13 @@ jobs:
$Env:PKG_CONFIG_PATH += ";D:/a/scram/libxml2/lib/pkgconfig"
mkdir -p build
cd build
cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=ON -DWITH_TCMALLOC=OFF -DWITH_JEMALLOC=OFF -DWITH_COVERAGE=OFF -DWITH_PROFILE=OFF -DBUILD_TESTING=ON -D "BOOST_ROOT=${{ matrix.env.boost_install_path }}/boost" -D "BOOST_LIBRARYDIR=${{ matrix.env.boost_install_path }}/boost/stage/x64/Release/lib" ${{ env.CMAKE_FLAGS }} -DCMAKE_INSTALL_PREFIX=../install ..
cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=ON -DWITH_TCMALLOC=OFF -DWITH_JEMALLOC=OFF -DWITH_COVERAGE=OFF -DWITH_PROFILE=OFF -DBUILD_TESTING=ON -D "BOOST_ROOT=${{ matrix.env.boost_install_path }}/boost" -D "BOOST_LIBRARYDIR=${{ matrix.env.boost_install_path }}/boost/stage/x64/Release/lib" ${{ env.CMAKE_FLAGS }} -DCMAKE_INSTALL_PREFIX=../install -DKDDockWidgets_DIR=${{github.workspace}}/lib/cmake/KDDockWidgets ..

- name: Build
run: |
cd build
ninja
cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=ON -DWITH_TCMALLOC=OFF -DWITH_JEMALLOC=OFF -DWITH_COVERAGE=OFF -DWITH_PROFILE=OFF -DBUILD_TESTING=ON -D "BOOST_ROOT=${{ matrix.env.boost_install_path }}/boost" -D "BOOST_LIBRARYDIR=${{ matrix.env.boost_install_path }}/boost/stage/x64/Release/lib" ${{ env.CMAKE_FLAGS }} -DCMAKE_INSTALL_PREFIX=../install ..
cmake -G Ninja ..

# used for testing
- name: Install
Expand Down
8 changes: 7 additions & 1 deletion gui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ message(STATUS "Found Qt5")
message(STATUS "Qt5 Version: ${Qt5_VERSION}")
######################## End find Qt ###################### }}}

######################## Begin KDABDockWidgets ########################
find_package(KDDockWidgets CONFIG REQUIRED)
######################### End KDABDockWidgets #########################


##################### Begin cmake configuration ################### {{{
set(CMAKE_INCLUDE_CURRENT_DIR ON)
include_directories("${CMAKE_BINARY_DIR}") # Access the generated core version header.
Expand Down Expand Up @@ -110,7 +115,8 @@ add_library(scram-gui STATIC ${SCRAM_GUI_SRC} ${SCRAM_GUI_UI})
set(QT_MODULES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Svg Qt5::OpenGL Qt5::PrintSupport Qt5::Concurrent)
target_link_libraries(scram-gui
${LIBS} scram
${QT_MODULES})
${QT_MODULES}
KDAB::kddockwidgets)
target_compile_options(scram-gui PUBLIC $<$<CONFIG:DEBUG>:${SCRAM_CXX_FLAGS_DEBUG} -Wno-useless-cast>) # TODO: MOC failure.
# Prevent implicit QString(const char*), string concat with "+", and other anti-patterns.
target_compile_definitions(scram-gui PRIVATE
Expand Down
Loading