diff options
author | Szymon Kłos <eszkadev@gmail.com> | 2016-05-10 19:16:47 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-05-17 12:40:15 +0000 |
commit | 6ebf9cfbf54052d7fae50cdab146cc5c63ba262a (patch) | |
tree | 60e9e0ccc0878746d7817d58497b7fa53c0468fd /sd | |
parent | 2049e55f507b00cf70f72706900e75d20ff3bb30 (diff) |
Set different ui file for NotebookBar in each app
Changes:
+ added ui file for start center, calc and impress
+ NotebookBar not visible in Math, Draw
Change-Id: Ie35935e67524ac712930b088591e9e53955de4a1
Reviewed-on: https://gerrit.libreoffice.org/24860
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/UIConfig_simpress.mk | 1 | ||||
-rw-r--r-- | sd/sdi/docshell.sdi | 5 | ||||
-rw-r--r-- | sd/source/ui/docshell/docshel3.cxx | 7 | ||||
-rw-r--r-- | sd/source/ui/docshell/docshell.cxx | 7 | ||||
-rw-r--r-- | sd/uiconfig/simpress/ui/notebookbar.ui | 118 |
5 files changed, 138 insertions, 0 deletions
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk index bcb61601c2b3..3e7b3feb3581 100644 --- a/sd/UIConfig_simpress.mk +++ b/sd/UIConfig_simpress.mk @@ -119,6 +119,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\ sd/uiconfig/simpress/ui/interactiondialog \ sd/uiconfig/simpress/ui/interactionpage \ sd/uiconfig/simpress/ui/masterlayoutdlg \ + sd/uiconfig/simpress/ui/notebookbar \ sd/uiconfig/simpress/ui/optimpressgeneralpage \ sd/uiconfig/simpress/ui/photoalbum \ sd/uiconfig/simpress/ui/presentationdialog \ diff --git a/sd/sdi/docshell.sdi b/sd/sdi/docshell.sdi index d2a0011944ca..f5f322177b13 100644 --- a/sd/sdi/docshell.sdi +++ b/sd/sdi/docshell.sdi @@ -18,6 +18,11 @@ interface ImpressDocument : DrawDocument { + SID_NOTEBOOKBAR + [ + ExecMethod = Execute; + StateMethod = GetState; + ] } shell DrawDocShell diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index 69f15c76eb9a..c8fe3f4dd0f3 100644 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -42,6 +42,7 @@ #include <editeng/langitem.hxx> #include <editeng/eeitem.hxx> #include <com/sun/star/i18n/TextConversionOption.hpp> +#include <sfx2/notebookbar/SfxNotebookBar.hxx> #include "strings.hrc" #include "glob.hrc" @@ -317,6 +318,12 @@ void DrawDocShell::Execute( SfxRequest& rReq ) } break; + case SID_NOTEBOOKBAR: + { + sfx2::SfxNotebookBar::ExecMethod(mpViewShell->GetFrame()->GetBindings()); + } + break; + default: break; } diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index e91caaac95f6..65dafa0fff21 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -67,6 +67,7 @@ #include "undo/undofactory.hxx" #include "OutlineView.hxx" #include "ViewShellBase.hxx" +#include <sfx2/notebookbar/SfxNotebookBar.hxx> using namespace sd; #define DrawDocShell @@ -271,6 +272,12 @@ void DrawDocShell::GetState(SfxItemSet &rSet) } break; + case SID_NOTEBOOKBAR: + { + sfx2::SfxNotebookBar::StateMethod(mpViewShell->GetFrame()->GetBindings(), "modules/simpress/ui/notebookbar.ui"); + } + break; + default: break; } diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui new file mode 100644 index 000000000000..f11f6eb0e136 --- /dev/null +++ b/sd/uiconfig/simpress/ui/notebookbar.ui @@ -0,0 +1,118 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> +<interface> + <requires lib="gtk+" version="3.12"/> + <object class="GtkGrid" id="NotebookBar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="box1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkNotebook" id="notebook1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child> + <object class="GtkBox" id="box63"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkBox" id="box2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkButton" id="Open"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:Open</property> + <property name="relief">none</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="Save"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:Save</property> + <property name="relief">none</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + <child type="tab"> + <object class="GtkLabel" id="label9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">File</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Impress</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="position">1</property> + <property name="tab_fill">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> +</interface> |