benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bumping Qt-Color-Widgets (#2052)

Browse Source 
* Bumping Qt-Color-Widgets

* changing Qt Color Widget CMAKE setup
This commit is contained in:
borgmanJeremy
2021-11-20 20:44:58 -06:00
committed by GitHub
parent 2283b3e783
commit 8ab1ac0eaa
135 changed files with 16061 additions and 712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/CMakeLists.txt
View File

@@ -116,9 +116,9 @@ endif ()
target_sources(
flameshot
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../external/Qt-Color-Widgets/src/color_utils.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../external/Qt-Color-Widgets/src/color_wheel.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../external/Qt-Color-Widgets/include/color_wheel.hpp
# ${CMAKE_CURRENT_SOURCE_DIR}/../external/Qt-Color-Widgets/src/QtColorWidgets/color_utils.cpp
# ${CMAKE_CURRENT_SOURCE_DIR}/../external/Qt-Color-Widgets/src/QtColorWidgets/color_wheel.cpp
# ${CMAKE_CURRENT_SOURCE_DIR}/../external/Qt-Color-Widgets/include/QtColorWidgets/color_wheel.hpp
${CMAKE_CURRENT_SOURCE_DIR}/../data/graphics.qrc
${CMAKE_CURRENT_SOURCE_DIR}/../data/flameshot.rc # windows binary icon resource file
${QM_FILES}
@@ -181,6 +181,7 @@ target_link_libraries(
Qt5::Network
Qt5::Widgets
${QTSINGLEAPPLICATION_LIBRARY}
QtColorWidgets
spdlog::spdlog
)

2
src/config/uicoloreditor.cpp
View File

@@ -74,7 +74,7 @@ void UIcolorEditor::initColorWheel()
{
m_colorWheel = new color_widgets::ColorWheel(this);
connect(m_colorWheel,
&color_widgets::ColorWheel::mouseReleaseOnColor,
&color_widgets::ColorWheel::colorSelected,
this,
&UIcolorEditor::updateUIcolor);
connect(m_colorWheel,

2
src/config/uicoloreditor.h
View File

@@ -3,7 +3,7 @@
#pragma once
#include "color_wheel.hpp"
#include "QtColorWidgets/color_wheel.hpp"
#include "src/widgets/capture/capturetoolbutton.h"
#include <QGroupBox>

2
src/widgets/panel/sidepanelwidget.cpp
View File

@@ -97,7 +97,7 @@ SidePanelWidget::SidePanelWidget(QPixmap* p, QWidget* parent)
// color wheel sigslots
// re-emit ColorWheel::colorSelected as SidePanelWidget::colorChanged
connect(m_colorWheel,
&color_widgets::ColorWheel::mouseReleaseOnColor,
&color_widgets::ColorWheel::colorSelected,
this,
&SidePanelWidget::colorChanged);
}

2
src/widgets/panel/sidepanelwidget.h
View File

@@ -3,7 +3,7 @@
#pragma once
#include "color_wheel.hpp"
#include "QtColorWidgets/color_wheel.hpp"
#include <QWidget>
class QVBoxLayout;