basctl/AllLangResTarget_basctl.mk | 1
basctl/UIConfig_basicide.mk | 1
basctl/source/dlged/dlgresid.src | 5
basctl/source/dlged/managelang.cxx | 6
basctl/source/dlged/managelang.src | 30 ----
basctl/source/inc/dlgresid.hrc | 7 -
basctl/uiconfig/basicide/ui/deletelangdialog.ui | 36 +++++
bin/count-todo-dialogs | 4
dbaccess/UIConfig_dbaccess.mk | 5
dbaccess/source/ui/browser/brwctrlr.cxx | 5
dbaccess/source/ui/browser/sbabrw.src | 7 -
dbaccess/source/ui/dlg/indexdialog.cxx | 4
dbaccess/source/ui/dlg/indexdialog.src | 10 -
dbaccess/source/ui/inc/dbu_resource.hrc | 8 -
dbaccess/source/ui/relationdesign/RelationController.cxx | 5
dbaccess/source/ui/relationdesign/relation.src | 7 -
dbaccess/source/ui/tabledesign/TableController.cxx | 6
dbaccess/source/ui/tabledesign/table.src | 14 --
dbaccess/uiconfig/ui/deleteallrowsdialog.ui | 82 ++++++++++++
dbaccess/uiconfig/ui/designsavemodifieddialog.ui | 83 ++++++++++++
dbaccess/uiconfig/ui/saveindexdialog.ui | 83 ++++++++++++
dbaccess/uiconfig/ui/savemodifieddialog.ui | 83 ++++++++++++
dbaccess/uiconfig/ui/tabledesignsavemodifieddialog.ui | 83 ++++++++++++
desktop/UIConfig_deployment.mk | 1
desktop/source/app/desktop.hrc | 3
desktop/source/app/desktop.src | 6
desktop/source/app/lockfile2.cxx | 9 -
desktop/source/deployment/gui/dp_gui.hrc | 22 +--
desktop/source/deployment/gui/dp_gui_dialog.src | 42 +-----
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 53 ++------
desktop/source/deployment/gui/dp_gui_dialog2.src | 7 -
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 20 +--
desktop/source/deployment/gui/dp_gui_updatedialog.src | 10 -
desktop/source/deployment/gui/dp_gui_versionboxes.src | 26 +--
desktop/uiconfig/ui/installforalldialog.ui | 83 ++++++++++++
editeng/source/misc/lingu.src | 13 -
editeng/source/misc/splwrap.cxx | 11 -
filter/source/pdf/impdialog.cxx | 6
filter/source/pdf/impdialog.hrc | 2
filter/source/pdf/impdialog.src | 5
include/editeng/editrids.hrc | 6
include/svtools/svtools.hrc | 25 +--
include/svx/fmresids.hrc | 5
include/tools/rcid.h | 5
include/vcl/msgbox.hxx | 6
rsc/inc/rscdb.hxx | 5
rsc/source/parser/rscibas.cxx | 28 ----
rsc/source/parser/rscicpx.cxx | 32 ----
rsc/source/parser/rscinit.cxx | 25 ---
sfx2/source/appl/app.hrc | 2
sfx2/source/appl/app.src | 6
sfx2/source/appl/appopen.cxx | 6
svtools/UIConfig_svt.mk | 1
svtools/source/java/javaerror.src | 34 +----
svtools/source/java/javainteractionhandler.cxx | 15 +-
svtools/uiconfig/ui/javadisableddialog.ui | 85 +++++++++++++
svx/UIConfig_svx.mk | 2
svx/source/form/datanavi.cxx | 13 -
svx/source/form/datanavi.src | 11 -
svx/source/form/fmshell.cxx | 5
svx/source/form/fmstring.src | 6
svx/source/inc/datanavi.hxx | 3
svx/uiconfig/ui/formlinkwarndialog.ui | 71 ++++++++++
svx/uiconfig/ui/savemodifieddialog.ui | 85 +++++++++++++
sw/UIConfig_swriter.mk | 2
sw/inc/comcore.hrc | 1
sw/inc/helpid.h | 1
sw/source/core/crsr/viscrs.cxx | 5
sw/source/ui/app/app.src | 15 --
sw/source/uibase/inc/app.hrc | 1
sw/source/uibase/uiview/viewprt.cxx | 4
sw/uiconfig/swriter/ui/asksearchdialog.ui | 84 ++++++++++++
sw/uiconfig/swriter/ui/printmergedialog.ui | 84 ++++++++++++
vcl/inc/svids.hrc | 2
vcl/source/control/edit.cxx | 4
vcl/source/src/stdtext.src | 4
vcl/source/window/msgbox.cxx | 40 ------
xmlsecurity/inc/xmlsecurity/global.hrc | 2
xmlsecurity/source/component/documentdigitalsignatures.cxx | 4
xmlsecurity/source/component/warnbox.src | 6
80 files changed, 1109 insertions(+), 526 deletions(-)
New commits:
commit 07244947b55ded00e1ab518d305bf8d3f4087b0c
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Aug 25 15:54:11 2014 +0100
MessBox not loaded from resource files anymore
Change-Id: I12378a1c80e1070763cd2bd0539d74f4cc270a30
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index 168e0c8..04ae924 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -47,8 +47,6 @@
#define RSC_IMAGE (RSC_NOTYPE + 0x23)
#define RSC_IMAGELIST (RSC_NOTYPE + 0x24)
-#define RSC_MESSBOX (RSC_NOTYPE + 0x30)
-
#define RSC_WINDOW (RSC_NOTYPE + 0x35)
#define RSC_SYSWINDOW (RSC_NOTYPE + 0x36)
#define RSC_WORKWIN (RSC_NOTYPE + 0x37)
diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx
index 38cc4ba..f067047 100644
--- a/include/vcl/msgbox.hxx
+++ b/include/vcl/msgbox.hxx
@@ -45,13 +45,9 @@ protected:
SAL_DLLPRIVATE void ImplInitButtons();
SAL_DLLPRIVATE void ImplPosControls();
-protected:
- SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
-
public:
MessBox( Window* pParent, WinBits nStyle,
const OUString& rTitle, const OUString&
rMessage );
- MessBox( Window* pParent, const ResId& rResId );
virtual ~MessBox();
virtual void StateChanged( StateChangedType nStateChange )
SAL_OVERRIDE;
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 6aca602..f5dac31 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -146,8 +146,6 @@ class RscTypCont
RscEnum * InitMapUnit();
RscEnum * InitKey();
RscEnum * InitTriState();
- RscEnum * InitMessButtons();
- RscEnum * InitMessDefButton();
RscTupel * InitGeometry();
RscArray * InitLangGeometry( RscTupel * pGeo );
RscArray * InitSystemGeometry( RscTupel * pGeo );
@@ -191,9 +189,6 @@ class RscTypCont
RscTop * InitClassMenuItem( RscTop * pSuper, RscTop * pClassBitmap,
RscTop * pClassKeyCode );
RscTop * InitClassMenu( RscTop * pSuper, RscTop * pMenuItem );
- RscTop * InitClassMessBox( RscTop * pSuper,
- RscEnum * pMessButtons,
- RscEnum * pMessDefButton );
RscTop * InitClassSplitter( RscTop * pSuper );
RscTop * InitClassSplitWindow( RscTop * pSuper );
RscTop * InitClassTime( RscTop * pSuper );
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index 6e2aaff..49416ba 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.cxx
@@ -391,34 +391,6 @@ RscEnum * RscTypCont::InitTriState()
return pTriState;
}
-RscEnum * RscTypCont::InitMessButtons()
-{
- RscEnum * pMessButtons;
- pMessButtons = new RscEnum( pHS->getID( "EnumMessButtons" ), RSC_NOTYPE );
- SETCONST( pMessButtons, "WB_OK",
sal::static_int_cast<sal_uInt32>(WB_OK) );
- SETCONST( pMessButtons, "WB_OK_CANCEL",
sal::static_int_cast<sal_uInt32>(WB_OK_CANCEL) );
- SETCONST( pMessButtons, "WB_YES_NO",
sal::static_int_cast<sal_uInt32>(WB_YES_NO) );
- SETCONST( pMessButtons, "WB_YES_NO_CANCEL",
sal::static_int_cast<sal_uInt32>(WB_YES_NO_CANCEL) );
- SETCONST( pMessButtons, "WB_RETRY_CANCEL",
sal::static_int_cast<sal_uInt32>(WB_RETRY_CANCEL) );
- SETCONST( pMessButtons, "WB_ABORT_RETRY_IGNORE",
sal::static_int_cast<sal_uInt32>(WB_ABORT_RETRY_IGNORE) );
- return pMessButtons;
-}
-
-RscEnum * RscTypCont::InitMessDefButton()
-{
- RscEnum * pMessDefButton;
- pMessDefButton = new RscEnum( pHS->getID( "EnumMessDefButton" ),
- RSC_NOTYPE );
-
- SETCONST( pMessDefButton, "WB_DEF_OK",
sal::static_int_cast<sal_uInt32>(WB_DEF_OK) );
- SETCONST( pMessDefButton, "WB_DEF_CANCEL",
sal::static_int_cast<sal_uInt32>(WB_DEF_CANCEL) );
- SETCONST( pMessDefButton, "WB_DEF_RETRY",
sal::static_int_cast<sal_uInt32>(WB_DEF_RETRY) );
- SETCONST( pMessDefButton, "WB_DEF_YES",
sal::static_int_cast<sal_uInt32>(WB_DEF_YES) );
- SETCONST( pMessDefButton, "WB_DEF_NO",
sal::static_int_cast<sal_uInt32>(WB_DEF_NO) );
- SETCONST( pMessDefButton, "WB_DEF_IGNORE",
sal::static_int_cast<sal_uInt32>(WB_DEF_IGNORE) );
- return pMessDefButton;
-}
-
RscTupel * RscTypCont::InitGeometry()
{
RscTop * pTupel;
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 6169eda..25dec34 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -927,38 +927,6 @@ RscTop * RscTypCont::InitClassMenu( RscTop * pSuper,
return pClassMenu;
}
-RscTop * RscTypCont::InitClassMessBox( RscTop * pSuper,
- RscEnum * pMessButtons,
- RscEnum * pMessDefButton )
-{
- Atom nId;
- RscTop * pClassMessBox;
-
- // Klasse anlegen
- nId = pHS->getID( "MessBox" );
- pClassMessBox = new RscClass( nId, RSC_MESSBOX, pSuper );
- pClassMessBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
- aNmTb.Put( nId, CLASSNAME, pClassMessBox );
-
- // Variablen anlegen
- nId = aNmTb.Put( "Buttons", VARNAME );
- pClassMessBox->SetVariable( nId, pMessButtons );
- nId = aNmTb.Put( "DefButton", VARNAME );
- pClassMessBox->SetVariable( nId, pMessDefButton );
- nId = aNmTb.Put( "HelpID", VARNAME );
- pClassMessBox->SetVariable( nId, &aStringLiteral );
- nId = aNmTb.Put( "SysModal", VARNAME );
- pClassMessBox->SetVariable( nId, &aBool );
- nId = aNmTb.Put( "Title", VARNAME );
- pClassMessBox->SetVariable( nId, &aLangString );
- nId = aNmTb.Put( "Message", VARNAME );
- pClassMessBox->SetVariable( nId, &aLangString );
- nId = aNmTb.Put( "HelpText", VARNAME );
- pClassMessBox->SetVariable( nId, &aLangString );
-
- return pClassMessBox;
-}
-
RscTop * RscTypCont::InitClassSplitter( RscTop * pSuper )
{
Atom nId;
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 1f95399..22c79ae 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -49,8 +49,6 @@ void RscTypCont::Init()
RscEnum * pMapUnit;
RscEnum * pKey;
RscEnum * pTriState;
- RscEnum * pMessButtons;
- RscEnum * pMessDefButton;
RscTupel * pGeometry;
RscArray * pLangGeometry;
RscCont * pStringList;
@@ -93,7 +91,6 @@ void RscTypCont::Init()
RscTop * pClassAccel;
RscTop * pClassMenuItem;
RscTop * pClassMenu;
- RscTop * pClassMessBox;
RscTop * pClassSplitter;
RscTop * pClassSplitWindow;
RscTop * pClassSpinButton;
@@ -289,8 +286,6 @@ void RscTypCont::Init()
aBaseLst.push_back( pMapUnit = InitMapUnit() );
aBaseLst.push_back( pKey = InitKey() );
aBaseLst.push_back( pTriState = InitTriState() );
- aBaseLst.push_back( pMessButtons = InitMessButtons() );
- aBaseLst.push_back( pMessDefButton = InitMessDefButton() );
aBaseLst.push_back( pGeometry = InitGeometry() );
aBaseLst.push_back( pLangGeometry = InitLangGeometry( pGeometry ) );
@@ -463,10 +458,6 @@ void RscTypCont::Init()
nId = aNmTb.Put( "SubMenu", VARNAME );
pClassMenuItem->SetVariable( nId, pClassMenu, NULL, VAR_SVDYNAMIC,
RSC_MENUITEM_MENU );
-
- pClassMessBox = InitClassMessBox( pClassMgr, pMessButtons,
- pMessDefButton );
- pRoot->Insert( pClassMessBox );
}
{
pClassSplitter = InitClassSplitter( pClassWindow );
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 639c5fa..446df62 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -149,34 +149,6 @@ MessBox::MessBox( Window* pParent, WinBits nStyle,
SetText( rTitle );
}
-MessBox::MessBox( Window* pParent, const ResId& rResId ) :
- ButtonDialog( WINDOW_MESSBOX )
-{
- ImplInitMessBoxData();
-
- GetRes( rResId.SetRT( RSC_MESSBOX ) );
- sal_uInt16 nHiButtons = ReadShortRes();
- sal_uInt16 nLoButtons = ReadShortRes();
- sal_uInt16 nHiDefButton = ReadShortRes();
- sal_uInt16 nLoDefButton = ReadShortRes();
- OString aHelpId( ReadByteStringRes() );
- /* sal_uInt16 bSysModal = */ ReadShortRes();
- SetHelpId( aHelpId );
- WinBits nBits = (((sal_uLong)nHiButtons << 16) + nLoButtons) |
- (((sal_uLong)nHiDefButton << 16) + nLoDefButton);
- ImplInit( pParent, nBits | WB_MOVEABLE | WB_HORZ | WB_CENTER );
-
- ImplLoadRes( rResId );
- ImplInitButtons();
-}
-
-void MessBox::ImplLoadRes( const ResId& )
-{
- SetText( ReadStringRes() );
- SetMessText( ReadStringRes() );
- SetHelpText( ReadStringRes() );
-}
-
MessBox::~MessBox()
{
delete mpVCLMultiLineEdit;
commit 4e84484cc6bcf02819b097a666ee79bbc2ecf1b0
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Aug 25 16:00:58 2014 +0100
convert MessBox with custom buttons to .ui
Change-Id: I05704746ce5f098a2caaafafdc574009b279e458
diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc
index 1257e32..63e8319 100644
--- a/include/svx/fmresids.hrc
+++ b/include/svx/fmresids.hrc
@@ -84,9 +84,6 @@
#define MENU_FM_TEXTATTRIBITES_SPACING (RID_FORMS_START + 9)
#define RID_MENU_DATANAVIGATOR (RID_FORMS_START + 10)
-// QueryBox-Id's -----------------------------------------------------------
-#define RID_QRY_LINK_WARNING (RID_FORMS_START + 6)
-
// String-Id's -----------------------------------------------------------
#define RID_STR_INVALID_XMLNAME (RID_FORMS_START + 1)
#define RID_STR_INVALID_XMLPREFIX (RID_FORMS_START + 2)
@@ -199,7 +196,6 @@
#define RID_STR_DATANAV_ADD_SUBMISSION (RID_FORMS_START + 141)
#define RID_STR_DATANAV_EDIT_SUBMISSION (RID_FORMS_START + 142)
#define RID_STR_DATANAV_REMOVE_SUBMISSION (RID_FORMS_START + 143)
-#define RID_STR_DATANAV_LINKWARN_BUTTON (RID_FORMS_START + 144)
#define RID_STR_SVT_SQL_SYNTAX_TABLE_OR_QUERY (RID_FORMS_START + 145)
#define RID_STR_SVT_SQL_SYNTAX_TABLE_EXISTS (RID_FORMS_START + 146)
#define RID_STR_SVT_SQL_SYNTAX_QUERY_EXISTS (RID_FORMS_START + 147)
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index c1f856a..21ac190 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/findreplacedialog \
svx/uiconfig/ui/fontworkgallerydialog \
svx/uiconfig/ui/fontworkspacingdialog \
+ svx/uiconfig/ui/formlinkwarndialog \
svx/uiconfig/ui/headfootformatpage \
svx/uiconfig/ui/imapdialog \
svx/uiconfig/ui/linkwarndialog \
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 9f2a0eb..2b2fae5 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -3322,20 +3322,11 @@ namespace svxform
return 0;
}
- LinkedInstanceWarningBox::LinkedInstanceWarningBox( Window* pParent ) :
-
- MessBox( pParent, SVX_RES( RID_QRY_LINK_WARNING ) )
-
+ LinkedInstanceWarningBox::LinkedInstanceWarningBox( Window* pParent )
+ : MessageDialog(pParent, "FormLinkWarnDialog",
"svx/ui/formlinkwarndialog.ui")
{
- SetText( Application::GetDisplayName() );
- SetImage( QueryBox::GetStandardImage() );
- AddButton( SVX_RESSTR( RID_STR_DATANAV_LINKWARN_BUTTON ), RET_OK,
BUTTONDIALOG_DEFBUTTON );
- AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
}
-
} // namespace svxform
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index debd9ee..82b18a3 100644
--- a/svx/source/form/datanavi.src
+++ b/svx/source/form/datanavi.src
@@ -90,12 +90,6 @@ String RID_STR_QRY_REMOVE_BINDING
Text [ en-US ] = "Deleting the binding '$BINDINGNAME' affects all controls
currently bound to this binding.\n\nDo you really want to delete this binding?"
;
};
-MessBox RID_QRY_LINK_WARNING
-{
- Buttons = 0 ;
- Message [ en-US ] = "This instance is linked with the form.\n\nThe changes
you make to this instance will be lost when the form is reloaded.\n\nHow do you
want to proceed?" ;
-};
-
String RID_STR_INVALID_XMLNAME
{
Text [ en-US ] = "The name '%1' is not valid in XML. Please enter a
different name." ;
@@ -293,11 +287,6 @@ String RID_STR_DATANAV_REMOVE_SUBMISSION
Text [ en-US ] = "Delete Submission" ;
};
-String RID_STR_DATANAV_LINKWARN_BUTTON
-{
- Text [ en-US ] = "~Edit" ;
-};
-
String RID_STR_ELEMENT
{
Text [ en-US ] = "Element" ;
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 0ed7998..8c79cba 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -25,7 +25,6 @@
#include <vcl/layout.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/menubtn.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/tabctrl.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/toolbox.hxx>
@@ -648,7 +647,7 @@ namespace svxform
};
- class LinkedInstanceWarningBox : public MessBox
+ class LinkedInstanceWarningBox : public MessageDialog
{
public:
LinkedInstanceWarningBox( Window* pParent );
diff --git a/svx/uiconfig/ui/formlinkwarndialog.ui
b/svx/uiconfig/ui/formlinkwarndialog.ui
new file mode 100644
index 0000000..ba156d8
--- /dev/null
+++ b/svx/uiconfig/ui/formlinkwarndialog.ui
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+ <requires lib="gtk+" version="3.0"/>
+ <object class="GtkMessageDialog" id="FormLinkWarnDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="resizable">False</property>
+ <property name="type_hint">dialog</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="message_type">question</property>
+ <property name="text" translatable="yes">This instance is linked with the
form.
+
+The changes you make to this instance will be lost when the form is reloaded.
+
+How do you want to proceed?</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>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">_Edit</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </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>
+ <action-widgets>
+ <action-widget response="1">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ </action-widgets>
+ </object>
+</interface>
commit a548b48c15bf00ecac1899261049c4f1871e26d7
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Aug 25 15:52:47 2014 +0100
add MessBox to count-todo-dialogs
Change-Id: I9466ecdde466010615a1f136334605e6ed24e9b8
diff --git a/bin/count-todo-dialogs b/bin/count-todo-dialogs
index 9c47edb..722e029 100755
--- a/bin/count-todo-dialogs
+++ b/bin/count-todo-dialogs
@@ -30,9 +30,11 @@ errorboxes=`git grep -h ErrorBox -- *.src|cut -d' ' -f2-
|sort|uniq|wc -l`
infoboxes=`git grep -h InfoBox -- *.src|cut -d' ' -f2- |sort|uniq|wc -l`
queryboxes=`git grep -h QueryBox -- *.src|cut -d' ' -f2- |sort|uniq|wc -l`
warningboxes=`git grep -h WarningBox -- *.src|cut -d' ' -f2- |sort|uniq|wc -l`
+msgboxes=`git grep -h MessBox -- *.src|cut -d' ' -f2- |sort|uniq|wc -l`
echo
echo We need to reduce $errorboxes ErrorBox to basic strings as arguments to
MessageDialog
echo We need to reduce $infoboxes InfoBox to basic strings as arguments to
MessageDialog
echo We need to reduce $queryboxes QueryBox to basic strings as arguments to
MessageDialog
echo We need to reduce $warningboxes WarningBox to basic strings as arguments
to MessageDialog
+echo We need to reduce $msgboxes MessBox to basic strings as arguments to
MessageDialog
commit bddd6d823df677308e25f93b50153012b2005ef5
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Aug 25 15:45:01 2014 +0100
WarningBox are no longer loaded from resource files
Change-Id: Ib05a9876c0b1d3425dd1629f8a0fe3d16a57cc30
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index c8a405f..168e0c8 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -49,8 +49,6 @@
#define RSC_MESSBOX (RSC_NOTYPE + 0x30)
-#define RSC_WARNINGBOX (RSC_NOTYPE + 0x32)
-
#define RSC_WINDOW (RSC_NOTYPE + 0x35)
#define RSC_SYSWINDOW (RSC_NOTYPE + 0x36)
#define RSC_WORKWIN (RSC_NOTYPE + 0x37)
diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx
index 0bc49e8..38cc4ba 100644
--- a/include/vcl/msgbox.hxx
+++ b/include/vcl/msgbox.hxx
@@ -91,7 +91,6 @@ private:
public:
WarningBox( Window* pParent, WinBits nStyle,
const OUString& rMessage );
- WarningBox( Window* pParent, const ResId& rResId );
void SetDefaultCheckBoxText();
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index a399e86..1f95399 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -94,7 +94,6 @@ void RscTypCont::Init()
RscTop * pClassMenuItem;
RscTop * pClassMenu;
RscTop * pClassMessBox;
- RscTop * pClassWarningBox;
RscTop * pClassSplitter;
RscTop * pClassSplitWindow;
RscTop * pClassSpinButton;
@@ -468,13 +467,6 @@ void RscTypCont::Init()
pClassMessBox = InitClassMessBox( pClassMgr, pMessButtons,
pMessDefButton );
pRoot->Insert( pClassMessBox );
-
- // Klasse anlegen
- nId = pHS->getID( "WarningBox" );
- pClassWarningBox = new RscClass( nId, RSC_WARNINGBOX, pClassMessBox );
- pClassWarningBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
- aNmTb.Put( nId, CLASSNAME, pClassWarningBox );
- pRoot->Insert( pClassWarningBox );
}
{
pClassSplitter = InitClassSplitter( pClassWindow );
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index d414ab0..639c5fa 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -448,12 +448,6 @@ WarningBox::WarningBox( Window* pParent, WinBits nStyle,
ImplInitWarningBoxData();
}
-WarningBox::WarningBox( Window* pParent, const ResId& rResId ) :
- MessBox( pParent, rResId.SetRT( RSC_WARNINGBOX ) )
-{
- ImplInitWarningBoxData();
-}
-
void WarningBox::SetDefaultCheckBoxText()
{
ResMgr* pResMgr = ImplGetResMgr();
commit 0696e590455145e3a57b9925b76a7a8ff5f6043e
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Aug 25 15:40:49 2014 +0100
convert WARNINGBOX_* to MessageDialog + string
Change-Id: Icdd1cbd4660ebcc156d1a406bd853fce3b5cf1e1
diff --git a/include/svtools/svtools.hrc b/include/svtools/svtools.hrc
index c0af413..207f2f0 100644
--- a/include/svtools/svtools.hrc
+++ b/include/svtools/svtools.hrc
@@ -196,13 +196,16 @@
#define STR_SVT_INDEXENTRY_END (STR_SVT_INDEXENTRY_PHONETIC_LC)
//String - Ids for Java errors, messages
-#define STR_SVT_JAVAERROR_START (STR_SVT_INDEXENTRY_END + 1)
-#define STR_ERROR_JVMCREATIONFAILED_TITLE (STR_SVT_JAVAERROR_START+1)
-#define STR_WARNING_JAVANOTFOUND (STR_SVT_JAVAERROR_START+2)
-#define STR_WARNING_INVALIDJAVASETTINGS (STR_SVT_JAVAERROR_START+3)
-#define STR_ERROR_JVMCREATIONFAILED (STR_SVT_JAVAERROR_START+4)
-#define STR_ERROR_JVMCREATIONFAILED_MAC (STR_SVT_JAVAERROR_START+5)
-#define STR_SVT_JAVAERROR_END (STR_ERROR_JVMCREATIONFAILED_MAC)
+#define STR_SVT_JAVAERROR_START (STR_SVT_INDEXENTRY_END + 1)
+#define STR_ERROR_JVMCREATIONFAILED_TITLE (STR_SVT_JAVAERROR_START+1)
+#define STR_WARNING_JAVANOTFOUND (STR_SVT_JAVAERROR_START+2)
+#define STR_WARNING_JAVANOTFOUND_TITLE (STR_SVT_JAVAERROR_START+3)
+#define STR_WARNING_INVALIDJAVASETTINGS (STR_SVT_JAVAERROR_START+4)
+#define STR_WARNING_INVALIDJAVASETTINGS_MAC (STR_SVT_JAVAERROR_START+5)
+#define STR_WARNING_INVALIDJAVASETTINGS_TITLE (STR_SVT_JAVAERROR_START+6)
+#define STR_ERROR_JVMCREATIONFAILED (STR_SVT_JAVAERROR_START+7)
+#define STR_ERROR_JVMCREATIONFAILED_MAC (STR_SVT_JAVAERROR_START+8)
+#define STR_SVT_JAVAERROR_END (STR_ERROR_JVMCREATIONFAILED_MAC)
// String array to match UI language names to LanguageType values and vice
versa
#define STR_ARR_SVT_LANGUAGE_TABLE_START (STR_SVT_JAVAERROR_END + 1)
@@ -261,12 +264,6 @@
#define RID_SVTOOLS_IMAGELIST_SMALL
(RID_SVTOOLS_IMAGELIST_START + 2)
#define RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX
(RID_SVTOOLS_IMAGELIST_START + 3)
-// Java message boxes
-#define WARNINGBOX_JAVANOTFOUND (RID_SVTOOLS_START+22)
-#define WARNINGBOX_INVALIDJAVASETTINGS (RID_SVTOOLS_START+23)
-// RID_SVTOOLS_START + 24 unused
-#define WARNINGBOX_INVALIDJAVASETTINGS_MAC (RID_SVTOOLS_START+25)
-
// images
#define RID_IMG_TREENODE_COLLAPSED (RID_SVTOOLS_START + 0)
#define RID_IMG_TREENODE_EXPANDED (RID_SVTOOLS_START + 1)
diff --git a/svtools/source/java/javaerror.src
b/svtools/source/java/javaerror.src
index e5c17e9..f1d1386 100644
--- a/svtools/source/java/javaerror.src
+++ b/svtools/source/java/javaerror.src
@@ -19,25 +19,19 @@
#include <svtools/svtools.hrc>
-WarningBox WARNINGBOX_JAVANOTFOUND
+String STR_WARNING_JAVANOTFOUND
{
- Buttons = WB_OK ;
- DefButton = WB_DEF_OK ;
- Message[ en-US ] ="%PRODUCTNAME requires a Java runtime environment (JRE)
to perform this task. Please install a JRE and restart %PRODUCTNAME.";
+ Text [ en-US ] ="%PRODUCTNAME requires a Java runtime environment (JRE) to
perform this task. Please install a JRE and restart %PRODUCTNAME.";
};
-WarningBox WARNINGBOX_INVALIDJAVASETTINGS_MAC
+String STR_WARNING_INVALIDJAVASETTINGS_MAC
{
- Buttons = WB_OK ;
- DefButton = WB_DEF_OK ;
- Message[ en-US ] ="The %PRODUCTNAME configuration has been changed. Under
%PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced, select the Java runtime
environment you want to have used by %PRODUCTNAME.";
+ Text [ en-US ] ="The %PRODUCTNAME configuration has been changed. Under
%PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced, select the Java runtime
environment you want to have used by %PRODUCTNAME.";
};
-WarningBox WARNINGBOX_INVALIDJAVASETTINGS
+String STR_WARNING_INVALIDJAVASETTINGS
{
- Buttons = WB_OK ;
- DefButton = WB_DEF_OK ;
- Message[ en-US ] ="The %PRODUCTNAME configuration has been changed. Under
Tools - Options - %PRODUCTNAME - Advanced, select the Java runtime environment
you want to have used by %PRODUCTNAME.";
+ Text [ en-US ] ="The %PRODUCTNAME configuration has been changed. Under
Tools - Options - %PRODUCTNAME - Advanced, select the Java runtime environment
you want to have used by %PRODUCTNAME.";
};
String STR_ERROR_JVMCREATIONFAILED_MAC
@@ -50,12 +44,12 @@ String STR_ERROR_JVMCREATIONFAILED
Text[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to
perform this task. The selected JRE is defective. Please select another version
or install a new JRE and select it under Tools - Options - %PRODUCTNAME -
Advanced.";
};
-String STR_WARNING_JAVANOTFOUND
+String STR_WARNING_JAVANOTFOUND_TITLE
{
Text[ en-US ] = "JRE Required" ;
};
-String STR_WARNING_INVALIDJAVASETTINGS
+String STR_WARNING_INVALIDJAVASETTINGS_TITLE
{
Text[ en-US ] = "Select JRE";
};
diff --git a/svtools/source/java/javainteractionhandler.cxx
b/svtools/source/java/javainteractionhandler.cxx
index 36ab197..15e797d 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.cxx
@@ -29,7 +29,6 @@
#include <com/sun/star/java/RestartRequiredException.hpp>
#include <comphelper/processfactory.hxx>
#include <vcl/layout.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
#include <tools/rcid.h>
@@ -123,8 +122,8 @@ void SAL_CALL JavaInteractionHandler::handle( const
Reference< XInteractionReque
// No suitable JRE found
SolarMutexGuard aSolarGuard;
m_bJavaNotFound_Handled = true;
- WarningBox aWarningBox( NULL, SvtResId( WARNINGBOX_JAVANOTFOUND )
);
- aWarningBox.SetText(SvtResId(STR_WARNING_JAVANOTFOUND).toString());
+ MessageDialog aWarningBox(NULL,
SvtResId(STR_WARNING_JAVANOTFOUND), VCL_MESSAGE_WARNING);
+ aWarningBox.SetText(SvtResId(STR_WARNING_JAVANOTFOUND_TITLE));
nResult = aWarningBox.Execute();
}
else
@@ -140,11 +139,11 @@ void SAL_CALL JavaInteractionHandler::handle( const
Reference< XInteractionReque
SolarMutexGuard aSolarGuard;
m_bInvalidSettings_Handled = true;
#ifdef MACOSX
- WarningBox aWarningBox( NULL, SvtResId(
WARNINGBOX_INVALIDJAVASETTINGS_MAC ) );
+ MessageDialog aWarningBox(NULL,
SvtResId(STR_WARNING_INVALIDJAVASETTINGS_MAC), VCL_MESSAGE_WARNING);
#else
- WarningBox aWarningBox( NULL, SvtResId(
WARNINGBOX_INVALIDJAVASETTINGS ) );
+ MessageDialog aWarningBox(NULL,
SvtResId(STR_WARNING_INVALIDJAVASETTINGS), VCL_MESSAGE_WARNING);
#endif
-
aWarningBox.SetText(SvtResId(STR_WARNING_INVALIDJAVASETTINGS).toString());
+
aWarningBox.SetText(SvtResId(STR_WARNING_INVALIDJAVASETTINGS_TITLE));
nResult = aWarningBox.Execute();
}
else
commit 5f073470617d225fc519fd485e447a8ad10967d9
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Aug 25 15:27:09 2014 +0100
convert RID_XMLSECWB_NO_MOZILLA_PROFILE to MessageDialog + string
Change-Id: I7e02dc9db8c6a3195a4b2adccea3d0f4e260c661
diff --git a/xmlsecurity/inc/xmlsecurity/global.hrc
b/xmlsecurity/inc/xmlsecurity/global.hrc
index e56e8bb..3b62a30 100644
--- a/xmlsecurity/inc/xmlsecurity/global.hrc
+++ b/xmlsecurity/inc/xmlsecurity/global.hrc
@@ -22,8 +22,6 @@
// global resource ids
-#define RID_XMLSECTP_GENERAL 1003
-
#define RID_XMLSECWB_NO_MOZILLA_PROFILE 1013
#endif
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx
b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index 157292a..c97779b 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -36,7 +36,7 @@
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <com/sun/star/ucb/XCommandProcessor.hpp>
#include <com/sun/star/ucb/Command.hpp>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
#include <unotools/securityoptions.hxx>
#include <com/sun/star/security/CertificateValidity.hpp>
#include <com/sun/star/security/SerialNumberAdapter.hpp>
@@ -226,7 +226,7 @@ bool DocumentDigitalSignatures::ImplViewSignatures(
}
else
{
- WarningBox aBox( NULL, XMLSEC_RES( RID_XMLSECWB_NO_MOZILLA_PROFILE ) );
+ MessageDialog aBox(NULL, XMLSEC_RES(RID_XMLSECWB_NO_MOZILLA_PROFILE),
VCL_MESSAGE_WARNING);
aBox.Execute();
}
diff --git a/xmlsecurity/source/component/warnbox.src
b/xmlsecurity/source/component/warnbox.src
index 8e323e1..7202fe9 100644
--- a/xmlsecurity/source/component/warnbox.src
+++ b/xmlsecurity/source/component/warnbox.src
@@ -19,11 +19,9 @@
#include <xmlsecurity/global.hrc>
-WarningBox RID_XMLSECWB_NO_MOZILLA_PROFILE
+String RID_XMLSECWB_NO_MOZILLA_PROFILE
{
- Buttons = WB_OK ;
- DefButton = WB_DEF_OK ;
- Message [ en-US ] = "Digital signatures functionality could not be used,
because no Mozilla user profile was found. Please check the Mozilla
installation." ;
+ Text [ en-US ] = "Digital signatures functionality could not be used,
because no Mozilla user profile was found. Please check the Mozilla
installation." ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit d0c3c16c87a8ff6300a0e07c4d6170748a6c59ed
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Aug 25 15:24:18 2014 +0100
convert SV_EDIT_WARNING_BOX to MessageDialog + string
Change-Id: Ie3ceba0e3fa54b6aac7aca844588ed69063af02e
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index b1f3ff4..83d7ae7 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -173,7 +173,7 @@
#define SV_PRINT_INVALID_TXT 10616
#define SV_PRINT_CUSTOM_TXT 10617
-#define SV_EDIT_WARNING_BOX 10650
+#define SV_EDIT_WARNING_STR 10650
#define SV_FUNIT_STRINGS 10700
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index ac5c57b..287339c 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -24,8 +24,8 @@
#include <vcl/virdev.hxx>
#include <vcl/menu.hxx>
#include <vcl/edit.hxx>
+#include <vcl/layout.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
#include <window.h>
@@ -791,7 +791,7 @@ void Edit::ShowTruncationWarning( Window* pParent )
ResMgr* pResMgr = ImplGetResMgr();
if( pResMgr )
{
- WarningBox aBox( pParent, ResId( SV_EDIT_WARNING_BOX, *pResMgr ) );
+ MessageDialog aBox(pParent, ResId(SV_EDIT_WARNING_STR, *pResMgr),
VCL_MESSAGE_WARNING);
aBox.Execute();
}
}
diff --git a/vcl/source/src/stdtext.src b/vcl/source/src/stdtext.src
index 1a33cfa..7e48859 100644
--- a/vcl/source/src/stdtext.src
+++ b/vcl/source/src/stdtext.src
@@ -49,9 +49,9 @@ String SV_STDTEXT_PREFERENCES
Text [ en-US ] = "Preferences...";
};
-WarningBox SV_EDIT_WARNING_BOX
+String SV_EDIT_WARNING_STR
{
- Message [en-US] = "The inserted text exceeded the maximum length of this
text field. The text was truncated.";
+ Text [en-US] = "The inserted text exceeded the maximum length of this text
field. The text was truncated.";
};
String SV_MAC_SCREENNNAME
commit c407e548cf2ea606c819c7bb5a26559cb0d128be
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Aug 25 15:22:06 2014 +0100
convert RID_SECURITY_WARNING_NO_HYPERLINKS to MessageDialog + string
Change-Id: I960ae9b418249df58f4395445b9de98a41ac2758
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index a4aaf0e..1d74997 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -108,7 +108,7 @@
#define STR_QUERY_UPDATE_LINKS (RID_SFX_APP_START + 192)
#define STR_DDE_ERROR (RID_SFX_APP_START + 193)
-#define RID_SECURITY_WARNING_NO_HYPERLINKS (RID_SFX_APP_START + 194)
+#define STR_SECURITY_WARNING_NO_HYPERLINKS (RID_SFX_APP_START + 194)
#define RID_SVXSTR_FILELINK (RID_SFX_APP_START + 195)
#define RID_SVXSTR_GRAFIKLINK (RID_SFX_APP_START + 196)
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index a18b076..aeb560d 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -326,11 +326,9 @@ String STR_DDE_ERROR
Text [ en-US ] = "DDE link to % for % area % are not available." ;
};
-WarningBox RID_SECURITY_WARNING_NO_HYPERLINKS
+String STR_SECURITY_WARNING_NO_HYPERLINKS
{
- Buttons = WB_OK ;
- DefButton = WB_DEF_OK ;
- Message [ en-US ] = "For security reasons, the hyperlink cannot be
executed.\nThe stated address will not be opened.";
+ Text [ en-US ] = "For security reasons, the hyperlink cannot be
executed.\nThe stated address will not be opened.";
};
String RID_SECURITY_WARNING_TITLE
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index bac3124..dbe8ad9 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -53,7 +53,7 @@
#include <vcl/wrkwin.hxx>
#include <svl/intitem.hxx>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
#include <svl/stritem.hxx>
#include <svl/eitem.hxx>
#include <sfx2/doctempl.hxx>
@@ -833,7 +833,9 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
SolarMutexGuard aGuard;
Window *pWindow = SfxGetpApp()->GetTopWindow();
- WarningBox aSecurityWarningBox( pWindow, SfxResId(
RID_SECURITY_WARNING_NO_HYPERLINKS ));
+ MessageDialog aSecurityWarningBox(pWindow,
+
SfxResId(STR_SECURITY_WARNING_NO_HYPERLINKS),
+ VCL_MESSAGE_WARNING);
aSecurityWarningBox.SetText(
SfxResId(RID_SECURITY_WARNING_TITLE).toString() );
aSecurityWarningBox.Execute();
return;
commit 98ef8894dd01665eda2c303543c366a15a553af7
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Aug 25 15:20:26 2014 +0100
convert RID_PDF_WARNPDFAPASSWORD to MessageDialog + string
Change-Id: I40da6ede705bf8e56adee7a45c56cb60cf42d166
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 9149a8a..ba74e6f 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -21,9 +21,9 @@
#include "impdialog.hxx"
#include "impdialog.hrc"
-#include "vcl/svapp.hxx"
-#include "vcl/msgbox.hxx"
+#include <vcl/layout.hxx>
#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
#include "sfx2/passwd.hxx"
#include "svtools/miscopt.hxx"
@@ -814,7 +814,7 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportPDFAHdl)
// if a password was set, inform the user that this will not be used in
PDF/A case
if( mpCbPDFA1b->IsChecked() && pSecPage && pSecPage->hasPassword() )
{
- WarningBox aBox( this, PDFFilterResId( RID_PDF_WARNPDFAPASSWORD ) );
+ MessageDialog aBox(this, PDFFilterResId(STR_WARN_PASSWORD_PDFA),
VCL_MESSAGE_WARNING);
aBox.Execute();
}
diff --git a/filter/source/pdf/impdialog.hrc b/filter/source/pdf/impdialog.hrc
index 0927cb0..d55d590 100644
--- a/filter/source/pdf/impdialog.hrc
+++ b/filter/source/pdf/impdialog.hrc
@@ -19,7 +19,7 @@
#include <filter.hrc>
-#define RID_PDF_WARNPDFAPASSWORD (RID_PDF_DIALOG_START + 6)
+#define STR_WARN_PASSWORD_PDFA (RID_PDF_DIALOG_START + 6)
//strings for PDF security, user password management
#define STR_PDF_EXPORT_UDPWD (RID_PDF_DIALOG_START + 7)
diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src
index 32d81a4..8bb0512 100644
--- a/filter/source/pdf/impdialog.src
+++ b/filter/source/pdf/impdialog.src
@@ -33,10 +33,9 @@ String STR_PDF_EXPORT_ODPWD
Text[ en-US ] = "Set permission password";
};
-WarningBox RID_PDF_WARNPDFAPASSWORD
+String STR_WARN_PASSWORD_PDFA
{
- Title[en-US] = "PDF/A Export";
- Message[ en-US ] = "PDF/A does not allow encryption. The exported PDF file
will not be password protected.";
+ Text [ en-US ] = "PDF/A does not allow encryption. The exported PDF file
will not be password protected.";
};
String STR_WARN_TRANSP_PDFA_SHORT
commit 57488f2a10ad7a40bfed6e02024aea8d3d1bf493
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Aug 25 15:11:42 2014 +0100
convert RID_WARNINGBOX_* to MessageDialog + string
Change-Id: Ic6031faa475e22ee23a6c8888987127b3caf92de
diff --git a/desktop/source/deployment/gui/dp_gui.hrc
b/desktop/source/deployment/gui/dp_gui.hrc
index a9e469d..7ccd459 100644
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/desktop/source/deployment/gui/dp_gui.hrc
@@ -23,13 +23,13 @@
#include "deployment.hrc"
#include "helpid.hrc"
-#define RID_WARNINGBOX_VERSION_LESS
(RID_DEPLOYMENT_GUI_START + 3)
+#define RID_STR_WARNING_VERSION_LESS
(RID_DEPLOYMENT_GUI_START + 3)
#define RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES
(RID_DEPLOYMENT_GUI_START + 4)
-#define RID_WARNINGBOX_VERSION_EQUAL
(RID_DEPLOYMENT_GUI_START + 5)
+#define RID_STR_WARNING_VERSION_EQUAL
(RID_DEPLOYMENT_GUI_START + 5)
#define RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES
(RID_DEPLOYMENT_GUI_START + 6)
-#define RID_WARNINGBOX_VERSION_GREATER
(RID_DEPLOYMENT_GUI_START + 7)
+#define RID_STR_WARNING_VERSION_GREATER
(RID_DEPLOYMENT_GUI_START + 7)
#define RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES
(RID_DEPLOYMENT_GUI_START + 8)
-#define RID_WARNINGBOX_INSTALL_EXTENSION
(RID_DEPLOYMENT_GUI_START + 9)
+#define RID_STR_WARNING_INSTALL_EXTENSION
(RID_DEPLOYMENT_GUI_START + 9)
#define RID_DLG_UPDATE_NORMALALERT (RID_DEPLOYMENT_GUI_START + 11)
#define RID_DLG_UPDATE_ERROR (RID_DEPLOYMENT_GUI_START + 12)
@@ -84,12 +84,11 @@
#define RID_STR_ERROR_MISSING_LICENSE (RID_DEPLOYMENT_GUI_START+97)
#define RID_STR_SHOW_LICENSE_CMD (RID_DEPLOYMENT_GUI_START+98)
-#define RID_STR_UNSUPPORTED_PLATFORM (RID_DEPLOYMENT_GUI_START+101)
-#define RID_WARNINGBOX_UPDATE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+102)
-#define RID_WARNINGBOX_REMOVE_EXTENSION (RID_DEPLOYMENT_GUI_START+103)
-#define RID_WARNINGBOX_REMOVE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+104)
-#define RID_WARNINGBOX_ENABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+105)
-#define RID_WARNINGBOX_DISABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+106)
+#define RID_STR_UNSUPPORTED_PLATFORM (RID_DEPLOYMENT_GUI_START+101)
+#define RID_STR_WARNING_REMOVE_EXTENSION (RID_DEPLOYMENT_GUI_START+103)
+#define RID_STR_WARNING_REMOVE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+104)
+#define RID_STR_WARNING_ENABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+105)
+#define RID_STR_WARNING_DISABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+106)
#endif
diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src
b/desktop/source/deployment/gui/dp_gui_dialog.src
index e328ace..ae85a1d 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog.src
@@ -111,47 +111,39 @@ String RID_STR_SHOW_LICENSE_CMD
Text [ en-US ] = "Show license";
};
-WarningBox RID_WARNINGBOX_INSTALL_EXTENSION {
- Buttons = WB_OK_CANCEL;
- DefButton = WB_DEF_OK;
- Message[en-US] = "You are about to install the extension '%NAME'.\n"
+String RID_STR_WARNING_INSTALL_EXTENSION
+{
+ Text [en-US] = "You are about to install the extension '%NAME'.\n"
"Click 'OK' to proceed with the installation.\n"
"Click 'Cancel' to stop the installation.";
};
-WarningBox RID_WARNINGBOX_REMOVE_EXTENSION {
- Buttons = WB_OK_CANCEL;
- DefButton = WB_DEF_CANCEL;
- Message[en-US] = "You are about to remove the extension '%NAME'.\n"
+String RID_STR_WARNING_REMOVE_EXTENSION
+{
+ Text [en-US] = "You are about to remove the extension '%NAME'.\n"
"Click 'OK' to remove the extension.\n"
"Click 'Cancel' to stop removing the extension.";
};
-WarningBox RID_WARNINGBOX_REMOVE_SHARED_EXTENSION
+String RID_STR_WARNING_REMOVE_SHARED_EXTENSION
{
- Buttons = WB_OK_CANCEL;
- DefButton = WB_DEF_CANCEL;
- Message[en-US] = "Make sure that no further users are working with the
same "
+ Text [en-US] = "Make sure that no further users are working with the same "
"%PRODUCTNAME, when changing shared extensions in a multi user
environment.\n"
"Click 'OK' to remove the extension.\n"
"Click 'Cancel' to stop removing the extension.";
};
-WarningBox RID_WARNINGBOX_ENABLE_SHARED_EXTENSION
+String RID_STR_WARNING_ENABLE_SHARED_EXTENSION
{
- Buttons = WB_OK_CANCEL;
- DefButton = WB_DEF_CANCEL;
- Message[en-US] = "Make sure that no further users are working with the
same "
+ Text [en-US] = "Make sure that no further users are working with the same "
"%PRODUCTNAME, when changing shared extensions in a multi user
environment.\n"
"Click 'OK' to enable the extension.\n"
"Click 'Cancel' to stop enabling the extension.";
};
-WarningBox RID_WARNINGBOX_DISABLE_SHARED_EXTENSION
+String RID_STR_WARNING_DISABLE_SHARED_EXTENSION
{
- Buttons = WB_OK_CANCEL;
- DefButton = WB_DEF_CANCEL;
- Message[en-US] = "Make sure that no further users are working with the
same "
+ Text [en-US] = "Make sure that no further users are working with the same "
"%PRODUCTNAME, when changing shared extensions in a multi user
environment.\n"
"Click 'OK' to disable the extension.\n"
"Click 'Cancel' to stop disabling the extension.";
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 37769f9..e5ba333 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -36,7 +36,6 @@
#include <vcl/ctrl.hxx>
#include <vcl/menu.hxx>
#include <vcl/layout.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/svapp.hxx>
@@ -589,11 +588,8 @@ bool DialogHelper::continueOnSharedExtension( const
uno::Reference< deployment::
if ( !bHadWarning && IsSharedPkgMgr( xPackage ) )
{
const SolarMutexGuard guard;
- WarningBox aInfoBox( pParent, getResId( nResID ) );
- OUString aMsgText = aInfoBox.GetMessText();
- aMsgText = aMsgText.replaceAll(
- "%PRODUCTNAME", utl::ConfigManager::getProductName());
- aInfoBox.SetMessText( aMsgText );
+ MessageDialog aInfoBox(pParent, getResId(nResID),
+ VCL_MESSAGE_WARNING, VCL_BUTTONS_OK_CANCEL);
bHadWarning = true;
@@ -630,15 +626,15 @@ void DialogHelper::openWebBrowser( const OUString & sURL,
const OUString &sTitle
}
}
-
bool DialogHelper::installExtensionWarn( const OUString &rExtensionName ) const
{
const SolarMutexGuard guard;
- WarningBox aInfo( m_pVCLWindow, getResId( RID_WARNINGBOX_INSTALL_EXTENSION
) );
+ MessageDialog aInfo(m_pVCLWindow,
getResId(RID_STR_WARNING_INSTALL_EXTENSION),
+ VCL_MESSAGE_WARNING, VCL_BUTTONS_OK_CANCEL);
- OUString sText(aInfo.GetMessText());
+ OUString sText(aInfo.get_primary_text());
sText = sText.replaceAll("%NAME", rExtensionName);
- aInfo.SetMessText(sText);
+ aInfo.set_primary_text(sText);
return ( RET_OK == aInfo.Execute() );
}
@@ -765,27 +761,25 @@ void ExtMgrDialog::prepareChecking()
m_pExtensionBox->prepareChecking();
}
-
void ExtMgrDialog::checkEntries()
{
const SolarMutexGuard guard;
m_pExtensionBox->checkEntries();
}
-
bool ExtMgrDialog::removeExtensionWarn( const OUString &rExtensionName ) const
{
const SolarMutexGuard guard;
- WarningBox aInfo( const_cast< ExtMgrDialog* >(this), getResId(
RID_WARNINGBOX_REMOVE_EXTENSION ) );
+ MessageDialog aInfo(const_cast<ExtMgrDialog*>(this),
getResId(RID_STR_WARNING_REMOVE_EXTENSION),
+ VCL_MESSAGE_WARNING, VCL_BUTTONS_OK_CANCEL);
- OUString sText(aInfo.GetMessText());
+ OUString sText(aInfo.get_primary_text());
sText = sText.replaceAll("%NAME", rExtensionName);
- aInfo.SetMessText(sText);
+ aInfo.set_primary_text(sText);
return ( RET_OK == aInfo.Execute() );
}
-
bool ExtMgrDialog::enablePackage( const uno::Reference< deployment::XPackage >
&xPackage,
bool bEnable )
{
@@ -794,12 +788,12 @@ bool ExtMgrDialog::enablePackage( const uno::Reference<
deployment::XPackage > &
if ( bEnable )
{
- if ( ! continueOnSharedExtension( xPackage, this,
RID_WARNINGBOX_ENABLE_SHARED_EXTENSION, m_bEnableWarning ) )
+ if ( ! continueOnSharedExtension( xPackage, this,
RID_STR_WARNING_ENABLE_SHARED_EXTENSION, m_bEnableWarning ) )
return false;
}
else
{
- if ( ! continueOnSharedExtension( xPackage, this,
RID_WARNINGBOX_DISABLE_SHARED_EXTENSION, m_bDisableWarning ) )
+ if ( ! continueOnSharedExtension( xPackage, this,
RID_STR_WARNING_DISABLE_SHARED_EXTENSION, m_bDisableWarning ) )
return false;
}
@@ -820,7 +814,7 @@ bool ExtMgrDialog::removePackage( const uno::Reference<
deployment::XPackage > &
return false;
}
- if ( ! continueOnSharedExtension( xPackage, this,
RID_WARNINGBOX_REMOVE_SHARED_EXTENSION, m_bDeleteWarning ) )
+ if ( ! continueOnSharedExtension( xPackage, this,
RID_STR_WARNING_REMOVE_SHARED_EXTENSION, m_bDeleteWarning ) )
return false;
m_pManager->getCmdQueue()->removeExtension( xPackage );
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 51dfdb4..86a3056 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -62,7 +62,6 @@
#include <cppuhelper/implbase3.hxx>
#include <comphelper/anytostring.hxx>
#include <vcl/layout.hxx>
-#include <vcl/msgbox.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include "dp_gui.h"
@@ -438,13 +437,13 @@ void ProgressCmdEnv::handle( uno::Reference<
task::XInteractionRequest > const &
verExc.NewVersion, verExc.Deployed->getVersion() ))
{
case dp_misc::LESS:
- id = RID_WARNINGBOX_VERSION_LESS;
+ id = RID_STR_WARNING_VERSION_LESS;
break;
case dp_misc::EQUAL:
- id = RID_WARNINGBOX_VERSION_EQUAL;
+ id = RID_STR_WARNING_VERSION_EQUAL;
break;
default: // dp_misc::GREATER
- id = RID_WARNINGBOX_VERSION_GREATER;
+ id = RID_STR_WARNING_VERSION_GREATER;
break;
}
OSL_ASSERT( verExc.Deployed.is() );
@@ -452,24 +451,25 @@ void ProgressCmdEnv::handle( uno::Reference<
task::XInteractionRequest > const &
verExc.Deployed->getDisplayName());
{
SolarMutexGuard guard;
- WarningBox box( m_pDialogHelper? m_pDialogHelper->getWindow() :
NULL, ResId(id, *DeploymentGuiResMgr::get()));
+ MessageDialog box(m_pDialogHelper? m_pDialogHelper->getWindow() :
NULL,
+ ResId(id, *DeploymentGuiResMgr::get()), VCL_MESSAGE_WARNING,
VCL_BUTTONS_OK_CANCEL);
OUString s;
if (bEqualNames)
{
- s = box.GetMessText();
+ s = box.get_primary_text();
}
- else if (id == RID_WARNINGBOX_VERSION_EQUAL)
+ else if (id == RID_STR_WARNING_VERSION_EQUAL)
{
//hypothetical: requires two instances of an extension with
the same
//version to have different display names. Probably the
developer forgot
//to change the version.
s = ResId(RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES,
*DeploymentGuiResMgr::get()).toString();
}
- else if (id == RID_WARNINGBOX_VERSION_LESS)
+ else if (id == RID_STR_WARNING_VERSION_LESS)
{
s = ResId(RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES,
*DeploymentGuiResMgr::get()).toString();
}
- else if (id == RID_WARNINGBOX_VERSION_GREATER)
+ else if (id == RID_STR_WARNING_VERSION_GREATER)
{
s = ResId(RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES,
*DeploymentGuiResMgr::get()).toString();
}
@@ -477,7 +477,7 @@ void ProgressCmdEnv::handle( uno::Reference<
task::XInteractionRequest > const &
s = s.replaceAll("$OLDNAME", verExc.Deployed->getDisplayName());
s = s.replaceAll("$NEW", getVersion(verExc.NewVersion));
s = s.replaceAll("$DEPLOYED", getVersion(verExc.Deployed));
- box.SetMessText(s);
+ box.set_primary_text(s);
approve = box.Execute() == RET_OK;
abort = !approve;
}
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src
b/desktop/source/deployment/gui/dp_gui_updatedialog.src
index aac2f88..6cead51 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.src
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.src
@@ -87,14 +87,4 @@ String RID_DLG_UPDATE_IGNORED_UPDATE {
Text[en-US] = "This update will be ignored.\n";
};
-WarningBox RID_WARNINGBOX_UPDATE_SHARED_EXTENSION
-{
- Buttons = WB_OK_CANCEL;
- DefButton = WB_DEF_CANCEL;
- Message[en-US] = "Make sure that no further users are working with the
same "
- "%PRODUCTNAME, when changing shared extensions in a multi user
environment.\n"
- "Click 'OK' to update the extensions.\n"
- "Click 'Cancel' to stop updating the extensions.";
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/gui/dp_gui_versionboxes.src
b/desktop/source/deployment/gui/dp_gui_versionboxes.src
index 8ef810c..7e18fa6 100644
--- a/desktop/source/deployment/gui/dp_gui_versionboxes.src
+++ b/desktop/source/deployment/gui/dp_gui_versionboxes.src
@@ -19,10 +19,9 @@
#include "dp_gui.hrc"
-WarningBox RID_WARNINGBOX_VERSION_LESS {
- Buttons = WB_OK_CANCEL;
- DefButton = WB_DEF_CANCEL;
- Message[en-US] = "You are about to install version $NEW of the extension
'$NAME'.\n"
+String RID_STR_WARNING_VERSION_LESS
+{
+ Text [en-US] = "You are about to install version $NEW of the extension
'$NAME'.\n"
"The newer version $DEPLOYED is already installed.\n"
"Click 'OK' to replace the installed extension.\n"
"Click 'Cancel' to stop the installation.";
@@ -35,10 +34,9 @@ String RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES {
"Click 'Cancel' to stop the installation.";
};
-WarningBox RID_WARNINGBOX_VERSION_EQUAL {
- Buttons = WB_OK_CANCEL;
- DefButton = WB_DEF_CANCEL;
- Message[en-US] = "You are about to install version $NEW of the extension
'$NAME'.\n"
+String RID_STR_WARNING_VERSION_EQUAL
+{
+ Text [en-US] = "You are about to install version $NEW of the extension
'$NAME'.\n"
"That version is already installed.\n"
"Click 'OK' to replace the installed extension.\n"
"Click 'Cancel' to stop the installation.";
@@ -51,17 +49,17 @@ String RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES {
"Click 'Cancel' to stop the installation.";
};
-WarningBox RID_WARNINGBOX_VERSION_GREATER {
- Buttons = WB_OK_CANCEL;
- DefButton = WB_DEF_OK;
- Message[en-US] = "You are about to install version $NEW of the extension
'$NAME'.\n"
+String RID_STR_WARNING_VERSION_GREATER
+{
+ Text [en-US] = "You are about to install version $NEW of the extension
'$NAME'.\n"
"The older version $DEPLOYED is already installed.\n"
"Click 'OK' to replace the installed extension.\n"
"Click 'Cancel' to stop the installation.";
};
-String RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES {
- TEXT [en-US] = "You are about to install version $NEW of the extension
'$NAME'.\n"
+String RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES
+{
+ Text [en-US] = "You are about to install version $NEW of the extension
'$NAME'.\n"
"The older version $DEPLOYED, named '$OLDNAME', is already installed.\n"
"Click 'OK' to replace the installed extension.\n"
"Click 'Cancel' to stop the installation.";
commit fd345ccfafcc0deb3c2840f03f4cea839886f23c
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Aug 25 14:21:17 2014 +0100
queryboxes cannot be loaded from resource files anymore
Change-Id: I2ee03b2f8f34d9ecf8a762e7845410fd9a31590f
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index 70199fc..c8a405f 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -51,7 +51,6 @@
#define RSC_WARNINGBOX (RSC_NOTYPE + 0x32)
-#define RSC_QUERYBOX (RSC_NOTYPE + 0x34)
#define RSC_WINDOW (RSC_NOTYPE + 0x35)
#define RSC_SYSWINDOW (RSC_NOTYPE + 0x36)
#define RSC_WORKWIN (RSC_NOTYPE + 0x37)
diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx
index 2684a25..0bc49e8 100644
--- a/include/vcl/msgbox.hxx
+++ b/include/vcl/msgbox.hxx
@@ -118,7 +118,6 @@ private:
public:
QueryBox( Window* pParent, WinBits nStyle,
const OUString& rMessage );
- QueryBox( Window* pParent, const ResId& rResId );
void SetDefaultCheckBoxText();
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 2016d11..a399e86 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -95,7 +95,6 @@ void RscTypCont::Init()
RscTop * pClassMenu;
RscTop * pClassMessBox;
RscTop * pClassWarningBox;
- RscTop * pClassQueryBox;
RscTop * pClassSplitter;
RscTop * pClassSplitWindow;
RscTop * pClassSpinButton;
@@ -476,13 +475,6 @@ void RscTypCont::Init()
pClassWarningBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
aNmTb.Put( nId, CLASSNAME, pClassWarningBox );
pRoot->Insert( pClassWarningBox );
-
- // Klasse anlegen
- nId = pHS->getID( "QueryBox" );
- pClassQueryBox = new RscClass( nId, RSC_QUERYBOX, pClassMessBox );
- pClassQueryBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
- aNmTb.Put( nId, CLASSNAME, pClassQueryBox );
- pRoot->Insert( pClassQueryBox );
}
{
pClassSplitter = InitClassSplitter( pClassWindow );
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 666411c..d414ab0 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -513,12 +513,6 @@ QueryBox::QueryBox( Window* pParent, WinBits nStyle, const
OUString& rMessage )
ImplInitQueryBoxData();
}
-QueryBox::QueryBox( Window* pParent, const ResId& rResId ) :
- MessBox( pParent, rResId.SetRT( RSC_QUERYBOX ) )
-{
- ImplInitQueryBoxData();
-}
-
void QueryBox::SetDefaultCheckBoxText()
{
ResMgr* pResMgr = ImplGetResMgr();
commit 6cf795539604a96d712ecbef579863c699419641
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Aug 25 14:17:42 2014 +0100
convert MSG_PRINT_AS_MERGE with custom buttons to .ui
Change-Id: I42296f8cde4e03214b29f35fd3c42a63c4317f79
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 25fa197..4a2a448 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -183,6 +183,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/picturepage \
sw/uiconfig/swriter/ui/previewzoomdialog \
sw/uiconfig/swriter/ui/printeroptions \
+ sw/uiconfig/swriter/ui/printmergedialog \
sw/uiconfig/swriter/ui/printmonitordialog \
sw/uiconfig/swriter/ui/printoptionspage \
sw/uiconfig/swriter/ui/privateuserpage \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index f6dfdbc..1e4a640 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -361,7 +361,6 @@
#define HID_PVIEW_ZOOM_LB
"SW_HID_PVIEW_ZOOM_LB"
#define HID_MAIL_MERGE_SELECT
"SW_HID_MAIL_MERGE_SELECT"
-#define HID_PRINT_AS_MERGE
"SW_HID_PRINT_AS_MERGE"
#define HID_MODULE_TOOLBOX
"SW_HID_MODULE_TOOLBOX"
#define HID_MM_SELECTDBTABLEDDIALOG
"SW_HID_MM_SELECTDBTABLEDDIALOG"
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 4da399b..8f19774 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -466,14 +466,6 @@ String STR_REDLINE_UNKNOWN_AUTHOR
Text [ en-US ] = "Unknown Author";
};
-QueryBox MSG_PRINT_AS_MERGE
-{
- HelpId = HID_PRINT_AS_MERGE;
- Buttons = WB_YES_NO ;
- DefButton = WB_DEF_YES ;
- Message [ en-US ] = "Your document contains address database fields. Do
you want to print a form letter?";
-};
-
String RID_MODULE_TOOLBOX
{
Text [ en-US ] = "Function Bar (viewing mode)" ;
diff --git a/sw/source/uibase/inc/app.hrc b/sw/source/uibase/inc/app.hrc
index 5ffc2dc..6239955 100644
--- a/sw/source/uibase/inc/app.hrc
+++ b/sw/source/uibase/inc/app.hrc
@@ -42,7 +42,6 @@
#define STR_REDLINE_UNKNOWN_AUTHOR (RC_APP_BEGIN + 76)
#define STR_WESTERN_FONT (RC_APP_BEGIN + 77)
#define STR_CJK_FONT (RC_APP_BEGIN + 78)
-#define MSG_PRINT_AS_MERGE (RC_APP_BEGIN + 80)
#define STR_ENV_TITLE (RC_APP_BEGIN + 91)
#define STR_LAB_TITLE (RC_APP_BEGIN + 92)
diff --git a/sw/source/uibase/uiview/viewprt.cxx
b/sw/source/uibase/uiview/viewprt.cxx
index 39af799..f136f33 100644
--- a/sw/source/uibase/uiview/viewprt.cxx
+++ b/sw/source/uibase/uiview/viewprt.cxx
@@ -24,7 +24,6 @@
#include <sfx2/progress.hxx>
#include <sfx2/app.hxx>
#include <vcl/layout.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/oldprintadaptor.hxx>
#include <sfx2/printer.hxx>
#include <sfx2/prnmon.hxx>
@@ -202,7 +201,8 @@ void SwView::ExecutePrint(SfxRequest& rReq)
if(!bSilent && !bFromMerge &&
SW_MOD()->GetModuleConfig()->IsAskForMailMerge() &&
pSh->IsAnyDatabaseFieldInDoc())
{
- QueryBox aBox( &GetEditWin(), SW_RES( MSG_PRINT_AS_MERGE ));
+ MessageDialog aBox(&GetEditWin(), "PrintMergeDialog",
+ "modules/swriter/ui/printmergedialog.ui");
short nRet = aBox.Execute();
if(RET_YES == nRet)
{
diff --git a/sw/uiconfig/swriter/ui/printmergedialog.ui
b/sw/uiconfig/swriter/ui/printmergedialog.ui
new file mode 100644
index 0000000..b1d541b
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/printmergedialog.ui
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+ <requires lib="gtk+" version="3.0"/>
+ <object class="GtkMessageDialog" id="PrintMergeDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="resizable">False</property>
+ <property name="type_hint">dialog</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="message_type">question</property>
+ <property name="text" translatable="yes">Your document contains address
database fields. Do you want to print a form letter?</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>
+ <child>
+ <object class="GtkButton" id="no">
+ <property name="label">gtk-no</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="yes">
+ <property name="label">gtk-yes</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </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>
+ <action-widgets>
+ <action-widget response="3">no</action-widget>
+ <action-widget response="2">yes</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ </action-widgets>
+ </object>
+</interface>
commit f50a3677380f611b4cc5f86258ca4dc543c8dc3e
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Aug 25 14:14:33 2014 +0100
convert MSG_COMCORE_ASKSEARCH with custom buttons to .ui
Change-Id: I5066c850a22a9dcf0778878a160bbedee6fba81d
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 6af4be8..25fa197 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/addressblockdialog \
sw/uiconfig/swriter/ui/alreadyexistsdialog \
sw/uiconfig/swriter/ui/asciifilterdialog \
+ sw/uiconfig/swriter/ui/asksearchdialog \
sw/uiconfig/swriter/ui/assignfieldsdialog \
sw/uiconfig/swriter/ui/assignstylesdialog \
sw/uiconfig/swriter/ui/attachnamedialog \
diff --git a/sw/inc/comcore.hrc b/sw/inc/comcore.hrc
index 5affd93..5b26deb 100644
--- a/sw/inc/comcore.hrc
+++ b/sw/inc/comcore.hrc
@@ -24,7 +24,6 @@
// Strings
#define STR_COMCORE_READERROR (RC_COMCORE_BEGIN + 0)
-#define MSG_COMCORE_ASKSEARCH (RC_COMCORE_BEGIN + 1)
#define STR_TABLE_DEFNAME (RC_COMCORE_BEGIN + 2)
#define STR_GRAPHIC_DEFNAME (RC_COMCORE_BEGIN + 3)
#define STR_OBJECT_DEFNAME (RC_COMCORE_BEGIN + 4)
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index b767028..f53ac0b 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -20,7 +20,7 @@
#include <config_features.h>
#include <vcl/dialog.hxx>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/settings.hxx>
#include <viewopt.hxx>
@@ -601,7 +601,8 @@ short SwShellCrsr::MaxReplaceArived()
} while( pShell != ( pSh = (SwViewShell*)pSh->GetNext() ) );
{
- nRet = QueryBox( pDlg, SW_RES( MSG_COMCORE_ASKSEARCH )).Execute();
+ nRet = MessageDialog(pDlg, "AskSearchDialog",
+
"modules/swriter/ui/asksearchdialog.ui").Execute();
}
for( sal_uInt16 n = 0; n < aArr.size(); ++n )
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index e8f7b71..4da399b 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -371,13 +371,6 @@ String STR_STATSTR_SWGPRTOLENOTIFY
Text [ en-US ] = "Adapt Objects...";
};
-QueryBox MSG_COMCORE_ASKSEARCH
-{
- Buttons = WB_YES_NO_CANCEL ;
- DefButton = WB_DEF_YES ;
- Message [ en-US ] = "To proceed with this action, you must first turn off
the \"undo\" function. Do you want to turn off the \"undo\" function?" ;
-};
-
Bitmap RID_GRAPHIC_REPLACEBMP
{
File = "grafikei.bmp" ;
diff --git a/sw/uiconfig/swriter/ui/asksearchdialog.ui
b/sw/uiconfig/swriter/ui/asksearchdialog.ui
new file mode 100644
index 0000000..32b568e
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/asksearchdialog.ui
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+ <requires lib="gtk+" version="3.0"/>
+ <object class="GtkMessageDialog" id="AskSearchDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="resizable">False</property>
+ <property name="type_hint">dialog</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="message_type">question</property>
+ <property name="text" translatable="yes">To proceed with this action, you
must first turn off the "undo" function. Do you want to turn off the "undo"
function?</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>
+ <child>
+ <object class="GtkButton" id="no">
+ <property name="label">gtk-no</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="yes">
+ <property name="label">gtk-yes</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </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>
+ <action-widgets>
+ <action-widget response="3">no</action-widget>
+ <action-widget response="2">yes</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ </action-widgets>
+ </object>
+</interface>
commit 9a11491731541232d8e184b0b25442cdb790cf9f
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Aug 25 14:10:31 2014 +0100
convert RID_QRY_SAVEMODIFIED with custom buttons to .ui
Change-Id: I782ca0f7e60f92e65e1a93bb8d1d38eded941cbb
diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc
index 3282bf0..1257e32 100644
--- a/include/svx/fmresids.hrc
+++ b/include/svx/fmresids.hrc
@@ -85,7 +85,6 @@
#define RID_MENU_DATANAVIGATOR (RID_FORMS_START + 10)
// QueryBox-Id's -----------------------------------------------------------
-#define RID_QRY_SAVEMODIFIED (RID_FORMS_START + 1)
#define RID_QRY_LINK_WARNING (RID_FORMS_START + 6)
// String-Id's -----------------------------------------------------------
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 76e7f12..c1f856a 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/redlinecontrol \
svx/uiconfig/ui/redlinefilterpage \
svx/uiconfig/ui/redlineviewpage \
+ svx/uiconfig/ui/savemodifieddialog \
svx/uiconfig/ui/sidebararea \
svx/uiconfig/ui/sidebargraphic \
svx/uiconfig/ui/sidebarinsert \
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 08c0634..80fc744 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -37,8 +37,8 @@
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/awt/XTabControllerModel.hpp>
#include <sfx2/viewfrm.hxx>
+#include <vcl/layout.hxx>
#include <vcl/wrkwin.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/whiter.hxx>
#include <sfx2/app.hxx>
#include <svl/intitem.hxx>
@@ -272,7 +272,8 @@ bool FmFormShell::PrepareClose(bool bUI)
if ( bModified && bUI )
{
- QueryBox aQry(NULL, SVX_RES(RID_QRY_SAVEMODIFIED));
+ MessageDialog aQry(NULL, "SaveModifiedDialog",
+ "svx/ui/savemodifieddialog.ui");
switch (aQry.Execute())
{
case RET_NO:
diff --git a/svx/source/form/fmstring.src b/svx/source/form/fmstring.src
index e9dcdd36a..bf0fdd0 100644
--- a/svx/source/form/fmstring.src
+++ b/svx/source/form/fmstring.src
@@ -301,12 +301,6 @@ String RID_STR_AUTOFIELD
Text [ en-US ] = "<AutoField>";
};
-QueryBox RID_QRY_SAVEMODIFIED
-{
- Buttons = WB_YES_NO_CANCEL ;
- DefButton = WB_DEF_YES ;
- Message [ en-US ] = "The content of the current form has been
modified.\nDo you want to save your changes?";
-};
Resource RID_RSC_SQL_INTERNATIONAL
{
String 1
diff --git a/svx/uiconfig/ui/savemodifieddialog.ui
b/svx/uiconfig/ui/savemodifieddialog.ui
new file mode 100644
index 0000000..c5018e2
--- /dev/null
+++ b/svx/uiconfig/ui/savemodifieddialog.ui
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+ <requires lib="gtk+" version="3.0"/>
+ <object class="GtkMessageDialog" id="SaveModifiedDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="resizable">False</property>
+ <property name="type_hint">dialog</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="message_type">question</property>
+ <property name="text" translatable="yes">Do you want to save your
changes?</property>
+ <property name="secondary_text" translatable="yes">The content of the
current form has been modified.</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>
+ <child>
+ <object class="GtkButton" id="no">
+ <property name="label">gtk-no</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="yes">
+ <property name="label">gtk-yes</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </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>
+ <action-widgets>
+ <action-widget response="3">no</action-widget>
+ <action-widget response="2">yes</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ </action-widgets>
+ </object>
+</interface>
commit 65597c9907a895a773fd9f9c991870416bd33335
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Aug 25 14:08:06 2014 +0100
add WarningBox to count-todo-dialogs
Change-Id: Id56afd3bd343980aefce1039704afe0eff581208
diff --git a/bin/count-todo-dialogs b/bin/count-todo-dialogs
index c530e36..9c47edb 100755
--- a/bin/count-todo-dialogs
+++ b/bin/count-todo-dialogs
@@ -29,8 +29,10 @@ echo We are $percent% of the way through the .ui conversion.
errorboxes=`git grep -h ErrorBox -- *.src|cut -d' ' -f2- |sort|uniq|wc -l`
infoboxes=`git grep -h InfoBox -- *.src|cut -d' ' -f2- |sort|uniq|wc -l`
queryboxes=`git grep -h QueryBox -- *.src|cut -d' ' -f2- |sort|uniq|wc -l`
+warningboxes=`git grep -h WarningBox -- *.src|cut -d' ' -f2- |sort|uniq|wc -l`
echo
echo We need to reduce $errorboxes ErrorBox to basic strings as arguments to
MessageDialog
echo We need to reduce $infoboxes InfoBox to basic strings as arguments to
MessageDialog
echo We need to reduce $queryboxes QueryBox to basic strings as arguments to
MessageDialog
+echo We need to reduce $warningboxes WarningBox to basic strings as arguments
to MessageDialog
commit 7cf74a8e8e5bcd6a98ab737bd6f5655a915ce589
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Aug 25 14:04:04 2014 +0100
convert STR_QUESTION_JAVADISABLED with custom buttons to .ui
Change-Id: I6f806f27232865ab871576e18a33fae08c20ed31
diff --git a/include/svtools/svtools.hrc b/include/svtools/svtools.hrc
index 2887e54..c0af413 100644
--- a/include/svtools/svtools.hrc
+++ b/include/svtools/svtools.hrc
@@ -197,7 +197,6 @@
//String - Ids for Java errors, messages
#define STR_SVT_JAVAERROR_START (STR_SVT_INDEXENTRY_END + 1)
-#define STR_QUESTION_JAVADISABLED (STR_SVT_JAVAERROR_START+0)
#define STR_ERROR_JVMCREATIONFAILED_TITLE (STR_SVT_JAVAERROR_START+1)
#define STR_WARNING_JAVANOTFOUND (STR_SVT_JAVAERROR_START+2)
#define STR_WARNING_INVALIDJAVASETTINGS (STR_SVT_JAVAERROR_START+3)
@@ -263,7 +262,6 @@
#define RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX
(RID_SVTOOLS_IMAGELIST_START + 3)
// Java message boxes
-#define QBX_JAVADISABLED (RID_SVTOOLS_START+20)
#define WARNINGBOX_JAVANOTFOUND (RID_SVTOOLS_START+22)
#define WARNINGBOX_INVALIDJAVASETTINGS (RID_SVTOOLS_START+23)
// RID_SVTOOLS_START + 24 unused
diff --git a/svtools/UIConfig_svt.mk b/svtools/UIConfig_svt.mk
index 0c482cd..dd6182e 100644
--- a/svtools/UIConfig_svt.mk
+++ b/svtools/UIConfig_svt.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svt,\
svtools/uiconfig/ui/addresstemplatedialog \
svtools/uiconfig/ui/graphicexport \
svtools/uiconfig/ui/GraphicExportOptionsDialog \
+ svtools/uiconfig/ui/javadisableddialog \
svtools/uiconfig/ui/placeedit \
svtools/uiconfig/ui/printersetupdialog \
svtools/uiconfig/ui/querydeletedialog \
diff --git a/svtools/source/java/javaerror.src
b/svtools/source/java/javaerror.src
index 40d4194..e5c17e9 100644
--- a/svtools/source/java/javaerror.src
+++ b/svtools/source/java/javaerror.src
@@ -40,13 +40,6 @@ WarningBox WARNINGBOX_INVALIDJAVASETTINGS
Message[ en-US ] ="The %PRODUCTNAME configuration has been changed. Under
Tools - Options - %PRODUCTNAME - Advanced, select the Java runtime environment
you want to have used by %PRODUCTNAME.";
};
-QueryBox QBX_JAVADISABLED
-{
- Buttons = WB_YES_NO_CANCEL ;
- DefButton = WB_DEF_YES ;
- Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE)
to perform this task. However, use of a JRE has been disabled. Do you want to
enable the use of a JRE now?";
-};
-
String STR_ERROR_JVMCREATIONFAILED_MAC
{
Text[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to
perform this task. The selected JRE is defective. Please select another version
or install a new JRE and select it under %PRODUCTNAME - Preferences -
%PRODUCTNAME - Advanced.";
@@ -67,11 +60,6 @@ String STR_WARNING_INVALIDJAVASETTINGS
Text[ en-US ] = "Select JRE";
};
-String STR_QUESTION_JAVADISABLED
-{
- Text[ en-US ] = "Enable JRE" ;
-};
-
String STR_ERROR_JVMCREATIONFAILED_TITLE
{
Text[ en-US ] = "JRE is Defective" ;
diff --git a/svtools/source/java/javainteractionhandler.cxx
b/svtools/source/java/javainteractionhandler.cxx
index beda635..36ab197 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.cxx
@@ -29,8 +29,8 @@
#include <com/sun/star/java/RestartRequiredException.hpp>
#include <comphelper/processfactory.hxx>
#include <vcl/layout.hxx>
-#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
#include <tools/rcid.h>
#include <jvmfwk/framework.h>
@@ -159,8 +159,8 @@ void SAL_CALL JavaInteractionHandler::handle( const
Reference< XInteractionReque
SolarMutexGuard aSolarGuard;
m_bJavaDisabled_Handled = true;
// Java disabled. Give user a chance to enable Java inside Office.
- QueryBox aQueryBox( NULL, SvtResId( QBX_JAVADISABLED ) );
- aQueryBox.SetText(SvtResId( STR_QUESTION_JAVADISABLED
).toString());
+ MessageDialog aQueryBox(NULL, "JavaDisabledDialog",
+ "svt/ui/javadisableddialog.ui");
nResult = aQueryBox.Execute();
if ( nResult == RET_YES )
{
diff --git a/svtools/uiconfig/ui/javadisableddialog.ui
b/svtools/uiconfig/ui/javadisableddialog.ui
new file mode 100644
index 0000000..ade251b
--- /dev/null
+++ b/svtools/uiconfig/ui/javadisableddialog.ui
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+ <requires lib="gtk+" version="3.0"/>
+ <object class="GtkMessageDialog" id="JavaDisabledDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="title" translatable="yes">Enable JRE?</property>
+ <property name="resizable">False</property>
+ <property name="type_hint">dialog</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="message_type">question</property>
+ <property name="text" translatable="yes">%PRODUCTNAME requires a Java
runtime environment (JRE) to perform this task. However, use of a JRE has been
disabled. Do you want to enable the use of a JRE now?</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>
+ <child>
+ <object class="GtkButton" id="no">
+ <property name="label">gtk-no</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="yes">
+ <property name="label">gtk-yes</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </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>
+ <action-widgets>
+ <action-widget response="3">no</action-widget>
+ <action-widget response="2">yes</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ </action-widgets>
+ </object>
+</interface>
commit e932500e2342752106140c642203f97b592c7a9c
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Aug 25 13:55:03 2014 +0100
convert RID_QUERYBOX_INSTALL_FOR_ALL with custom buttons to .ui
Change-Id: If7ac491cb6f256af22b48f681590adb1484350d0
diff --git a/desktop/UIConfig_deployment.mk b/desktop/UIConfig_deployment.mk
index 4bc03a5..d5cb72c 100644
--- a/desktop/UIConfig_deployment.mk
+++ b/desktop/UIConfig_deployment.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_UIConfig_add_uifiles,desktop,\
desktop/uiconfig/ui/cmdlinehelp \
desktop/uiconfig/ui/dependenciesdialog \
desktop/uiconfig/ui/extensionmanager \
+ desktop/uiconfig/ui/installforalldialog \
desktop/uiconfig/ui/licensedialog \
desktop/uiconfig/ui/showlicensedialog \
desktop/uiconfig/ui/updatedialog \
diff --git a/desktop/source/deployment/gui/dp_gui.hrc
b/desktop/source/deployment/gui/dp_gui.hrc
index 134df341..a9e469d 100644
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/desktop/source/deployment/gui/dp_gui.hrc
@@ -23,7 +23,6 @@
#include "deployment.hrc"
#include "helpid.hrc"
-#define RID_QUERYBOX_INSTALL_FOR_ALL
(RID_DEPLOYMENT_GUI_START + 2)
#define RID_WARNINGBOX_VERSION_LESS
(RID_DEPLOYMENT_GUI_START + 3)
#define RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES
(RID_DEPLOYMENT_GUI_START + 4)
#define RID_WARNINGBOX_VERSION_EQUAL
(RID_DEPLOYMENT_GUI_START + 5)
@@ -77,8 +76,6 @@
#define RID_STR_DISABLING_PACKAGES (RID_DEPLOYMENT_GUI_START+88)
#define RID_STR_ACCEPT_LICENSE (RID_DEPLOYMENT_GUI_START+89)
-#define RID_STR_INSTALL_FOR_ALL (RID_DEPLOYMENT_GUI_START+90)
-#define RID_STR_INSTALL_FOR_ME (RID_DEPLOYMENT_GUI_START+91)
#define RID_STR_ERROR_UNKNOWN_STATUS (RID_DEPLOYMENT_GUI_START+92)
#define RID_STR_CLOSE_BTN (RID_DEPLOYMENT_GUI_START+93)
#define RID_STR_EXIT_BTN (RID_DEPLOYMENT_GUI_START+94)
diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src
b/desktop/source/deployment/gui/dp_gui_dialog.src
index caa23d2..e328ace 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog.src
@@ -74,16 +74,6 @@ String RID_STR_ACCEPT_LICENSE
Text [ en-US ] = "Accept license for %EXTENSION_NAME";
};
-String RID_STR_INSTALL_FOR_ALL
-{
- Text [ en-US ] = "~For all users";
-};
-
-String RID_STR_INSTALL_FOR_ME
-{
- Text [ en-US ] = "~Only for me";
-};
-
String RID_STR_ERROR_UNKNOWN_STATUS
{
Text [ en-US ] = "Error: The status of this extension is unknown";
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 3856140..37769f9 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -643,35 +643,20 @@ bool DialogHelper::installExtensionWarn( const OUString
&rExtensionName ) const
return ( RET_OK == aInfo.Execute() );
}
-
bool DialogHelper::installForAllUsers( bool &bInstallForAll ) const
{
const SolarMutexGuard guard;
- QueryBox aQuery( m_pVCLWindow, getResId( RID_QUERYBOX_INSTALL_FOR_ALL ) );
-
- OUString sMsgText(aQuery.GetMessText());
- sMsgText = sMsgText.replaceAll(
- "%PRODUCTNAME", utl::ConfigManager::getProductName());
- aQuery.SetMessText(sMsgText);
-
- sal_uInt16 nYesBtnID = aQuery.GetButtonId( 0 );
- sal_uInt16 nNoBtnID = aQuery.GetButtonId( 1 );
-
- if ( nYesBtnID != BUTTONDIALOG_BUTTON_NOTFOUND )
- aQuery.SetButtonText( nYesBtnID, getResourceString(
RID_STR_INSTALL_FOR_ME ) );
- if ( nNoBtnID != BUTTONDIALOG_BUTTON_NOTFOUND )
- aQuery.SetButtonText( nNoBtnID, getResourceString(
RID_STR_INSTALL_FOR_ALL ) );
+ MessageDialog aQuery(m_pVCLWindow, "InstallForAllDialog",
+ "desktop/ui/installforalldialog.ui");
short nRet = aQuery.Execute();
-
- if ( nRet == RET_CANCEL )
+ if (nRet == RET_CANCEL)
return false;
bInstallForAll = ( nRet == RET_NO );
return true;
}
-
void DialogHelper::PostUserEvent( const Link& rLink, void* pCaller )
{
if ( m_nEventID )
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.src
b/desktop/source/deployment/gui/dp_gui_dialog2.src
index ca6e0af..a399c22 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.src
@@ -40,11 +40,4 @@ Image RID_IMG_EXTENSION
ImageBitmap = Bitmap { File = "extension_32.png"; };
};
-QueryBox RID_QUERYBOX_INSTALL_FOR_ALL
-{
- Buttons = WB_YES_NO_CANCEL;
- DefButton = WB_DEF_YES;
- Message[en-US] = "Make sure that no further users are working with the
same %PRODUCTNAME, when installing an extension for all users in a multi user
environment.\n\nFor whom do you want to install the extension?\n";
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/uiconfig/ui/installforalldialog.ui
b/desktop/uiconfig/ui/installforalldialog.ui
new file mode 100644
index 0000000..99dbaf2
--- /dev/null
+++ b/desktop/uiconfig/ui/installforalldialog.ui
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+ <requires lib="gtk+" version="3.0"/>
+ <object class="GtkMessageDialog" id="InstallForAllDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="resizable">False</property>
+ <property name="type_hint">dialog</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="message_type">question</property>
+ <property name="text" translatable="yes">For whom do you want to install
the extension?</property>
+ <property name="secondary_text" translatable="yes">Make sure that no
further users are working with the same %PRODUCTNAME, when installing an
extension for all users in a multi user environment.</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>
+ <child>
+ <object class="GtkButton" id="no">
+ <property name="label" translatable="yes">_For all
users</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="yes">
+ <property name="label" translatable="yes">_Only for
me</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </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>
+ <action-widgets>
+ <action-widget response="3">no</action-widget>
+ <action-widget response="2">yes</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ </action-widgets>
+ </object>
+</interface>
commit db83365b3b0f0e50148af30af67e01e985e21295
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Aug 25 13:48:22 2014 +0100
convert TABLE_DESIGN_ALL_ROWS_DELETED with custom buttons to .ui
Change-Id: Id4b5573cd7e20f841e25ba17f17e98b78fb759cc
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 5ee75b1..c62fb19 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/dbwizmysqlnativepage \
dbaccess/uiconfig/ui/dbwizspreadsheetpage \
dbaccess/uiconfig/ui/dbwiztextpage \
+ dbaccess/uiconfig/ui/deleteallrowsdialog \
dbaccess/uiconfig/ui/designsavemodifieddialog \
dbaccess/uiconfig/ui/directsqldialog \
dbaccess/uiconfig/ui/emptypage \
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc
b/dbaccess/source/ui/inc/dbu_resource.hrc
index 115000c..4bf0d02 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -98,10 +98,6 @@
// FREE
-// query boxes
-
-#define TABLE_DESIGN_ALL_ROWS_DELETED RID_QUERYBOX_START + 13
-
// images
#define TABLE_TREE_ICON RID_IMAGE_START + 0
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx
b/dbaccess/source/ui/tabledesign/TableController.cxx
index a929bb1..d51d1bc 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -580,7 +580,8 @@ sal_Bool SAL_CALL OTableController::suspend(sal_Bool
/*_bSuspend*/) throw( Runti
}
else if ( !m_bNew )
{
- QueryBox aQry(getView(), ModuleRes(TABLE_DESIGN_ALL_ROWS_DELETED));
+ MessageDialog aQry(getView(), "DeleteAllRowsDialog",
+ "dbaccess/ui/deleteallrowsdialog.ui");
switch (aQry.Execute())
{
case RET_YES:
diff --git a/dbaccess/source/ui/tabledesign/table.src
b/dbaccess/source/ui/tabledesign/table.src
index ce22642..a191b34 100644
--- a/dbaccess/source/ui/tabledesign/table.src
+++ b/dbaccess/source/ui/tabledesign/table.src
@@ -371,13 +371,6 @@ String STR_TABLEDESIGN_COULD_NOT_DROP_COL
Text [ en-US ] = "The column $column$ could not be deleted.";
};
-QueryBox TABLE_DESIGN_ALL_ROWS_DELETED
-{
- Buttons = WB_YES_NO_CANCEL ;
- DefButton = WB_DEF_YES ;
- Message [ en-US ] = "You are trying to delete all the columns in the
table. A table cannot exist without columns. Should the table be deleted from
the database? If not, the table will remain unchanged.";
-};
-
String STR_AUTOINCREMENT_VALUE
{
Text [ en-US ] = "A~uto-increment statement";
diff --git a/dbaccess/uiconfig/ui/deleteallrowsdialog.ui
b/dbaccess/uiconfig/ui/deleteallrowsdialog.ui
new file mode 100644
index 0000000..5f69c51
--- /dev/null
+++ b/dbaccess/uiconfig/ui/deleteallrowsdialog.ui
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+ <requires lib="gtk+" version="3.0"/>
+ <object class="GtkMessageDialog" id="DeleteAllRowsDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="resizable">False</property>
+ <property name="type_hint">dialog</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="message_type">question</property>
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
