[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
Manal Alhassoun
malhassoun at kacst.edu.sa
Wed Nov 20 01:50:47 PST 2013
cui/UIConfig_cui.mk | 1
cui/source/inc/cuires.hrc | 1
cui/source/tabpages/strings.src | 4 ---
cui/source/tabpages/tphatch.cxx | 3 --
cui/uiconfig/ui/querychangelineenddialog.ui | 1
cui/uiconfig/ui/querydeletehatchdialog.ui | 34 ++++++++++++++++++++++++++
cui/uiconfig/ui/querydeletelinestyledialog.ui | 1
cui/uiconfig/ui/queryduplicatedialog.ui | 1
cui/uiconfig/ui/querynoloadedfiledialog.ui | 1
cui/uiconfig/ui/querynosavefiledialog.ui | 1
cui/uiconfig/ui/querysavelistdialog.ui | 1
11 files changed, 42 insertions(+), 7 deletions(-)
New commits:
commit 533b91f87be3147a9a6bdb2e1b20165aa4921e37
Author: Manal Alhassoun <malhassoun at kacst.edu.sa>
Date: Mon Nov 18 13:42:05 2013 +0300
convert delete hatch querybox to .ui
Change-Id: If550ac8ad58ea7ff05650692d1a506c5088d05e2
Reviewed-on: https://gerrit.libreoffice.org/6708
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 830689b..474189a 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/querychangelineenddialog \
cui/uiconfig/ui/querydeletechartcolordialog \
cui/uiconfig/ui/querydeletedictionarydialog \
+ cui/uiconfig/ui/querydeletehatchdialog \
cui/uiconfig/ui/querydeletelineenddialog \
cui/uiconfig/ui/querydeletelinestyledialog \
cui/uiconfig/ui/queryduplicatedialog \
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 4a887c2..99fdaa2 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -86,7 +86,6 @@
#define RID_SVXSTR_ASK_CHANGE_LINESTYLE (RID_SVX_START + 177)
#define RID_SVXSTR_DESC_HATCH (RID_SVX_START + 232)
-#define RID_SVXSTR_ASK_DEL_HATCH (RID_SVX_START + 234)
#define RID_SVXSTR_ASK_CHANGE_HATCH (RID_SVX_START + 235)
#define RID_SVXSTR_CHANGE (RID_SVX_START + 181)
#define RID_SVXSTR_ADD (RID_SVX_START + 182)
diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src
index 6d9d524..db8c177 100644
--- a/cui/source/tabpages/strings.src
+++ b/cui/source/tabpages/strings.src
@@ -59,10 +59,6 @@ String RID_SVXSTR_DESC_HATCH
{
Text [ en-US ] = "Please enter a name for the hatching:" ;
};
-String RID_SVXSTR_ASK_DEL_HATCH
-{
- Text [ en-US ] = "Do you want to delete the hatching?" ;
-};
String RID_SVXSTR_ASK_CHANGE_HATCH
{
Text [ en-US ] = "The hatching type was modified but not saved. \nModify the selected hatching type or add a new hatching type." ;
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index d6c4d60..6ebda18 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -626,8 +626,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl)
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- QueryBox aQueryBox( GetParentDialog(), WinBits( WB_YES_NO | WB_DEF_NO ),
- OUString( CUI_RES( RID_SVXSTR_ASK_DEL_HATCH ) ) );
+ MessageDialog aQueryBox( GetParentDialog(),"AskDelHatchDialog","cui/ui/querydeletehatchdialog.ui");
if( aQueryBox.Execute() == RET_YES )
{
diff --git a/cui/uiconfig/ui/querychangelineenddialog.ui b/cui/uiconfig/ui/querychangelineenddialog.ui
index 397afaf..8712336 100644
--- a/cui/uiconfig/ui/querychangelineenddialog.ui
+++ b/cui/uiconfig/ui/querychangelineenddialog.ui
@@ -5,6 +5,7 @@
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">Save arrowhead ?</property>
+ <property name="resizable">False</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="message_type">warning</property>
diff --git a/cui/uiconfig/ui/querydeletehatchdialog.ui b/cui/uiconfig/ui/querydeletehatchdialog.ui
new file mode 100644
index 0000000..cd80209
--- /dev/null
+++ b/cui/uiconfig/ui/querydeletehatchdialog.ui
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkMessageDialog" id="AskDelHatchDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="title" translatable="yes">Delete hatching?</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="buttons">yes-no</property>
+ <property name="text" translatable="yes">Do you want to delete the hatching?</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">center</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>
diff --git a/cui/uiconfig/ui/querydeletelinestyledialog.ui b/cui/uiconfig/ui/querydeletelinestyledialog.ui
index 3a4bf2b..9aea902 100644
--- a/cui/uiconfig/ui/querydeletelinestyledialog.ui
+++ b/cui/uiconfig/ui/querydeletelinestyledialog.ui
@@ -5,6 +5,7 @@
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">Delete line style?</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>
diff --git a/cui/uiconfig/ui/queryduplicatedialog.ui b/cui/uiconfig/ui/queryduplicatedialog.ui
index 79905ef..89bc7c3 100644
--- a/cui/uiconfig/ui/queryduplicatedialog.ui
+++ b/cui/uiconfig/ui/queryduplicatedialog.ui
@@ -5,6 +5,7 @@
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">Duplicate name</property>
+ <property name="resizable">False</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="message_type">warning</property>
diff --git a/cui/uiconfig/ui/querynoloadedfiledialog.ui b/cui/uiconfig/ui/querynoloadedfiledialog.ui
index 3597577..c715093 100644
--- a/cui/uiconfig/ui/querynoloadedfiledialog.ui
+++ b/cui/uiconfig/ui/querynoloadedfiledialog.ui
@@ -5,6 +5,7 @@
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">No loaded file</property>
+ <property name="resizable">False</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="message_type">error</property>
diff --git a/cui/uiconfig/ui/querynosavefiledialog.ui b/cui/uiconfig/ui/querynosavefiledialog.ui
index d6565f1..9fed973 100644
--- a/cui/uiconfig/ui/querynosavefiledialog.ui
+++ b/cui/uiconfig/ui/querynosavefiledialog.ui
@@ -5,6 +5,7 @@
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">No saved file</property>
+ <property name="resizable">False</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="message_type">error</property>
diff --git a/cui/uiconfig/ui/querysavelistdialog.ui b/cui/uiconfig/ui/querysavelistdialog.ui
index 7c47ea4..5bd2c3d 100644
--- a/cui/uiconfig/ui/querysavelistdialog.ui
+++ b/cui/uiconfig/ui/querysavelistdialog.ui
@@ -5,6 +5,7 @@
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">Save list?</property>
+ <property name="resizable">False</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="message_type">warning</property>
More information about the Libreoffice-commits
mailing list