cui/source/customize/cfg.cxx | 4 ++-- cui/source/customize/cfg.hrc | 2 -- cui/source/customize/cfg.src | 6 ++---- cui/source/inc/cuires.hrc | 8 +++++--- cui/source/options/dbregister.cxx | 7 +------ cui/source/options/doclinkdialog.src | 5 ++--- cui/source/options/optcolor.cxx | 4 ++-- cui/source/options/optcolor.src | 8 +++----- cui/source/options/optdict.cxx | 10 +++++----- cui/source/options/optdict.src | 8 +++----- dbaccess/source/ui/app/AppControllerGen.cxx | 3 ++- dbaccess/source/ui/app/app.src | 6 ++---- dbaccess/source/ui/browser/brwctrlr.cxx | 3 ++- dbaccess/source/ui/browser/sbabrw.src | 5 ++--- dbaccess/source/ui/inc/dbu_resource.hrc | 7 +++---- include/sfx2/sfx.hrc | 2 +- 16 files changed, 37 insertions(+), 51 deletions(-)
New commits: commit 2b65832b5853dfea1f970141acfeee46177e3799 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Aug 21 13:27:11 2014 +0100 QueryBox QUERY_BRW_DELETE_ROWS -> MessageDialog + string Change-Id: Ifb6fb8a09cda0c868a3b4f510f6b04665cfe7597 diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 6378211..328d0ee 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -82,6 +82,7 @@ #include <svx/svxdlg.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> +#include <vcl/layout.hxx> #include <vcl/msgbox.hxx> #include <vcl/waitobj.hxx> @@ -1386,7 +1387,7 @@ void SbaXDataBrowserController::resetted(const ::com::sun::star::lang::EventObje sal_Bool SbaXDataBrowserController::confirmDelete(const ::com::sun::star::sdb::RowChangeEvent& /*aEvent*/) throw( RuntimeException, std::exception ) { - if (QueryBox(getBrowserView(), ModuleRes(QUERY_BRW_DELETE_ROWS)).Execute() != RET_YES) + if (MessageDialog(getBrowserView(), ModuleRes(STR_QUERY_BRW_DELETE_ROWS), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO).Execute() != RET_YES) return sal_False; return sal_True; diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src index ba2620e..ba326e0 100644 --- a/dbaccess/source/ui/browser/sbabrw.src +++ b/dbaccess/source/ui/browser/sbabrw.src @@ -29,10 +29,9 @@ QueryBox QUERY_BRW_SAVEMODIFIED Message [ en-US ] = "The current record has been changed.\nDo you want to save the changes?" ; }; -QueryBox QUERY_BRW_DELETE_ROWS +String STR_QUERY_BRW_DELETE_ROWS { - Buttons = WB_YES_NO ; - Message [ en-US ] = "Do you want to delete the selected data?" ; + Text[ en-US ] = "Do you want to delete the selected data?" ; }; String RID_STR_DATABROWSER_FILTERED diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index d0d56b6..3c099f0 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -62,7 +62,7 @@ #define RID_STR_UNO_END RID_STR_UNO_START + 20 // 414 - 433 #define RID_STR_GEN_START RID_STR_UNO_END -#define RID_STR_GEN_END RID_STR_GEN_START + 61 // 434 - 493 +#define RID_STR_GEN_END RID_STR_GEN_START + 62 // 434 - 493 #define RID_STR_APP_START RID_STR_GEN_END #define RID_STR_APP_END RID_STR_APP_START + 40 // 494 - 533 @@ -100,7 +100,6 @@ // query boxes -#define QUERY_BRW_DELETE_ROWS RID_QUERYBOX_START + 0 #define QUERY_BRW_SAVEMODIFIED RID_QUERYBOX_START + 1 #define QUERY_CONNECTION_LOST RID_QUERYBOX_START + 2 #define TABLE_DESIGN_SAVEMODIFIED RID_QUERYBOX_START + 5 @@ -223,7 +222,7 @@ #define STR_QRY_ORDERBY_ON_ASTERISK RID_STR_GEN_START + 58 #define STR_NEED_INDEX_FIELDS RID_STR_GEN_START + 59 #define STR_QUERY_CLOSEDOCUMENTS RID_STR_GEN_START + 60 - +#define STR_QUERY_BRW_DELETE_ROWS RID_STR_GEN_START + 61 // untyped resources commit 54758555e11e01eb2fcfe7c7df6feae215821029 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Aug 21 13:19:05 2014 +0100 QueryBox APP_CLOSEDOCUMENTS -> MessageDialog + string Change-Id: Id87de082167ab775fa7072f0c96159261011e898 diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index cb3cd70..c119ced 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -61,6 +61,7 @@ #include <tools/diagnose_ex.h> #include <osl/diagnose.h> #include <unotools/bootstrap.hxx> +#include <vcl/layout.hxx> #include <vcl/mnemonic.hxx> #include <vcl/svapp.hxx> #include <vcl/waitobj.hxx> @@ -533,7 +534,7 @@ void OApplicationController::askToReconnect() bool bClear = true; if ( !m_pSubComponentManager->empty() ) { - QueryBox aQry(getView(), ModuleRes(APP_CLOSEDOCUMENTS)); + MessageDialog aQry(getView(), ModuleRes(STR_QUERY_CLOSEDOCUMENTS), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO); switch (aQry.Execute()) { case RET_YES: diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src index c3000d0..0c2ef92 100644 --- a/dbaccess/source/ui/app/app.src +++ b/dbaccess/source/ui/app/app.src @@ -351,11 +351,9 @@ String STR_DISABLEPREVIEW Text [ en-US ] = "Disable Preview" ; }; -QueryBox APP_CLOSEDOCUMENTS +String STR_QUERY_CLOSEDOCUMENTS { - Buttons = WB_YES_NO ; - DefButton = WB_DEF_YES ; - Message [ en-US ] = "The connection type has been altered.\nFor the changes to take effect, all forms, reports, queries and tables must be closed.\n\nDo you want to close all documents now?" ; + Text [ en-US ] = "The connection type has been altered.\nFor the changes to take effect, all forms, reports, queries and tables must be closed.\n\nDo you want to close all documents now?" ; }; Menu RID_MENU_APP_PREVIEW diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index fb81c4b..d0d56b6 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -62,7 +62,7 @@ #define RID_STR_UNO_END RID_STR_UNO_START + 20 // 414 - 433 #define RID_STR_GEN_START RID_STR_UNO_END -#define RID_STR_GEN_END RID_STR_GEN_START + 60 // 434 - 493 +#define RID_STR_GEN_END RID_STR_GEN_START + 61 // 434 - 493 #define RID_STR_APP_START RID_STR_GEN_END #define RID_STR_APP_END RID_STR_APP_START + 40 // 494 - 533 @@ -107,7 +107,6 @@ #define QUERY_SAVE_CURRENT_INDEX RID_QUERYBOX_START + 7 #define QUERY_SAVE_TABLE_EDIT_INDEXES RID_QUERYBOX_START + 8 #define RELATION_DESIGN_SAVEMODIFIED RID_QUERYBOX_START + 9 -#define APP_CLOSEDOCUMENTS RID_QUERYBOX_START + 11 #define QUERY_USERADMIN_DELETE_USER RID_QUERYBOX_START + 12 #define TABLE_DESIGN_ALL_ROWS_DELETED RID_QUERYBOX_START + 13 @@ -223,6 +222,7 @@ #define STR_QRY_CRITERIA_ON_ASTERISK RID_STR_GEN_START + 57 #define STR_QRY_ORDERBY_ON_ASTERISK RID_STR_GEN_START + 58 #define STR_NEED_INDEX_FIELDS RID_STR_GEN_START + 59 +#define STR_QUERY_CLOSEDOCUMENTS RID_STR_GEN_START + 60 // untyped resources commit 8b62a475f742dd864be714d2b990a0c01035c3ff Author: Caolán McNamara <caol...@redhat.com> Date: Thu Aug 21 12:46:07 2014 +0100 QueryBox RID_SFXQB_SET_LANGUAGE -> MessageDialog + string Change-Id: Ic1b5233563ff9ce3e3453b47fe86138ae2497a18 diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 8e26588..18bd651 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -410,6 +410,7 @@ #define RID_SXVSTR_CONFIRM_DELETE_TOOLBAR (RID_SVX_START + 1283) #define RID_SVXSTR_CONFIRM_RESTORE_DEFAULT (RID_SVX_START + 1284) +#define RID_SVXSTR_CONFIRM_SET_LANGUAGE (RID_SVX_START + 1285) #endif diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 4141037..23c7d23 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -26,7 +26,7 @@ #include <comphelper/string.hxx> #include <unotools/intlwrapper.hxx> #include <vcl/svapp.hxx> -#include <vcl/msgbox.hxx> +#include <vcl/layout.hxx> #include <vcl/settings.hxx> #include <svx/dialogs.hrc> @@ -141,7 +141,7 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl) if ( bFound ) { // duplicate names? - InfoBox( this, CUI_RESSTR( RID_SVXSTR_OPT_DOUBLE_DICTS ) ).Execute(); + MessageDialog(this, CUI_RESSTR(RID_SVXSTR_OPT_DOUBLE_DICTS), VCL_MESSAGE_INFO).Execute(); pNameEdit->GrabFocus(); return 0; } @@ -450,10 +450,10 @@ IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectLangHdl_Impl) if ( nLang != nOldLang ) { - QueryBox aBox( this, CUI_RES( RID_SFXQB_SET_LANGUAGE ) ); - OUString sTxt( aBox.GetMessText() ); + MessageDialog aBox(this, CUI_RES( RID_SVXSTR_CONFIRM_SET_LANGUAGE), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO); + OUString sTxt(aBox.get_primary_text()); sTxt = sTxt.replaceFirst( "%1", pAllDictsLB->GetSelectEntry() ); - aBox.SetMessText( sTxt ); + aBox.set_primary_text(sTxt); if ( aBox.Execute() == RET_YES ) { diff --git a/cui/source/options/optdict.src b/cui/source/options/optdict.src index d188087..eeae631 100644 --- a/cui/source/options/optdict.src +++ b/cui/source/options/optdict.src @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sfx2/sfx.hrc> #include "helpid.hrc" #include <cuires.hrc> @@ -25,16 +24,15 @@ String RID_SVXSTR_OPT_DOUBLE_DICTS { Text [ en-US ] = "The specified name already exists.\nPlease enter a new name." ; }; + String STR_MODIFY { Text [ en-US ] = "~Replace" ; }; -QueryBox RID_SFXQB_SET_LANGUAGE +String RID_SVXSTR_CONFIRM_SET_LANGUAGE { - Buttons = WB_YES_NO ; - DefButton = WB_DEF_NO ; - Message [ en-US ] = "Do you want to change the '%1' dictionary language?" ; + Text [ en-US ] = "Do you want to change the '%1' dictionary language?" ; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc index e3307e3..0a9b8a2 100644 --- a/include/sfx2/sfx.hrc +++ b/include/sfx2/sfx.hrc @@ -213,7 +213,7 @@ #define RID_SFXDLG_EDITDICT (RID_OPTIONS_START + 4) #define RID_SFXPAGE_PATH (RID_OPTIONS_START + 6) #define RID_SFXPAGE_LINGU (RID_OPTIONS_START + 7) -#define RID_SFXQB_SET_LANGUAGE (RID_OPTIONS_START + 10) + #define RID_SFXPAGE_PRINTOPTIONS (RID_OPTIONS_START + 12) #define RID_STR_NEW_TASK (RID_SFX_DOC_START+ 76) commit 566e6fe58ea66722dd0c504f58676b89e8b95621 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Aug 21 12:38:44 2014 +0100 QueryBox RID_SVXQB_DELETE_COLOR_CONFIG -> MessageDialog + string Change-Id: I3ae71cf2fd4a8cf0db76845c60f633285bd00e27 diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 3f91246..8e26588 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -128,10 +128,10 @@ #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) -#define RID_SVXQB_DELETE_COLOR_CONFIG (RID_SVX_START + 324) +#define RID_SVXSTR_COLOR_CONFIG_DELETE (RID_SVX_START + 324) #define RID_SVXSTR_COLOR_CONFIG_SAVE1 (RID_SVX_START + 853) #define RID_SVXSTR_COLOR_CONFIG_SAVE2 (RID_SVX_START + 854) -#define RID_SVXSTR_COLOR_CONFIG_DELETE (RID_SVX_START + 855) +#define RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE (RID_SVX_START + 855) #define RID_SVXSTR_OPT_DOUBLE_DICTS (RID_SVX_START + 320) #define RID_SVXSTR_OPT_PROXYPORTS (RID_SVX_START + 224) #define RID_SVXSTR_JRE_NOT_RECOGNIZED (RID_SVX_START + 256) diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index e2f853e..2bf8b38 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1178,8 +1178,8 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton ) else { DBG_ASSERT(m_pColorSchemeLB->GetEntryCount() > 1, "don't delete the last scheme"); - QueryBox aQuery(pButton, CUI_RES(RID_SVXQB_DELETE_COLOR_CONFIG)); - aQuery.SetText(CUI_RES(RID_SVXSTR_COLOR_CONFIG_DELETE)); + MessageDialog aQuery(pButton, CUI_RES(RID_SVXSTR_COLOR_CONFIG_DELETE), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO); + aQuery.SetText(CUI_RES(RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE)); if(RET_YES == aQuery.Execute()) { OUString sDeleteScheme(m_pColorSchemeLB->GetSelectEntry()); diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src index cb17c49..2a9af27 100644 --- a/cui/source/options/optcolor.src +++ b/cui/source/options/optcolor.src @@ -21,13 +21,11 @@ #include "helpid.hrc" #include <cuires.hrc> -QueryBox RID_SVXQB_DELETE_COLOR_CONFIG +String RID_SVXSTR_COLOR_CONFIG_DELETE { - Buttons = WB_YES_NO ; - DefButton = WB_DEF_NO ; - Message [ en-US ] = "Do you really want to delete the color scheme?" ; + Text [ en-US ] = "Do you really want to delete the color scheme?" ; }; -String RID_SVXSTR_COLOR_CONFIG_DELETE +String RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE { Text [ en-US ] = "Color Scheme Deletion" ; }; commit d27cdf1caf4359b5a8b1b8af1b1ec1ede406d8ad Author: Caolán McNamara <caol...@redhat.com> Date: Thu Aug 21 12:24:07 2014 +0100 QueryBox QUERY_DELETE_CONFIRM -> MessageDialog + string Change-Id: Ieae9977fd77f7b28991771a31c18e15be4a4f0dd diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index ca44437..3f91246 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -96,7 +96,7 @@ // options #define RID_SVXSTR_DIAGRAM_ROW (RID_SVX_START + 1162) -#define QUERY_DELETE_CONFIRM (RID_SVX_START + 1110) +#define RID_SVXSTR_QUERY_DELETE_CONFIRM (RID_SVX_START + 1110) #define RID_SVXPAGE_JSEARCH_OPTIONS (RID_SVX_START + 840) #define STR_LINKEDDOC_DOESNOTEXIST (RID_SVX_START + 1111) #define STR_LINKEDDOC_NO_SYSTEM_FILE (RID_SVX_START + 1169) diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index dd380e7..303a7b5 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -256,8 +256,6 @@ void DbRegistrationOptionsPage::Reset( const SfxItemSet* rSet ) } } - - void DbRegistrationOptionsPage::FillUserData() { HeaderBar &rBar = pPathBox->GetTheHeaderBar(); @@ -269,13 +267,12 @@ void DbRegistrationOptionsPage::FillUserData() SetUserData( aUserData ); } - IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl) { SvTreeListEntry* pEntry = pPathBox->FirstSelected(); if ( pEntry ) { - QueryBox aQuery(this,CUI_RES(QUERY_DELETE_CONFIRM)); + MessageDialog aQuery(this, CUI_RES(RID_SVXSTR_QUERY_DELETE_CONFIRM), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO); if ( aQuery.Execute() == RET_YES ) pPathBox->GetModel()->Remove(pEntry); } @@ -289,8 +286,6 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, NewHdl) return 0; } - - IMPL_LINK_NOARG(DbRegistrationOptionsPage, EditHdl) { SvTreeListEntry* pEntry = pPathBox->GetCurEntry(); diff --git a/cui/source/options/doclinkdialog.src b/cui/source/options/doclinkdialog.src index 059f54f..6e93f0c 100644 --- a/cui/source/options/doclinkdialog.src +++ b/cui/source/options/doclinkdialog.src @@ -34,10 +34,9 @@ String STR_NAME_CONFLICT Text [ en-US ] = "The name '$file$' is already used for another database.\nPlease choose a different name."; }; -QueryBox QUERY_DELETE_CONFIRM +String RID_SVXSTR_QUERY_DELETE_CONFIRM { - Buttons = WB_YES_NO ; - Message [ en-US ] = "Do you want to delete the entry?" ; + Text [ en-US ] = "Do you want to delete the entry?" ; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 8fce2ef6c33787922a06340fe8eab69b104cb555 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Aug 21 11:42:48 2014 +0100 QueryBox QBX_CONFIRM_RESTORE_DEFAULT -> MessageDialog + string Change-Id: I93911342a316beaba0d33b35bda1bfa4355befe2 diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 21fced9..34edd30 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -3075,8 +3075,8 @@ IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton ) } case ID_DEFAULT_STYLE: { - QueryBox qbox( this, - CUI_RES( QBX_CONFIRM_RESTORE_DEFAULT ) ); + MessageDialog qbox(this, + CUI_RES(RID_SVXSTR_CONFIRM_RESTORE_DEFAULT), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO); if ( qbox.Execute() == RET_YES ) { diff --git a/cui/source/customize/cfg.hrc b/cui/source/customize/cfg.hrc index 5fc6d73..6a83713 100644 --- a/cui/source/customize/cfg.hrc +++ b/cui/source/customize/cfg.hrc @@ -37,6 +37,4 @@ #define MODIFY_TOOLBAR (60 + CFG_OFFSET) #define MODIFY_TOOLBAR_CONTENT (61 + CFG_OFFSET) -#define QBX_CONFIRM_RESTORE_DEFAULT (66 + CFG_OFFSET) - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src index 08f1c72..fed45bd 100644 --- a/cui/source/customize/cfg.src +++ b/cui/source/customize/cfg.src @@ -236,11 +236,9 @@ String RID_SVXSTR_CONFIRM_TOOLBAR_RESET Text [ en-US ] = "The toolbar configuration for %SAVE IN SELECTION% will be reset to the default settings. Do you want to continue?"; }; -QueryBox QBX_CONFIRM_RESTORE_DEFAULT +String RID_SVXSTR_CONFIRM_RESTORE_DEFAULT { - Message [ en-US ] = "This will delete all changes previously made to this toolbar. Do you really want to reset the toolbar?"; - BUTTONS = WB_YES_NO ; - DEFBUTTON = WB_DEF_NO ; + Text [ en-US ] = "This will delete all changes previously made to this toolbar. Do you really want to reset the toolbar?"; }; String RID_SVXSTR_MNUCFG_ALREADY_INCLUDED diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index b0e48e5..ca44437 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -409,6 +409,7 @@ #define RID_SVXSTR_APPLYPERSONA (RID_SVX_START + 1282) #define RID_SXVSTR_CONFIRM_DELETE_TOOLBAR (RID_SVX_START + 1283) +#define RID_SVXSTR_CONFIRM_RESTORE_DEFAULT (RID_SVX_START + 1284) #endif
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits