mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert some more queryboxes to new style MessageBox

Browse Source 
Change-Id: I1775d1e169919a7bfb157faba5e18695568f7f78
This commit is contained in:
Caolán McNamara
2013-06-04 11:52:03 +01:00
parent 19a2685ec0
commit 4097ce73b6
5 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sw/UIConfig_swriter.mk
View File

@@ -106,6 +106,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/renameautotextdialog \
sw/uiconfig/swriter/ui/renameobjectdialog \
sw/uiconfig/swriter/ui/rowheight \
sw/uiconfig/swriter/ui/saveashtmldialog \
sw/uiconfig/swriter/ui/sortdialog \
sw/uiconfig/swriter/ui/splittable \
sw/uiconfig/swriter/ui/statisticsinfopage \

6
sw/source/ui/app/app.src
View File

@@ -451,12 +451,6 @@ QueryBox MSG_SAVE_HTML_QUERY
DEFBUTTON = WB_DEF_YES ;
Message [ en-US ] = "Conversion into HTML format \nmay cause information loss. \nDo you want to save the document?" ;
};
QueryBox MSG_SAVEAS_HTML_QUERY
{
BUTTONS = WB_YES_NO;
DEFBUTTON = WB_DEF_NO ;
Message [ en-US ] = "The source code can only be displayed if the document is saved in HTML format.\nWould you like to save the document as HTML?";
};
String STR_ABSTRACT_TITLE
{

4
sw/source/ui/app/docsh2.cxx
View File

@@ -872,7 +872,9 @@ void SwDocShell::Execute(SfxRequest& rReq)
const SfxFilter* pFlt = GetMedium()->GetFilter();
if(!pFlt || pFlt->GetUserData() != pHtmlFlt->GetUserData())
{
QueryBox aQuery(&pViewFrm->GetWindow(), SW_RES(MSG_SAVEAS_HTML_QUERY));
MessageDialog aQuery(&pViewFrm->GetWindow(),
"SaveAsHTMLDialog", "modules/swriter/ui/saveashtmldialog.ui");
if(RET_YES == aQuery.Execute())
bLocalHasName = sal_False;
else

1
sw/source/ui/inc/app.hrc
View File

@@ -34,7 +34,6 @@
// For the interface because the RID_APP_BEGIN is now Desktop.
#define RID_SW_NAME ( RC_APP_BEGIN + 8)
#define MSG_SAVEAS_HTML_QUERY ( RC_APP_BEGIN + 9)
#define STR_UNBENANNT (RC_APP_BEGIN + 13)

34
sw/uiconfig/swriter/ui/saveashtmldialog.ui Normal file
View File

@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkMessageDialog" id="SaveAsHTMLDialog">
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">Save as HTML</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="message_type">question</property>
<property name="buttons">yes-no</property>
<property name="text" translatable="yes">Would you like to save the document as HTML?</property>
<property name="secondary_text" translatable="yes">The source code can only be displayed if the document is saved in HTML format.</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>
</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>
</object>
</interface>