[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 3 commits - cui/uiconfig icon-themes/sifr svx/source
Adolfo Jayme Barrientos
fitojb at ubuntu.com
Thu Jun 1 13:38:04 UTC 2017
cui/uiconfig/ui/optviewpage.ui | 139 ++++++++++++++++++++-------------------
icon-themes/sifr/sw/res/sf06.png |binary
svx/source/unodraw/unoshtxt.cxx | 20 +++++
3 files changed, 90 insertions(+), 69 deletions(-)
New commits:
commit 37042506a0cac9b2dc0fda615abe819223d9035d
Author: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Date: Wed Mar 29 03:25:43 2017 -0600
tdf#105281 Rearrange a few things for l10n-friendliness
With the Notebookbar addition, no care was taken to update this UI
bearing in mind that there *might* be a few languages suffering in
consequence.
Change-Id: I78c4a1846e192c4c7a64328b730517d42aff979f
(cherry picked from commit bd911c02594c77e1f7e8a01a364b6e0967d4db26)
Reviewed-on: https://gerrit.libreoffice.org/35832
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Sophie Gautier <gautier.sophie at gmail.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
(cherry picked from commit 828a54cfb944c1b98cd38628dbb8cb99fc86dfec)
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index 06cb489d7e77..fc75fc821e9d 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment1">
@@ -166,11 +166,12 @@
<object class="GtkGrid" id="grid8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
<child>
<object class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Icons in men_us:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">menuicons</property>
@@ -181,7 +182,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="menuicons">
+ <object class="GtkComboBoxText" id="contextmenushortcuts">
<property name="visible">True</property>
<property name="can_focus">False</property>
<items>
@@ -191,44 +192,39 @@
</items>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="contextmenushortcuts">
+ <object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <items>
- <item translatable="yes">Automatic</item>
- <item translatable="yes">Hide</item>
- <item translatable="yes">Show</item>
- </items>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Shortcuts in context menus:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">contextmenushortcuts</property>
</object>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label10">
+ <object class="GtkComboBoxText" id="menuicons">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_top">6</property>
- <property name="margin_bottom">6</property>
- <property name="label" translatable="yes">Shortcuts in context menus:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">contextmenushortcuts</property>
+ <items>
+ <item translatable="yes">Automatic</item>
+ <item translatable="yes">Hide</item>
+ <item translatable="yes">Show</item>
+ </items>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">2</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
@@ -339,12 +335,11 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Toolbar icon _size:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">iconsize</property>
@@ -373,8 +368,8 @@
</items>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
</packing>
</child>
<child>
@@ -389,22 +384,22 @@
</items>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Icon s_tyle:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">iconstyle</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="top_attach">6</property>
</packing>
</child>
<child>
@@ -419,49 +414,21 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">4</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="aafrom">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes">fro_m:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">aanf:0pixels</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="aanf:0pixels">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">start</property>
- <property name="invisible_char">•</property>
- <property name="adjustment">adjustment2</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">5</property>
+ <property name="top_attach">8</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Sidebar _icon size:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">iconsize</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
@@ -475,22 +442,22 @@
</items>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">_Notebookbar icon size:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">iconsize</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">4</property>
</packing>
</child>
<child>
@@ -504,8 +471,46 @@
</items>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">18</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="aafrom">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">fro_m:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">aanf:0pixels</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="aanf:0pixels">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="adjustment">adjustment2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">9</property>
</packing>
</child>
</object>
commit 03a443b1791a2ed440422e4d1bbc4f70c42b0793
Author: Matthias Freund <matti_lx at secure.mailbox.org>
Date: Tue May 30 20:27:57 2017 +0200
tdf#106607 - Sifr icon for "Table Styles" needed
Change-Id: I174e8022fbc206256b19fb8e9f2a60f02757fce4
Reviewed-on: https://gerrit.libreoffice.org/38229
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
(cherry picked from commit c9b7511983fd0150283e894cc5ba314df0df45d1)
diff --git a/icon-themes/sifr/sw/res/sf06.png b/icon-themes/sifr/sw/res/sf06.png
new file mode 100644
index 000000000000..95412dc9aee7
Binary files /dev/null and b/icon-themes/sifr/sw/res/sf06.png differ
commit 824fb52a0a6ad02c985cb639a2a959a8ecca6eaf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue May 30 10:49:01 2017 +0100
Related: tdf#107961 ensure notifyhdl is unset after dispose
Change-Id: I69790c8d3cfffc09ee6d6c165e17823223c5058a
Reviewed-on: https://gerrit.libreoffice.org/38238
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
(cherry picked from commit cbd8fd58c6d5ad40561b936b1c7f3b75f518b6c2)
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index b7bd9a66fcba..e3b59926f5c8 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -101,6 +101,7 @@ private:
bool mbForwarderIsEditMode; // have to reflect that, since ENDEDIT can happen more often
bool mbShapeIsEditMode; // #104157# only true, if SdrHintKind::BeginEdit was received
bool mbNotificationsDisabled; // prevent EditEngine/Outliner notifications (e.g. when setting up forwarder)
+ bool mbNotifyEditOutlinerSet;
SvxUnoTextRangeBaseList maTextRanges;
@@ -173,7 +174,8 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText
mbOldUndoMode ( false ),
mbForwarderIsEditMode ( false ),
mbShapeIsEditMode ( false ),
- mbNotificationsDisabled ( false )
+ mbNotificationsDisabled ( false ),
+ mbNotifyEditOutlinerSet ( false )
{
DBG_ASSERT( mpObject, "invalid pObject!" );
@@ -209,7 +211,8 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText
mbOldUndoMode ( false ),
mbForwarderIsEditMode ( false ),
mbShapeIsEditMode ( true ),
- mbNotificationsDisabled ( false )
+ mbNotificationsDisabled ( false ),
+ mbNotifyEditOutlinerSet ( false )
{
if( !mpText )
{
@@ -391,7 +394,10 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
// register as listener - need to broadcast state change messages
if( mpView && mpView->GetTextEditOutliner() )
+ {
mpView->GetTextEditOutliner()->SetNotifyHdl( LINK(this, SvxTextEditSourceImpl, NotifyHdl) );
+ mbNotifyEditOutlinerSet = true;
+ }
// #104157# Only now we're really in edit mode
mbShapeIsEditMode = true;
@@ -410,7 +416,10 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
// remove as listener - outliner might outlive ourselves
if( mpView && mpView->GetTextEditOutliner() )
+ {
mpView->GetTextEditOutliner()->SetNotifyHdl( Link<EENotify&,void>() );
+ mbNotifyEditOutlinerSet = false;
+ }
// destroy view forwarder, OutlinerView no longer
// valid (no need for UpdateData(), it's been
@@ -484,6 +493,12 @@ void SvxTextEditSourceImpl::dispose()
if( mpView )
{
+ // remove as listener - outliner might outlive ourselves
+ if (mbNotifyEditOutlinerSet && mpView && mpView->GetTextEditOutliner())
+ {
+ mpView->GetTextEditOutliner()->SetNotifyHdl(Link<EENotify&,void>());
+ mbNotifyEditOutlinerSet = false;
+ }
EndListening( *mpView );
mpView = nullptr;
}
@@ -731,6 +746,7 @@ SvxDrawOutlinerViewForwarder* SvxTextEditSourceImpl::CreateViewForwarder()
{
// register as listener - need to broadcast state change messages
mpView->GetTextEditOutliner()->SetNotifyHdl( LINK(this, SvxTextEditSourceImpl, NotifyHdl) );
+ mbNotifyEditOutlinerSet = true;
SdrTextObj* pTextObj = dynamic_cast<SdrTextObj*>( mpObject );
if( pTextObj )
More information about the Libreoffice-commits
mailing list