[Libreoffice-commits] core.git: Branch 'feature/template_manager_improvements' - 2 commits - sfx2/source sfx2/uiconfig
Efe Gürkan YALAMAN
efeyalaman at gmail.com
Thu Jul 31 17:08:20 PDT 2014
sfx2/source/dialog/backingwindow.cxx | 67 ++++++++++++++++++++---------------
sfx2/source/dialog/backingwindow.hxx | 1
sfx2/uiconfig/ui/startcenter.ui | 17 ++++----
3 files changed, 49 insertions(+), 36 deletions(-)
New commits:
commit 58fc7d25a5904a6747fdb2a3bf4c4a39be547bef
Author: Efe Gürkan YALAMAN <efeyalaman at gmail.com>
Date: Fri Aug 1 02:59:41 2014 +0300
All templates option added
Change-Id: I622d5d6fd7fa7be474fa56abf67a1a62fddbcf60
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index f481f18..bf17b95 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -363,7 +363,7 @@ void BackingWindow::setupButton( MenuButton* pButton )
pMenu->SetMenuFlags(
pMenu->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
- pButton->SetClickHdl( LINK( this, BackingWindow, ClickHdl ) );
+ //pButton->SetClickHdl( LINK( this, BackingWindow, ClickHdl ) );
pButton->SetSelectHdl( LINK( this, BackingWindow, MenuSelectHdl ) );
}
@@ -590,21 +590,25 @@ IMPL_LINK( BackingWindow, MenuSelectHdl, MenuButton*, pButton )
{
OString sId = pButton->GetCurItemIdent();
- if( sId == "filter_writer" )
+ if( sId == "filter_none" )
+ {
+ mpCurrentView->filterItems(ViewFilter_Application(FILTER_APP_NONE));
+ }
+ else if( sId == "filter_writer" )
{
mpCurrentView->filterItems(ViewFilter_Application(FILTER_APP_WRITER));
}
else if( sId == "filter_calc" )
{
- mpLocalView->filterItems(ViewFilter_Application(FILTER_APP_CALC));
+ mpCurrentView->filterItems(ViewFilter_Application(FILTER_APP_CALC));
}
else if( sId == "filter_impress" )
{
- mpLocalView->filterItems(ViewFilter_Application(FILTER_APP_IMPRESS));
+ mpCurrentView->filterItems(ViewFilter_Application(FILTER_APP_IMPRESS));
}
else if( sId == "filter_draw" )
{
- mpLocalView->filterItems(ViewFilter_Application(FILTER_APP_DRAW));
+ mpCurrentView->filterItems(ViewFilter_Application(FILTER_APP_DRAW));
}
else if( sId == "edit" )
{
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index da54f91..915028e 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Sun Jul 27 15:03:37 2014 -->
+<!-- Generated with glade 3.16.0 on Fri Aug 1 02:51:49 2014 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
@@ -435,6 +435,14 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
+ <object class="GtkMenuItem" id="filter_none">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">All Templates</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
<object class="GtkMenuItem" id="filter_writer">
<property name="visible">True</property>
<property name="can_focus">False</property>
commit f42ed44b2f612b33998242091a3a762ca3fb4215
Author: Efe Gürkan YALAMAN <efeyalaman at gmail.com>
Date: Fri Aug 1 02:46:51 2014 +0300
Some code cleanup
SetupButton function overloaded for MenuButton type.
Change-Id: Ib171c7590a59ad360dd8ebab1039d3eba5d565ef
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 34a40e1..f481f18 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -52,9 +52,6 @@
#include <com/sun/star/task/InteractionHandler.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-//FIXME:well find a better way for it.
-#include "../doc/doc.hrc"
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
@@ -294,32 +291,13 @@ void BackingWindow::initControls()
//mpTemplateBar->SetDropdownClickHdl(LINK(this, BackingWindow,TBXDropdownHdl));
//set handlers
- //mpLocalView->setItemStateHdl(LINK(this, BackingWindow, TVItemStateHdl));
mpLocalView->setOpenRegionHdl(LINK(this, BackingWindow, OpenRegionHdl));
mpLocalView->setOpenTemplateHdl(LINK(this,BackingWindow,OpenTemplateHdl));
- /*FIXME: Add other things for Local View
- *Filter and the bars*/
+ /*FIXME: Add other things for Local View*/
setupButton( mpOpenButton );
- //setupButton( mpTemplateButton );
- Font bFont(mpTemplateButton->GetControlFont());
- bFont.SetHeight(nButtonsFontSize);
- mpTemplateButton->SetControlFont(bFont);
-
- // color that fits the theme
- mpTemplateButton->SetControlForeground(aButtonsText);
-
-
-
- //Menubutton implementation
- PopupMenu* pMenu = mpTemplateButton->GetPopupMenu();
- pMenu->SetMenuFlags(
- pMenu->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
-
- mpTemplateButton->SetSelectHdl(LINK(this,BackingWindow,MenuSelectHdl));
- mpTemplateButton->SetClickHdl( LINK(this, BackingWindow, ClickHdl) );
-
+ setupButton( mpTemplateButton );
setupButton( mpWriterAllButton );
setupButton( mpDrawAllButton );
setupButton( mpCalcAllButton );
@@ -373,6 +351,23 @@ void BackingWindow::setupButton( PushButton* pButton )
pButton->SetClickHdl( LINK( this, BackingWindow, ClickHdl ) );
}
+void BackingWindow::setupButton( MenuButton* pButton )
+{
+ Font aFont(pButton->GetControlFont());
+ aFont.SetHeight(nButtonsFontSize);
+ pButton->SetControlFont(aFont);
+ pButton->SetControlForeground(aButtonsText);
+
+ //Menubutton implementation
+ PopupMenu* pMenu = mpTemplateButton->GetPopupMenu();
+ pMenu->SetMenuFlags(
+ pMenu->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
+
+ pButton->SetClickHdl( LINK( this, BackingWindow, ClickHdl ) );
+ pButton->SetSelectHdl( LINK( this, BackingWindow, MenuSelectHdl ) );
+}
+
+
void BackingWindow::Paint( const Rectangle& )
{
Resize();
@@ -611,6 +606,18 @@ IMPL_LINK( BackingWindow, MenuSelectHdl, MenuButton*, pButton )
{
mpLocalView->filterItems(ViewFilter_Application(FILTER_APP_DRAW));
}
+ else if( sId == "edit" )
+ {
+ Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY );
+
+ Sequence< com::sun::star::beans::PropertyValue > aArgs(1);
+ PropertyValue* pArg = aArgs.getArray();
+ pArg[0].Name = "Referer";
+ pArg[0].Value <<= OUString("private:user");
+
+ dispatchURL( TEMPLATE_URL, OUString(), xFrame, aArgs );
+
+ }
mpAllRecentThumbnails->Hide();
diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx
index 586b879..f842644 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -101,6 +101,7 @@ class BackingWindow
svt::AcceleratorExecute* mpAccExec;
void setupButton( PushButton* pButton );
+ void setupButton( MenuButton* pButton );
//Template Manager
void OnTemplateOpen ();
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index 792b43b..da54f91 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Wed Jul 23 16:41:24 2014 -->
+<!-- Generated with glade 3.16.0 on Sun Jul 27 15:03:37 2014 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
@@ -466,13 +466,6 @@
</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>
More information about the Libreoffice-commits
mailing list