[Libreoffice-commits] core.git: 2 commits - svx/AllLangResTarget_svx.mk svx/source svx/uiconfig svx/UIConfig_svx.mk
Jan Holesovsky
kendy at suse.cz
Sun Jul 28 05:25:59 PDT 2013
svx/AllLangResTarget_svx.mk | 1
svx/UIConfig_svx.mk | 1
svx/source/sidebar/graphic/GraphicPropertyPanel.cxx | 47 --
svx/source/sidebar/graphic/GraphicPropertyPanel.hrc | 37 --
svx/source/sidebar/graphic/GraphicPropertyPanel.hxx | 33 -
svx/source/sidebar/graphic/GraphicPropertyPanel.src | 237 ------------
svx/uiconfig/ui/sidebargraphic.ui | 369 ++++++++++++++++++++
7 files changed, 393 insertions(+), 332 deletions(-)
New commits:
commit ed5251e19ee37cb65d4560534026f04ecb690a5c
Author: Jan Holesovsky <kendy at suse.cz>
Date: Sun Jul 28 08:20:56 2013 +0200
sidebar: Use GtkGrid, adjustments & mnemonic wdgts in SidebarGraphicPanel.
Change-Id: I1f06733e292986ed0136837ccd6e3a5ba48d07bd
diff --git a/svx/uiconfig/ui/sidebargraphic.ui b/svx/uiconfig/ui/sidebargraphic.ui
index 5b6453f..1403d30 100644
--- a/svx/uiconfig/ui/sidebargraphic.ui
+++ b/svx/uiconfig/ui/sidebargraphic.ui
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="0to100adjustment">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkGrid" id="GraphicPropertyPanel">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -14,180 +19,154 @@
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <property name="column_homogeneous">True</property>
<child>
- <object class="GtkBox" id="box3">
+ <object class="GtkLabel" id="brightnesslabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="brightnesslabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Brightness:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="contrastlabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">10</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Contrast:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Brightness:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">setbrightness:%</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="setbrightness:%">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Specify the luminance of the graphic.</property>
+ <property name="tooltip_text" translatable="yes">Specify the luminance of the graphic.</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">plusminus100adjustment</property>
+ <property name="climb_rate">1</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box4">
+ <object class="GtkLabel" id="contrastlabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_bottom">10</property>
- <child>
- <object class="GtkSpinButton" id="setbrightness:%">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_markup" translatable="yes">Specify the luminance of the graphic.</property>
- <property name="tooltip_text" translatable="yes">Specify the luminance of the graphic.</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="setcontrast:%">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_markup" translatable="yes">Specify the degree of difference between the lightest and darkest parts of the graphic.</property>
- <property name="tooltip_text" translatable="yes">Specify the degree of difference between the lightest and darkest parts of the graphic.</property>
- <property name="margin_left">10</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Contrast:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">setcontrast:%</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box5">
+ <object class="GtkSpinButton" id="setcontrast:%">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Specify the degree of difference between the lightest and darkest parts of the graphic.</property>
+ <property name="tooltip_text" translatable="yes">Specify the degree of difference between the lightest and darkest parts of the graphic.</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">plusminus100adjustment</property>
+ <property name="climb_rate">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="colorlmodelabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="colorlmodelabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Color _mode:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="transparencylabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">30</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Transparency:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Color _mode:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">setcolormode</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box6">
+ <object class="GtkComboBoxText" id="setcolormode">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_bottom">10</property>
- <child>
- <object class="GtkComboBoxText" id="setcolormode">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_right">10</property>
- <property name="wrap_width">1</property>
- <property name="row_span_column">0</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="settransparency:%">
- <property name="width_request">120</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_markup" translatable="yes">Specify the percentage of transparency; 0% is fully opaque and 100% is fully transparent.</property>
- <property name="tooltip_text" translatable="yes">Specify the percentage of transparency; 0% is fully opaque and 100% is fully transparent.</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="wrap_width">1</property>
+ <property name="row_span_column">0</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box7">
+ <object class="GtkLabel" id="transparencylabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Transparency:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">settransparency:%</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="settransparency:%">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Specify the percentage of transparency; 0% is fully opaque and 100% is fully transparent.</property>
+ <property name="tooltip_text" translatable="yes">Specify the percentage of transparency; 0% is fully opaque and 100% is fully transparent.</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">0to100adjustment</property>
+ <property name="climb_rate">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
@@ -204,9 +183,13 @@
<object class="GtkSpinButton" id="setred:%">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Red</property>
<property name="tooltip_text" translatable="yes">Red</property>
<property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">plusminus100adjustment</property>
+ <property name="climb_rate">1</property>
</object>
<packing>
<property name="expand">True</property>
@@ -214,45 +197,63 @@
<property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">10</property>
<property name="pixbuf">svx/res/symphony/AdjustColorGreen_16x16.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="setgreen:%">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Green</property>
<property name="tooltip_text" translatable="yes">Green</property>
<property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">plusminus100adjustment</property>
+ <property name="climb_rate">1</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
- <property name="position">3</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box8">
+ <object class="GtkBox" id="box11">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
@@ -269,9 +270,13 @@
<object class="GtkSpinButton" id="setblue:%">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Blue</property>
<property name="tooltip_text" translatable="yes">Blue</property>
<property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">plusminus100adjustment</property>
+ <property name="climb_rate">1</property>
</object>
<packing>
<property name="expand">True</property>
@@ -279,40 +284,57 @@
<property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">10</property>
<property name="pixbuf">svx/res/symphony/AdjustColorGamma_16x16.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="setgamma:0">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Specify the gamma value that affects the brightness of the midtone values.</property>
<property name="tooltip_text" translatable="yes">Specify the gamma value that affects the brightness of the midtone values.</property>
<property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">gammaadjustment</property>
+ <property name="climb_rate">0.10000000000000001</property>
<property name="digits">2</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
- <property name="position">3</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">5</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
@@ -331,4 +353,17 @@
</packing>
</child>
</object>
+ <object class="GtkAdjustment" id="gammaadjustment">
+ <property name="lower">0.01</property>
+ <property name="upper">10</property>
+ <property name="value">1</property>
+ <property name="step_increment">0.10000000000000001</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkAdjustment" id="plusminus100adjustment">
+ <property name="lower">-100</property>
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
</interface>
commit 14b0715b02b7711db0c65c79bf48ed4dca1e515d
Author: Prashant Pandey <prashant3.yishu at gmail.com>
Date: Tue Jul 16 23:51:35 2013 +0530
sidebar: SidebarGraphicPanel conversion to .ui
Change-Id: Iac55960a2f0fd586961abc5cbf239e06a97e088c
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index 2adb6dc..f2674d1 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -70,7 +70,6 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\
svx/source/items/svxitems.src \
svx/source/sidebar/EmptyPanel.src \
svx/source/sidebar/area/AreaPropertyPanel.src \
- svx/source/sidebar/graphic/GraphicPropertyPanel.src \
svx/source/sidebar/line/LinePropertyPanel.src \
svx/source/sidebar/text/TextPropertyPanel.src \
svx/source/sidebar/paragraph/ParaPropertyPanel.src \
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 99feed8..7b98a08 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/redlinefilterpage \
svx/uiconfig/ui/redlineviewpage \
svx/uiconfig/ui/sidebararea \
+ svx/uiconfig/ui/sidebargraphic \
svx/uiconfig/ui/sidebarinsert \
svx/uiconfig/ui/sidebarline \
svx/uiconfig/ui/sidebarparagraph \
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index 04bdbf5..663fa30 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -19,7 +19,6 @@
#include <sfx2/sidebar/Theme.hxx>
#include <sfx2/sidebar/ControlFactory.hxx>
#include <GraphicPropertyPanel.hxx>
-#include <GraphicPropertyPanel.hrc>
#include <svx/dialogs.hrc>
#include <svx/dialmgr.hxx>
#include <vcl/field.hxx>
@@ -46,21 +45,7 @@ GraphicPropertyPanel::GraphicPropertyPanel(
Window* pParent,
const cssu::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
-: Control(
- pParent,
- SVX_RES(RID_SIDEBAR_GRAPHIC_PANEL)),
- mpFtBrightness(new FixedText(this, SVX_RES(FT_BRIGHTNESS))),
- mpMtrBrightness(new MetricField(this, SVX_RES(MTR_BRIGHTNESS))),
- mpFtContrast(new FixedText(this, SVX_RES(FT_CONTRAST))),
- mpMtrContrast(new MetricField(this, SVX_RES(MTR_CONTRAST))),
- mpFtColorMode(new FixedText(this, SVX_RES(FT_COLOR_MODE))),
- mpLBColorMode(new ListBox(this, SVX_RES(LB_COLOR_MODE))),
- mpFtTrans(new FixedText(this, SVX_RES(FT_TRANSPARENT))),
- mpMtrTrans(new MetricField(this, SVX_RES(MTR_TRANSPARENT))),
- mpMtrRed(new MetricField(this, SVX_RES(MF_RED))),
- mpMtrGreen(new MetricField(this, SVX_RES(MF_GREEN))),
- mpMtrBlue(new MetricField(this, SVX_RES(MF_BLUE))),
- mpMtrGamma(new MetricField(this, SVX_RES(MF_GAMMA))),
+: PanelLayout(pParent, "GraphicPropertyPanel", "svx/ui/sidebargraphic.ui", rxFrame),
maBrightControl(SID_ATTR_GRAF_LUMINANCE, *pBindings, *this),
maContrastControl(SID_ATTR_GRAF_CONTRAST, *pBindings, *this),
maTransparenceControl(SID_ATTR_GRAF_TRANSPARENCE, *pBindings, *this),
@@ -69,15 +54,18 @@ GraphicPropertyPanel::GraphicPropertyPanel(
maBlueControl(SID_ATTR_GRAF_BLUE, *pBindings, *this),
maGammaControl(SID_ATTR_GRAF_GAMMA, *pBindings, *this),
maModeControl(SID_ATTR_GRAF_MODE, *pBindings, *this),
- maImgRed(this, SVX_RES(IMG_RED)),
- maImgGreen(this, SVX_RES(IMG_GREEN)),
- maImgBlue(this, SVX_RES(IMG_BLUE)),
- maImgGamma(this, SVX_RES(IMG_GAMMA)),
mxFrame(rxFrame),
mpBindings(pBindings)
{
+ get(mpMtrBrightness, "setbrightness");
+ get(mpMtrContrast, "setcontrast");
+ get(mpLBColorMode, "setcolormode");
+ get(mpMtrTrans, "settransparency");
+ get(mpMtrRed, "setred");
+ get(mpMtrGreen, "setgreen");
+ get(mpMtrBlue, "setblue");
+ get(mpMtrGamma, "setgamma");
Initialize();
- FreeResource();
}
//////////////////////////////////////////////////////////////////////////////
@@ -90,11 +78,6 @@ GraphicPropertyPanel::~GraphicPropertyPanel()
void GraphicPropertyPanel::Initialize()
{
- mpFtBrightness->SetBackground(Wallpaper());
- mpFtContrast->SetBackground(Wallpaper());
- mpFtColorMode->SetBackground(Wallpaper());
- mpFtTrans->SetBackground(Wallpaper());
-
mpMtrBrightness->SetModifyHdl( LINK( this, GraphicPropertyPanel, ModifyBrightnessHdl ) );
mpMtrBrightness->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Brightness")));
mpMtrContrast->SetModifyHdl( LINK( this, GraphicPropertyPanel, ModifyContrastHdl ) );
@@ -118,14 +101,10 @@ void GraphicPropertyPanel::Initialize()
mpMtrBlue->SetAccessibleName(mpMtrBlue->GetQuickHelpText());
mpMtrGamma->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Gamma value")));
- mpMtrRed->SetAccessibleRelationLabeledBy(mpMtrRed.get());
- mpMtrGreen->SetAccessibleRelationLabeledBy(mpMtrGreen.get());
- mpMtrBlue->SetAccessibleRelationLabeledBy(mpMtrBlue.get());
- mpMtrGamma->SetAccessibleRelationLabeledBy(mpMtrGamma.get());
- mpMtrBrightness->SetAccessibleRelationLabeledBy(mpFtBrightness.get());
- mpMtrContrast->SetAccessibleRelationLabeledBy(mpFtContrast.get());
- mpMtrTrans->SetAccessibleRelationLabeledBy(mpFtTrans.get());
- mpLBColorMode->SetAccessibleRelationLabeledBy(mpFtColorMode.get());
+ mpMtrRed->SetAccessibleRelationLabeledBy(mpMtrRed);
+ mpMtrGreen->SetAccessibleRelationLabeledBy(mpMtrGreen);
+ mpMtrBlue->SetAccessibleRelationLabeledBy(mpMtrBlue);
+ mpMtrGamma->SetAccessibleRelationLabeledBy(mpMtrGamma);
// Fix left position of some controls that may be wrong due to
// rounding errors.
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hrc b/svx/source/sidebar/graphic/GraphicPropertyPanel.hrc
deleted file mode 100644
index 16ab734..0000000
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hrc
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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 .
- */
-// RID_SIDEBAR_GRAPHIC_PANEL--------------------------------------------------------------
-#define FT_BRIGHTNESS 1
-#define MTR_BRIGHTNESS 2
-#define FT_CONTRAST 3
-#define MTR_CONTRAST 4
-#define FT_TRANSPARENT 5
-#define MTR_TRANSPARENT 6
-#define FT_COLOR_MODE 10
-#define LB_COLOR_MODE 11
-#define MBOX_WIDTH 50
-
-#define MF_RED 21
-#define MF_GREEN 22
-#define MF_BLUE 23
-#define MF_GAMMA 24
-#define IMG_RED 25
-#define IMG_GREEN 26
-#define IMG_BLUE 27
-#define IMG_GAMMA 28
-
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
index d5e0c09..2ad4d41 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
@@ -21,6 +21,7 @@
#include <vcl/ctrl.hxx>
#include <sfx2/sidebar/SidebarPanelBase.hxx>
#include <sfx2/sidebar/ControllerItem.hxx>
+#include <svx/sidebar/PanelLayout.hxx>
#include <vcl/fixed.hxx>
#include <boost/scoped_ptr.hpp>
@@ -33,7 +34,7 @@ class FloatingWindow;
namespace svx { namespace sidebar {
class GraphicPropertyPanel
-: public Control,
+: public PanelLayout,
public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
{
public:
@@ -55,18 +56,14 @@ public:
private:
//ui controls
- ::boost::scoped_ptr< FixedText > mpFtBrightness;
- ::boost::scoped_ptr< MetricField > mpMtrBrightness;
- ::boost::scoped_ptr< FixedText > mpFtContrast;
- ::boost::scoped_ptr< MetricField > mpMtrContrast;
- ::boost::scoped_ptr< FixedText > mpFtColorMode;
- ::boost::scoped_ptr< ListBox > mpLBColorMode;
- ::boost::scoped_ptr< FixedText > mpFtTrans;
- ::boost::scoped_ptr< MetricField > mpMtrTrans;
- ::boost::scoped_ptr< MetricField > mpMtrRed;
- ::boost::scoped_ptr< MetricField > mpMtrGreen;
- ::boost::scoped_ptr< MetricField > mpMtrBlue;
- ::boost::scoped_ptr< MetricField > mpMtrGamma;
+ MetricField* mpMtrBrightness;
+ MetricField* mpMtrContrast;
+ ListBox* mpLBColorMode;
+ MetricField* mpMtrTrans;
+ MetricField* mpMtrRed;
+ MetricField* mpMtrGreen;
+ MetricField* mpMtrBlue;
+ MetricField* mpMtrGamma;
::sfx2::sidebar::ControllerItem maBrightControl;
::sfx2::sidebar::ControllerItem maContrastControl;
@@ -77,16 +74,6 @@ private:
::sfx2::sidebar::ControllerItem maGammaControl;
::sfx2::sidebar::ControllerItem maModeControl;
- Image maImgNormal;
- Image maImgBW;
- Image maImgGray;
- Image maImgWater;
-
- FixedImage maImgRed;
- FixedImage maImgGreen;
- FixedImage maImgBlue;
- FixedImage maImgGamma;
-
String msNormal;
String msBW;
String msGray;
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.src b/svx/source/sidebar/graphic/GraphicPropertyPanel.src
deleted file mode 100644
index 209d463..0000000
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.src
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * 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 .
- */
-#include "GraphicPropertyPanel.hrc"
-#include <sfx2/sidebar/ResourceDefinitions.hrc>
-#include <svx/dialogs.hrc>
-#include "helpid.hrc"
-
-#define X0 SECTIONPAGE_MARGIN_HORIZONTAL
-#define X1 X0 + 10
-#define X2 X0 + MBOX_WIDTH + CONTROL_SPACING_HORIZONTAL
-#define X3 X2 + 10
-
-#define Y0 SECTIONPAGE_MARGIN_VERTICAL_TOP
-#define Y1 Y0 + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL
-#define Y2 Y1 + MBOX_HEIGHT + CONTROL_SPACING_VERTICAL
-#define Y3 Y2 + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL
-#define Y4 Y3 + MBOX_HEIGHT + CONTROL_SPACING_VERTICAL
-#define Y5 Y4 + MBOX_HEIGHT + CONTROL_SPACING_VERTICAL
-
-#define PAGE_HEIGHT Y5 + MBOX_HEIGHT + SECTIONPAGE_MARGIN_VERTICAL_BOT
-
-
-
-Control RID_SIDEBAR_GRAPHIC_PANEL
-{
- OutputSize = TRUE;
- DialogControl = TRUE;
- Border = FALSE;
-
- Size = MAP_APPFONT( PROPERTYPAGE_WIDTH, PAGE_HEIGHT );
- HelpID = HID_PROPERTYPANEL_GRAPHIC_SECTION ;
- Text = "Graphic";
-
- FixedText FT_BRIGHTNESS
- {
- Pos = MAP_APPFONT (X0, Y0);
- Size = MAP_APPFONT ( MBOX_WIDTH , TEXT_HEIGHT ) ;
- Text [ en-US ] = "~Brightness:";
- };
- MetricField MTR_BRIGHTNESS
- {
- Border = TRUE ;
- Pos = MAP_APPFONT (X0, Y1);
- Size = MAP_APPFONT ( MBOX_WIDTH , MBOX_HEIGHT ) ;
- HelpID = HID_PROPERTY_PANEL_GRAPHIC_MTR_BRIGHT;
- QuickHelpText [ en-US ] = "Specify the luminance of the graphic.";
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 100 ;
- Minimum = -100 ;
- StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
- SpinSize = 1 ;
- };
- FixedText FT_CONTRAST
- {
- Pos = MAP_APPFONT (X2, Y0);
- Size = MAP_APPFONT ( MBOX_WIDTH, TEXT_HEIGHT ) ;
- Text [ en-US ] = "~Contrast:";
- };
- MetricField MTR_CONTRAST
- {
- Border = TRUE ;
- Pos = MAP_APPFONT (X2, Y1);
- Size = MAP_APPFONT ( MBOX_WIDTH , MBOX_HEIGHT ) ;
- HelpID = HID_PROPERTY_PANEL_GRAPHIC_MTR_CONTRAST;
- QuickHelpText [ en-US ] = "Specify the degree of difference between the lightest and darkest parts of the graphic.";
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 100 ;
- Minimum = -100 ;
- StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
- SpinSize = 1 ;
- };
- FixedText FT_COLOR_MODE
- {
- Pos = MAP_APPFONT (X0, Y2);
- Size = MAP_APPFONT ( MBOX_WIDTH, TEXT_HEIGHT ) ;
- Text [ en-US ] = "Color ~mode:";
- };
- ListBox LB_COLOR_MODE
- {
- Border = TRUE ;
- Pos = MAP_APPFONT (X0 , Y3) ;
- Size = MAP_APPFONT ( MBOX_WIDTH , 100 ) ;
- HelpID = HID_PROPERTY_PANEL_GRAPHIC_LB_COLORMODE;
- QuickHelpText [ en-US ] = "Select the color mode of the graphic.";
- TabStop = TRUE ;
- DropDown = TRUE ;
- };
- FixedText FT_TRANSPARENT
- {
- Pos = MAP_APPFONT (X2, Y2);
- Size = MAP_APPFONT ( MBOX_WIDTH , TEXT_HEIGHT ) ;
- Text [ en-US ] = "~Transparency:";
- };
- MetricField MTR_TRANSPARENT
- {
- Border = TRUE ;
- Pos = MAP_APPFONT (X2, Y3) ;
- Size = MAP_APPFONT ( MBOX_WIDTH ,MBOX_HEIGHT ) ;
- HelpID = HID_PROPERTY_PANEL_GRAPHIC_MTR_TRANSP;
- QuickHelpText [ en-US ] = "Specify the percentage of transparency; 0% is fully opaque and 100% is fully transparent.";
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 100 ;
- StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
- SpinSize = 1 ;
- };
- MetricField MF_RED
- {
- Border = TRUE ;
- Pos = MAP_APPFONT (X1, Y4) ;
- Size = MAP_APPFONT ( MBOX_WIDTH - 10,MBOX_HEIGHT ) ;
- HelpID = HID_PROPERTY_PANEL_GRAPHIC_MTR_RED;
- QuickHelpText [ en-US ] = "Red";
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 100 ;
- Minimum = -100 ;
- StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
- SpinSize = 1 ;
- };
- MetricField MF_GREEN
- {
- Border = TRUE ;
- Pos = MAP_APPFONT (X3, Y4) ;
- Size = MAP_APPFONT ( MBOX_WIDTH - 10 ,MBOX_HEIGHT ) ;
- HelpID = HID_PROPERTY_PANEL_GRAPHIC_MTR_GREEN;
- QuickHelpText [ en-US ] = "Green";
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 100 ;
- Minimum = -100 ;
- StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
- SpinSize = 1 ;
- };
- MetricField MF_BLUE
- {
- Border = TRUE ;
- Pos = MAP_APPFONT (X1, Y5) ;
- Size = MAP_APPFONT ( MBOX_WIDTH - 10 ,MBOX_HEIGHT ) ;
- HelpID = HID_PROPERTY_PANEL_GRAPHIC_MTR_BLUE;
- QuickHelpText [ en-US ] = "Blue";
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 100 ;
- Minimum = -100 ;
- StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
- SpinSize = 1 ;
- };
- MetricField MF_GAMMA
- {
- Border = TRUE ;
- Pos = MAP_APPFONT (X3, Y5) ;
- Size = MAP_APPFONT ( MBOX_WIDTH - 10 ,MBOX_HEIGHT ) ;
- HelpID = HID_PROPERTY_PANEL_GRAPHIC_MTR_GAMMA;
- QuickHelpText [ en-US ] = "Specify the gamma value that affects the brightness of the midtone values.";
- TabStop = TRUE;
- Repeat = TRUE;
- Spin = TRUE;
- Minimum = 10;
- Maximum = 1000;
- DecimalDigits = 2;
- SpinSize = 10;
- };
- FixedImage IMG_RED
- {
- Pos = MAP_APPFONT(X0, Y4);
- Size = MAP_APPFONT( 10, 12 );
- Fixed = Image
- {
- ImageBitmap = Bitmap { File = "symphony/AdjustColorRed_16x16.png"; };
- };
- };
- FixedImage IMG_GREEN
- {
- Pos = MAP_APPFONT(X2, Y4);
- Size = MAP_APPFONT( 10, 12 );
- Fixed = Image
- {
- ImageBitmap = Bitmap { File = "symphony/AdjustColorGreen_16x16.png"; };
- };
- };
- FixedImage IMG_BLUE
- {
- Pos = MAP_APPFONT(X0, Y5);
- Size = MAP_APPFONT( 10, 12 );
- Fixed = Image
- {
- ImageBitmap = Bitmap { File = "symphony/AdjustColorBlue_16x16.png"; };
- };
- };
- FixedImage IMG_GAMMA
- {
- Pos = MAP_APPFONT(X2, Y5);
- Size = MAP_APPFONT( 10, 12 );
- Fixed = Image
- {
- ImageBitmap = Bitmap { File = "symphony/AdjustColorGamma_16x16.png"; };
- };
- };
-};
-
-// eof
diff --git a/svx/uiconfig/ui/sidebargraphic.ui b/svx/uiconfig/ui/sidebargraphic.ui
new file mode 100644
index 0000000..5b6453f
--- /dev/null
+++ b/svx/uiconfig/ui/sidebargraphic.ui
@@ -0,0 +1,334 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkGrid" id="GraphicPropertyPanel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_homogeneous">True</property>
+ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkBox" id="box3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="brightnesslabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Brightness:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="contrastlabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">10</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Contrast:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_bottom">10</property>
+ <child>
+ <object class="GtkSpinButton" id="setbrightness:%">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_markup" translatable="yes">Specify the luminance of the graphic.</property>
+ <property name="tooltip_text" translatable="yes">Specify the luminance of the graphic.</property>
+ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="setcontrast:%">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_markup" translatable="yes">Specify the degree of difference between the lightest and darkest parts of the graphic.</property>
+ <property name="tooltip_text" translatable="yes">Specify the degree of difference between the lightest and darkest parts of the graphic.</property>
+ <property name="margin_left">10</property>
+ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="colorlmodelabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Color _mode:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="transparencylabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">30</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Transparency:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_bottom">10</property>
+ <child>
+ <object class="GtkComboBoxText" id="setcolormode">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_right">10</property>
+ <property name="wrap_width">1</property>
+ <property name="row_span_column">0</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="settransparency:%">
+ <property name="width_request">120</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_markup" translatable="yes">Specify the percentage of transparency; 0% is fully opaque and 100% is fully transparent.</property>
+ <property name="tooltip_text" translatable="yes">Specify the percentage of transparency; 0% is fully opaque and 100% is fully transparent.</property>
+ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">svx/res/symphony/AdjustColorRed_16x16.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="setred:%">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_markup" translatable="yes">Red</property>
+ <property name="tooltip_text" translatable="yes">Red</property>
+ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">10</property>
+ <property name="pixbuf">svx/res/symphony/AdjustColorGreen_16x16.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="setgreen:%">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_markup" translatable="yes">Green</property>
+ <property name="tooltip_text" translatable="yes">Green</property>
+ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImage" id="image3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">svx/res/symphony/AdjustColorBlue_16x16.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="setblue:%">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_markup" translatable="yes">Blue</property>
+ <property name="tooltip_text" translatable="yes">Blue</property>
+ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">10</property>
+ <property name="pixbuf">svx/res/symphony/AdjustColorGamma_16x16.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="setgamma:0">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_markup" translatable="yes">Specify the gamma value that affects the brightness of the midtone values.</property>
+ <property name="tooltip_text" translatable="yes">Specify the gamma value that affects the brightness of the midtone values.</property>
+ <property name="invisible_char">•</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list