Skip to content

C
core
Kaydet (Commit) 6522f737 authored tarafından Christian Lippka's avatar Christian Lippka Kaydeden (comit) Jan Holesovsky
Dosyalara gözat
Seçenekler

New color picker dialog for all applications. 

Replaces the old color picker with a new one.
Demo: http://www.youtube.com/watch?v=rPu6EmIxkIM
üst 3a93807b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 191 additions and 2 deletions
cui/AllLangResTarget_cui.mk
Dosyayı görüntüle @ 6522f737
......@@ -49,6 +49,7 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/customize/selector.src \
cui/source/dialogs/about.src \
cui/source/dialogs/charmap.src \
cui/source/dialogs/colorpicker.src \
cui/source/dialogs/commonlingui.src \
cui/source/dialogs/cuiimapdlg.src \
cui/source/dialogs/dlgname.src \
......
cui/Library_cui.mk
Dosyayı görüntüle @ 6522f737
......@@ -27,6 +27,8 @@
$(eval $(call gb_Library_Library,cui))
$(eval $(call gb_Library_set_componentfile,cui,cui/util/cui))
$(eval $(call gb_Library_add_precompiled_header,cui,$(SRCDIR)/cui/inc/pch/precompiled_cui))
$(eval $(call gb_Library_set_include,cui,\
......@@ -59,8 +61,10 @@ $(eval $(call gb_Library_add_linked_libs,cui,\
jvmfwk \
lng \
sal \
sax \
sb \
sfx \
sot \
svl \
svt \
svxcore \
......@@ -88,6 +92,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/customize/macropg \
cui/source/customize/selector \
cui/source/dialogs/about \
cui/source/dialogs/colorpicker \
cui/source/dialogs/commonlingui \
cui/source/dialogs/cuicharmap \
cui/source/dialogs/cuifmsearch \
......@@ -200,6 +205,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/tabpages/tplneend \
cui/source/tabpages/tpshadow \
cui/source/tabpages/transfrm \
cui/source/uno/services \
))
ifeq ($(GUI),WNT)
......
cui/prj/build.lst
Dosyayı görüntüle @ 6522f737
cu cui : svx NULL
cu cui : svx sax NULL
cu cui usr1 - all cui_mkout NULL
cu cui\prj nmake - all cui_prj NULL
cui/source/dialogs/colorpicker.cxx 0 → 100644
Dosyayı görüntüle @ 6522f737
This diff is collapsed.
cui/source/dialogs/colorpicker.hrc 0 → 100644
Dosyayı görüntüle @ 6522f737
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License or as specified alternatively below. You may obtain a copy of
* the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Initial Developer of the Original Code is
* Christian Lippka <cl@lippka.com>
* Portions created by the Initial Developer are Copyright (C) 2010 the
* Initial Developer. All Rights Reserved.
*
* Major Contributor(s):
*
*
* For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
* the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
* in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
* instead of those above.
*/
#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
cui/source/dialogs/colorpicker.src 0 → 100644
Dosyayı görüntüle @ 6522f737
This diff is collapsed.
cui/source/inc/cuires.hrc
Dosyayı görüntüle @ 6522f737
......@@ -430,4 +430,10 @@
#define RID_SVXSTR_EVENT_CALCULATE (RID_SVX_START + 1193)
#define RID_SVXSTR_EVENT_CONTENTCHANGED (RID_SVX_START + 1194)
#define RID_CUISTR_CONTROLS_CONTINUOUS (RID_SVX_START + 1195)
#define RID_CUISTR_CONTROLS_INVISIBLE (RID_SVX_START + 1196)
#define RID_CUISTR_CONTROLS_INSERTTABLE (RID_SVX_START + 1197)
#define RID_CUI_DIALOG_COLORPICKER (RID_SVX_START + 3)
#endif
cui/source/tabpages/tpcolor.cxx
Dosyayı görüntüle @ 6522f737
......@@ -634,6 +634,7 @@ IMPL_LINK( SvxColorTabPage, ClickWorkOnHdl_Impl, void *, EMPTYARG )
ConvertColorValues (aTmpColor, CM_RGB);
pColorDlg->SetColor (aTmpColor);
pColorDlg->SetMode( svtools::ColorPickerMode_MODIFY );
if( pColorDlg->Execute() == RET_OK )
{
......
cui/source/uno/services.cxx 0 → 100644
Dosyayı görüntüle @ 6522f737
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License or as specified alternatively below. You may obtain a copy of
* the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Initial Developer of the Original Code is
* Christian Lippka <cl@lippka.com>
* Portions created by the Initial Developer are Copyright (C) 2010 the
* Initial Developer. All Rights Reserved.
*
* Major Contributor(s):
*
*
* For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
* the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
* in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
* instead of those above.
*/
#include <com/sun/star/registry/XRegistryKey.hpp>
#include "sal/types.h"
#include "cppuhelper/factory.hxx"
#include <cppuhelper/implementationentry.hxx>
using rtl::OUString;
using namespace com::sun::star;
namespace cui {
extern rtl::OUString SAL_CALL ColorPicker_getImplementationName();
extern uno::Reference< uno::XInterface > SAL_CALL ColorPicker_createInstance( uno::Reference< uno::XComponentContext > const & ) SAL_THROW( (uno::Exception) );
extern uno::Sequence< rtl::OUString > SAL_CALL ColorPicker_getSupportedServiceNames() throw( uno::RuntimeException );
}
namespace
{
cppu::ImplementationEntry entries[] = {
{ &::cui::ColorPicker_createInstance, &::cui::ColorPicker_getImplementationName, &::cui::ColorPicker_getSupportedServiceNames, &cppu::createSingleComponentFactory, 0, 0 },
{ 0, 0, 0, 0, 0, 0 }
};
}
extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( char const * implName, void * serviceManager, void * registryKey)
{
return cppu::component_getFactoryHelper(implName, serviceManager, registryKey, entries);
}
extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment ( const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
cui/util/cui.component 0 → 100644
Dosyayı görüntüle @ 6522f737
<?xml version="1.0" encoding="UTF-8"?>
<!--
*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License or as specified alternatively below. You may obtain a copy of
* the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Initial Developer of the Original Code is
* Christian Lippka <cl@lippka.com>
* Portions created by the Initial Developer are Copyright (C) 2010 the
* Initial Developer. All Rights Reserved.
*
* Major Contributor(s):
*
*
* For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
* the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
* in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
* instead of those above.
* -->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.cui.ColorPicker">
<service name="com.sun.star.ui.dialogs.ColorPicker"/>
</implementation>
</component>
cui/util/cui.map
Dosyayı görüntüle @ 6522f737
UDK_3_0_0 {
global:
CreateDialogFactory;
CreateDialogFactory;
GetSpecialCharsForEdit;
component_getImplementationEnvironment;
component_getFactory;
local:
*;
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment