diff options
author | Efe Gürkan YALAMAN <efeyalaman@gmail.com> | 2014-06-01 17:02:56 +0300 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2014-08-14 22:20:24 +0200 |
commit | 031f11ee3b3cefe2814744a6d854857652f81e51 (patch) | |
tree | c8afd22452b2b618d6a867456bc83049ce9ae646 /sfx2 | |
parent | 61f70a423e94ca5f67eedc3455536063748a4a7c (diff) |
ViewBar moved to Start Center
View bar moved to the start center without handlers. Visible but
useless ATM.
Change-Id: I1cb64faa1ee86b19ecbb793351c8c11362ef799e
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/dialog/backingwindow.cxx | 26 | ||||
-rw-r--r-- | sfx2/source/dialog/backingwindow.hxx | 6 | ||||
-rw-r--r-- | sfx2/uiconfig/ui/startcenter.ui | 87 |
3 files changed, 115 insertions, 4 deletions
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index e223ee9fa493..81d6b48cec07 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -88,6 +88,8 @@ BackingWindow::BackingWindow( Window* i_pParent ) : get(mpHelpButton, "help"); get(mpExtensionsButton, "extensions"); + get(mpViewBar, "action_view"); + //Containers are invisible to cursor traversal //So on pressing "right" when in Help the //extension button is considered as a candidate @@ -239,6 +241,11 @@ void BackingWindow::initControls() mpLocalView->Hide(); mpLocalView->filterItems(ViewFilter_Application(FILTER_APP_NONE)); + mpViewBar->SetButtonType(BUTTON_SYMBOLTEXT); + mpViewBar->SetItemBits(mpViewBar->GetItemId("repository"), TIB_DROPDOWNONLY); + //mpViewBar->SetClickHdl(LINK(this,BackingWindow,TBXViewHdl)); + //mpViewBar->SetDropdownClickHdl(LINK(this,BackingWindow,TBXDropdownHdl)); + mpViewBar->Hide(); /*FIXME: Add other things for Local View *Filter and the bars*/ @@ -511,10 +518,29 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton ) */ mpAllRecentThumbnails->Hide(); mpLocalView->Show(); + mpViewBar->Show(); } return 0; } +IMPL_LINK_NOARG( BackingWindow, OpenRegionHdl) +{ + //maSelFolders.clear(); + //maSelTemplates.clear(); + + //mpViewBar->ShowItem(VIEWBAR_NEW_FOLDER, mpCurView->isNestedRegionAllowed()); + + //if (!mbIsSaveMode) + //mpViewBar->ShowItem(VIEWBAR_IMPORT, mpCurView->isImportAllowed()); + + //mpTemplateBar->Hide(); + //mpViewBar->Show(); + //mpActionBar->Show(); + + return 0; +} + + struct ImplDelayedDispatch { Reference< XDispatch > xDispatch; diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index 29276de3e96f..cff49ec4e930 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -26,9 +26,11 @@ #include <vcl/button.hxx> #include <vcl/tabctrl.hxx> #include <vcl/layout.hxx> +#include <vcl/toolbox.hxx> #include <sfx2/recentdocsview.hxx> #include <sfx2/templatelocalview.hxx> +#include <sfx2/templateabstractview.hxx> #include <sfx2/templateviewitem.hxx> #include <svtools/acceleratorexecute.hxx> @@ -79,6 +81,9 @@ class BackingWindow RecentDocsView* mpAllRecentThumbnails; TemplateLocalView* mpLocalView; + TemplateAbstractView* mpCurrentView; + + ToolBox* mpViewBar; std::vector<Window*> maDndWindows; @@ -98,6 +103,7 @@ class BackingWindow DECL_LINK(ClickHdl, Button*); DECL_LINK(ExtLinkClickHdl, Button*); + DECL_LINK(OpenRegionHdl, void*); void initControls(); diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui index 80e51cf63957..20136945b661 100644 --- a/sfx2/uiconfig/ui/startcenter.ui +++ b/sfx2/uiconfig/ui/startcenter.ui @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.0 on Sun May 25 15:43:37 2014 --> +<!-- Generated with glade 3.16.0 on Sun Jun 1 16:42:18 2014 --> <interface> - <!-- interface-requires LibreOffice 1.0 --> <!-- interface-requires gtk+ 3.0 --> + <!-- interface-requires LibreOffice 1.0 --> <object class="GtkImage" id="calc_all_image"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -388,6 +388,85 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> + <object class="GtkToolbar" id="action_view"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <child> + <object class="GtkToolButton" id="repository"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">repository</property> + <property name="label" translatable="yes">Repository</property> + <property name="use_underline">True</property> + <property name="icon_name">sfx2/imglst/actionview026.png</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="import"> + <property name="can_focus">False</property> + <property name="action_name">import</property> + <property name="label" translatable="yes">Import</property> + <property name="use_underline">True</property> + <property name="icon_name">sfx2/imglst/actionview010.png</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="delete"> + <property name="can_focus">False</property> + <property name="action_name">delete</property> + <property name="label" translatable="yes">Delete</property> + <property name="use_underline">True</property> + <property name="icon_name">sfx2/imglst/actionview025.png</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="save"> + <property name="can_focus">False</property> + <property name="action_name">save</property> + <property name="label" translatable="yes">Save</property> + <property name="use_underline">True</property> + <property name="icon_name">sfx2/imglst/actionview028.png</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="new_folder"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">new_folder</property> + <property name="label" translatable="yes">New Folder</property> + <property name="use_underline">True</property> + <property name="icon_name">sfx2/imglst/actionview029.png</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="sfxlo-RecentDocsView" id="all_recent"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -398,7 +477,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">2</property> </packing> </child> <child> @@ -412,7 +491,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> </object> |