diff options
| author | Manal Alhassoun <malhassoun@kacst.edu.sa> | 2013-11-20 09:55:06 +0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-20 04:13:42 -0600 |
| commit | 7b069f4bc8138e03abf455998452dd0f6f8ed9ac (patch) | |
| tree | 6ca767a234ba14b60e1c00074fbf520b02fd1d09 /cui/source | |
| parent | f138a539ddd77265343fbdd1eadb4c4d990b0e38 (diff) | |
convert delete gradient/color queryboxes to .ui
Conflicts:
cui/UIConfig_cui.mk
Change-Id: Ie45c1c0d549fc879043d7f108f33e67adc4721fd
Reviewed-on: https://gerrit.libreoffice.org/6729
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui/source')
| -rw-r--r-- | cui/source/inc/cuires.hrc | 2 | ||||
| -rw-r--r-- | cui/source/tabpages/strings.src | 8 | ||||
| -rw-r--r-- | cui/source/tabpages/tpcolor.cxx | 3 | ||||
| -rw-r--r-- | cui/source/tabpages/tpgradnt.cxx | 3 |
4 files changed, 2 insertions, 14 deletions
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index c8507a64e294..f856a25d551d 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -76,7 +76,6 @@ #define RID_SVXSTR_EDIT_GRAPHIC (RID_SVX_START + 509) #define RID_SVXSTR_DESC_GRADIENT (RID_SVX_START + 163) -#define RID_SVXSTR_ASK_DEL_GRADIENT (RID_SVX_START + 165) #define RID_SVXSTR_ASK_CHANGE_GRADIENT (RID_SVX_START + 166) #define RID_SVXSTR_ASK_CHANGE_BITMAP (RID_SVX_START + 172) #define RID_SVXSTR_DESC_NEW_BITMAP (RID_SVX_START + 168) @@ -89,7 +88,6 @@ #define RID_SVXSTR_CHANGE (RID_SVX_START + 181) #define RID_SVXSTR_ADD (RID_SVX_START + 182) #define RID_SVXSTR_DESC_COLOR (RID_SVX_START + 215) -#define RID_SVXSTR_ASK_DEL_COLOR (RID_SVX_START + 217) #define RID_SVXSTR_ASK_CHANGE_COLOR (RID_SVX_START + 218) #define RID_SVXSTR_TABLE (RID_SVX_START + 220) #define RID_SVXSTR_CONNECTOR (RID_SVX_START + 221) diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src index dee7e7e97b6e..7eefbe56c943 100644 --- a/cui/source/tabpages/strings.src +++ b/cui/source/tabpages/strings.src @@ -23,10 +23,6 @@ String RID_SVXSTR_DESC_GRADIENT { Text [ en-US ] = "Please enter a name for the gradient:" ; }; -String RID_SVXSTR_ASK_DEL_GRADIENT -{ - Text [ en-US ] = "Do you want to delete the gradient?" ; -}; String RID_SVXSTR_ASK_CHANGE_GRADIENT { Text [ en-US ] = "The gradient was modified without saving. \nModify the selected gradient or add a new gradient." ; @@ -71,10 +67,6 @@ String RID_SVXSTR_DESC_COLOR { Text [ en-US ] = "Please enter a name for the new color:" ; }; -String RID_SVXSTR_ASK_DEL_COLOR -{ - Text [ en-US ] = "Do you want to delete the color?" ; -}; String RID_SVXSTR_ASK_CHANGE_COLOR { Text [ en-US ] = "The color was modified without saving.\nModify the selected color or add a new color." ; diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 379e3da8b54c..c677ee3fcfe3 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -866,8 +866,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl) if( nPos != LISTBOX_ENTRY_NOTFOUND ) { - QueryBox aQueryBox( GetParentDialog(), WinBits( WB_YES_NO | WB_DEF_NO ), - OUString( CUI_RES( RID_SVXSTR_ASK_DEL_COLOR ) ) ); + MessageDialog aQueryBox( GetParentDialog(),"AskDelColorDialog","cui/ui/querydeletecolordialog.ui"); if( aQueryBox.Execute() == RET_YES ) { diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 001c042c4d23..10d708eace90 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -583,8 +583,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl) if( nPos != LISTBOX_ENTRY_NOTFOUND ) { - QueryBox aQueryBox( GetParentDialog(), WinBits( WB_YES_NO | WB_DEF_NO ), - OUString( CUI_RES( RID_SVXSTR_ASK_DEL_GRADIENT ) ) ); + MessageDialog aQueryBox( GetParentDialog(),"AskDelGradientDialog","cui/ui/querydeletegradientdialog.ui"); if ( aQueryBox.Execute() == RET_YES ) { |