diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-08-21 13:19:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-21 14:07:55 +0100 |
| commit | 54758555e11e01eb2fcfe7c7df6feae215821029 (patch) | |
| tree | 57fb00fbd85f7decbbe399ed3c9c656a3777472a /dbaccess/source | |
| parent | 8b62a475f742dd864be714d2b990a0c01035c3ff (diff) | |
QueryBox APP_CLOSEDOCUMENTS -> MessageDialog + string
Change-Id: Id87de082167ab775fa7072f0c96159261011e898
Diffstat (limited to 'dbaccess/source')
| -rw-r--r-- | dbaccess/source/ui/app/AppControllerGen.cxx | 3 | ||||
| -rw-r--r-- | dbaccess/source/ui/app/app.src | 6 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/dbu_resource.hrc | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index cb3cd70e7c8b..c119ced880ef 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 c3000d0ca52c..0c2ef92e7dd7 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 fb81c4b2658c..d0d56b6e7249 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 |