Convert RID_CUI_DIALOG_COLORPICKER to .ui

Conflicts:
	extras/source/glade/libreoffice-catalog.xml.in

Change-Id: I161681859c924cc97afa9886b80005e70fa2a87c
Reviewed-on: https://gerrit.libreoffice.org/10210Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

cui/AllLangResTarget_cui.mk

@@ -26,7 +26,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
     cui/source/customize/acccfg.src \
     cui/source/customize/cfg.src \
     cui/source/customize/macropg.src \
-    cui/source/dialogs/colorpicker.src \
     cui/source/dialogs/commonlingui.src \
     cui/source/dialogs/cuires.src \
     cui/source/dialogs/fmsearch.src \

cui/UIConfig_cui.mk

@@ -36,9 +36,12 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/cellalignment \
 	cui/uiconfig/ui/certdialog \
 	cui/uiconfig/ui/charnamepage \
+	cui/uiconfig/ui/colorconfigwin \
 	cui/uiconfig/ui/colorpage \
+	cui/uiconfig/ui/colorpickerdialog \
 	cui/uiconfig/ui/comment \
 	cui/uiconfig/ui/connectortabpage \
+	cui/uiconfig/ui/connpooloptions \
 	cui/uiconfig/ui/croppage \
 	cui/uiconfig/ui/cuiimapdlg \
 	cui/uiconfig/ui/databaselinkdialog \
@@ -51,8 +54,6 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/formatnumberdialog \
 	cui/uiconfig/ui/fmsearchdialog \
 	cui/uiconfig/ui/gradientpage \
-	cui/uiconfig/ui/colorconfigwin \
-	cui/uiconfig/ui/connpooloptions \
 	cui/uiconfig/ui/customizedialog \
 	cui/uiconfig/ui/dbregisterpage \
 	cui/uiconfig/ui/distributiondialog \

cui/source/dialogs/colorpicker.hrc

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _CUI_COLORPICKER_HRC_
-#define _CUI_COLORPICKER_HRC_
-
-#include <cuires.hrc>
-
-#define FT_BOTTOMLINE   1
-#define BTN_OK          2
-#define BTN_CANCEL      3
-#define BTN_HELP        4
-
-#define CT_COLORFIELD   5
-#define CT_COLORSLIDER  6
-#define CT_PREVIEW      7
-#define CT_PREVIOUS     8
-
-#define FL_RGB          9
-#define CT_RED          10
-#define CT_GREEN        11
-#define CT_BLUE         12
-#define CT_HEX          13
-
-#define FL_HSB          14
-#define CT_HUE          15
-#define CT_SATURATION   16
-#define CT_BRIGHTNESS   17
-
-#define FL_CMYK         18
-#define CT_CYAN         19
-#define CT_MAGENTA      20
-#define CT_YELLOW       21
-#define CT_KEY          22
-
-#define PB_PICKER       23
-
-#define CT_LEFT_SLIDER  24
-#define CT_RIGHT_SLIDER 25
-
-#define CT_SLIDERIMG    26
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

cui/source/inc/cuires.hrc

@@ -28,7 +28,6 @@
 // RID_SVX_START + 0 unused
 #define RID_SVX_MSGBOX_OPTIONS_RESTART      (RID_SVX_START + 1)
 #define RID_SVX_MSGBOX_LANGUAGE_RESTART     (RID_SVX_START + 2)
-#define RID_CUI_DIALOG_COLORPICKER          (RID_SVX_START + 3)
 
 #define RID_CUIIMG_HARDDISK                 (RID_SVX_START + 4)
 #define RID_CUIIMG_LIB                      (RID_SVX_START + 5)

extras/source/glade/libreoffice-catalog.xml.in

@@ -39,6 +39,9 @@
     <glade-widget-class title="Spelling View" name="cuilo-SentenceEditWindow"
                         generic-name="SentenceEditWindow" parent="GtkTextView"
                         icon-name="widget-gtk-textview"/>
+    <glade-widget-class title="Hex Color Control" name="cuilo-HexColorControl"
+                        generic-name="Hex Color Control" parent="GtkEntry"
+                        icon-name="widget-gtk-textentry"/>
     <glade-widget-class title="Thesaurus Edit" name="cuilo-ReplaceEdit"
                         generic-name="ReplaceEdit" parent="GtkEntry"
                         icon-name="widget-gtk-textentry"/>
@@ -286,6 +289,15 @@
     <glade-widget-class title="Graphic Preview" name="cuilo-GraphicPreviewWindow"
                         generic-name="Graphic Preview Window" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>
+    <glade-widget-class title="Color Field Control" name="cuilo-ColorFieldControl"
+                        generic-name="Color Field Control" parent="GtkDrawingArea"
+                        icon-name="widget-gtk-drawingarea"/>
+    <glade-widget-class title="Color Slider Control" name="cuilo-ColorSliderControl"
+                        generic-name="Color Slider Control" parent="GtkDrawingArea"
+                        icon-name="widget-gtk-drawingarea"/>
+    <glade-widget-class title="Color Preview Control" name="cuilo-ColorPreviewControl"
+                        generic-name="Color Preview Control" parent="GtkDrawingArea"
+                        icon-name="widget-gtk-drawingarea"/>
     <glade-widget-class title="Html Attribute Preview" name="sduilo-SdHtmlAttrPreview"
                         generic-name="Html Attribute Preview" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>