diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-01-21 16:04:51 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-21 16:22:23 +0000 |
| commit | 7701b0cbb932f4d75d5c82b66d4fcca4230222ff (patch) | |
| tree | 7970e0ade812fb397606f0776062f2a907d4df36 | |
| parent | eb4c29f4d10ae4be0e6be15a4c7c8c5bfb1edcc3 (diff) | |
add has-focus .ui support
Change-Id: Ifd95d9fa74f6cbba989c05aae2a225a85b78c9f1
| -rw-r--r-- | sc/source/ui/miscdlgs/inscodlg.cxx | 1 | ||||
| -rw-r--r-- | sc/uiconfig/scalc/ui/pastespecial.ui | 11 | ||||
| -rw-r--r-- | sfx2/uiconfig/ui/documentinfopage.ui | 1 | ||||
| -rw-r--r-- | vcl/source/window/window2.cxx | 5 |
4 files changed, 16 insertions, 2 deletions
diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index 0ac77f7af429..75e5bac2574f 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -124,7 +124,6 @@ ScInsertContentsDlg::ScInsertContentsDlg( vcl::Window* pParent, mpBtnShortCutPasteValuesOnly->SetClickHdl( LINK( this, ScInsertContentsDlg, ShortCutHdl ) );; mpBtnShortCutPasteValuesFormats->SetClickHdl( LINK( this, ScInsertContentsDlg, ShortCutHdl ) );; mpBtnShortCutPasteTranspose->SetClickHdl( LINK( this, ScInsertContentsDlg, ShortCutHdl ) ); - mpBtnInsAll->GrabFocus(); } InsertDeleteFlags ScInsertContentsDlg::GetInsContentsCmdBits() const diff --git a/sc/uiconfig/scalc/ui/pastespecial.ui b/sc/uiconfig/scalc/ui/pastespecial.ui index 1a5f4ff44305..552d2bfbb6de 100644 --- a/sc/uiconfig/scalc/ui/pastespecial.ui +++ b/sc/uiconfig/scalc/ui/pastespecial.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.16.1 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkImage" id="img_paste_transpose"> @@ -175,6 +175,7 @@ <property name="label" translatable="yes">_Paste all</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="has_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> @@ -316,6 +317,8 @@ <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> @@ -446,6 +449,8 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> @@ -537,6 +542,8 @@ <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> @@ -632,6 +639,8 @@ <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> </object> diff --git a/sfx2/uiconfig/ui/documentinfopage.ui b/sfx2/uiconfig/ui/documentinfopage.ui index 494e20fb120a..46e1c28214eb 100644 --- a/sfx2/uiconfig/ui/documentinfopage.ui +++ b/sfx2/uiconfig/ui/documentinfopage.ui @@ -237,6 +237,7 @@ <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="has_focus">True</property> <property name="receives_default">True</property> <property name="valign">center</property> <property name="use_underline">True</property> diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 2fa48aeb8239..4c39be227d0a 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -1666,6 +1666,11 @@ bool Window::set_property(const OString &rKey, const OString &rValue) //https://live.gnome.org/GnomeGoals/RemoveMarkupInMessages SAL_WARN_IF(toBool(rValue), "vcl.layout", "Use pango attributes instead of mark-up"); } + else if (rKey == "has-focus") + { + if (toBool(rValue)) + GrabFocus(); + } else { SAL_INFO("vcl.layout", "unhandled property: " << rKey.getStr()); |