[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - 5 commits - cui/source cui/uiconfig dbaccess/source svx/source sw/uiconfig translations vcl/unx
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Mon Jun 24 04:04:24 UTC 2019
cui/source/options/treeopt.cxx | 3
cui/uiconfig/ui/optionsdialog.ui | 119 +++++++++++++-------------
dbaccess/source/ui/control/curledit.cxx | 2
svx/source/dialog/measctrl.cxx | 3
sw/uiconfig/swriter/ui/insertsectiondialog.ui | 33 +++----
translations | 2
vcl/unx/gtk/gtksalmenu.cxx | 11 ++
7 files changed, 98 insertions(+), 75 deletions(-)
New commits:
commit 600b92914d655ed4354debc8dfd7227de5d41cd1
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Jun 23 16:09:24 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Jun 23 19:40:41 2019 +0200
Resolves: tdf#125168 label mnemonic appearing in database url
Change-Id: I39531ae2a656c16c7355d73b76cb918d3535f7b0
Reviewed-on: https://gerrit.libreoffice.org/74603
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx
index 3568f482c8fa..eadc67c6de30 100644
--- a/dbaccess/source/ui/control/curledit.cxx
+++ b/dbaccess/source/ui/control/curledit.cxx
@@ -78,7 +78,7 @@ void OConnectionURLEdit::SetText(const OUString& _rStr, const Selection& /*_rNew
OUString OConnectionURLEdit::GetText() const
{
- return m_xForcedPrefix->get_label() + m_xEntry->get_text();
+ return m_xForcedPrefix->strip_mnemonic(m_xForcedPrefix->get_label()) + m_xEntry->get_text();
}
void OConnectionURLEdit::ShowPrefix(bool _bShowPrefix)
commit 1afa9f0f6cdcf11beb86e93529c7674a79af6771
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Jun 22 18:47:46 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Jun 23 19:40:13 2019 +0200
Related: tdf#126036 give options dialog consistent button order
its not welded yet, but skip ahead and give it explicit consistent
button order in the meantime
Change-Id: Ia850a024cb5a87b9231b5ffdec701646d7014e08
Reviewed-on: https://gerrit.libreoffice.org/74574
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index ef6f45014818..abcad124faf5 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -490,6 +490,9 @@ struct OptionsGroupInfo
void OfaTreeOptionsDialog::InitWidgets()
{
+ VclButtonBox *pButtonBox = get_action_area();
+ pButtonBox->sort_native_button_order();
+
get(pOkPB, "ok");
get(pApplyPB, "apply");
get(pBackPB, "revert");
diff --git a/cui/uiconfig/ui/optionsdialog.ui b/cui/uiconfig/ui/optionsdialog.ui
index 8baa0d609b12..9d7b4ff2df39 100644
--- a/cui/uiconfig/ui/optionsdialog.ui
+++ b/cui/uiconfig/ui/optionsdialog.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="cui">
<requires lib="gtk+" version="3.18"/>
<requires lib="LibreOffice" version="1.0"/>
@@ -10,6 +10,9 @@
<property name="border_width">6</property>
<property name="title" translatable="yes" context="optionsdialog|OptionsDialog">Options</property>
<property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
@@ -17,38 +20,32 @@
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
- <child>
- <object class="GtkBox" id="box2">
- <property name="visible">True</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="spacing">6</property>
+ <property name="layout_style">end</property>
<child>
- <object class="vcllo-SvTreeListBox" id="pages:border">
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="vexpand">True</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="Tree List-selection"/>
- </child>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
+ <property name="secondary">True</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box">
+ <object class="GtkButton" id="revert">
+ <property name="label">gtk-revert-to-saved</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="orientation">vertical</property>
- <child>
- <placeholder/>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -56,50 +53,39 @@
<property name="position">1</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area1">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="ok">
- <property name="label">gtk-ok</property>
+ <object class="GtkButton" id="apply">
+ <property name="label">gtk-apply</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="cancel">
- <property name="label">gtk-cancel</property>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="help">
- <property name="label">gtk-help</property>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -108,53 +94,70 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
- <property name="secondary">True</property>
+ <property name="position">4</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkButton" id="apply">
- <property name="label">gtk-apply</property>
+ <object class="vcllo-SvTreeListBox" id="pages:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="vexpand">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="Tree List-selection"/>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="revert">
- <property name="label">gtk-revert-to-saved</property>
+ <object class="GtkBox" id="box">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
</child>
<action-widgets>
- <action-widget response="-5">ok</action-widget>
- <action-widget response="-6">cancel</action-widget>
<action-widget response="-11">help</action-widget>
<action-widget response="101">revert</action-widget>
+ <action-widget response="-5">ok</action-widget>
+ <action-widget response="-6">cancel</action-widget>
</action-widgets>
</object>
</interface>
diff --git a/sw/uiconfig/swriter/ui/insertsectiondialog.ui b/sw/uiconfig/swriter/ui/insertsectiondialog.ui
index 9152393db1b4..7804190daf50 100644
--- a/sw/uiconfig/swriter/ui/insertsectiondialog.ui
+++ b/sw/uiconfig/swriter/ui/insertsectiondialog.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sw">
<requires lib="gtk+" version="3.18"/>
<object class="GtkDialog" id="InsertSectionDialog">
@@ -8,6 +8,9 @@
<property name="title" translatable="yes" context="insertsectiondialog|InsertSectionDialog">Insert Section</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
@@ -18,14 +21,12 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="ok">
- <property name="label" translatable="yes" context="insertsectiondialog|ok">_Insert</property>
+ <object class="GtkButton" id="reset">
+ <property name="label">gtk-revert-to-saved</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -34,12 +35,14 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="cancel">
- <property name="label">gtk-cancel</property>
+ <object class="GtkButton" id="ok">
+ <property name="label" translatable="yes" context="insertsectiondialog|ok">_Insert</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -48,8 +51,8 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="help">
- <property name="label">gtk-help</property>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -59,12 +62,11 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
- <property name="secondary">True</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="reset">
- <property name="label">gtk-revert-to-saved</property>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -74,6 +76,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
+ <property name="secondary">True</property>
</packing>
</child>
</object>
@@ -213,10 +216,10 @@
</object>
</child>
<action-widgets>
+ <action-widget response="101">reset</action-widget>
<action-widget response="-5">ok</action-widget>
<action-widget response="-6">cancel</action-widget>
<action-widget response="-11">help</action-widget>
- <action-widget response="101">reset</action-widget>
</action-widgets>
</object>
</interface>
commit b85067dd005bdc54cf820af1987f287f4f719c58
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Jun 22 20:34:06 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Jun 23 16:38:17 2019 +0200
tdf#125803 deactivate the menu regardless of menu item type
spacebar will toggle radios and checkbuttons without automatically
closing the menu. To handle this properly I imagine we need to set groups for the
radiobuttons so the others visually untoggle when the active one is togged and
we would further need to teach vcl that the state can change more than once.
so simpler to just dropdown the menus no matter what type was activated,
which won't happen in the unity case, but that's presumably mostly gone
by now(?)
Change-Id: I2ba841dd192c1461ef26d8395ba572843f4c5c4f
Reviewed-on: https://gerrit.libreoffice.org/74581
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index e3d9dc85c087..0d149bf4b30c 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -1220,6 +1220,17 @@ void GtkSalMenu::DispatchCommand(const gchar *pCommand)
MenuAndId aMenuAndId = decode_command(pCommand);
GtkSalMenu* pSalSubMenu = aMenuAndId.first;
GtkSalMenu* pTopLevel = pSalSubMenu->GetTopLevel();
+ if (pTopLevel->mpMenuBarWidget)
+ {
+ // tdf#125803 spacebar will toggle radios and checkbuttons without automatically
+ // closing the menu. To handle this properly I imagine we need to set groups for the
+ // radiobuttons so the others visually untoggle when the active one is togged and
+ // we would further need to teach vcl that the state can change more than once.
+ //
+ // or we could unconditonally deactivate the menus if regardless of what particular
+ // type of menu item got activated
+ gtk_menu_shell_deactivate(GTK_MENU_SHELL(pTopLevel->mpMenuBarWidget));
+ }
pTopLevel->GetMenu()->HandleMenuCommandEvent(pSalSubMenu->GetMenu(), aMenuAndId.second);
}
commit fe20f04889da1c8654d1e5f26219c4980918c0a5
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Sun Jun 23 15:43:35 2019 +0200
Commit: Gerrit Code Review <gerrit at gerrit.libreoffice.org>
CommitDate: Sun Jun 23 15:43:47 2019 +0200
Update git submodules
* Update translations from branch 'libreoffice-6-3'
- Updated Slovenian translation
Change-Id: Ib8075caa443870b2d20e70167fec43c4bf96a8ea
diff --git a/translations b/translations
index 3134d6517256..f3ad292ee6de 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 3134d6517256c9fc5a4141d1b4e23a86e863c90b
+Subproject commit f3ad292ee6de193750afa5860eb992f457187b98
commit 340d4f9d8e726827113967e91f05d4831727180a
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Jun 22 21:00:20 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Jun 23 15:43:16 2019 +0200
Resolves: tdf#126039 erase old content before drawing new content
Change-Id: I0006467f5c172b6a0cb8b9bc4c9a0181fd57a8ac
Reviewed-on: https://gerrit.libreoffice.org/74584
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx
index 507f7ff34329..0a0741bbe922 100644
--- a/svx/source/dialog/measctrl.cxx
+++ b/svx/source/dialog/measctrl.cxx
@@ -77,6 +77,9 @@ SvxXMeasurePreview::~SvxXMeasurePreview()
void SvxXMeasurePreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
{
+ rRenderContext.SetBackground(rRenderContext.GetSettings().GetStyleSettings().GetWindowColor());
+ rRenderContext.Erase();
+
rRenderContext.Push(PushFlags::MAPMODE);
rRenderContext.SetMapMode(m_aMapMode);
More information about the Libreoffice-commits
mailing list