cui/UIConfig_cui.mk | 2 +
cui/source/inc/cuires.hrc | 2 -
cui/source/tabpages/strings.src | 4 ---
cui/source/tabpages/tpbitmap.cxx | 5 ++-
cui/source/tabpages/tpcolor.cxx | 6 ++--
cui/source/tabpages/tpgradnt.cxx | 7 +++--
cui/source/tabpages/tphatch.cxx | 12 +++------
cui/source/tabpages/tplnedef.cxx | 23 ++++++++++++------
cui/source/tabpages/tplneend.cxx | 6 ++--
cui/uiconfig/ui/querydeletelinestyledialog.ui | 33 ++++++++++++++++++++++++++
cui/uiconfig/ui/querynoloadedfiledialog.ui | 33 ++++++++++++++++++++++++++
cui/uiconfig/ui/querysavelistdialog.ui | 4 +--
vcl/source/window/layout.cxx | 9 +++++--
13 files changed, 112 insertions(+), 34 deletions(-)
New commits:
commit 6c0e752093ddedca0a6f0063567aff19997bab03
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Aug 8 09:23:50 2013 +0100
wrong .ui name
Change-Id: Ieb10eedd791aab6ea251c3fd33d74a2232e2bd6b
diff --git a/cui/uiconfig/ui/querynoloadfiledialog.ui
b/cui/uiconfig/ui/querynoloadedfiledialog.ui
similarity index 100%
rename from cui/uiconfig/ui/querynoloadfiledialog.ui
rename to cui/uiconfig/ui/querynoloadedfiledialog.ui
commit 1a89eaeabd31dddfbad037e8109431a924632543
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Aug 8 09:07:30 2013 +0100
if there is no secondary text then keep primary text orig font size
Change-Id: I12a70c3b3d12d6986a45a5f5c38affd2cd343bfe
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index bdae0fc..0c03839 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1845,11 +1845,16 @@ short MessageDialog::Execute()
WinBits nWinStyle = WB_LEFT | WB_VCENTER | WB_WORDBREAK | WB_NOLABEL |
WB_NOTABSTOP;
+ bool bHasSecondaryText = !m_sSecondaryString.isEmpty();
+
m_pPrimaryMessage = new VclMultiLineEdit(m_pGrid, nWinStyle);
m_pPrimaryMessage->SetPaintTransparent(true);
m_pPrimaryMessage->EnableCursor(false);
Font aFont = GetSettings().GetStyleSettings().GetLabelFont();
- aFont.SetSize( Size( 0, aFont.GetSize().Height() * 1.2 ) );
+
+ if (bHasSecondaryText)
+ aFont.SetSize(Size(0, aFont.GetSize().Height() * 1.2));
+
aFont.SetWeight(WEIGHT_BOLD);
m_pPrimaryMessage->SetControlFont(aFont);
m_pPrimaryMessage->set_grid_left_attach(1);
@@ -1866,7 +1871,7 @@ short MessageDialog::Execute()
m_pSecondaryMessage->set_grid_top_attach(1);
m_pSecondaryMessage->set_hexpand(true);
m_pSecondaryMessage->SetText(m_sSecondaryString);
- m_pSecondaryMessage->Show(!m_sSecondaryString.isEmpty());
+ m_pSecondaryMessage->Show(bHasSecondaryText);
m_pSecondaryMessage->SetMaxTextWidth(m_pSecondaryMessage->approximate_char_width()
* 80);
VclButtonBox *pButtonBox = get_action_area();
commit 786f0eae0673bc18a6e2a71323c70af671e46e66
Author: Olivier Hallot <olivier.hal...@edx.srv.br>
Date: Wed Aug 7 09:06:52 2013 -0300
Use new widget UI dialogs in line style ctor
Change-Id: I2b646d71fe4ab28137d88ebf638b28674eab3c91
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 69ea08c..485edae 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -92,6 +92,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/querydeletechartcolordialog \
cui/uiconfig/ui/querydeletedictionarydialog \
cui/uiconfig/ui/querydeletelineenddialog \
+ cui/uiconfig/ui/querydeletelinestyledialog \
cui/uiconfig/ui/queryduplicatedialog \
cui/uiconfig/ui/querynoloadedfiledialog \
cui/uiconfig/ui/querysavelistdialog \
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index bf0a9c5..737ebbb 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -85,7 +85,7 @@
#define RID_SVXSTR_DESC_NEW_BITMAP (RID_SVX_START + 168)
#define RID_SVXSTR_DESC_EXT_BITMAP (RID_SVX_START + 169)
#define RID_SVXSTR_DESC_LINESTYLE (RID_SVX_START + 174)
-#define RID_SVXSTR_ASK_DEL_LINESTYLE (RID_SVX_START + 176)
+
#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)
diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src
index 3b31606..cf42f8d 100644
--- a/cui/source/tabpages/strings.src
+++ b/cui/source/tabpages/strings.src
@@ -51,10 +51,6 @@ String RID_SVXSTR_DESC_LINESTYLE
{
Text [ en-US ] = "Please enter a name for the line style:" ;
};
-String RID_SVXSTR_ASK_DEL_LINESTYLE
-{
- Text [ en-US ] = "Do you want to delete the line style?" ;
-};
String RID_SVXSTR_ASK_CHANGE_LINESTYLE
{
Text [ en-US ] = "The line style was modified without saving. \nModify the
selected line style or add a new line style." ;
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index d8860cc..36b773a 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -419,7 +419,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl)
{
aName = aNewName;
aName += sal_Unicode(' ');
- aName += OUString::valueOf( j++ );
+ aName += OUString::number( j++ );
bDifferent = sal_True;
for( long i = 0; i < nCount && bDifferent; i++ )
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 5adb247..07a5305 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -589,8 +589,10 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl)
}
else
{
- WarningBox aBox( GetParentDialog(), WinBits( WB_OK ),OUString(
ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) );
- aBox.SetHelpId( HID_WARN_NAME_DUPLICATE );
+
+ MessageDialog aBox( GetParentDialog()
+ ,"DuplicateNameDialog"
+ ,"cui/ui/queryduplicatedialog.ui");
aBox.Execute();
}
}
@@ -667,8 +669,9 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl)
}
else
{
- WarningBox aBox( GetParentDialog(), WinBits( WB_OK ),
OUString( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) );
- aBox.SetHelpId( HID_WARN_NAME_DUPLICATE );
+ MessageDialog aBox( GetParentDialog()
+ ,"DuplicateNameDialog"
+ ,"cui/ui/queryduplicatedialog.ui");
aBox.Execute();
}
}
@@ -685,7 +688,9 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl)
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- QueryBox aQueryBox( GetParentDialog(), WinBits( WB_YES_NO | WB_DEF_NO
), OUString( CUI_RES( RID_SVXSTR_ASK_DEL_LINESTYLE ) ) );
+ MessageDialog aQueryBox( GetParentDialog()
+ ,"AskDelLineStyleDialog"
+ ,"cui/ui/querydeletelinestyledialog.ui");
if ( aQueryBox.Execute() == RET_YES )
{
@@ -721,7 +726,9 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl)
if ( *pnDashListState & CT_MODIFIED )
{
- nReturn = WarningBox( GetParentDialog(), WinBits( WB_YES_NO_CANCEL ),
OUString( ResId( RID_SVXSTR_WARN_TABLE_OVERWRITE, rMgr ) ) ).Execute();
+ nReturn = MessageDialog( GetParentDialog()
+ ,"AskSaveList"
+ ,"cui/ui/querysavelistdialog.ui").Execute();
if ( nReturn == RET_YES )
pDashList->Save();
@@ -762,7 +769,9 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl)
}
else
//aIStream.Close();
- ErrorBox( GetParentDialog(), WinBits( WB_OK ), OUString(
ResId( RID_SVXSTR_READ_DATA_ERROR, rMgr ) ) ).Execute();
+ MessageDialog( GetParentDialog()
+ ,"NoLoadedFileDialog"
+ ,"cui/ui/querynoloadedfiledialog.ui").Execute();
}
}
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 87b2f52..310f7fa 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -328,7 +328,6 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl)
MessageDialog aWarningBox( GetParentDialog()
,"DuplicateNameDialog"
,"cui/ui/queryduplicatedialog.ui");
-// aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE );
aWarningBox.Execute();
SvxAbstractDialogFactory* pFact =
SvxAbstractDialogFactory::Create();
@@ -474,7 +473,6 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl)
MessageDialog aBox( GetParentDialog()
,"DuplicateNameDialog"
,"cui/ui/queryduplicatedialog.ui");
- //aBox.SetHelpId( HID_WARN_NAME_DUPLICATE );
aBox.Execute();
}
}
diff --git a/cui/uiconfig/ui/querydeletelinestyledialog.ui
b/cui/uiconfig/ui/querydeletelinestyledialog.ui
new file mode 100644
index 0000000..3a4bf2b
--- /dev/null
+++ b/cui/uiconfig/ui/querydeletelinestyledialog.ui
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.6 -->
+ <object class="GtkMessageDialog" id="AskDelLineStyleDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="title" translatable="yes">Delete line style?</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 line
style?</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>
commit 4dfb33788de68c827cb7a768efe2012cc0ed1ac5
Author: Olivier Hallot <olivier.hal...@edx.srv.br>
Date: Wed Aug 7 01:00:10 2013 -0300
Use new file load error dialog in widget UI
Change-Id: Ifa31cb9113fc497992d029f401cdadb12cf83c96
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 76cd91f..69ea08c 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -93,6 +93,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/querydeletedictionarydialog \
cui/uiconfig/ui/querydeletelineenddialog \
cui/uiconfig/ui/queryduplicatedialog \
+ cui/uiconfig/ui/querynoloadedfiledialog \
cui/uiconfig/ui/querysavelistdialog \
cui/uiconfig/ui/scriptorganizer \
cui/uiconfig/ui/securityoptionsdialog \
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 7143a9a..fe83718 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -814,8 +814,9 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickLoadHdl_Impl)
else
{
LeaveWait();
- ErrorBox( GetParentDialog(), WinBits( WB_OK ),
- String( ResId( RID_SVXSTR_READ_DATA_ERROR, rMgr ) )
).Execute();
+ MessageDialog( GetParentDialog()
+ ,"NoLoadedFileDialog"
+ ,"cui/ui/querynoloadedfiledialog.ui").Execute();
}
}
}
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index e20b648..a8cfb7c 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -179,9 +179,9 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickLoadHdl_Impl)
}
else
{
- ErrorBox aErrorBox( mpTopDlg, WinBits( WB_OK ),
- String( ResId( RID_SVXSTR_READ_DATA_ERROR, rMgr ) ) );
- aErrorBox.Execute();
+ MessageDialog( mpTopDlg
+ ,"NoLoadedFileDialog"
+ ,"cui/ui/querynoloadedfiledialog.ui").Execute();
}
}
}
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index e8a8fef..d8860cc 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -683,8 +683,9 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickLoadHdl_Impl)
else
{
LeaveWait();
- ErrorBox( GetParentDialog(), WinBits( WB_OK ),
- String( ResId( RID_SVXSTR_READ_DATA_ERROR, rMgr ) )
).Execute();
+ MessageDialog( GetParentDialog()
+ ,"NoLoadedFileDialog"
+ ,"cui/ui/querynoloadedfiledialog.ui").Execute();
}
}
}
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index eb2da03..c65bf71 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -673,9 +673,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickLoadHdl_Impl)
if ( nReturn != RET_CANCEL )
{
- ::sfx2::FileDialogHelper aDlg(
- com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
- 0 );
+ ::sfx2::FileDialogHelper aDlg(
com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
String aStrFilterType( "*.soh" );
aDlg.AddFilter( aStrFilterType, aStrFilterType );
INetURLObject aFile( SvtPathOptions().GetPalettePath() );
@@ -720,8 +718,9 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickLoadHdl_Impl)
*pnHatchingListState &= ~CT_MODIFIED;
}
else
- ErrorBox( GetParentDialog(), WinBits( WB_OK ),
- String( ResId( RID_SVXSTR_READ_DATA_ERROR, rMgr ) )
).Execute();
+ MessageDialog( GetParentDialog()
+ ,"NoLoadedFileDialog"
+ ,"cui/ui/querynoloadedfiledialog.ui").Execute();
}
}
@@ -745,8 +744,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickLoadHdl_Impl)
IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl)
{
- ::sfx2::FileDialogHelper aDlg(
- com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
+ ::sfx2::FileDialogHelper aDlg(
com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
String aStrFilterType( "*.soh" );
aDlg.AddFilter( aStrFilterType, aStrFilterType );
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 6e5b817..87b2f52 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -578,7 +578,9 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl)
*pnLineEndListState &= ~CT_MODIFIED;
}
else
- ErrorBox( GetParentDialog(), WinBits( WB_OK ), OUString(
ResId( RID_SVXSTR_READ_DATA_ERROR, rMgr ) ) ).Execute();
+ MessageDialog( GetParentDialog()
+ ,"NoLoadedFileDialog"
+ ,"cui/ui/querynoloadedfiledialog.ui").Execute();
}
}
diff --git a/cui/uiconfig/ui/querynoloadfiledialog.ui
b/cui/uiconfig/ui/querynoloadfiledialog.ui
new file mode 100644
index 0000000..3597577
--- /dev/null
+++ b/cui/uiconfig/ui/querynoloadfiledialog.ui
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.6 -->
+ <object class="GtkMessageDialog" id="NoLoadedFileDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="title" translatable="yes">No loaded file</property>
+ <property name="type_hint">dialog</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="message_type">error</property>
+ <property name="buttons">ok</property>
+ <property name="text" translatable="yes">The file could not be
loaded!</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>
diff --git a/cui/uiconfig/ui/querysavelistdialog.ui
b/cui/uiconfig/ui/querysavelistdialog.ui
index 3d4c81e..7c47ea4 100644
--- a/cui/uiconfig/ui/querysavelistdialog.ui
+++ b/cui/uiconfig/ui/querysavelistdialog.ui
@@ -3,7 +3,7 @@
<!-- interface-requires gtk+ 3.6 -->
<object class="GtkMessageDialog" id="AskSaveList">
<property name="can_focus">False</property>
- <property name="border_width">6</property>
+ <property name="border_width">12</property>
<property name="title" translatable="yes">Save list?</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
@@ -15,7 +15,7 @@
<object class="GtkBox" id="messagedialog-vbox">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">24</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="messagedialog-action_area">
<property name="can_focus">False</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
