cui/UIConfig_cui.mk | 1
cui/source/inc/cuires.hrc | 1
cui/source/options/optchart.cxx | 10 +++----
cui/source/options/optchart.src | 7 -----
cui/uiconfig/ui/colorpage.ui | 8 ++---
cui/uiconfig/ui/querydeletechartcolordialog.ui | 35 +++++++++++++++++++++++++
6 files changed, 46 insertions(+), 16 deletions(-)
New commits:
commit d2118b08463e60b96244165f4671a7249e06efff
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Jul 13 14:01:18 2013 +0100
convert chart color QueryBox to .ui
Change-Id: Idc514afb9b4e5e2404500d3ad81a4e4203600218
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index e0cff23..4939247 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -72,6 +72,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/picknumberingpage \
cui/uiconfig/ui/pickoutlinepage \
cui/uiconfig/ui/positionpage \
+ cui/uiconfig/ui/querydeletechartcolordialog \
cui/uiconfig/ui/scriptorganizer \
cui/uiconfig/ui/securityoptionsdialog \
cui/uiconfig/ui/select_persona_dialog \
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 16b6ce5..a79c503 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -158,7 +158,6 @@
#define RID_SVXPAGE_ACCESSIBILITYCONFIG (RID_SVX_START + 250)
#define RID_SVXPAGE_ASIAN_LAYOUT (RID_SVX_START + 246)
#define RID_OPTPAGE_CHART_DEFCOLORS (RID_SVX_START + 299)
-#define RID_OPTQB_COLOR_CHART_DELETE (RID_SVX_START + 296)
#define RID_OPTSTR_COLOR_CHART_DELETE (RID_SVX_START + 289)
#define RID_SVXPAGE_PERSONALIZATION (RID_SVX_START + 247)
#define RID_SVXPAGE_COLORCONFIG (RID_SVX_START + 249)
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index cf7d025..34e5c1a 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -227,11 +227,11 @@ IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor,
PushButton*, pButton )
if( pColorConfig )
{
OSL_ENSURE(pColorConfig->GetColorList().size() > 1, "don't delete the
last chart color");
- QueryBox aQuery(pButton, CUI_RES(RID_OPTQB_COLOR_CHART_DELETE));
- aQuery.SetText(String(CUI_RES(RID_OPTSTR_COLOR_CHART_DELETE)));
- if(RET_YES == aQuery.Execute())
- {
+ MessageDialog aQuery(pButton, "QueryDeleteChartColorDialog",
+ "cui/ui/querydeletechartcolordialog.ui");
+ if (RET_YES == aQuery.Execute())
+ {
pColorConfig->GetColorList().remove( nIndex );
aLbChartColors.Clear();
@@ -244,7 +244,7 @@ IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor,
PushButton*, pButton )
else if (aLbChartColors.GetEntryCount() > 0)
aLbChartColors.SelectEntryPos( nIndex );
else
- aPBRemove.Enable( sal_False );
+ aPBRemove.Enable(true);
}
}
diff --git a/cui/source/options/optchart.src b/cui/source/options/optchart.src
index 3034b13..1653216 100644
--- a/cui/source/options/optchart.src
+++ b/cui/source/options/optchart.src
@@ -84,12 +84,7 @@ String RID_SVXSTR_DIAGRAM_ROW
Text [ en-US ] = "Data Series $(ROW)" ;
};
-QueryBox RID_OPTQB_COLOR_CHART_DELETE
-{
- Buttons = WB_YES_NO ;
- DefButton = WB_DEF_NO ;
- Message [ en-US ] = "Do you really want to delete the chart color?" ;
-};
+
String RID_OPTSTR_COLOR_CHART_DELETE
{
Text [ en-US ] = "Chart Color Deletion" ;
diff --git a/cui/uiconfig/ui/querydeletechartcolordialog.ui
b/cui/uiconfig/ui/querydeletechartcolordialog.ui
new file mode 100644
index 0000000..1492ad0
--- /dev/null
+++ b/cui/uiconfig/ui/querydeletechartcolordialog.ui
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkMessageDialog" id="QueryDeleteChartColorDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="title" translatable="yes">Show changes?</property>
+ <property name="resizable">False</property>
+ <property name="type_hint">dialog</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="message_type">warning</property>
+ <property name="buttons">yes-no</property>
+ <property name="text" translatable="yes">Do you really want to delete the
chart color?</property>
+ <property name="secondary_text" translatable="yes">This action cannot be
undone.</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="messagedialog-vbox">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">24</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="messagedialog-action_area">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+</interface>
commit 04f6d24a0a072dc8f1298b34bd2c473b5f0f961e
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Jul 13 13:42:42 2013 +0100
.ui parser glitch
Change-Id: I0ec484c230ecddf29d09b13f78af724f27657913
diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui
index 3481d58..6c58d05 100644
--- a/cui/uiconfig/ui/colorpage.ui
+++ b/cui/uiconfig/ui/colorpage.ui
@@ -205,15 +205,15 @@
<property name="halign">end</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
+ <items>
+ <item translatable="yes">RGB</item>
+ <item translatable="yes">CMYK</item>
+ </items>
<child internal-child="accessible">
<object class="AtkObject" id="modellb-atkobject">
<property name="AtkObject::accessible-name"
translatable="yes">Color Mode</property>
</object>
</child>
- <items>
- <item translatable="yes">RGB</item>
- <item translatable="yes">CMYK</item>
- </items>
</object>
<packing>
<property name="left_attach">1</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
