Skip to content

C
core
Kaydet (Commit) c1f15930 authored tarafından Efe Gürkan YALAMAN's avatar Efe Gürkan YALAMAN Kaydeden (comit) Jan Holesovsky
Dosyalara gözat
Seçenekler

Initial TemplateBar moved from TemplateManager 

Change-Id: I335e69de31bd64e7c4504a58d7652f755491af33
üst 9a4d86a0
Hide whitespace changes
Inline Side-by-side
Showing with 228 additions and 56 deletions
sfx2/source/dialog/backingwindow.cxx
Dosyayı görüntüle @ c1f15930
...@@ -71,6 +71,15 @@ const char TEMPLATE_URL[] = "slot:5500"; ...@@ -71,6 +71,15 @@ const char TEMPLATE_URL[] = "slot:5500";
const char OPEN_URL[] = ".uno:Open"; const char OPEN_URL[] = ".uno:Open";
const char SERVICENAME_CFGREADACCESS[] = "com.sun.star.configuration.ConfigurationAccess"; const char SERVICENAME_CFGREADACCESS[] = "com.sun.star.configuration.ConfigurationAccess";
const char TEMPLATEBAR_SAVE[] = "template_save";
const char TEMPLATEBAR_OPEN[] = "open";
const char TEMPLATEBAR_EDIT[] = "edit";
const char TEMPLATEBAR_PROPERTIES[] = "properties";
const char TEMPLATEBAR_DEFAULT[] = "default";
const char TEMPLATEBAR_MOVE[] = "move";
const char TEMPLATEBAR_EXPORT[] = "export";
const char TEMPLATEBAR_DELETE[] = "template_delete";
float fMultiplier = 1.4f; float fMultiplier = 1.4f;
const Color aButtonsBackground(114, 168, 84); // TDF green const Color aButtonsBackground(114, 168, 84); // TDF green
const Color aButtonsText(COL_WHITE); const Color aButtonsText(COL_WHITE);
...@@ -116,6 +125,7 @@ BackingWindow::BackingWindow( Window* i_pParent ) : ...@@ -116,6 +125,7 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
get(mpExtensionsButton, "extensions"); get(mpExtensionsButton, "extensions");
get(mpViewBar, "action_view"); get(mpViewBar, "action_view");
get(mpTemplateBar, "action_templates");
//Containers are invisible to cursor traversal //Containers are invisible to cursor traversal
//So on pressing "right" when in Help the //So on pressing "right" when in Help the
...@@ -276,6 +286,11 @@ void BackingWindow::initControls() ...@@ -276,6 +286,11 @@ void BackingWindow::initControls()
//mpViewBar->SetDropdownClickHdl(LINK(this,BackingWindow,TBXDropdownHdl)); //mpViewBar->SetDropdownClickHdl(LINK(this,BackingWindow,TBXDropdownHdl));
mpViewBar->Hide(); mpViewBar->Hide();
mpTemplateBar->SetButtonType(BUTTON_SYMBOLTEXT);
mpTemplateBar->SetItemBits(mpTemplateBar->GetItemId(TEMPLATEBAR_MOVE), TIB_DROPDOWNONLY);
mpTemplateBar->SetClickHdl( LINK( this, BackingWindow,TBXTemplateHdl ) );
//mpTemplateBar->SetDropdownClickHdl(LINK(this, BackingWindow,TBXDropdownHdl));
//set handlers //set handlers
mpLocalView->setItemStateHdl(LINK(this, BackingWindow, TVItemStateHdl)); mpLocalView->setItemStateHdl(LINK(this, BackingWindow, TVItemStateHdl));
mpLocalView->setOpenRegionHdl(LINK(this, BackingWindow, OpenRegionHdl)); mpLocalView->setOpenRegionHdl(LINK(this, BackingWindow, OpenRegionHdl));
...@@ -795,6 +810,28 @@ IMPL_LINK_NOARG(BackingWindow,TBXViewHdl) ...@@ -795,6 +810,28 @@ IMPL_LINK_NOARG(BackingWindow,TBXViewHdl)
return 0; return 0;
} }
//FIXME: Implement OnSomething() methods
IMPL_LINK_NOARG(BackingWindow,TBXTemplateHdl)
{
//const size_t nCurItemId = mpTemplateBar->GetCurItemId();
//if (nCurItemId == mpTemplateBar->GetItemId(TEMPLATEBAR_OPEN))
//OnTemplateOpen();
//else if (nCurItemId == mpTemplateBar->GetItemId(TEMPLATEBAR_EDIT))
//OnTemplateEdit();
//else if (nCurItemId == mpTemplateBar->GetItemId(TEMPLATEBAR_PROPERTIES))
//OnTemplateProperties();
//else if (nCurItemId == mpTemplateBar->GetItemId(TEMPLATEBAR_DELETE))
//OnTemplateDelete();
//else if (nCurItemId == mpTemplateBar->GetItemId(TEMPLATEBAR_DEFAULT))
//OnTemplateAsDefault();
//else if (nCurItemId == mpTemplateBar->GetItemId(TEMPLATEBAR_EXPORT))
//OnTemplateExport();
return 0;
}
IMPL_LINK(BackingWindow, TVItemStateHdl, const ThumbnailViewItem*, pItem) IMPL_LINK(BackingWindow, TVItemStateHdl, const ThumbnailViewItem*, pItem)
{ {
const TemplateContainerItem *pCntItem = dynamic_cast<const TemplateContainerItem*>(pItem); const TemplateContainerItem *pCntItem = dynamic_cast<const TemplateContainerItem*>(pItem);
......
sfx2/source/dialog/backingwindow.hxx
Dosyayı görüntüle @ c1f15930
...@@ -86,6 +86,7 @@ class BackingWindow ...@@ -86,6 +86,7 @@ class BackingWindow
TemplateAbstractView* mpCurrentView; TemplateAbstractView* mpCurrentView;
ToolBox* mpViewBar; ToolBox* mpViewBar;
ToolBox* mpTemplateBar;
std::vector<Window*> maDndWindows; std::vector<Window*> maDndWindows;
...@@ -97,11 +98,10 @@ class BackingWindow ...@@ -97,11 +98,10 @@ class BackingWindow
svt::AcceleratorExecute* mpAccExec; svt::AcceleratorExecute* mpAccExec;
void setupButton( PushButton* pButton ); void setupButton( PushButton* pButton );
//Template Manager
void OnTemplateImport (); void OnTemplateImport ();
void OnFolderNew (); void OnFolderNew ();
void OnFolderDelete (); void OnFolderDelete ();
void OnRegionState (const ThumbnailViewItem *pItem); void OnRegionState (const ThumbnailViewItem *pItem);
void dispatchURL( const OUString& i_rURL, void dispatchURL( const OUString& i_rURL,
...@@ -117,6 +117,7 @@ class BackingWindow ...@@ -117,6 +117,7 @@ class BackingWindow
DECL_LINK(ExtLinkClickHdl, Button*); DECL_LINK(ExtLinkClickHdl, Button*);
DECL_LINK(OpenRegionHdl, void*); DECL_LINK(OpenRegionHdl, void*);
DECL_LINK(TBXViewHdl, void*); DECL_LINK(TBXViewHdl, void*);
DECL_LINK(TBXTemplateHdl, void*);
DECL_LINK(TVItemStateHdl, const ThumbnailViewItem*); DECL_LINK(TVItemStateHdl, const ThumbnailViewItem*);
void initControls(); void initControls();
......
sfx2/uiconfig/ui/startcenter.ui
Dosyayı görüntüle @ c1f15930
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.0 on Sun Jun 1 16:42:18 2014 --> <!-- Generated with glade 3.16.0 on Sat Jun 14 02:47:36 2014 -->
<interface> <interface>
<!-- interface-requires gtk+ 3.0 --> <!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 --> <!-- interface-requires LibreOffice 1.0 -->
...@@ -388,75 +388,209 @@ ...@@ -388,75 +388,209 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkToolbar" id="action_view"> <object class="GtkBox" id="box3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<child> <child>
<object class="GtkToolButton" id="repository"> <object class="GtkToolbar" id="action_view">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="action_name">repository</property> <property name="hexpand">True</property>
<property name="label" translatable="yes">Repository</property> <child>
<property name="use_underline">True</property> <object class="GtkToolButton" id="repository">
<property name="icon_name">sfx2/imglst/actionview026.png</property> <property name="visible">True</property>
</object> <property name="can_focus">False</property>
<packing> <property name="action_name">repository</property>
<property name="expand">False</property> <property name="label" translatable="yes">Repository</property>
<property name="homogeneous">True</property> <property name="use_underline">True</property>
</packing> <property name="icon_name">sfx2/imglst/actionview026.png</property>
</child> </object>
<child> <packing>
<object class="GtkToolButton" id="import"> <property name="expand">False</property>
<property name="can_focus">False</property> <property name="homogeneous">True</property>
<property name="action_name">import</property> </packing>
<property name="label" translatable="yes">Import</property> </child>
<property name="use_underline">True</property> <child>
<property name="icon_name">sfx2/imglst/actionview010.png</property> <object class="GtkToolButton" id="import">
</object> <property name="can_focus">False</property>
<packing> <property name="action_name">import</property>
<property name="expand">False</property> <property name="label" translatable="yes">Import</property>
<property name="homogeneous">True</property> <property name="use_underline">True</property>
</packing> <property name="icon_name">sfx2/imglst/actionview010.png</property>
</child> </object>
<child> <packing>
<object class="GtkToolButton" id="delete"> <property name="expand">False</property>
<property name="can_focus">False</property> <property name="homogeneous">True</property>
<property name="action_name">delete</property> </packing>
<property name="label" translatable="yes">Delete</property> </child>
<property name="use_underline">True</property> <child>
<property name="icon_name">sfx2/imglst/actionview025.png</property> <object class="GtkToolButton" id="delete">
</object> <property name="can_focus">False</property>
<packing> <property name="action_name">delete</property>
<property name="expand">False</property> <property name="label" translatable="yes">Delete</property>
<property name="homogeneous">True</property> <property name="use_underline">True</property>
</packing> <property name="icon_name">sfx2/imglst/actionview025.png</property>
</child> </object>
<child> <packing>
<object class="GtkToolButton" id="save"> <property name="expand">False</property>
<property name="can_focus">False</property> <property name="homogeneous">True</property>
<property name="action_name">save</property> </packing>
<property name="label" translatable="yes">Save</property> </child>
<property name="use_underline">True</property> <child>
<property name="icon_name">sfx2/imglst/actionview028.png</property> <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> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="homogeneous">True</property> <property name="fill">True</property>
<property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkToolButton" id="new_folder"> <object class="GtkToolbar" id="action_templates">
<property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="action_name">new_folder</property> <property name="hexpand">True</property>
<property name="label" translatable="yes">New Folder</property> <child>
<property name="use_underline">True</property> <object class="GtkToolButton" id="template_save">
<property name="icon_name">sfx2/imglst/actionview029.png</property> <property name="can_focus">False</property>
<property name="action_name">template_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="open">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">open</property>
<property name="label" translatable="yes">Open</property>
<property name="use_underline">True</property>
<property name="icon_name">sfx2/imglst/actionview030.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="edit">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">edit</property>
<property name="label" translatable="yes">Edit</property>
<property name="use_underline">True</property>
<property name="icon_name">sfx2/imglst/actiontemplates019.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="properties">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">properties</property>
<property name="label" translatable="yes">Properties</property>
<property name="use_underline">True</property>
<property name="icon_name">sfx2/imglst/actiontemplates016.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="default">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">default</property>
<property name="label" translatable="yes">Set as Default</property>
<property name="use_underline">True</property>
<property name="icon_name">sfx2/imglst/actiontemplates015.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="move">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">move</property>
<property name="label" translatable="yes">Move to Folder</property>
<property name="use_underline">True</property>
<property name="icon_name">sfx2/imglst/actiontemplates017.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="export">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">export</property>
<property name="label" translatable="yes">Export</property>
<property name="use_underline">True</property>
<property name="icon_name">sfx2/imglst/actiontemplates020.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="template_delete">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">template_delete</property>
<property name="label" translatable="yes">Delete</property>
<property name="use_underline">True</property>
<property name="icon_name">sfx2/imglst/actiontemplates018.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="homogeneous">True</property> <property name="fill">True</property>
<property name="position">1</property>
</packing> </packing>
</child> </child>
</object> </object>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment