From 03ce9ee8f77a35969ab912790c02b107f3b30272 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Wed, 22 Apr 2020 23:38:51 +1000 Subject: [PATCH] moved color widgets from ColorDialog folder to a widget folder --- app/dialog/color/CMakeLists.txt | 6 ------ app/widget/colorwheel/CMakeLists.txt | 6 ++++++ app/{dialog/color => widget/colorwheel}/colorpreviewbox.cpp | 0 app/{dialog/color => widget/colorwheel}/colorpreviewbox.h | 0 .../color => widget/colorwheel}/colorspacechooser.cpp | 0 app/{dialog/color => widget/colorwheel}/colorspacechooser.h | 0 .../color => widget/colorwheel}/colorvalueswidget.cpp | 0 app/{dialog/color => widget/colorwheel}/colorvalueswidget.h | 0 8 files changed, 6 insertions(+), 6 deletions(-) rename app/{dialog/color => widget/colorwheel}/colorpreviewbox.cpp (100%) rename app/{dialog/color => widget/colorwheel}/colorpreviewbox.h (100%) rename app/{dialog/color => widget/colorwheel}/colorspacechooser.cpp (100%) rename app/{dialog/color => widget/colorwheel}/colorspacechooser.h (100%) rename app/{dialog/color => widget/colorwheel}/colorvalueswidget.cpp (100%) rename app/{dialog/color => widget/colorwheel}/colorvalueswidget.h (100%) diff --git a/app/dialog/color/CMakeLists.txt b/app/dialog/color/CMakeLists.txt index 661896880..f36cd6b5d 100644 --- a/app/dialog/color/CMakeLists.txt +++ b/app/dialog/color/CMakeLists.txt @@ -18,11 +18,5 @@ set(OLIVE_SOURCES ${OLIVE_SOURCES} dialog/color/colordialog.h dialog/color/colordialog.cpp - dialog/color/colorpreviewbox.h - dialog/color/colorpreviewbox.cpp - dialog/color/colorspacechooser.h - dialog/color/colorspacechooser.cpp - dialog/color/colorvalueswidget.h - dialog/color/colorvalueswidget.cpp PARENT_SCOPE ) diff --git a/app/widget/colorwheel/CMakeLists.txt b/app/widget/colorwheel/CMakeLists.txt index 6c9c3a784..508c7ce59 100644 --- a/app/widget/colorwheel/CMakeLists.txt +++ b/app/widget/colorwheel/CMakeLists.txt @@ -18,8 +18,14 @@ set(OLIVE_SOURCES ${OLIVE_SOURCES} widget/colorwheel/colorgradientwidget.h widget/colorwheel/colorgradientwidget.cpp + widget/colorwheel/colorpreviewbox.h + widget/colorwheel/colorpreviewbox.cpp + widget/colorwheel/colorspacechooser.h + widget/colorwheel/colorspacechooser.cpp widget/colorwheel/colorswatchwidget.h widget/colorwheel/colorswatchwidget.cpp + widget/colorwheel/colorvalueswidget.h + widget/colorwheel/colorvalueswidget.cpp widget/colorwheel/colorwheelwidget.h widget/colorwheel/colorwheelwidget.cpp PARENT_SCOPE diff --git a/app/dialog/color/colorpreviewbox.cpp b/app/widget/colorwheel/colorpreviewbox.cpp similarity index 100% rename from app/dialog/color/colorpreviewbox.cpp rename to app/widget/colorwheel/colorpreviewbox.cpp diff --git a/app/dialog/color/colorpreviewbox.h b/app/widget/colorwheel/colorpreviewbox.h similarity index 100% rename from app/dialog/color/colorpreviewbox.h rename to app/widget/colorwheel/colorpreviewbox.h diff --git a/app/dialog/color/colorspacechooser.cpp b/app/widget/colorwheel/colorspacechooser.cpp similarity index 100% rename from app/dialog/color/colorspacechooser.cpp rename to app/widget/colorwheel/colorspacechooser.cpp diff --git a/app/dialog/color/colorspacechooser.h b/app/widget/colorwheel/colorspacechooser.h similarity index 100% rename from app/dialog/color/colorspacechooser.h rename to app/widget/colorwheel/colorspacechooser.h diff --git a/app/dialog/color/colorvalueswidget.cpp b/app/widget/colorwheel/colorvalueswidget.cpp similarity index 100% rename from app/dialog/color/colorvalueswidget.cpp rename to app/widget/colorwheel/colorvalueswidget.cpp diff --git a/app/dialog/color/colorvalueswidget.h b/app/widget/colorwheel/colorvalueswidget.h similarity index 100% rename from app/dialog/color/colorvalueswidget.h rename to app/widget/colorwheel/colorvalueswidget.h