[Libreoffice-commits] core.git: sw/source sw/uiconfig
Jim Raykowski (via logerrit)
logerrit at kemper.freedesktop.org
Tue Nov 17 02:22:41 UTC 2020
sw/source/uibase/inc/navipi.hxx | 10 +
sw/source/uibase/ribbar/workctrl.cxx | 17 +--
sw/source/uibase/utlui/content.cxx | 20 +--
sw/source/uibase/utlui/navipi.cxx | 79 +++++++++-----
sw/uiconfig/swriter/ui/navigatorpanel.ui | 173 ++++++++++++++++++-------------
5 files changed, 179 insertions(+), 120 deletions(-)
New commits:
commit b80c2745c50d064ad9e673cf8a5b73aaf0aa1778
Author: Jim Raykowski <raykowj at gmail.com>
AuthorDate: Tue Nov 10 16:24:06 2020 -0900
Commit: Jim Raykowski <raykowj at gmail.com>
CommitDate: Tue Nov 17 03:22:02 2020 +0100
tdf#137777 Writer: fix keyboard navigation of Navigator
This patch:
-Splits the first row of the Navigator panel into four toolbar controls
to make keyboard navigation possible.
-Makes an Escape key press, when focus is in the sidebar Navigator
'Navigate By' control, result in keyboard focus on the content panel
title, which in the Navigator deck/panel case is the deck title bar.
-Fixes spacing issues of first row controls.
-Fixes 'Navigate By' listbox/combobox keyboard use.
-Keeps focus on previous/next scroll button when enter key is used to
activate the button.
Gtk3 has problems with focusing to title bar and wrapping keyboard
focus. This has been left to be fixed by a separate patch.
Change-Id: Ic9d3a35f2b8c31a209947a1fe61094ddafee4f42
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105574
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj at gmail.com>
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index af232add07a3..498a8d3da7c5 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.hxx
@@ -58,7 +58,11 @@ class SwNavigationPI : public PanelLayout
std::unique_ptr<weld::Toolbar> m_xContent1ToolBox;
std::unique_ptr<weld::Toolbar> m_xContent2ToolBox;
std::unique_ptr<weld::Toolbar> m_xContent3ToolBox;
- std::unique_ptr<ToolbarUnoDispatcher> m_xContent1Dispatch;
+ std::unique_ptr<weld::Toolbar> m_xContent4ToolBox;
+ std::unique_ptr<weld::Toolbar> m_xContent5ToolBox;
+ std::unique_ptr<weld::Toolbar> m_xContent6ToolBox;
+ std::unique_ptr<ToolbarUnoDispatcher> m_xContent2Dispatch;
+ std::unique_ptr<ToolbarUnoDispatcher> m_xContent3Dispatch;
std::unique_ptr<weld::Menu> m_xHeadingsMenu;
std::unique_ptr<weld::Menu> m_xDragModeMenu;
std::unique_ptr<weld::Menu> m_xUpdateMenu;
@@ -98,8 +102,8 @@ class SwNavigationPI : public PanelLayout
DECL_LINK( DocListBoxSelectHdl, weld::ComboBox&, void );
DECL_LINK( ToolBoxSelectHdl, const OString&, void );
DECL_LINK( ToolBoxClickHdl, const OString&, void );
- DECL_LINK( ToolBox2DropdownClickHdl, const OString&, void );
- DECL_LINK( ToolBox3DropdownClickHdl, const OString&, void );
+ DECL_LINK( ToolBox5DropdownClickHdl, const OString&, void );
+ DECL_LINK( ToolBox6DropdownClickHdl, const OString&, void );
DECL_LINK( DoneLink, SfxPoolItem const *, void );
DECL_LINK( DropModeMenuSelectHdl, const OString&, void );
DECL_LINK( HeadingsMenuSelectHdl, const OString&, void );
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index 6a73899d52f9..44dd2f6c1040 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -721,12 +721,6 @@ IMPL_LINK(NavElementBox_Base, SelectHdl, weld::ComboBox&, rComboBox, void)
SwView::SetMoveType( nMoveType );
css::uno::Sequence< css::beans::PropertyValue > aArgs;
-
- /* #i33380# DR 2004-09-03 Moved the following line above the Dispatch() call.
- This instance may be deleted in the meantime (i.e. when a dialog is opened
- while in Dispatch()), accessing members will crash in this case. */
- ReleaseFocus_Impl();
-
m_pCtrl->dispatchCommand( aArgs );
}
@@ -767,14 +761,10 @@ bool NavElementBox_Base::DoKeyInput(const KeyEvent& rKEvt)
}
case KEY_RETURN:
{
- bHandled = true;
+ m_bRelease = false;
SelectHdl(*m_xWidget);
break;
}
- case KEY_ESCAPE:
- ReleaseFocus_Impl();
- bHandled = true;
- break;
}
return bHandled;
@@ -782,6 +772,11 @@ bool NavElementBox_Base::DoKeyInput(const KeyEvent& rKEvt)
bool NavElementBox_Impl::DoKeyInput(const KeyEvent& rKEvt)
{
+ if (KEY_ESCAPE == rKEvt.GetKeyCode().GetCode())
+ {
+ ReleaseFocus_Impl();
+ return true;
+ }
return NavElementBox_Base::DoKeyInput(rKEvt) || ChildKeyInput(rKEvt);
}
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index fad3aa2a4a2c..2ac47cd7efb7 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -2028,11 +2028,11 @@ void SwContentTree::Display( bool bActive )
m_bIsLastReadOnly = bReadOnly;
bool bDisable = pShell == nullptr || bReadOnly;
SwNavigationPI* pNavi = GetParentWindow();
- pNavi->m_xContent3ToolBox->set_item_sensitive("chapterup", !bDisable);
- pNavi->m_xContent3ToolBox->set_item_sensitive("chapterdown", !bDisable);
- pNavi->m_xContent3ToolBox->set_item_sensitive("promote", !bDisable);
- pNavi->m_xContent3ToolBox->set_item_sensitive("demote", !bDisable);
- pNavi->m_xContent2ToolBox->set_item_sensitive("reminder", !bDisable);
+ pNavi->m_xContent6ToolBox->set_item_sensitive("chapterup", !bDisable);
+ pNavi->m_xContent6ToolBox->set_item_sensitive("chapterdown", !bDisable);
+ pNavi->m_xContent6ToolBox->set_item_sensitive("promote", !bDisable);
+ pNavi->m_xContent6ToolBox->set_item_sensitive("demote", !bDisable);
+ pNavi->m_xContent5ToolBox->set_item_sensitive("reminder", !bDisable);
}
if (pShell)
@@ -2403,7 +2403,7 @@ void SwContentTree::ToggleToRoot()
Display(State::HIDDEN != m_eState);
}
m_pConfig->SetRootType( m_nRootType );
- weld::Toolbar* pBox = GetParentWindow()->m_xContent2ToolBox.get();
+ weld::Toolbar* pBox = GetParentWindow()->m_xContent5ToolBox.get();
pBox->set_item_active("root", m_bIsRoot);
}
@@ -4006,10 +4006,10 @@ void SwContentTree::Select()
}
}
SwNavigationPI* pNavi = GetParentWindow();
- pNavi->m_xContent3ToolBox->set_item_sensitive("chapterup", bEnable);
- pNavi->m_xContent3ToolBox->set_item_sensitive("chapterdown", bEnable);
- pNavi->m_xContent3ToolBox->set_item_sensitive("promote", bEnable);
- pNavi->m_xContent3ToolBox->set_item_sensitive("demote", bEnable);
+ pNavi->m_xContent6ToolBox->set_item_sensitive("chapterup", bEnable);
+ pNavi->m_xContent6ToolBox->set_item_sensitive("chapterdown", bEnable);
+ pNavi->m_xContent6ToolBox->set_item_sensitive("promote", bEnable);
+ pNavi->m_xContent6ToolBox->set_item_sensitive("demote", bEnable);
}
void SwContentTree::SetRootType(ContentTypeId nType)
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index d5135682f84a..e5e139cba20f 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -200,13 +200,15 @@ IMPL_LINK(SwNavigationPI, ToolBoxSelectHdl, const OString&, rCommand, void)
int nFuncId = 0;
bool bFocusToDoc = false;
- if (rCommand == ".uno:ScrollToPrevious")
+ if (rCommand == ".uno:ScrollToPrevious" || rCommand == ".uno:ScrollToNext")
{
- rSh.GetView().GetViewFrame()->GetDispatcher()->Execute(FN_SCROLL_PREV, SfxCallMode::ASYNCHRON);
- }
- else if (rCommand == ".uno:ScrollToNext")
- {
- rSh.GetView().GetViewFrame()->GetDispatcher()->Execute(FN_SCROLL_NEXT, SfxCallMode::ASYNCHRON);
+ bool *pbNext = new bool(true);
+ if (rCommand == ".uno:ScrollToPrevious")
+ *pbNext = false;
+ const bool bEnabled = pView->GetEditWin().IsEnabled();
+ pView->GetEditWin().Enable(false); // prevent edit window from grabbing focus
+ pView->MoveNavigationHdl(pbNext);
+ pView->GetEditWin().Enable(bEnabled);
}
else if (rCommand == "root")
{
@@ -296,7 +298,7 @@ IMPL_LINK(SwNavigationPI, ToolBoxSelectHdl, const OString&, rCommand, void)
{
// Standard: sublevels are taken
// do not take sublevels with Ctrl
- bool bOutlineWithChildren = (KEY_MOD1 != m_xContent3ToolBox->get_modifier_state());
+ bool bOutlineWithChildren = (KEY_MOD1 != m_xContent6ToolBox->get_modifier_state());
m_xContentTree->ExecCommand(rCommand, bOutlineWithChildren);
}
}
@@ -315,9 +317,9 @@ IMPL_LINK(SwNavigationPI, ToolBoxSelectHdl, const OString&, rCommand, void)
m_xGlobalToolBox->set_item_active(rCommand, !bSave);
}
else if (rCommand == "dragmode")
- m_xContent3ToolBox->set_menu_item_active("dragmode", !m_xContent3ToolBox->get_menu_item_active("dragmode"));
+ m_xContent6ToolBox->set_menu_item_active("dragmode", !m_xContent6ToolBox->get_menu_item_active("dragmode"));
else if (rCommand == "headings")
- m_xContent2ToolBox->set_menu_item_active("headings", !m_xContent2ToolBox->get_menu_item_active("headings"));
+ m_xContent5ToolBox->set_menu_item_active("headings", !m_xContent5ToolBox->get_menu_item_active("headings"));
else if (rCommand == "update")
m_xGlobalToolBox->set_menu_item_active("update", !m_xGlobalToolBox->get_menu_item_active("update"));
else if (rCommand == "insert")
@@ -341,9 +343,9 @@ IMPL_LINK(SwNavigationPI, ToolBoxClickHdl, const OString&, rCommand, void)
m_xGlobalTree->TbxMenuHdl(rCommand, *m_xInsertMenu);
}
-IMPL_LINK(SwNavigationPI, ToolBox3DropdownClickHdl, const OString&, rCommand, void)
+IMPL_LINK(SwNavigationPI, ToolBox6DropdownClickHdl, const OString&, rCommand, void)
{
- if (!m_xContent3ToolBox->get_menu_item_active(rCommand))
+ if (!m_xContent6ToolBox->get_menu_item_active(rCommand))
return;
if (rCommand != "dragmode")
@@ -378,9 +380,9 @@ IMPL_LINK(SwNavigationPI, GlobalMenuSelectHdl, const OString&, rIdent, void)
m_xGlobalTree->ExecuteContextMenuAction(rIdent);
}
-IMPL_LINK(SwNavigationPI, ToolBox2DropdownClickHdl, const OString&, rCommand, void)
+IMPL_LINK(SwNavigationPI, ToolBox5DropdownClickHdl, const OString&, rCommand, void)
{
- if (!m_xContent2ToolBox->get_menu_item_active(rCommand))
+ if (!m_xContent5ToolBox->get_menu_item_active(rCommand))
return;
if (rCommand == "headings")
@@ -445,7 +447,7 @@ void SwNavigationPI::ZoomOut()
m_xContentTree->Select(); // Enable toolbox
m_pConfig->SetSmall(false);
- m_xContent3ToolBox->set_item_active("listbox", true);
+ m_xContent6ToolBox->set_item_active("listbox", true);
}
void SwNavigationPI::ZoomIn()
@@ -474,7 +476,7 @@ void SwNavigationPI::ZoomIn()
m_xContentTree->Select(); // Enable toolbox
m_pConfig->SetSmall(true);
- m_xContent3ToolBox->set_item_active("listbox", false);
+ m_xContent6ToolBox->set_item_active("listbox", false);
}
namespace {
@@ -510,7 +512,11 @@ SwNavigationPI::SwNavigationPI(vcl::Window* pParent,
, m_xContent1ToolBox(m_xBuilder->weld_toolbar("content1"))
, m_xContent2ToolBox(m_xBuilder->weld_toolbar("content2"))
, m_xContent3ToolBox(m_xBuilder->weld_toolbar("content3"))
- , m_xContent1Dispatch(new ToolbarUnoDispatcher(*m_xContent1ToolBox, *m_xBuilder, rxFrame))
+ , m_xContent4ToolBox(m_xBuilder->weld_toolbar("content4"))
+ , m_xContent5ToolBox(m_xBuilder->weld_toolbar("content5"))
+ , m_xContent6ToolBox(m_xBuilder->weld_toolbar("content6"))
+ , m_xContent2Dispatch(new ToolbarUnoDispatcher(*m_xContent2ToolBox, *m_xBuilder, rxFrame))
+ , m_xContent3Dispatch(new ToolbarUnoDispatcher(*m_xContent3ToolBox, *m_xBuilder, rxFrame))
, m_xHeadingsMenu(m_xBuilder->weld_menu("headingsmenu"))
, m_xDragModeMenu(m_xBuilder->weld_menu("dragmodemenu"))
, m_xUpdateMenu(m_xBuilder->weld_menu("updatemenu"))
@@ -539,6 +545,9 @@ SwNavigationPI::SwNavigationPI(vcl::Window* pParent,
m_xContent1ToolBox->set_help_id(HID_NAVIGATOR_TOOLBOX);
m_xContent2ToolBox->set_help_id(HID_NAVIGATOR_TOOLBOX);
m_xContent3ToolBox->set_help_id(HID_NAVIGATOR_TOOLBOX);
+ m_xContent4ToolBox->set_help_id(HID_NAVIGATOR_TOOLBOX);
+ m_xContent5ToolBox->set_help_id(HID_NAVIGATOR_TOOLBOX);
+ m_xContent6ToolBox->set_help_id(HID_NAVIGATOR_TOOLBOX);
m_xGlobalToolBox->set_help_id(HID_NAVIGATOR_GLOBAL_TOOLBOX);
m_xDocListBox->set_help_id(HID_NAVIGATOR_LISTBOX);
m_xDocListBox->set_size_request(42, -1); // set a nominal width so it takes width of surroundings
@@ -583,8 +592,8 @@ SwNavigationPI::SwNavigationPI(vcl::Window* pParent,
m_xContentTree->set_selection_mode(SelectionMode::Single);
m_xContentTree->ShowTree();
- m_xContent3ToolBox->set_item_active("listbox", true);
- m_xContent3ToolBox->set_item_sensitive("listbox", bFloatingNavigator);
+ m_xContent6ToolBox->set_item_active("listbox", true);
+ m_xContent6ToolBox->set_item_sensitive("listbox", bFloatingNavigator);
// TreeListBox for global document
m_xGlobalTree->set_selection_mode(SelectionMode::Multiple);
@@ -592,16 +601,17 @@ SwNavigationPI::SwNavigationPI(vcl::Window* pParent,
// Handler
Link<const OString&, void> aLk = LINK(this, SwNavigationPI, ToolBoxSelectHdl);
m_xContent1ToolBox->connect_clicked(aLk);
- m_xContent2ToolBox->connect_clicked(aLk);
m_xContent3ToolBox->connect_clicked(aLk);
+ m_xContent5ToolBox->connect_clicked(aLk);
+ m_xContent6ToolBox->connect_clicked(aLk);
m_xGlobalToolBox->connect_clicked(aLk);
m_xDocListBox->connect_changed(LINK(this, SwNavigationPI, DocListBoxSelectHdl));
- m_xContent2ToolBox->set_item_menu("headings", m_xHeadingsMenu.get());
+ m_xContent5ToolBox->set_item_menu("headings", m_xHeadingsMenu.get());
m_xHeadingsMenu->connect_activate(LINK(this, SwNavigationPI, HeadingsMenuSelectHdl));
- m_xContent2ToolBox->connect_menu_toggled(LINK(this, SwNavigationPI, ToolBox2DropdownClickHdl));
- m_xContent3ToolBox->set_item_menu("dragmode", m_xDragModeMenu.get());
+ m_xContent5ToolBox->connect_menu_toggled(LINK(this, SwNavigationPI, ToolBox5DropdownClickHdl));
+ m_xContent6ToolBox->set_item_menu("dragmode", m_xDragModeMenu.get());
m_xDragModeMenu->connect_activate(LINK(this, SwNavigationPI, DropModeMenuSelectHdl));
- m_xContent3ToolBox->connect_menu_toggled(LINK(this, SwNavigationPI, ToolBox3DropdownClickHdl));
+ m_xContent6ToolBox->connect_menu_toggled(LINK(this, SwNavigationPI, ToolBox6DropdownClickHdl));
m_xGlobalToolBox->set_item_menu("update", m_xUpdateMenu.get());
m_xUpdateMenu->connect_activate(LINK(this, SwNavigationPI, GlobalMenuSelectHdl));
m_xGlobalToolBox->set_item_menu("insert", m_xInsertMenu.get());
@@ -610,7 +620,10 @@ SwNavigationPI::SwNavigationPI(vcl::Window* pParent,
m_xGlobalToolBox->set_item_active("globaltoggle", true);
// set toolbar of both modes to widest of each
- m_xGlobalToolBox->set_size_request(m_xContent1ToolBox->get_preferred_size().Width(), -1);
+ m_xGlobalToolBox->set_size_request(m_xContent1ToolBox->get_preferred_size().Width() +
+ m_xContent2ToolBox->get_preferred_size().Width() +
+ m_xContent3ToolBox->get_preferred_size().Width() +
+ m_xContent4ToolBox->get_preferred_size().Width(), -1);
StartListening(*SfxGetpApp());
@@ -672,10 +685,14 @@ void SwNavigationPI::dispose()
m_xDragModeMenu.reset();
m_xUpdateMenu.reset();
m_xInsertMenu.reset();
- m_xContent1Dispatch.reset();
+ m_xContent2Dispatch.reset();
+ m_xContent3Dispatch.reset();
m_xContent1ToolBox.reset();
m_xContent2ToolBox.reset();
m_xContent3ToolBox.reset();
+ m_xContent4ToolBox.reset();
+ m_xContent5ToolBox.reset();
+ m_xContent6ToolBox.reset();
m_aPageChgIdle.Stop();
@@ -733,7 +750,7 @@ void SwNavigationPI::StateChanged(StateChangedType nStateChange)
// the sidebar or is otherwise docked. While the navigator could change
// its size, the sidebar can not, and the navigator would just waste
// space. Therefore disable this button.
- m_xContent3ToolBox->set_item_sensitive("listbox", SfxChildWindowContext::GetFloatingWindow(GetParent()) != nullptr);
+ m_xContent6ToolBox->set_item_sensitive("listbox", SfxChildWindowContext::GetFloatingWindow(GetParent()) != nullptr);
// show content if docked
if (SfxChildWindowContext::GetFloatingWindow(GetParent()) == nullptr && IsZoomedIn())
ZoomOut();
@@ -990,7 +1007,7 @@ void SwNavigationPI::SetRegionDropMode(RegionMode nNewMode)
sImageId = RID_BMP_DROP_COPY;
break;
}
- m_xContent3ToolBox->set_item_icon_name("dragmode", sImageId);
+ m_xContent6ToolBox->set_item_icon_name("dragmode", sImageId);
}
void SwNavigationPI::ToggleTree()
@@ -1009,6 +1026,9 @@ void SwNavigationPI::ToggleTree()
m_xContent1ToolBox->hide();
m_xContent2ToolBox->hide();
m_xContent3ToolBox->hide();
+ m_xContent4ToolBox->hide();
+ m_xContent5ToolBox->hide();
+ m_xContent6ToolBox->hide();
m_xDocListBox->hide();
SetGlobalMode(true);
SetUpdateMode(true);
@@ -1025,6 +1045,9 @@ void SwNavigationPI::ToggleTree()
m_xContent1ToolBox->show();
m_xContent2ToolBox->show();
m_xContent3ToolBox->show();
+ m_xContent4ToolBox->show();
+ m_xContent5ToolBox->show();
+ m_xContent6ToolBox->show();
m_xDocListBox->show();
}
SetGlobalMode(false);
@@ -1104,7 +1127,7 @@ SwNavigationChild::SwNavigationChild( vcl::Window* pParent,
if( nRootType != ContentTypeId::UNKNOWN )
{
pNavi->m_xContentTree->SetRootType(nRootType);
- pNavi->m_xContent2ToolBox->set_item_active("root", true);
+ pNavi->m_xContent5ToolBox->set_item_active("root", true);
if (nRootType == ContentTypeId::OUTLINE)
{
pNavi->m_xContentTree->set_selection_mode(SelectionMode::Multiple);
diff --git a/sw/uiconfig/swriter/ui/navigatorpanel.ui b/sw/uiconfig/swriter/ui/navigatorpanel.ui
index f6f14bdb7932..5baec7f66177 100644
--- a/sw/uiconfig/swriter/ui/navigatorpanel.ui
+++ b/sw/uiconfig/swriter/ui/navigatorpanel.ui
@@ -250,115 +250,159 @@
<property name="hexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkToolbar" id="content1">
+ <object class="GtkGrid">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="toolbar_style">icons</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkToggleToolButton" id="contenttoggle">
+ <object class="GtkToolbar" id="content1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes" context="navigatorpanel|contenttoggle|tooltip_text">Toggle Master View</property>
- <property name="icon_name">sw/res/sc20244.png</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="contenttoggle-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="navigatorpanel|extended_tip|contenttoggle">Switches between master view and normal view if a master document is open.</property>
+ <property name="can_focus">True</property>
+ <property name="toolbar_style">icons</property>
+ <child>
+ <object class="GtkToggleToolButton" id="contenttoggle">
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes" context="navigatorpanel|contenttoggle|tooltip_text">Toggle Master View</property>
+ <property name="icon_name">sw/res/sc20244.png</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="contenttoggle-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="navigatorpanel|extended_tip|contenttoggle">Switches between master view and normal view if a master document is open.</property>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkToolItem" id=".uno:NavElement">
+ <object class="GtkToolbar" id="content2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
+ <property name="toolbar_style">icons</property>
<child>
- <object class="GtkComboBox" id="NavElementWidget">
+ <object class="GtkToolItem" id=".uno:NavElement">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="model">liststore4</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext3"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
<child>
- <object class="GtkCellRendererPixbuf" id="cellrenderertext1"/>
- <attributes>
- <attribute name="pixbuf">2</attribute>
- </attributes>
+ <object class="GtkComboBox" id="NavElementWidget">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="model">liststore4</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext7"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ <child>
+ <object class="GtkCellRendererPixbuf" id="cellrenderertext8"/>
+ <attributes>
+ <attribute name="pixbuf">2</attribute>
+ </attributes>
+ </child>
+ </object>
</child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">False</property>
+ </packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id=".uno:ScrollToPrevious">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkToolButton" id=".uno:ScrollToNext">
+ <object class="GtkToolbar" id="content3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="toolbar_style">icons</property>
+ <child>
+ <object class="GtkToolButton" id=".uno:ScrollToPrevious">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id=".uno:ScrollToNext">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkToolItem" id="contentedit">
+ <object class="GtkToolbar" id="content4">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
+ <property name="toolbar_style">icons</property>
<child>
- <object class="GtkSpinButton" id="spinbutton">
+ <object class="GtkToolItem" id="contentedit">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="adjustment">adjustment1</property>
- <property name="tooltip_text" translatable="yes" context="navigatorpanel|spinbutton|tooltip_text">Go to Page</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="spinbutton-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="navigatorpanel|extended_tip|spinbutton">Enter page number and press Enter. Use arrows to move to next page forward or backward.</property>
+ <child>
+ <object class="GtkSpinButton" id="spinbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes" context="navigatorpanel|spinbutton|tooltip_text">Go to Page</property>
+ <property name="hexpand">True</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="value">1</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="spinbutton-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="navigatorpanel|extended_tip|spinbutton">Enter page number and press Enter. Use arrows to move to next page forward or backward.</property>
+ </object>
+ </child>
</object>
</child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">False</property>
+ </packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="homogeneous">False</property>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkToolbar" id="content2">
+ <object class="GtkToolbar" id="content5">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
@@ -492,7 +536,7 @@
</packing>
</child>
<child>
- <object class="GtkToolbar" id="content3">
+ <object class="GtkToolbar" id="content6">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
@@ -949,14 +993,7 @@
</packing>
</child>
</object>
- <object class="GtkSizeGroup" id="sizegroup1">
- <widgets>
- <widget name="content1"/>
- <widget name="content2"/>
- <widget name="content3"/>
- <widget name="global"/>
- </widgets>
- </object>
+ <object class="GtkSizeGroup" id="sizegroup1"/>
<object class="GtkMenu" id="updatemenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
More information about the Libreoffice-commits
mailing list