[Libreoffice-commits] core.git: cui/uiconfig desktop/source desktop/uiconfig sw/source sw/uiconfig
Caolán McNamara
caolanm at redhat.com
Wed Feb 28 08:41:05 UTC 2018
cui/uiconfig/ui/baselinksdialog.ui | 8 +++----
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 6 ++---
desktop/uiconfig/ui/updateinstalldialog.ui | 8 +++----
sw/source/ui/misc/titlepage.cxx | 2 -
sw/uiconfig/swriter/ui/titlepage.ui | 12 +++++------
5 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 6a0686e843204ef657cb3fdbd785f6f8ef206c64
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 27 09:35:14 2018 +0000
sneaky uppercase OK,CANCEL,HELP responses
Change-Id: I02324d31822c37daa1e5e1b8c87aa597def58957
Reviewed-on: https://gerrit.libreoffice.org/50437
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/uiconfig/ui/baselinksdialog.ui b/cui/uiconfig/ui/baselinksdialog.ui
index 5b19711dfec9..31416432ddbc 100644
--- a/cui/uiconfig/ui/baselinksdialog.ui
+++ b/cui/uiconfig/ui/baselinksdialog.ui
@@ -18,7 +18,7 @@
<property name="orientation">vertical</property>
<property name="layout_style">start</property>
<child>
- <object class="GtkButton" id="CLOSE">
+ <object class="GtkButton" id="close">
<property name="label">gtk-close</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
@@ -35,7 +35,7 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="HELP">
+ <object class="GtkButton" id="help">
<property name="label">gtk-help</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
@@ -412,8 +412,8 @@
</object>
</child>
<action-widgets>
- <action-widget response="0">CLOSE</action-widget>
- <action-widget response="-11">HELP</action-widget>
+ <action-widget response="-7">close</action-widget>
+ <action-widget response="-11">help</action-widget>
<action-widget response="0">UPDATE_NOW</action-widget>
<action-widget response="0">CHANGE_SOURCE</action-widget>
<action-widget response="0">BREAK_LINK</action-widget>
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index eb5cce4025ec..ede28929eddb 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -217,9 +217,9 @@ UpdateInstallDialog::UpdateInstallDialog(
get(m_pMle_info, "INFO");
m_pMle_info->set_height_request(m_pMle_info->GetTextHeight() * 5);
m_pMle_info->set_width_request(m_pMle_info->approximate_char_width() * 56);
- get(m_pHelp, "HELP");
- get(m_pOk, "OK");
- get(m_pCancel, "CANCEL");
+ get(m_pHelp, "help");
+ get(m_pOk, "ok");
+ get(m_pCancel, "cancel");
m_xExtensionManager = css::deployment::ExtensionManager::get( xCtx );
diff --git a/desktop/uiconfig/ui/updateinstalldialog.ui b/desktop/uiconfig/ui/updateinstalldialog.ui
index d96a85edef67..cd6e482a032b 100644
--- a/desktop/uiconfig/ui/updateinstalldialog.ui
+++ b/desktop/uiconfig/ui/updateinstalldialog.ui
@@ -17,7 +17,7 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="HELP">
+ <object class="GtkButton" id="help">
<property name="label">gtk-help</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
@@ -157,9 +157,9 @@
</object>
</child>
<action-widgets>
- <action-widget response="0">HELP</action-widget>
- <action-widget response="0">OK</action-widget>
- <action-widget response="0">CANCEL</action-widget>
+ <action-widget response="-11">help</action-widget>
+ <action-widget response="-5">ok</action-widget>
+ <action-widget response="-6">cancel</action-widget>
</action-widgets>
</object>
</interface>
diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx
index 9d1596159364..eb2263393bcd 100644
--- a/sw/source/ui/misc/titlepage.cxx
+++ b/sw/source/ui/misc/titlepage.cxx
@@ -165,7 +165,7 @@ SwTitlePageDlg::SwTitlePageDlg( vcl::Window *pParent ) :
get(m_pSetPageNumberNF, "NF_SET_PAGE_NUMBER");
get(m_pPagePropertiesLB, "LB_PAGE_PROPERTIES");
get(m_pPagePropertiesPB, "PB_PAGE_PROPERTIES");
- get(m_pOkPB, "PB_OK");
+ get(m_pOkPB, "ok");
m_pOkPB->SetClickHdl(LINK(this, SwTitlePageDlg, OKHdl));
m_pRestartNumberingCB->SetClickHdl(LINK(this, SwTitlePageDlg, RestartNumberingHdl));
diff --git a/sw/uiconfig/swriter/ui/titlepage.ui b/sw/uiconfig/swriter/ui/titlepage.ui
index 3a4477f4fac5..d31c80ecc071 100644
--- a/sw/uiconfig/swriter/ui/titlepage.ui
+++ b/sw/uiconfig/swriter/ui/titlepage.ui
@@ -25,7 +25,7 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="PB_OK">
+ <object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -40,7 +40,7 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="PB_CANCEL">
+ <object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -54,7 +54,7 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="PB_HELP">
+ <object class="GtkButton" id="help">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -523,9 +523,9 @@
</object>
</child>
<action-widgets>
- <action-widget response="0">PB_OK</action-widget>
- <action-widget response="0">PB_CANCEL</action-widget>
- <action-widget response="0">PB_HELP</action-widget>
+ <action-widget response="-5">ok</action-widget>
+ <action-widget response="-6">cancel</action-widget>
+ <action-widget response="-11">help</action-widget>
</action-widgets>
</object>
<object class="GtkSizeGroup" id="sizegroup1">
More information about the Libreoffice-commits
mailing list