summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-08-25 16:00:58 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-08-25 16:45:32 +0100
commit4e84484cc6bcf02819b097a666ee79bbc2ecf1b0 (patch)
tree29b9d8cb232b59e3a180224fa51779df2797f5ff /svx
parenta548b48c15bf00ecac1899261049c4f1871e26d7 (diff)
convert MessBox with custom buttons to .ui
Change-Id: I05704746ce5f098a2caaafafdc574009b279e458
Diffstat (limited to 'svx')
-rw-r--r--svx/UIConfig_svx.mk1
-rw-r--r--svx/source/form/datanavi.cxx13
-rw-r--r--svx/source/form/datanavi.src11
-rw-r--r--svx/source/inc/datanavi.hxx3
-rw-r--r--svx/uiconfig/ui/formlinkwarndialog.ui71
5 files changed, 75 insertions, 24 deletions
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index c1f856a68b51..21ac190369f8 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 9f2a0eb3a3b4..2b2fae5a3458 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 debd9eec8acb..82b18a368230 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 0ed799825e61..8c79cbafc27c 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 000000000000..ba156d8a5ac8
--- /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>