Kaydet (Commit) d2118b08 authored tarafından Caolán McNamara's avatar Caolán McNamara

convert chart color QueryBox to .ui

Change-Id: Idc514afb9b4e5e2404500d3ad81a4e4203600218
üst 04f6d24a
...@@ -72,6 +72,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\ ...@@ -72,6 +72,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/picknumberingpage \ cui/uiconfig/ui/picknumberingpage \
cui/uiconfig/ui/pickoutlinepage \ cui/uiconfig/ui/pickoutlinepage \
cui/uiconfig/ui/positionpage \ cui/uiconfig/ui/positionpage \
cui/uiconfig/ui/querydeletechartcolordialog \
cui/uiconfig/ui/scriptorganizer \ cui/uiconfig/ui/scriptorganizer \
cui/uiconfig/ui/securityoptionsdialog \ cui/uiconfig/ui/securityoptionsdialog \
cui/uiconfig/ui/select_persona_dialog \ cui/uiconfig/ui/select_persona_dialog \
......
...@@ -158,7 +158,6 @@ ...@@ -158,7 +158,6 @@
#define RID_SVXPAGE_ACCESSIBILITYCONFIG (RID_SVX_START + 250) #define RID_SVXPAGE_ACCESSIBILITYCONFIG (RID_SVX_START + 250)
#define RID_SVXPAGE_ASIAN_LAYOUT (RID_SVX_START + 246) #define RID_SVXPAGE_ASIAN_LAYOUT (RID_SVX_START + 246)
#define RID_OPTPAGE_CHART_DEFCOLORS (RID_SVX_START + 299) #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_OPTSTR_COLOR_CHART_DELETE (RID_SVX_START + 289)
#define RID_SVXPAGE_PERSONALIZATION (RID_SVX_START + 247) #define RID_SVXPAGE_PERSONALIZATION (RID_SVX_START + 247)
#define RID_SVXPAGE_COLORCONFIG (RID_SVX_START + 249) #define RID_SVXPAGE_COLORCONFIG (RID_SVX_START + 249)
......
...@@ -227,11 +227,11 @@ IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor, PushButton*, pButton ) ...@@ -227,11 +227,11 @@ IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor, PushButton*, pButton )
if( pColorConfig ) if( pColorConfig )
{ {
OSL_ENSURE(pColorConfig->GetColorList().size() > 1, "don't delete the last chart color"); 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 ); pColorConfig->GetColorList().remove( nIndex );
aLbChartColors.Clear(); aLbChartColors.Clear();
...@@ -244,7 +244,7 @@ IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor, PushButton*, pButton ) ...@@ -244,7 +244,7 @@ IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor, PushButton*, pButton )
else if (aLbChartColors.GetEntryCount() > 0) else if (aLbChartColors.GetEntryCount() > 0)
aLbChartColors.SelectEntryPos( nIndex ); aLbChartColors.SelectEntryPos( nIndex );
else else
aPBRemove.Enable( sal_False ); aPBRemove.Enable(true);
} }
} }
......
...@@ -84,12 +84,7 @@ String RID_SVXSTR_DIAGRAM_ROW ...@@ -84,12 +84,7 @@ String RID_SVXSTR_DIAGRAM_ROW
Text [ en-US ] = "Data Series $(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 String RID_OPTSTR_COLOR_CHART_DELETE
{ {
Text [ en-US ] = "Chart Color Deletion" ; Text [ en-US ] = "Chart Color Deletion" ;
......
<?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>
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