[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [krita/langkamp/stopgradienteditor] libs/ui: Merge remote-tracking branch 'origin/master' into langk
From:       Sven Langkamp <sven.langkamp () gmail ! com>
Date:       2016-09-11 15:19:13
Message-ID: E1bj6XJ-0004Hv-Bu () code ! kde ! org
[Download RAW message or body]

Git commit fc8f4e6c27c170d62d42e4682a97451bb42c0031 by Sven Langkamp.
Committed on 11/09/2016 at 15:18.
Pushed by langkamp into branch 'langkamp/stopgradienteditor'.

Merge remote-tracking branch 'origin/master' into langkamp/stopgradientedit=
or

M  +8    -1    libs/ui/CMakeLists.txt

http://commits.kde.org/krita/fc8f4e6c27c170d62d42e4682a97451bb42c0031

diff --cc libs/ui/CMakeLists.txt
index 29d2eda,76df00d..0d5f3f1
--- a/libs/ui/CMakeLists.txt
+++ b/libs/ui/CMakeLists.txt
@@@ -255,8 -254,12 +256,13 @@@ set(kritaui_LIB_SRC
      widgets/kis_color_label_selector_widget.cpp
      widgets/kis_color_filter_combo.cpp
      widgets/kis_elided_label.cpp
 +    widgets/kis_stopgradient_slider_widget.cpp
- =

+     widgets/kis_spinbox_color_selector.cpp
+     widgets/kis_screen_color_picker.cpp
+     widgets/kis_visual_color_selector.cpp
+     widgets/KoDualColorButton.cpp
+     widgets/kis_color_input.cpp
+     widgets/kis_color_button.cpp
      input/kis_input_manager.cpp
      input/kis_input_manager_p.cpp
      input/kis_extended_modifiers_mapper.cpp
@@@ -457,8 -460,8 +463,9 @@@ ki18n_wrap_ui(kritaui_LIB_SRC
      forms/wdgimportimagesequence.ui
      forms/KisDetailsPaneBase.ui
      forms/KisOpenPaneBase.ui
 +    forms/wdgstopgradienteditor.ui
      brushhud/kis_dlg_brush_hud_config.ui
+     forms/wdgdlginternalcolorselector.ui
      dialogs/kis_delayed_save_dialog.ui
      input/config/kis_input_configuration_page.ui
      input/config/kis_edit_profiles_dialog.ui
[prev in list] [next in list] [prev in thread] [next in thread]