Skip to content

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

Template Filtering Implementation 

Change-Id: I9270136afeaadbbe16c408e6e7d2fbde5b53d324
üst 219f314c
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 18 deletions
sfx2/source/dialog/backingwindow.cxx
Dosyayı görüntüle @ 13c4d0ab
...@@ -312,11 +312,14 @@ void BackingWindow::initControls() ...@@ -312,11 +312,14 @@ void BackingWindow::initControls()
mpTemplateButton->SetControlForeground(aButtonsText); mpTemplateButton->SetControlForeground(aButtonsText);
mpTemplateButton->SetDropDown( PUSHBUTTON_DROPDOWN_MENUBUTTON );
MenuButton *pMenuButton = static_cast<MenuButton*> (mpTemplateButton); //Menubutton implementation
pMenuButton->SetMenuMode( MENUBUTTON_MENUMODE_TIMED ); PopupMenu* pMenu = mpTemplateButton->GetPopupMenu();
pMenuButton->SetActivateHdl( LINK( this, BackingWindow, ActivateHdl )); pMenu->SetMenuFlags(
//pMenuButton->Activate(); pMenu->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
mpTemplateButton->SetSelectHdl(LINK(this,BackingWindow,MenuSelectHdl));
mpTemplateButton->SetClickHdl( LINK(this, BackingWindow, ClickHdl) );
setupButton( mpWriterAllButton ); setupButton( mpWriterAllButton );
setupButton( mpDrawAllButton ); setupButton( mpDrawAllButton );
...@@ -589,18 +592,30 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton ) ...@@ -589,18 +592,30 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
return 0; return 0;
} }
IMPL_LINK( BackingWindow, ActivateHdl, Button*, pButton ) IMPL_LINK( BackingWindow, MenuSelectHdl, MenuButton*, pButton )
{ {
printf("---------------------------------"); OString sId = pButton->GetCurItemIdent();
MenuButton *pMenuButton = static_cast<MenuButton*> (pButton);
PopupMenu *pFilterMenu = new PopupMenu;
//pFilterMenu->SetSelectHdl(LINK( this, BackingWindow, FilterMenuSelectHdl));
pFilterMenu->InsertItem(0, "Writer");
if( sId == "filter_writer" )
{
mpCurrentView->filterItems(ViewFilter_Application(FILTER_APP_WRITER));
}
else if( sId == "filter_calc" )
{
mpLocalView->filterItems(ViewFilter_Application(FILTER_APP_CALC));
}
else if( sId == "filter_impress" )
{
mpLocalView->filterItems(ViewFilter_Application(FILTER_APP_IMPRESS));
}
else if( sId == "filter_draw" )
{
mpLocalView->filterItems(ViewFilter_Application(FILTER_APP_DRAW));
}
pMenuButton->SetPopupMenu( pFilterMenu );
mpAllRecentThumbnails->Hide();
mpLocalView->Show();
return 0; return 0;
} }
......
sfx2/source/dialog/backingwindow.hxx
Dosyayı görüntüle @ 13c4d0ab
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
#include <vcl/tabctrl.hxx> #include <vcl/tabctrl.hxx>
#include <vcl/layout.hxx> #include <vcl/layout.hxx>
#include <vcl/menubtn.hxx>
#include <sfx2/recentdocsview.hxx> #include <sfx2/recentdocsview.hxx>
#include <sfx2/templatelocalview.hxx> #include <sfx2/templatelocalview.hxx>
#include <sfx2/templateabstractview.hxx> #include <sfx2/templateabstractview.hxx>
...@@ -59,7 +61,8 @@ class BackingWindow ...@@ -59,7 +61,8 @@ class BackingWindow
com::sun::star::uno::Reference< com::sun::star::datatransfer::dnd::XDropTargetListener > mxDropTargetListener; com::sun::star::uno::Reference< com::sun::star::datatransfer::dnd::XDropTargetListener > mxDropTargetListener;
PushButton* mpOpenButton; PushButton* mpOpenButton;
PushButton* mpTemplateButton; //PushButton* mpTemplateButton;
MenuButton* mpTemplateButton;
FixedText* mpCreateLabel; FixedText* mpCreateLabel;
...@@ -111,7 +114,7 @@ class BackingWindow ...@@ -111,7 +114,7 @@ class BackingWindow
std::set<const ThumbnailViewItem*,selection_cmp_fn> maSelFolders; std::set<const ThumbnailViewItem*,selection_cmp_fn> maSelFolders;
DECL_LINK(ClickHdl, Button*); DECL_LINK(ClickHdl, Button*);
DECL_LINK(ActivateHdl, Button*); DECL_LINK(MenuSelectHdl, MenuButton*);
DECL_LINK(ExtLinkClickHdl, Button*); DECL_LINK(ExtLinkClickHdl, Button*);
DECL_LINK(OpenRegionHdl, void*); DECL_LINK(OpenRegionHdl, void*);
DECL_LINK(OpenTemplateHdl, ThumbnailViewItem*); DECL_LINK(OpenTemplateHdl, ThumbnailViewItem*);
......
sfx2/uiconfig/ui/startcenter.ui
Dosyayı görüntüle @ 13c4d0ab
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.0 on Wed Jul 2 15:37:52 2014 --> <!-- Generated with glade 3.16.0 on Wed Jul 23 16:41:24 2014 -->
<interface> <interface>
<!-- interface-requires LibreOffice 1.0 -->
<!-- interface-requires gtk+ 3.0 --> <!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkImage" id="calc_all_image"> <object class="GtkImage" id="calc_all_image">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="templates_all"> <object class="GtkButton" id="templates_all:filtermenu">
<property name="label" translatable="yes">T_emplates</property> <property name="label" translatable="yes">T_emplates</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
...@@ -430,4 +430,59 @@ ...@@ -430,4 +430,59 @@
</packing> </packing>
</child> </child>
</object> </object>
<object class="GtkMenu" id="filtermenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkMenuItem" id="filter_writer">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Writer Templates</property>
<property name="use_underline">True</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="filter_calc">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Calc Templates</property>
<property name="use_underline">True</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="filter_impress">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Impress Templates</property>
<property name="use_underline">True</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="filter_draw">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Draw Templates</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="filter_math">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Math Templates</property>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="menuitem3">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="edit">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Edit Templates</property>
</object>
</child>
</object>
</interface> </interface>
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