[Libreoffice-commits] core.git: 4 commits - cui/source cui/uiconfig include/sfx2 include/svtools sfx2/source svtools/source sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
Caolán McNamara
caolanm at redhat.com
Sat Sep 28 12:58:39 PDT 2013
cui/source/inc/helpid.hrc | 3
cui/source/options/optlingu.cxx | 7
cui/uiconfig/ui/optlingupage.ui | 369 +++++++++++++++--------------
include/sfx2/dialoghelper.hxx | 2
include/svtools/wizdlg.hxx | 22 +
sfx2/source/dialog/dialoghelper.cxx | 5
svtools/source/dialogs/wizdlg.cxx | 29 ++
sw/AllLangResTarget_sw.mk | 1
sw/UIConfig_swriter.mk | 1
sw/inc/helpid.h | 1
sw/source/ui/config/optpage.cxx | 18 +
sw/source/ui/dbui/mmoutputtypepage.cxx | 50 +--
sw/source/ui/dbui/mmoutputtypepage.hrc | 35 --
sw/source/ui/dbui/mmoutputtypepage.hxx | 20 -
sw/source/ui/dbui/mmoutputtypepage.src | 84 ------
sw/uiconfig/swriter/ui/mmoutputtypepage.ui | 175 +++++++++++++
sw/uiconfig/swriter/ui/optredlinepage.ui | 8
17 files changed, 466 insertions(+), 364 deletions(-)
New commits:
commit 9ab2ecd0c6b941b388a69c647c9caed97eb72cca
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Sep 28 16:45:49 2013 +0100
pretty up optlingu page
Change-Id: Id9b2eec42c55d66ae4669703f1d2b376bae251ce
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index fb5cf88..5b376b6 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -26,10 +26,7 @@
#define HID_OPTIONS_LINGU "CUI_HID_OPTIONS_LINGU"
#define HID_OPTIONS_DICT_EDIT "CUI_HID_OPTIONS_DICT_EDIT"
-#define HID_CLB_EDIT_MODULES_DICS "CUI_HID_CLB_EDIT_MODULES_DICS"
#define HID_CLB_EDIT_MODULES_MODULES "CUI_HID_CLB_EDIT_MODULES_MODULES"
-#define HID_CLB_LINGU_MODULES "CUI_HID_CLB_LINGU_MODULES"
-#define HID_CLB_LINGU_OPTIONS "CUI_HID_CLB_LINGU_OPTIONS"
#define HID_EDIT_MODULES "CUI_HID_EDIT_MODULES"
#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME"
#define HID_OFADLG_OPTIONS_TREE "CUI_HID_OFADLG_OPTIONS_TREE"
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index d662ee1..84c2e77 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1081,10 +1081,13 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, const SfxItemSet& rSet ) :
get(m_pLinguOptionsEditPB, "linguoptionsedit");
get(m_pMoreDictsLink, "moredictslink");
+ m_pLinguModulesCLB->set_height_request(m_pLinguModulesCLB->GetTextHeight() * 3);
+ m_pLinguDicsCLB->set_height_request(m_pLinguDicsCLB->GetTextHeight() * 5);
+ m_pLinguOptionsCLB->set_height_request(m_pLinguOptionsCLB->GetTextHeight() * 5);
+
pCheckButtonData = NULL;
m_pLinguModulesCLB->SetStyle( m_pLinguModulesCLB->GetStyle()|WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
- m_pLinguModulesCLB->SetHelpId(HID_CLB_LINGU_MODULES );
m_pLinguModulesCLB->SetHighlightRange();
m_pLinguModulesCLB->SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl ));
m_pLinguModulesCLB->SetDoubleClickHdl(LINK(this, SvxLinguTabPage, BoxDoubleClickHdl_Impl));
@@ -1094,7 +1097,6 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, const SfxItemSet& rSet ) :
m_pLinguOptionsEditPB->SetClickHdl( LINK( this, SvxLinguTabPage, ClickHdl_Impl ));
m_pLinguDicsCLB->SetStyle( m_pLinguDicsCLB->GetStyle()|WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
- m_pLinguDicsCLB->SetHelpId(HID_CLB_EDIT_MODULES_DICS );
m_pLinguDicsCLB->SetHighlightRange();
m_pLinguDicsCLB->SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl ));
m_pLinguDicsCLB->SetCheckButtonHdl(LINK(this, SvxLinguTabPage, BoxCheckButtonHdl_Impl));
@@ -1104,7 +1106,6 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, const SfxItemSet& rSet ) :
m_pLinguDicsDelPB->SetClickHdl( LINK( this, SvxLinguTabPage, ClickHdl_Impl ));
m_pLinguOptionsCLB->SetStyle( m_pLinguOptionsCLB->GetStyle()|WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
- m_pLinguOptionsCLB->SetHelpId(HID_CLB_LINGU_OPTIONS );
m_pLinguOptionsCLB->SetHighlightRange();
m_pLinguOptionsCLB->SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl ));
m_pLinguOptionsCLB->SetDoubleClickHdl(LINK(this, SvxLinguTabPage, BoxDoubleClickHdl_Impl));
diff --git a/cui/uiconfig/ui/optlingupage.ui b/cui/uiconfig/ui/optlingupage.ui
index d3179cc..04a5e04 100644
--- a/cui/uiconfig/ui/optlingupage.ui
+++ b/cui/uiconfig/ui/optlingupage.ui
@@ -12,6 +12,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
@@ -19,6 +20,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
@@ -26,155 +28,64 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="row_spacing">12</property>
<property name="column_spacing">12</property>
<child>
- <object class="GtkLabel" id="lingumodulesft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Available language modules</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">lingumodules</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="svxcorelo-SvxCheckListBox" id="lingumodules">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="Check List Box-selection1"/>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="lingudictsft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_User-defined dictionaries</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">lingudicts</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="svxcorelo-SvxCheckListBox" id="lingudicts">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="Check List Box-selection2"/>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Options</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">linguoptions</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="svxcorelo-SvxCheckListBox" id="linguoptions">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="Check List Box-selection3"/>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkButton" id="lingudictsnew">
- <property name="label" translatable="yes">_New...</property>
- <property name="use_action_appearance">False</property>
+ <object class="GtkLabel" id="lingumodulesft">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Available language modules</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">lingumodules:border</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="lingudictsedit">
- <property name="label" translatable="yes">Ed_it...</property>
- <property name="use_action_appearance">False</property>
+ <object class="svxcorelo-SvxCheckListBox" id="lingumodules:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- <property name="use_underline">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="Check List Box-selection"/>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="lingudictsdelete">
- <property name="label" translatable="yes">_Delete</property>
- <property name="use_action_appearance">False</property>
+ <object class="GtkButton" id="lingumodulesedit">
+ <property name="label" translatable="yes">_Edit...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
+ <property name="valign">start</property>
<property name="use_underline">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -182,51 +93,108 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLinkButton" id="moredictslink">
- <property name="label" translatable="yes">Get more dictionaries online...</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="use_action_appearance">False</property>
- <property name="relief">none</property>
- <property name="xalign">0</property>
- <property name="uri">http://extensions.libreoffice.org/dictionaries/</property>
- </object>
- <packing>
<property name="left_attach">0</property>
- <property name="top_attach">6</property>
+ <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkButton" id="lingumodulesedit">
- <property name="label" translatable="yes">_Edit...</property>
- <property name="use_action_appearance">False</property>
+ <object class="GtkLabel" id="lingudictsft">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_User-defined dictionaries</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">lingudicts:border</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="svxcorelo-SvxCheckListBox" id="lingudicts:border">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="Check List Box-selection1"/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButtonBox" id="buttonbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="lingudictsnew">
+ <property name="label" translatable="yes">_New...</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="lingudictsedit">
+ <property name="label" translatable="yes">Ed_it...</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">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="lingudictsdelete">
+ <property name="label" translatable="yes">_Delete</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">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -234,31 +202,85 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box3">
+ <object class="GtkGrid" id="grid4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Options</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">linguoptions:border</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLinkButton" id="moredictslink">
+ <property name="label" translatable="yes">Get more dictionaries online...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="relief">none</property>
+ <property name="xalign">0</property>
+ <property name="uri">http://extensions.libreoffice.org/dictionaries/</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="svxcorelo-SvxCheckListBox" id="linguoptions:border">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="Check List Box-selection2"/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
<child>
<object class="GtkButton" id="linguoptionsedit">
<property name="label" translatable="yes">Edi_t...</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
+ <property name="valign">start</property>
<property name="use_underline">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -266,24 +288,12 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">5</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
@@ -307,4 +317,11 @@
</packing>
</child>
</object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <widgets>
+ <widget name="lingumodulesedit"/>
+ <widget name="buttonbox1"/>
+ <widget name="linguoptionsedit"/>
+ </widgets>
+ </object>
</interface>
commit 1f3ad1e31db21c73a0af7aae07cc3eb641e7d51c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Sep 27 14:19:51 2013 +0200
convert mail merge outputtype page to .ui
Change-Id: I3b4779bb36ad791ca4cc7d077da59af6bd04278a
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 2cb0c71..f79cd4e 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/dbui/mmlayoutpage.src \
sw/source/ui/dbui/mmmergepage.src \
sw/source/ui/dbui/mmoutputpage.src \
- sw/source/ui/dbui/mmoutputtypepage.src \
sw/source/ui/dbui/mmpreparemergepage.src \
sw/source/ui/dbui/selectdbtabledialog.src \
sw/source/ui/dialog/dialog.src \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 7e5d930..1a03283 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -159,6 +159,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/querydefaultcompatdialog \
sw/uiconfig/swriter/ui/querysavelabeldialog \
sw/uiconfig/swriter/ui/queryshowchangesdialog \
+ sw/uiconfig/swriter/ui/mmoutputtypepage \
sw/uiconfig/swriter/ui/mmselectpage \
sw/uiconfig/swriter/ui/paradialog \
sw/uiconfig/swriter/ui/picturedialog \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 52ea16d..cc4a15e 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -368,7 +368,6 @@
#define HID_MERGE_SOURCE_UNAVAILABLE "SW_HID_MERGE_SOURCE_UNAVAILABLE"
#define HID_MODULE_TOOLBOX "SW_HID_MODULE_TOOLBOX"
-#define HID_MM_OUTPUTTYPEPAGE "SW_HID_MM_OUTPUTTYPEPAGE"
#define HID_MM_ADDRESSBLOCKPAGE "SW_HID_MM_ADDRESSBLOCKPAGE"
#define HID_MM_GREETINGSPAGE "SW_HID_MM_GREETINGSPAGE"
#define HID_MM_PREPAREMERGEPAGE "SW_HID_MM_PREPAREMERGEPAGE"
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 48d8725..2265b3b 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -23,51 +23,35 @@
#include <vcl/msgbox.hxx>
#include <dbui.hrc>
#include <swtypes.hxx>
-#include <mmoutputtypepage.hrc>
-SwMailMergeOutputTypePage::SwMailMergeOutputTypePage( SwMailMergeWizard* _pParent) :
- svt::OWizardPage( _pParent, SW_RES(DLG_MM_OUTPUTTYPE_PAGE)),
-#ifdef _MSC_VER
-#pragma warning (disable : 4355)
-#endif
- m_aHeaderFI( this, SW_RES( FI_HEADER )),
- m_aTypeFT( this, SW_RES( FT_TYPE )),
- m_aLetterRB( this, SW_RES( RB_LETTER )),
- m_aMailRB( this, SW_RES( RB_MAIL )),
- m_aHintHeaderFI(this, SW_RES( FI_HINTHEADER)),
- m_aHintFI( this, SW_RES( FI_HINT)),
-#ifdef _MSC_VER
-#pragma warning (default : 4355)
-#endif
- m_sLetterHintHeader( SW_RES( ST_LETTERHINTHEADER)),
- m_sMailHintHeader( SW_RES( ST_MAILHINTHEADER)),
- m_sLetterHint( SW_RES( ST_LETTERHINT)),
- m_sMailHint( SW_RES( ST_MAILHINT)),
- m_pWizard(_pParent)
+SwMailMergeOutputTypePage::SwMailMergeOutputTypePage(SwMailMergeWizard* pParent)
+ : svt::OWizardPage(pParent, "MMOutputTypePage",
+ "modules/swriter/ui/mmoutputtypepage.ui")
+ , m_pWizard(pParent)
{
- FreeResource();
+ get(m_pLetterRB, "letter");
+ get(m_pMailRB, "email");
+ get(m_pLetterHint, "letterft");
+ get(m_pMailHint, "emailft");
+
Link aLink = LINK(this, SwMailMergeOutputTypePage, TypeHdl_Impl);
- m_aLetterRB.SetClickHdl(aLink);
- m_aMailRB.SetClickHdl(aLink);
+ m_pLetterRB->SetClickHdl(aLink);
+ m_pMailRB->SetClickHdl(aLink);
SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
if(rConfigItem.IsOutputToLetter())
- m_aLetterRB.Check();
+ m_pLetterRB->Check();
else
- m_aMailRB.Check();
- TypeHdl_Impl(&m_aLetterRB);
-
-}
+ m_pMailRB->Check();
+ TypeHdl_Impl(m_pLetterRB);
-SwMailMergeOutputTypePage::~SwMailMergeOutputTypePage()
-{
}
IMPL_LINK_NOARG(SwMailMergeOutputTypePage, TypeHdl_Impl)
{
- bool bLetter = m_aLetterRB.IsChecked();
- m_aHintHeaderFI.SetText(bLetter ? m_sLetterHintHeader : m_sMailHintHeader);
- m_aHintFI.SetText(bLetter ? m_sLetterHint : m_sMailHint);
+ bool bLetter = m_pLetterRB->IsChecked();
+ m_pLetterHint->Show(bLetter);
+ m_pMailHint->Show(!bLetter);
m_pWizard->GetConfigItem().SetOutputToLetter(bLetter);
m_pWizard->updateRoadmapItemLabel( MM_ADDRESSBLOCKPAGE );
m_pWizard->UpdateRoadmap();
diff --git a/sw/source/ui/dbui/mmoutputtypepage.hrc b/sw/source/ui/dbui/mmoutputtypepage.hrc
deleted file mode 100644
index ac86aab..0000000
--- a/sw/source/ui/dbui/mmoutputtypepage.hrc
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _MAILMERGEOUTPUTTYPEPAGE_HRC
-#define _MAILMERGEOUTPUTTYPEPAGE_HRC
-
-#define FT_TYPE 1
-#define RB_LETTER 2
-#define RB_MAIL 3
-#define FI_HEADER 4
-#define FI_HINTHEADER 5
-#define FI_HINT 6
-#define ST_LETTERHINTHEADER 7
-#define ST_MAILHINTHEADER 8
-#define ST_LETTERHINT 9
-#define ST_MAILHINT 10
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/mmoutputtypepage.hxx b/sw/source/ui/dbui/mmoutputtypepage.hxx
index 388d7d6..2aeab3b 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.hxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.hxx
@@ -27,29 +27,19 @@ class SwMailMergeWizard;
class SwMailMergeOutputTypePage : public svt::OWizardPage
{
- SwBoldFixedInfo m_aHeaderFI;
- FixedInfo m_aTypeFT;
- RadioButton m_aLetterRB;
- RadioButton m_aMailRB;
+ RadioButton* m_pLetterRB;
+ RadioButton* m_pMailRB;
- SwBoldFixedInfo m_aHintHeaderFI;
- FixedInfo m_aHintFI;
-
- String m_sLetterHintHeader;
- String m_sMailHintHeader;
- String m_sLetterHint;
- String m_sMailHint;
+ FixedText* m_pLetterHint;
+ FixedText* m_pMailHint;
SwMailMergeWizard* m_pWizard;
DECL_LINK(TypeHdl_Impl, void *);
public:
- SwMailMergeOutputTypePage( SwMailMergeWizard* _pParent);
- ~SwMailMergeOutputTypePage();
-
+ SwMailMergeOutputTypePage( SwMailMergeWizard* _pParent);
};
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/mmoutputtypepage.src b/sw/source/ui/dbui/mmoutputtypepage.src
deleted file mode 100644
index 678f483..0000000
--- a/sw/source/ui/dbui/mmoutputtypepage.src
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include <mmoutputtypepage.hrc>
-#include <dbui.hrc>
-#include <helpid.h>
-
-TabPage DLG_MM_OUTPUTTYPE_PAGE
-{
- HelpID = HID_MM_OUTPUTTYPEPAGE ;
- Size = MAP_APPFONT ( 260 , 250 ) ;
- Hide = TRUE ;
-
- FixedText FI_HEADER
- {
- Pos = MAP_APPFONT ( 6 , 8 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text[ en-US ] = "Select a document type";
- };
- FixedText FT_TYPE
- {
- Pos = MAP_APPFONT ( 6 , 27 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text[ en-US ] = "What type of document do you want to create?";
- };
- RadioButton RB_LETTER
- {
- HelpID = "sw:RadioButton:DLG_MM_OUTPUTTYPE_PAGE:RB_LETTER";
- Pos = MAP_APPFONT ( 12 , 43 ) ;
- Size = MAP_APPFONT ( 240 , 10 ) ;
- Text[ en-US ] = "~Letter";
- };
- RadioButton RB_MAIL
- {
- HelpID = "sw:RadioButton:DLG_MM_OUTPUTTYPE_PAGE:RB_MAIL";
- Pos = MAP_APPFONT ( 12 , 57 ) ;
- Size = MAP_APPFONT ( 240 , 10 ) ;
- Text[ en-US ] = "~E-mail message";
- };
- FixedText FI_HINTHEADER
- {
- Pos = MAP_APPFONT ( 12 , 72) ;
- Size = MAP_APPFONT ( 242 , 8 ) ;
- };
- FixedText FI_HINT
- {
- Pos = MAP_APPFONT ( 12 , 83 ) ;
- Size = MAP_APPFONT ( 242 , 26 ) ;
- WordBreak = TRUE;
- };
- String ST_LETTERHINTHEADER
- {
- Text[ en-US ] = "Letter:";
- };
- String ST_MAILHINTHEADER
- {
- Text[ en-US ] = "E-Mail Message:";
- };
- String ST_LETTERHINT
- {
- Text[ en-US ] = "Send letters to a group of recipients. The letters can contain an address block and a salutation. The letters can be personalized for each recipient.";
- };
- String ST_MAILHINT
- {
- Text[ en-US ] = "Send e-mail messages to a group of recipients. The e-mail messages can contain a salutation. The e-mail messages can be personalized for each recipient.";
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/uiconfig/swriter/ui/mmoutputtypepage.ui b/sw/uiconfig/swriter/ui/mmoutputtypepage.ui
new file mode 100644
index 0000000..12c1306
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/mmoutputtypepage.ui
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkBox" id="MMOutputTypePage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="letterft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">Send letters to a group of recipients. The letters can contain an address block and a salutation. The letters can be personalized for each recipient.</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">72</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="emailft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">Send e-mail messages to a group of recipients. The e-mail messages can contain a salutation. The e-mail messages can be personalized for each recipient.</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">72</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="row_homogeneous">True</property>
+ <child>
+ <object class="GtkRadioButton" id="letter">
+ <property name="label" translatable="yes">_Letter</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">email</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="email">
+ <property name="label" translatable="yes">_E-mail message</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button1">
+ <property name="label">layoutdetail-forheight</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="no_show_all">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">What type of document do you want to create?</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <property name="mode">vertical</property>
+ <widgets>
+ <widget name="letter"/>
+ <widget name="email"/>
+ <widget name="button1"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup2">
+ <property name="mode">both</property>
+ <widgets>
+ <widget name="letterft"/>
+ <widget name="emailft"/>
+ </widgets>
+ </object>
+</interface>
commit 35a16a88ebd7ea0a09f49d95e7cd6ae2e98381e8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Sep 28 12:17:33 2013 +0200
route wizards child queue_resize requests to preexisting layout
As an interim measure, until wizards can only be constructed from .ui and then
always contain layout widgets, implement listening for layout widget children
announcing layout change requests and route that to pre-existing original
positioning code. That allows e.g. the mail merge output page in writer to
show/hide the alternative descriptions on selecting letter/email.
Change-Id: I086921f4d46b29756cf4f4fccdf3bdf632ea70b8
diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index 765d2fa..82212b3 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -210,6 +210,7 @@ IMPL_LINK( MyWizardDlg, ImplNextHdl, PushButton*, pBtn )
class SVT_DLLPUBLIC WizardDialog : public ModalDialog
{
private:
+ Timer maWizardLayoutTimer;
Size maPageSize;
ImplWizPageData* mpFirstPage;
ImplWizButtonData* mpFirstBtn;
@@ -225,6 +226,9 @@ private:
sal_Int16 mnLeftAlignCount;
bool mbEmptyViewMargin;
+ DECL_DLLPRIVATE_LINK( ImplHandleWizardLayoutTimerHdl, void* );
+ bool hasWizardPendingLayout() const;
+
protected:
long LogicalCoordinateToPixel(int iCoordinate);
/**sets the number of buttons which should be left-aligned. Normally, buttons are right-aligned.
@@ -248,9 +252,9 @@ private:
SVT_DLLPRIVATE TabPage* ImplGetPage( sal_uInt16 nLevel ) const;
public:
- WizardDialog( Window* pParent, WinBits nStyle = WB_STDTABDIALOG );
- WizardDialog( Window* pParent, const ResId& rResId );
- ~WizardDialog();
+ WizardDialog( Window* pParent, WinBits nStyle = WB_STDTABDIALOG );
+ WizardDialog( Window* pParent, const ResId& rResId );
+ ~WizardDialog();
virtual void Resize();
virtual void StateChanged( StateChangedType nStateChange );
@@ -259,11 +263,13 @@ public:
virtual void ActivatePage();
virtual long DeactivatePage();
- sal_Bool ShowPrevPage();
- sal_Bool ShowNextPage();
- sal_Bool ShowPage( sal_uInt16 nLevel );
- sal_Bool Finnish( long nResult = 0 );
- sal_uInt16 GetCurLevel() const { return mnCurLevel; }
+ virtual void queue_layout();
+
+ sal_Bool ShowPrevPage();
+ sal_Bool ShowNextPage();
+ sal_Bool ShowPage( sal_uInt16 nLevel );
+ sal_Bool Finnish( long nResult = 0 );
+ sal_uInt16 GetCurLevel() const { return mnCurLevel; }
void AddPage( TabPage* pPage );
void RemovePage( TabPage* pPage );
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index 1a9191a..df05a62 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -61,6 +61,9 @@ void WizardDialog::ImplInitData()
meViewAlign = WINDOWALIGN_LEFT;
mbEmptyViewMargin = false;
mnLeftAlignCount = 0;
+
+ maWizardLayoutTimer.SetTimeout(50);
+ maWizardLayoutTimer.SetTimeoutHdl( LINK( this, WizardDialog, ImplHandleWizardLayoutTimerHdl ) );
}
// -----------------------------------------------------------------------
@@ -111,7 +114,26 @@ void WizardDialog::ImplCalcSize( Size& rSize )
}
}
-// -----------------------------------------------------------------------
+bool WizardDialog::hasWizardPendingLayout() const
+{
+ return maWizardLayoutTimer.IsActive();
+}
+
+void WizardDialog::queue_layout()
+{
+ if (hasWizardPendingLayout())
+ return;
+ if (IsInClose())
+ return;
+ maWizardLayoutTimer.Start();
+}
+
+IMPL_LINK( WizardDialog, ImplHandleWizardLayoutTimerHdl, void*, EMPTYARG )
+{
+ ImplPosCtrls();
+ ImplPosTabPage();
+ return 0;
+}
void WizardDialog::ImplPosCtrls()
{
@@ -357,8 +379,9 @@ WizardDialog::WizardDialog( Window* pParent, const ResId& rResId ) :
WizardDialog::~WizardDialog()
{
- if ( mpFixedLine )
- delete mpFixedLine;
+ maWizardLayoutTimer.Stop();
+
+ delete mpFixedLine;
// Remove all buttons
while ( mpFirstBtn )
commit 63a8964ac6d34bb097cc20c0adf984f6380c0b01
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Sep 28 01:47:22 2013 +0200
fix change tracking options preview sizes
Change-Id: I39bf97cd84685132180694fc99bb3a298ec798ed
diff --git a/include/sfx2/dialoghelper.hxx b/include/sfx2/dialoghelper.hxx
index 5b09eb5..a1a6dac 100644
--- a/include/sfx2/dialoghelper.hxx
+++ b/include/sfx2/dialoghelper.hxx
@@ -36,6 +36,8 @@ Size SFX2_DLLPUBLIC getDrawListBoxOptimalSize(const Window *pReference);
Size SFX2_DLLPUBLIC getPreviewStripSize(const Window *pReference);
+Size SFX2_DLLPUBLIC getPreviewOptionsSize(const Window *pReference);
+
OUString SFX2_DLLPUBLIC getWidestTime(const LocaleDataWrapper& rWrapper);
OUString SFX2_DLLPUBLIC formatTime(const DateTime& rDateTime, const LocaleDataWrapper& rWrapper);
diff --git a/sfx2/source/dialog/dialoghelper.cxx b/sfx2/source/dialog/dialoghelper.cxx
index cd80500..fb710df 100644
--- a/sfx2/source/dialog/dialoghelper.cxx
+++ b/sfx2/source/dialog/dialoghelper.cxx
@@ -72,6 +72,11 @@ Size SFX2_DLLPUBLIC getPreviewStripSize(const Window *pReference)
return pReference->LogicToPixel(Size(70 , 40), MapMode(MAP_APPFONT));
}
+Size SFX2_DLLPUBLIC getPreviewOptionsSize(const Window *pReference)
+{
+ return pReference->LogicToPixel(Size(70 , 27), MapMode(MAP_APPFONT));
+}
+
OUString SFX2_DLLPUBLIC getWidestTime(const LocaleDataWrapper& rWrapper)
{
Date aDate(22, 12, 2000);
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index a2a7030..a92ea29 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -49,6 +49,7 @@
#include <editeng/fontitem.hxx>
#include <editeng/langitem.hxx>
#include <editeng/svxenum.hxx>
+#include <sfx2/dialoghelper.hxx>
#include <sfx2/request.hxx>
#include <sfx2/printer.hxx>
#include <sfx2/bindings.hxx>
@@ -1492,7 +1493,7 @@ SwMarkPreview::SwMarkPreview( Window *pParent, WinBits nWinBits ) :
nMarkPos(0)
{
- m_aInitialSize = LogicToPixel(Size(70 , 27), MapMode(MAP_APPFONT));
+ m_aInitialSize = getPreviewOptionsSize(this);
InitColors();
SetMapMode(MAP_PIXEL);
}
@@ -1665,9 +1666,12 @@ namespace
SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( Window* pParent,
const SfxItemSet& rSet )
- : SfxTabPage(pParent, "OptRedLinePage", "modules/swriter/ui/optredlinepage.ui" , rSet)
+ : SfxTabPage(pParent, "OptRedLinePage",
+ "modules/swriter/ui/optredlinepage.ui" , rSet)
, sNone(SW_RESSTR(SW_STR_NONE))
{
+ Size aPreviewSize(getPreviewOptionsSize(this));
+
get(pInsertLB,"insert");
get(pInsertColorLB,"insertcolor");
get(pInsertedPreviewWN,"insertedpreview");
@@ -1684,6 +1688,16 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( Window* pParent,
get(pMarkColorLB,"markcolor");
get(pMarkPreviewWN,"markpreview");
+ pInsertedPreviewWN->set_height_request(aPreviewSize.Height());
+ pDeletedPreviewWN->set_height_request(aPreviewSize.Height());
+ pChangedPreviewWN->set_height_request(aPreviewSize.Height());
+ pMarkPreviewWN->set_height_request(aPreviewSize.Height());
+
+ pInsertedPreviewWN->set_width_request(aPreviewSize.Width());
+ pDeletedPreviewWN->set_width_request(aPreviewSize.Width());
+ pChangedPreviewWN->set_width_request(aPreviewSize.Width());
+ pMarkPreviewWN->set_width_request(aPreviewSize.Width());
+
sAuthor = get<Window>("byauthor")->GetText();
for (sal_uInt16 i = 0; i < pInsertLB->GetEntryCount(); ++i)
diff --git a/sw/uiconfig/swriter/ui/optredlinepage.ui b/sw/uiconfig/swriter/ui/optredlinepage.ui
index 9b9b671..8e33253 100644
--- a/sw/uiconfig/swriter/ui/optredlinepage.ui
+++ b/sw/uiconfig/swriter/ui/optredlinepage.ui
@@ -48,6 +48,7 @@
<object class="svtlo-ColorListBox" id="insertcolor">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -60,6 +61,7 @@
<object class="svtlo-ColorListBox" id="deletedcolor">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -72,6 +74,7 @@
<object class="GtkComboBox" id="changed">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -84,6 +87,7 @@
<object class="svtlo-ColorListBox" id="changedcolor">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -304,6 +308,7 @@
<object class="GtkComboBoxText" id="insert">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<items>
@@ -331,6 +336,7 @@
<object class="GtkComboBox" id="deleted">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -386,6 +392,7 @@
<object class="svtlo-ColorListBox" id="markcolor">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -443,6 +450,7 @@
<object class="GtkComboBoxText" id="markpos">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<items>
More information about the Libreoffice-commits
mailing list