diff options
author | Szymon Kłos <eszkadev@gmail.com> | 2016-08-16 12:38:05 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <s.mehrbrodt@gmail.com> | 2016-08-16 14:42:12 +0000 |
commit | aa2aa4a6d25874b5c3bb751bd42574b838f75fe2 (patch) | |
tree | 09f4e77b233455d8c79abb9bc6982f5062e4a1ae | |
parent | 76de7bbf3625efd9f4eeb2183bb0bd22e7a795db (diff) |
GSoC notebookbar: icon size switching
+ added entry in the Options > View
+ changed sfxlo-SidebarToolBox to sfxlo-NotebookbarToolBox
in the Notebookbar ui files
Change-Id: Id5719953be9830b650af96d54e63936c553cda74
Reviewed-on: https://gerrit.libreoffice.org/28169
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
-rw-r--r-- | cui/source/options/optgdlg.cxx | 23 | ||||
-rw-r--r-- | cui/source/options/optgdlg.hxx | 2 | ||||
-rw-r--r-- | cui/uiconfig/ui/optviewpage.ui | 41 | ||||
-rw-r--r-- | include/sfx2/sidebar/SidebarToolBox.hxx | 2 | ||||
-rw-r--r-- | include/svtools/miscopt.hxx | 2 | ||||
-rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Common.xcs | 24 | ||||
-rw-r--r-- | sc/uiconfig/scalc/ui/notebookbar.ui | 60 | ||||
-rw-r--r-- | sd/uiconfig/simpress/ui/notebookbar.ui | 66 | ||||
-rw-r--r-- | sfx2/Library_sfx.mk | 1 | ||||
-rw-r--r-- | sfx2/source/notebookbar/NotebookbarToolBox.cxx | 55 | ||||
-rw-r--r-- | sfx2/source/sidebar/SidebarToolBox.cxx | 12 | ||||
-rw-r--r-- | svtools/source/config/miscopt.cxx | 55 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar.ui | 82 |
13 files changed, 311 insertions, 114 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 5c7944d2451a..298c45fc9c1c 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -613,6 +613,7 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptViewPage", "cui/ui/optviewpage.ui", &rSet) , nSizeLB_InitialSelection(0) , nSidebarSizeLB_InitialSelection(0) + , nNotebookbarSizeLB_InitialSelection(0) , nStyleLB_InitialSelection(0) , pAppearanceCfg(new SvtTabAppearanceCfg) , pCanvasSettings(new CanvasSettings) @@ -621,6 +622,7 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet) { get(m_pIconSizeLB, "iconsize"); get(m_pSidebarIconSizeLB, "sidebariconsize"); + get(m_pNotebookbarIconSizeLB, "notebookbariconsize"); get(m_pIconStyleLB, "iconstyle"); get(m_pFontAntiAliasing, "aafont"); @@ -702,6 +704,7 @@ void OfaViewTabPage::dispose() pAppearanceCfg = nullptr; m_pIconSizeLB.clear(); m_pSidebarIconSizeLB.clear(); + m_pNotebookbarIconSizeLB.clear(); m_pIconStyleLB.clear(); m_pFontAntiAliasing.clear(); m_pAAPointLimitLabel.clear(); @@ -776,6 +779,22 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) aMiscOptions.SetSidebarIconSize( eSet ); } + const sal_Int32 nNotebookbarSizeLB_NewSelection = m_pNotebookbarIconSizeLB->GetSelectEntryPos(); + if( nNotebookbarSizeLB_InitialSelection != nNotebookbarSizeLB_NewSelection ) + { + // from now on it's modified, even if via auto setting the same size was set as now selected in the LB + sal_Int16 eSet = TOOLBOX_BUTTONSIZE_DONTCARE; + switch( nNotebookbarSizeLB_NewSelection ) + { + case 0: eSet = TOOLBOX_BUTTONSIZE_DONTCARE; break; + case 1: eSet = TOOLBOX_BUTTONSIZE_SMALL; break; + case 2: eSet = TOOLBOX_BUTTONSIZE_LARGE; break; + default: + OSL_FAIL( "OfaViewTabPage::FillItemSet(): This state of m_pNotebookbarIconSizeLB should not be possible!" ); + } + aMiscOptions.SetNotebookbarIconSize( eSet ); + } + const sal_Int32 nStyleLB_NewSelection = m_pIconStyleLB->GetSelectEntryPos(); if( nStyleLB_InitialSelection != nStyleLB_NewSelection ) { @@ -928,6 +947,10 @@ void OfaViewTabPage::Reset( const SfxItemSet* ) nSidebarSizeLB_InitialSelection = aMiscOptions.GetSidebarIconSize(); m_pSidebarIconSizeLB->SelectEntryPos( nSidebarSizeLB_InitialSelection ); m_pSidebarIconSizeLB->SaveValue(); + if( aMiscOptions.GetNotebookbarIconSize() != TOOLBOX_BUTTONSIZE_DONTCARE ) + nNotebookbarSizeLB_InitialSelection = aMiscOptions.GetNotebookbarIconSize(); + m_pNotebookbarIconSizeLB->SelectEntryPos( nNotebookbarSizeLB_InitialSelection ); + m_pNotebookbarIconSizeLB->SaveValue(); if (aMiscOptions.IconThemeWasSetAutomatically()) { nStyleLB_InitialSelection = 0; diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 66688811af5a..8df1a3bb1dc6 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -81,6 +81,7 @@ class OfaViewTabPage : public SfxTabPage private: VclPtr<ListBox> m_pIconSizeLB; VclPtr<ListBox> m_pSidebarIconSizeLB; + VclPtr<ListBox> m_pNotebookbarIconSizeLB; VclPtr<ListBox> m_pIconStyleLB; VclPtr<CheckBox> m_pFontAntiAliasing; @@ -104,6 +105,7 @@ private: sal_Int32 nSizeLB_InitialSelection; sal_Int32 nSidebarSizeLB_InitialSelection; + sal_Int32 nNotebookbarSizeLB_InitialSelection; sal_Int32 nStyleLB_InitialSelection; SvtTabAppearanceCfg* pAppearanceCfg; diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui index 8389125c4e00..834b8000d450 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.20.0 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkAdjustment" id="adjustment1"> @@ -341,7 +341,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="top_attach">3</property> </packing> </child> <child> @@ -370,7 +370,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="top_attach">3</property> </packing> </child> <child> @@ -385,7 +385,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="top_attach">4</property> <property name="width">2</property> </packing> </child> @@ -400,7 +400,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="top_attach">5</property> </packing> </child> <child> @@ -413,7 +413,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">4</property> + <property name="top_attach">5</property> </packing> </child> <child> @@ -445,6 +445,35 @@ <property name="top_attach">1</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="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> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="notebookbariconsize"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes">Automatic</item> + <item translatable="yes">Small</item> + <item translatable="yes">Large</item> + </items> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> </object> <packing> <property name="left_attach">0</property> diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index d56a81b833ec..131364d51f66 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -43,6 +43,8 @@ public: virtual ~SidebarToolBox(); virtual void dispose() override; + virtual sal_uInt16 GetIconSize() const; + using ToolBox::InsertItem; virtual void InsertItem(const OUString& rCommand, const css::uno::Reference<css::frame::XFrame>& rFrame, diff --git a/include/svtools/miscopt.hxx b/include/svtools/miscopt.hxx index 1ec74ce1d57d..5d6a91a90ad7 100644 --- a/include/svtools/miscopt.hxx +++ b/include/svtools/miscopt.hxx @@ -64,6 +64,8 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options void SetSymbolsSize( sal_Int16 eSet ); sal_Int16 GetSidebarIconSize() const; void SetSidebarIconSize( sal_Int16 eSet ); + sal_Int16 GetNotebookbarIconSize() const; + void SetNotebookbarIconSize( sal_Int16 eSet ); sal_Int16 GetCurrentSymbolsSize() const; bool AreCurrentSymbolsLarge() const; diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 112e04c12a76..778638d77d5a 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -5705,6 +5705,30 @@ </enumeration> </constraints> </prop> + <prop oor:name="NotebookbarIconSize" oor:type="xs:short" oor:nillable="false"> + <!-- UIHints: Tools Options General View --> + <info> + <desc>Specifies which size of the icons is used for the + notebookbar.</desc> + </info> + <constraints> + <enumeration oor:value="0"> + <info> + <desc>will let the toolbox decide about its size</desc> + </info> + </enumeration> + <enumeration oor:value="1"> + <info> + <desc>small icons</desc> + </info> + </enumeration> + <enumeration oor:value="2"> + <info> + <desc>large icons</desc> + </info> + </enumeration> + </constraints> + </prop> <prop oor:name="SymbolStyle" oor:type="xs:string" oor:nillable="false"> <!-- UIHints: Tools Options General View --> <info> diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index a88b65d778fb..e7b146c316b7 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -507,7 +507,7 @@ <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="sfxlo-SidebarToolBox" id="font"> + <object class="sfxlo-NotebookbarToolBox" id="font"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -530,7 +530,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="fontheight"> + <object class="sfxlo-NotebookbarToolBox" id="fontheight"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -565,7 +565,7 @@ <property name="can_focus">False</property> <property name="spacing">12</property> <child> - <object class="sfxlo-SidebarToolBox" id="fonteffects"> + <object class="sfxlo-NotebookbarToolBox" id="fonteffects"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -647,7 +647,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="cellbordertype"> + <object class="sfxlo-NotebookbarToolBox" id="cellbordertype"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -677,7 +677,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="spacingbar"> + <object class="sfxlo-NotebookbarToolBox" id="spacingbar"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -703,7 +703,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="colorbar"> + <object class="sfxlo-NotebookbarToolBox" id="colorbar"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -765,7 +765,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="fontadjust"> + <object class="sfxlo-NotebookbarToolBox" id="fontadjust"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -805,7 +805,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="position"> + <object class="sfxlo-NotebookbarToolBox" id="position"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -892,7 +892,7 @@ <property name="can_focus">False</property> <property name="spacing">12</property> <child> - <object class="sfxlo-SidebarToolBox" id="verticalalignment"> + <object class="sfxlo-NotebookbarToolBox" id="verticalalignment"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -944,7 +944,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="writedirection"> + <object class="sfxlo-NotebookbarToolBox" id="writedirection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -983,7 +983,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="textdir"> + <object class="sfxlo-NotebookbarToolBox" id="textdir"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -1038,7 +1038,7 @@ <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="sfxlo-SidebarToolBox" id="horizontalalignment"> + <object class="sfxlo-NotebookbarToolBox" id="horizontalalignment"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -1101,7 +1101,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="indent"> + <object class="sfxlo-NotebookbarToolBox" id="indent"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -1147,7 +1147,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="wrap"> + <object class="sfxlo-NotebookbarToolBox" id="wrap"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -1231,7 +1231,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="numberformat"> + <object class="sfxlo-NotebookbarToolBox" id="numberformat"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -1256,7 +1256,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="numberformat1"> + <object class="sfxlo-NotebookbarToolBox" id="numberformat1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -1461,7 +1461,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="rows"> + <object class="sfxlo-NotebookbarToolBox" id="rows"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -1504,7 +1504,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="cols"> + <object class="sfxlo-NotebookbarToolBox" id="cols"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -3331,7 +3331,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="brightnes"> + <object class="sfxlo-NotebookbarToolBox" id="brightnes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -3358,7 +3358,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="contrast"> + <object class="sfxlo-NotebookbarToolBox" id="contrast"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -3409,7 +3409,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="gamma"> + <object class="sfxlo-NotebookbarToolBox" id="gamma"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -3436,7 +3436,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="transparence"> + <object class="sfxlo-NotebookbarToolBox" id="transparence"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -3502,7 +3502,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="mode"> + <object class="sfxlo-NotebookbarToolBox" id="mode"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -3529,7 +3529,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="red"> + <object class="sfxlo-NotebookbarToolBox" id="red"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -3580,7 +3580,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="green"> + <object class="sfxlo-NotebookbarToolBox" id="green"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -3607,7 +3607,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="blue"> + <object class="sfxlo-NotebookbarToolBox" id="blue"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -3670,7 +3670,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="flip"> + <object class="sfxlo-NotebookbarToolBox" id="flip"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -3696,7 +3696,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="flip1"> + <object class="sfxlo-NotebookbarToolBox" id="flip1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -3746,7 +3746,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="crop"> + <object class="sfxlo-NotebookbarToolBox" id="crop"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -3772,7 +3772,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="filter"> + <object class="sfxlo-NotebookbarToolBox" id="filter"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui index 49e2245741a9..dbaadbe01809 100644 --- a/sd/uiconfig/simpress/ui/notebookbar.ui +++ b/sd/uiconfig/simpress/ui/notebookbar.ui @@ -471,7 +471,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="layoutbox"> + <object class="sfxlo-NotebookbarToolBox" id="layoutbox"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -494,7 +494,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="layoutbox2"> + <object class="sfxlo-NotebookbarToolBox" id="layoutbox2"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -553,7 +553,7 @@ <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="sfxlo-SidebarToolBox" id="font"> + <object class="sfxlo-NotebookbarToolBox" id="font"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -576,7 +576,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="fontheight"> + <object class="sfxlo-NotebookbarToolBox" id="fontheight"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -599,7 +599,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="fontadjust"> + <object class="sfxlo-NotebookbarToolBox" id="fontadjust"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -651,7 +651,7 @@ <property name="can_focus">False</property> <property name="spacing">12</property> <child> - <object class="sfxlo-SidebarToolBox" id="fonteffects"> + <object class="sfxlo-NotebookbarToolBox" id="fonteffects"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -733,7 +733,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="position"> + <object class="sfxlo-NotebookbarToolBox" id="position"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -774,7 +774,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="spacingbar"> + <object class="sfxlo-NotebookbarToolBox" id="spacingbar"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -800,7 +800,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="colorbar"> + <object class="sfxlo-NotebookbarToolBox" id="colorbar"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -862,7 +862,7 @@ <property name="can_focus">False</property> <property name="spacing">12</property> <child> - <object class="sfxlo-SidebarToolBox" id="textdir"> + <object class="sfxlo-NotebookbarToolBox" id="textdir"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -905,7 +905,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="numberbullet"> + <object class="sfxlo-NotebookbarToolBox" id="numberbullet"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -945,7 +945,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="indent"> + <object class="sfxlo-NotebookbarToolBox" id="indent"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -1002,7 +1002,7 @@ <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="sfxlo-SidebarToolBox" id="horizontalalignment"> + <object class="sfxlo-NotebookbarToolBox" id="horizontalalignment"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -1065,7 +1065,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="writedirection"> + <object class="sfxlo-NotebookbarToolBox" id="writedirection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -1104,7 +1104,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="line"> + <object class="sfxlo-NotebookbarToolBox" id="line"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -1160,7 +1160,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="shapes1"> + <object class="sfxlo-NotebookbarToolBox" id="shapes1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -1224,7 +1224,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="shapes2"> + <object class="sfxlo-NotebookbarToolBox" id="shapes2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -1312,7 +1312,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="fillcolor"> + <object class="sfxlo-NotebookbarToolBox" id="fillcolor"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -1337,7 +1337,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="bordercolor"> + <object class="sfxlo-NotebookbarToolBox" id="bordercolor"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -1658,7 +1658,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="shapes3"> + <object class="sfxlo-NotebookbarToolBox" id="shapes3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -1722,7 +1722,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="shapes4"> + <object class="sfxlo-NotebookbarToolBox" id="shapes4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -2751,7 +2751,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="brightnes"> + <object class="sfxlo-NotebookbarToolBox" id="brightnes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -2778,7 +2778,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="contrast"> + <object class="sfxlo-NotebookbarToolBox" id="contrast"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -2829,7 +2829,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="gamma"> + <object class="sfxlo-NotebookbarToolBox" id="gamma"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -2856,7 +2856,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="transparence"> + <object class="sfxlo-NotebookbarToolBox" id="transparence"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -2922,7 +2922,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="mode"> + <object class="sfxlo-NotebookbarToolBox" id="mode"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -2949,7 +2949,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="red"> + <object class="sfxlo-NotebookbarToolBox" id="red"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -3000,7 +3000,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="green"> + <object class="sfxlo-NotebookbarToolBox" id="green"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -3027,7 +3027,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="blue"> + <object class="sfxlo-NotebookbarToolBox" id="blue"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -3090,7 +3090,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="flip"> + <object class="sfxlo-NotebookbarToolBox" id="flip"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -3116,7 +3116,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="flip1"> + <object class="sfxlo-NotebookbarToolBox" id="flip1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -3166,7 +3166,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="crop"> + <object class="sfxlo-NotebookbarToolBox" id="crop"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -3192,7 +3192,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="filter"> + <object class="sfxlo-NotebookbarToolBox" id="filter"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index e26d5ee2253c..460697532fad 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -242,6 +242,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/inet/inettbc \ sfx2/source/notebookbar/DropdownBox \ sfx2/source/notebookbar/NotebookBarPopupMenu \ + sfx2/source/notebookbar/NotebookbarToolBox \ sfx2/source/notebookbar/PriorityHBox \ sfx2/source/notebookbar/SfxNotebookBar \ sfx2/source/notify/eventsupplier \ diff --git a/sfx2/source/notebookbar/NotebookbarToolBox.cxx b/sfx2/source/notebookbar/NotebookbarToolBox.cxx new file mode 100644 index 000000000000..37662a845315 --- /dev/null +++ b/sfx2/source/notebookbar/NotebookbarToolBox.cxx @@ -0,0 +1,55 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include <sfx2/sidebar/SidebarToolBox.hxx> +#include <vcl/builderfactory.hxx> +#include <svtools/miscopt.hxx> + +namespace sfx2 { namespace notebookbar { + +class NotebookbarToolBox : public sfx2::sidebar::SidebarToolBox +{ +public: + + NotebookbarToolBox(vcl::Window* pParentWindow) + : sfx2::sidebar::SidebarToolBox(pParentWindow) + { + ToolBoxButtonSize eSize = TOOLBOX_BUTTONSIZE_SMALL; + + SvtMiscOptions aMiscOptions; + + sal_uInt16 nSize = GetIconSize(); + if (nSize <= TOOLBOX_BUTTONSIZE_LARGE) + eSize = static_cast<ToolBoxButtonSize>(nSize); + + SetToolboxButtonSize(eSize); + } + + virtual sal_uInt16 GetIconSize() const override + { + SvtMiscOptions aMiscOptions; + return aMiscOptions.GetNotebookbarIconSize(); + } +}; + +VCL_BUILDER_FACTORY(NotebookbarToolBox) + +} } // end of namespace sfx2::notebookbar + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index 986cd33a11cb..29c82ff3f18c 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -69,7 +69,7 @@ SidebarToolBox::SidebarToolBox (vcl::Window* pParentWindow) SvtMiscOptions aMiscOptions; aMiscOptions.AddListenerLink(LINK(this, SidebarToolBox, ChangedIconSizeHandler)); - sal_uInt16 nSize = aMiscOptions.GetSidebarIconSize(); + sal_uInt16 nSize = GetIconSize(); if (nSize <= TOOLBOX_BUTTONSIZE_LARGE) eSize = static_cast<ToolBoxButtonSize>(nSize); @@ -117,6 +117,12 @@ void SidebarToolBox::dispose() ToolBox::dispose(); } +sal_uInt16 SidebarToolBox::GetIconSize() const +{ + SvtMiscOptions aMiscOptions; + return aMiscOptions.GetSidebarIconSize(); +} + void SidebarToolBox::InsertItem(const OUString& rCommand, const css::uno::Reference<css::frame::XFrame>& rFrame, ToolBoxItemBits nBits, const Size& rRequestedSize, sal_uInt16 nPos) @@ -264,8 +270,7 @@ IMPL_LINK_NOARG_TYPED(SidebarToolBox, ChangedIconSizeHandler, LinkParamNone*, vo ToolBoxButtonSize eSize = TOOLBOX_BUTTONSIZE_SMALL; - SvtMiscOptions aMiscOptions; - sal_uInt16 nSize = aMiscOptions.GetSidebarIconSize(); + sal_uInt16 nSize = GetIconSize(); if(nSize <= TOOLBOX_BUTTONSIZE_LARGE) eSize = static_cast<ToolBoxButtonSize>(nSize); @@ -297,6 +302,7 @@ IMPL_LINK_NOARG_TYPED(SidebarToolBox, ChangedIconSizeHandler, LinkParamNone*, vo } } + Resize(); queue_resize(); } diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index 63fe6a60685a..dd42ca08adbe 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -64,6 +64,8 @@ using namespace ::com::sun::star; #define PROPERTYHANDLE_MACRORECORDERMODE 9 #define PROPERTYNAME_SIDEBARICONSIZE "SidebarIconSize" #define PROPERTYHANDLE_SIDEBARICONSIZE 10 +#define PROPERTYNAME_NOTEBOOKBARICONSIZE "NotebookbarIconSize" +#define PROPERTYHANDLE_NOTEBOOKBARICONSIZE 11 #define VCL_TOOLBOX_STYLE_FLAT ((sal_uInt16)0x0004) // from <vcl/toolbox.hxx> @@ -79,6 +81,8 @@ private: bool m_bIsSymbolsSizeRO; sal_Int16 m_nSidebarIconSize; bool m_bIsSidebarIconSizeRO; + sal_Int16 m_nNotebookbarIconSize; + bool m_bIsNotebookbarIconSizeRO; bool m_bIsSymbolsStyleRO; sal_Int16 m_nToolboxStyle; bool m_bIsToolboxStyleRO; @@ -153,10 +157,15 @@ public: inline sal_Int16 GetSidebarIconSize() { return m_nSidebarIconSize; } + inline sal_Int16 GetNotebookbarIconSize() + { return m_nNotebookbarIconSize; } + void SetSymbolsSize( sal_Int16 nSet ); void SetSidebarIconSize( sal_Int16 nSet ); + void SetNotebookbarIconSize( sal_Int16 nSet ); + static OUString GetIconTheme(); enum class SetModifiedFlag { SET, DONT_SET }; @@ -236,6 +245,8 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() , m_bIsSymbolsSizeRO( false ) , m_nSidebarIconSize( 0 ) , m_bIsSidebarIconSizeRO( false ) + , m_nNotebookbarIconSize( 0 ) + , m_bIsNotebookbarIconSizeRO( false ) , m_bIsSymbolsStyleRO( false ) , m_nToolboxStyle( 1 ) , m_bIsToolboxStyleRO( false ) @@ -296,6 +307,16 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() break; } + case PROPERTYHANDLE_NOTEBOOKBARICONSIZE : + { + if( !(seqValues[nProperty] >>= m_nNotebookbarIconSize) ) + { + OSL_FAIL("Wrong type of \"Misc\\NotebookbarIconSize\"!" ); + } + m_bIsNotebookbarIconSizeRO = seqRO[nProperty]; + break; + } + case PROPERTYHANDLE_TOOLBOXSTYLE : { if( !(seqValues[nProperty] >>= m_nToolboxStyle) ) @@ -432,6 +453,13 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames ) } } break; + case PROPERTYHANDLE_NOTEBOOKBARICONSIZE : { + if( !(seqValues[nProperty] >>= m_nNotebookbarIconSize) ) + { + OSL_FAIL("Wrong type of \"Misc\\NotebookbarIconSize\"!" ); + } + } + break; case PROPERTYHANDLE_TOOLBOXSTYLE : { if( !(seqValues[nProperty] >>= m_nToolboxStyle) ) { @@ -521,6 +549,13 @@ void SvtMiscOptions_Impl::SetSidebarIconSize( sal_Int16 nSet ) CallListeners(); } +void SvtMiscOptions_Impl::SetNotebookbarIconSize( sal_Int16 nSet ) +{ + m_nNotebookbarIconSize = nSet; + SetModified(); + CallListeners(); +} + OUString SvtMiscOptions_Impl::GetIconTheme() { return Application::GetSettings().GetStyleSettings().DetermineIconTheme(); @@ -595,6 +630,13 @@ void SvtMiscOptions_Impl::ImplCommit() break; } + case PROPERTYHANDLE_NOTEBOOKBARICONSIZE : + { + if ( !m_bIsNotebookbarIconSizeRO ) + seqValues[nProperty] <<= m_nNotebookbarIconSize; + break; + } + case PROPERTYHANDLE_TOOLBOXSTYLE : { if ( !m_bIsToolboxStyleRO ) @@ -677,7 +719,8 @@ Sequence< OUString > SvtMiscOptions_Impl::GetPropertyNames() OUString(PROPERTYNAME_DISABLEUICUSTOMIZATION), OUString(PROPERTYNAME_EXPERIMENTALMODE), OUString(PROPERTYNAME_MACRORECORDERMODE), - OUString(PROPERTYNAME_SIDEBARICONSIZE) + OUString(PROPERTYNAME_SIDEBARICONSIZE), + OUString(PROPERTYNAME_NOTEBOOKBARICONSIZE) }; // Initialize return sequence with these list ... @@ -749,11 +792,21 @@ sal_Int16 SvtMiscOptions::GetSidebarIconSize() const return m_pImpl->GetSidebarIconSize(); } +sal_Int16 SvtMiscOptions::GetNotebookbarIconSize() const +{ + return m_pImpl->GetNotebookbarIconSize(); +} + void SvtMiscOptions::SetSidebarIconSize( sal_Int16 nSet ) { m_pImpl->SetSidebarIconSize( nSet ); } +void SvtMiscOptions::SetNotebookbarIconSize( sal_Int16 nSet ) +{ + m_pImpl->SetNotebookbarIconSize( nSet ); +} + sal_Int16 SvtMiscOptions::GetCurrentSymbolsSize() const { sal_Int16 eOptSymbolsSize = m_pImpl->GetSymbolsSize(); diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui index e6e29f47f2a5..c5d531b484f0 100644 --- a/sw/uiconfig/swriter/ui/notebookbar.ui +++ b/sw/uiconfig/swriter/ui/notebookbar.ui @@ -444,7 +444,7 @@ <property name="orientation">vertical</property> <property name="valign">center</property> <child> - <object class="sfxlo-SidebarToolBox" id="cutbox"> + <object class="sfxlo-NotebookbarToolBox" id="cutbox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -470,7 +470,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="copybox"> + <object class="sfxlo-NotebookbarToolBox" id="copybox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -539,7 +539,7 @@ <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="sfxlo-SidebarToolBox" id="font"> + <object class="sfxlo-NotebookbarToolBox" id="font"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -562,7 +562,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="fontheight"> + <object class="sfxlo-NotebookbarToolBox" id="fontheight"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -597,7 +597,7 @@ <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="sfxlo-SidebarToolBox" id="fonteffects"> + <object class="sfxlo-NotebookbarToolBox" id="fonteffects"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -679,7 +679,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="position1"> + <object class="sfxlo-NotebookbarToolBox" id="position1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -748,7 +748,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="colorbar_writer"> + <object class="sfxlo-NotebookbarToolBox" id="colorbar_writer"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -822,7 +822,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="fontadjust"> + <object class="sfxlo-NotebookbarToolBox" id="fontadjust"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -862,7 +862,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="position"> + <object class="sfxlo-NotebookbarToolBox" id="position"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -948,7 +948,7 @@ <property name="orientation">vertical</property> <property name="valign">center</property> <child> - <object class="sfxlo-SidebarToolBox" id="numberbullet"> + <object class="sfxlo-NotebookbarToolBox" id="numberbullet"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -1001,7 +1001,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="level"> + <object class="sfxlo-NotebookbarToolBox" id="level"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -1116,7 +1116,7 @@ <property name="column_spacing">6</property> <property name="valign">center</property> <child> - <object class="sfxlo-SidebarToolBox" id="verticalalignment1"> + <object class="sfxlo-NotebookbarToolBox" id="verticalalignment1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -1167,7 +1167,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="horizontalalignment"> + <object class="sfxlo-NotebookbarToolBox" id="horizontalalignment"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -1229,7 +1229,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="writedirection"> + <object class="sfxlo-NotebookbarToolBox" id="writedirection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -1253,7 +1253,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="writedirection1"> + <object class="sfxlo-NotebookbarToolBox" id="writedirection1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -1356,7 +1356,7 @@ <property name="can_focus">False</property> <property name="spacing">12</property> <child> - <object class="sfxlo-SidebarToolBox" id="indent"> + <object class="sfxlo-NotebookbarToolBox" id="indent"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -1401,7 +1401,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="controlcodes"> + <object class="sfxlo-NotebookbarToolBox" id="controlcodes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -1440,7 +1440,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-SidebarToolBox" id="line"> + <object class="sfxlo-NotebookbarToolBox" id="line"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -1537,7 +1537,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="style"> + <object class="sfxlo-NotebookbarToolBox" id="style"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -2099,7 +2099,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-SidebarToolBox" id="shapes1"> + <object class="sfxlo-NotebookbarToolBox" id="shapes1"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -2158,7 +2158,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="shapes2"> + <object class="sfxlo-NotebookbarToolBox" id="shapes2"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -2216,7 +2216,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-SidebarToolBox" id="shapes3"> + <object class="sfxlo-NotebookbarToolBox" id="shapes3"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -2275,7 +2275,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="shapes4"> + <object class="sfxlo-NotebookbarToolBox" id="shapes4"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -2755,7 +2755,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-SidebarToolBox" id="ulspacing"> + <object class="sfxlo-NotebookbarToolBox" id="ulspacing"> <property name="width_request">210</property> <property name="height_request">72</property> <property name="visible">True</property> @@ -2785,7 +2785,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="lrspacing"> + <object class="sfxlo-NotebookbarToolBox" id="lrspacing"> <property name="width_request">200</property> <property name="height_request">72</property> <property name="visible">True</property> @@ -4610,7 +4610,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="formattable"> + <object class="sfxlo-NotebookbarToolBox" id="formattable"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -4652,7 +4652,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="formattable1"> + <object class="sfxlo-NotebookbarToolBox" id="formattable1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -4808,7 +4808,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="brightnes"> + <object class="sfxlo-NotebookbarToolBox" id="brightnes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -4835,7 +4835,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="contrast"> + <object class="sfxlo-NotebookbarToolBox" id="contrast"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -4886,7 +4886,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="gamma"> + <object class="sfxlo-NotebookbarToolBox" id="gamma"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -4913,7 +4913,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="transparence"> + <object class="sfxlo-NotebookbarToolBox" id="transparence"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -4979,7 +4979,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="mode"> + <object class="sfxlo-NotebookbarToolBox" id="mode"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -5006,7 +5006,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="red"> + <object class="sfxlo-NotebookbarToolBox" id="red"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -5057,7 +5057,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="green"> + <object class="sfxlo-NotebookbarToolBox" id="green"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -5084,7 +5084,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="blue"> + <object class="sfxlo-NotebookbarToolBox" id="blue"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -5147,7 +5147,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="flip"> + <object class="sfxlo-NotebookbarToolBox" id="flip"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -5173,7 +5173,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="flip1"> + <object class="sfxlo-NotebookbarToolBox" id="flip1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -5223,7 +5223,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="rotate"> + <object class="sfxlo-NotebookbarToolBox" id="rotate"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -5249,7 +5249,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="rotate1"> + <object class="sfxlo-NotebookbarToolBox" id="rotate1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -5299,7 +5299,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="crop"> + <object class="sfxlo-NotebookbarToolBox" id="crop"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -5325,7 +5325,7 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="filter"> + <object class="sfxlo-NotebookbarToolBox" id="filter"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> |