[Libreoffice-commits] core.git: extras/source include/sfx2 sfx2/source sfx2/uiconfig
Krisztian Pinter
pin.terminator at gmail.com
Fri Aug 30 05:35:35 PDT 2013
extras/source/glade/libreoffice-catalog.xml.in | 3
include/sfx2/templateabstractview.hxx | 2
include/sfx2/templatelocalview.hxx | 1
sfx2/source/control/templateabstractview.cxx | 12
sfx2/source/control/templatelocalview.cxx | 12
sfx2/source/dialog/backingwindow.cxx | 156 ++++++++++
sfx2/source/dialog/backingwindow.hxx | 22 +
sfx2/uiconfig/ui/startcenter.ui | 382 +++++++++++++++++++++----
8 files changed, 535 insertions(+), 55 deletions(-)
New commits:
commit f8426f505316d08f35d8a7cf8dbfd6a3c60db3db
Author: Krisztian Pinter <pin.terminator at gmail.com>
Date: Wed Aug 14 15:53:13 2013 +0200
startcenter: Add toggle to view templates in Start Center
Change-Id: I17aa3bfbb7f4b0eca525dd15d6866c6951d5d20f
Reviewed-on: https://gerrit.libreoffice.org/5543
Reviewed-by: Jan Holesovsky <kendy at suse.cz>
Tested-by: Jan Holesovsky <kendy at suse.cz>
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index 951445b..dcbd8a1 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -482,6 +482,9 @@
<glade-widget-class title="Recent Documents View" name="sfxlo-RecentDocsView"
generic-name="Icon View" parent="GtkIconView"
icon-name="widget-gtk-iconview"/>
+ <glade-widget-class title="Template Thumbnail View" name="sfxlo-TemplateLocalView"
+ generic-name="Template Icon View" parent="GtkIconView"
+ icon-name="widget-gtk-iconview"/>
</glade-widget-classes>
</glade-catalog>
diff --git a/include/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx
index 8dd6027..8648205 100644
--- a/include/sfx2/templateabstractview.hxx
+++ b/include/sfx2/templateabstractview.hxx
@@ -81,8 +81,8 @@ class SFX2_DLLPUBLIC TemplateAbstractView : public ThumbnailView
public:
TemplateAbstractView (Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren);
-
TemplateAbstractView ( Window* pParent, const ResId& rResId, bool bDisableTransientChildren = false );
+ TemplateAbstractView ( Window* pParent );
virtual ~TemplateAbstractView ();
diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx
index 3a53fcb..139fa70 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -30,6 +30,7 @@ class SFX2_DLLPUBLIC TemplateLocalView : public TemplateAbstractView
public:
TemplateLocalView ( Window* pParent, const ResId& rResId, bool bDisableTransientChildren = false );
+ TemplateLocalView ( Window* pParent );
virtual ~TemplateLocalView ();
diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx
index d911917..9eb0a01 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -142,6 +142,18 @@ TemplateAbstractView::TemplateAbstractView(Window *pParent, const ResId &rResId,
maFTName.Hide();
}
+TemplateAbstractView::TemplateAbstractView(Window *pParent)
+ : ThumbnailView(pParent),
+ mnCurRegionId(0),
+ maAllButton(this, SfxResId(BTN_ALL_TEMPLATES)),
+ maFTName(this, SfxResId(FT_NAME))
+{
+ maAllButton.Hide();
+ maAllButton.SetStyle(maAllButton.GetStyle() | WB_FLATBUTTON);
+ maAllButton.SetClickHdl(LINK(this,TemplateAbstractView,ShowRootRegionHdl));
+ maFTName.Hide();
+}
+
TemplateAbstractView::~TemplateAbstractView ()
{
}
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index 8dcbd32..bcc0d7d 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -16,6 +16,7 @@
#include <svl/inettype.hxx>
#include <tools/urlobj.hxx>
#include <unotools/ucbstreamhelper.hxx>
+#include <vcl/builder.hxx>
#include <vcl/pngread.hxx>
#include <com/sun/star/embed/ElementModes.hpp>
@@ -37,6 +38,17 @@ TemplateLocalView::TemplateLocalView ( Window* pParent, const ResId& rResId, boo
{
}
+TemplateLocalView::TemplateLocalView ( Window* pParent)
+ : TemplateAbstractView(pParent),
+ mpDocTemplates(new SfxDocumentTemplates)
+{
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTemplateLocalView(Window *pParent, VclBuilder::stringmap &)
+{
+ return new TemplateLocalView(pParent);
+}
+
TemplateLocalView::~TemplateLocalView()
{
for (size_t i = 0; i < maRegions.size(); ++i)
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index d69b2fb..4cedf1b 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -31,6 +31,8 @@
#include <toolkit/awt/vclxmenu.hxx>
+#include <com/sun/star/document/MacroExecMode.hpp>
+#include <com/sun/star/document/UpdateDocMode.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
@@ -38,11 +40,13 @@
#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <com/sun/star/util/URLTransformer.hpp>
+#include <com/sun/star/task/InteractionHandler.hpp>
+using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star;
+using namespace ::com::sun::star::document;
const char RECENT_FILE_LIST[] = ".uno:RecentFileList";
@@ -60,8 +64,15 @@ const int nItemId_Extensions = 1;
const int nItemId_Info = 3;
const int nItemId_TplRep = 4;
+const int nTemplateItemMaxWidth = 160;
+const int nTemplateItemMaxHeight = 148;
+const int nTemplateItemPadding = 5;
+const int nTemplateItemMaxTextLength = 20;
+const int nTemplateItemThumbnailMaxHeight = 96;
+
BackingWindow::BackingWindow( Window* i_pParent ) :
Window( i_pParent ),
+ mxDesktop( Desktop::create(comphelper::getProcessComponentContext()) ),
mbInitControls( false ),
mnHideExternalLinks( 0 ),
mpAccExec( NULL )
@@ -93,6 +104,16 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
get(mpInfoButton, "info");
get(mpTplRepButton, "add_temp");
+ get(mpShowWriterTemplateButton, "show_writer_template");
+ get(mpShowCalcTemplateButton, "show_calc_template");
+ get(mpShowImpressTemplateButton, "show_impress_template");
+ get(mpShowDrawTemplateButton, "show_draw_template");
+
+ get(mpShowWriterRecentButton, "show_writer_recent");
+ get(mpShowCalcRecentButton, "show_calc_recent");
+ get(mpShowImpressRecentButton, "show_impress_recent");
+ get(mpShowDrawRecentButton, "show_draw_recent");
+
get( mpAllRecentThumbnails, "all_recent");
get( mpWriterRecentThumbnails, "writer_recent");
get( mpCalcRecentThumbnails, "calc_recent");
@@ -101,6 +122,11 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
get( mpDatabaseRecentThumbnails, "database_recent");
get( mpMathRecentThumbnails, "math_recent");
+ get( mpWriterTemplateThumbnails, "writer_templates");
+ get( mpCalcTemplateThumbnails, "calc_templates");
+ get( mpImpressTemplateThumbnails, "impress_templates");
+ get( mpDrawTemplateThumbnails, "draw_templates");
+
try
{
mxContext.set( ::comphelper::getProcessComponentContext(), uno::UNO_SET_THROW );
@@ -158,6 +184,10 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
BackingWindow::~BackingWindow()
{
+ mpWriterTemplateThumbnails ->setOpenTemplateHdl(Link());
+ mpCalcTemplateThumbnails ->setOpenTemplateHdl(Link());
+ mpImpressTemplateThumbnails ->setOpenTemplateHdl(Link());
+ mpDrawTemplateThumbnails ->setOpenTemplateHdl(Link());
}
IMPL_LINK( BackingWindow, WindowEventListener, VclSimpleEvent*, pEvent )
@@ -247,6 +277,26 @@ void BackingWindow::initControls()
setupExternalLink( mpInfoButton );
setupExternalLink( mpTplRepButton );
+ mpShowWriterTemplateButton ->SetClickHdl( LINK( this, BackingWindow, RecentTemplateToggleHdl ) );
+ mpShowCalcTemplateButton ->SetClickHdl( LINK( this, BackingWindow, RecentTemplateToggleHdl ) );
+ mpShowImpressTemplateButton ->SetClickHdl( LINK( this, BackingWindow, RecentTemplateToggleHdl ) );
+ mpShowDrawTemplateButton ->SetClickHdl( LINK( this, BackingWindow, RecentTemplateToggleHdl ) );
+
+ mpShowWriterRecentButton ->SetClickHdl( LINK( this, BackingWindow, RecentTemplateToggleHdl ) );
+ mpShowCalcRecentButton ->SetClickHdl( LINK( this, BackingWindow, RecentTemplateToggleHdl ) );
+ mpShowImpressRecentButton ->SetClickHdl( LINK( this, BackingWindow, RecentTemplateToggleHdl ) );
+ mpShowDrawRecentButton ->SetClickHdl( LINK( this, BackingWindow, RecentTemplateToggleHdl ) );
+
+ mpShowWriterRecentButton ->Hide();
+ mpShowCalcRecentButton ->Hide();
+ mpShowImpressRecentButton ->Hide();
+ mpShowDrawRecentButton ->Hide();
+
+ setupTemplateView( mpWriterTemplateThumbnails, FILTER_APP_WRITER );
+ setupTemplateView( mpCalcTemplateThumbnails, FILTER_APP_CALC );
+ setupTemplateView( mpImpressTemplateThumbnails, FILTER_APP_IMPRESS );
+ setupTemplateView( mpDrawTemplateThumbnails, FILTER_APP_DRAW );
+
Resize();
}
@@ -281,6 +331,20 @@ void BackingWindow::setupButton( PushButton* pButton )
pButton->SetControlFont( aFont );
}
+void BackingWindow::setupTemplateView( TemplateLocalView* pView, FILTER_APPLICATION eFilter )
+{
+ pView->SetStyle(pView->GetStyle() | WB_VSCROLL);
+ pView->setItemMaxTextLength(nTemplateItemMaxTextLength);
+
+ pView->setItemDimensions(nTemplateItemMaxWidth, nTemplateItemThumbnailMaxHeight,
+ nTemplateItemMaxHeight-nTemplateItemMaxHeight, nTemplateItemPadding);
+ pView->filterItems(ViewFilter_Application(eFilter));
+ pView->Populate();
+ pView->Hide(); // hidden by default
+ pView->showRootRegion();
+ pView->setOpenTemplateHdl( LINK( this, BackingWindow, OpenTemplateHdl ) );
+}
+
void BackingWindow::setupExternalLink( PushButton* pButton )
{
if( mnHideExternalLinks == 0 )
@@ -441,6 +505,96 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
return 0;
}
+IMPL_LINK( BackingWindow, RecentTemplateToggleHdl, Button*, pButton )
+{
+ // writer
+ if( pButton == mpShowWriterTemplateButton )
+ {
+ mpWriterRecentThumbnails->Hide();
+ mpWriterTemplateThumbnails->Show();
+ mpShowWriterTemplateButton->Hide();
+ mpShowWriterRecentButton->Show();
+ }
+ else if( pButton == mpShowWriterRecentButton )
+ {
+ mpWriterRecentThumbnails->Show();
+ mpWriterTemplateThumbnails->Hide();
+ mpShowWriterTemplateButton->Show();
+ mpShowWriterRecentButton->Hide();
+ }
+ // calc
+ else if( pButton == mpShowCalcTemplateButton )
+ {
+ mpCalcRecentThumbnails->Hide();
+ mpCalcTemplateThumbnails->Show();
+ mpShowCalcTemplateButton->Hide();
+ mpShowCalcRecentButton->Show();
+ }
+ else if( pButton == mpShowCalcRecentButton )
+ {
+ mpCalcRecentThumbnails->Show();
+ mpCalcTemplateThumbnails->Hide();
+ mpShowCalcTemplateButton->Show();
+ mpShowCalcRecentButton->Hide();
+ }
+ // impress
+ else if( pButton == mpShowImpressTemplateButton )
+ {
+ mpImpressRecentThumbnails->Hide();
+ mpImpressTemplateThumbnails->Show();
+ mpShowImpressTemplateButton->Hide();
+ mpShowImpressRecentButton->Show();
+ }
+ else if( pButton == mpShowImpressRecentButton )
+ {
+ mpImpressRecentThumbnails->Show();
+ mpImpressTemplateThumbnails->Hide();
+ mpShowImpressTemplateButton->Show();
+ mpShowImpressRecentButton->Hide();
+ }
+ // draw
+ else if( pButton == mpShowDrawTemplateButton )
+ {
+ mpDrawRecentThumbnails->Hide();
+ mpDrawTemplateThumbnails->Show();
+ mpShowDrawTemplateButton->Hide();
+ mpShowDrawRecentButton->Show();
+ }
+ else if( pButton == mpShowDrawRecentButton )
+ {
+ mpDrawRecentThumbnails->Show();
+ mpDrawTemplateThumbnails->Hide();
+ mpShowDrawTemplateButton->Show();
+ mpShowDrawRecentButton->Hide();
+ }
+ return 0;
+}
+
+IMPL_LINK( BackingWindow, OpenTemplateHdl, ThumbnailViewItem*, pItem)
+{
+ uno::Sequence< PropertyValue > aArgs(4);
+ aArgs[0].Name = "AsTemplate";
+ aArgs[0].Value <<= sal_True;
+ aArgs[1].Name = "MacroExecutionMode";
+ aArgs[1].Value <<= MacroExecMode::USE_CONFIG;
+ aArgs[2].Name = "UpdateDocMode";
+ aArgs[2].Value <<= UpdateDocMode::ACCORDING_TO_CONFIG;
+ aArgs[3].Name = "InteractionHandler";
+ aArgs[3].Value <<= task::InteractionHandler::createWithParent( ::comphelper::getProcessComponentContext(), 0 );
+
+ TemplateViewItem *pTemplateItem = static_cast<TemplateViewItem*>(pItem);
+
+ try
+ {
+ mxDesktop->loadComponentFromURL(pTemplateItem->getPath(),"_default", 0, aArgs );
+ }
+ catch( const uno::Exception& )
+ {
+ }
+
+ return 0;
+}
+
struct ImplDelayedDispatch
{
Reference< XDispatch > xDispatch;
diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx
index 9bacbc8..5009df8 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -28,6 +28,8 @@
#include <vcl/layout.hxx>
#include <sfx2/recentdocsview.hxx>
+#include <sfx2/templatelocalview.hxx>
+#include <sfx2/templateviewitem.hxx>
#include <svtools/acceleratorexecute.hxx>
#include <unotools/moduleoptions.hxx>
@@ -36,6 +38,7 @@
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/frame/XDesktop.hpp>
#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/frame/XDesktop2.hpp>
#include <set>
@@ -46,6 +49,7 @@ class BackingWindow
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
com::sun::star::uno::Reference<com::sun::star::frame::XDispatchProvider > mxDesktopDispatchProvider;
com::sun::star::uno::Reference<com::sun::star::frame::XFrame> mxFrame;
+ com::sun::star::uno::Reference< com::sun::star::frame::XDesktop2 > mxDesktop;
PushButton* mpOpenButton;
PushButton* mpTemplateButton;
@@ -70,6 +74,16 @@ class BackingWindow
PushButton* mpInfoButton;
PushButton* mpTplRepButton;
+ PushButton* mpShowWriterTemplateButton;
+ PushButton* mpShowCalcTemplateButton;
+ PushButton* mpShowImpressTemplateButton;
+ PushButton* mpShowDrawTemplateButton;
+
+ PushButton* mpShowWriterRecentButton;
+ PushButton* mpShowCalcRecentButton;
+ PushButton* mpShowImpressRecentButton;
+ PushButton* mpShowDrawRecentButton;
+
RecentDocsView* mpAllRecentThumbnails;
RecentDocsView* mpWriterRecentThumbnails;
RecentDocsView* mpCalcRecentThumbnails;
@@ -78,6 +92,11 @@ class BackingWindow
RecentDocsView* mpDatabaseRecentThumbnails;
RecentDocsView* mpMathRecentThumbnails;
+ TemplateLocalView* mpWriterTemplateThumbnails;
+ TemplateLocalView* mpCalcTemplateThumbnails;
+ TemplateLocalView* mpImpressTemplateThumbnails;
+ TemplateLocalView* mpDrawTemplateThumbnails;
+
Rectangle maStartCentButtons;
bool mbInitControls;
@@ -88,6 +107,7 @@ class BackingWindow
const OUString& rURL, const std::set<OUString>& rURLS, SvtModuleOptions& rOpt,
SvtModuleOptions::EModule eMod );
void setupButton( PushButton* pButton );
+ void setupTemplateView( TemplateLocalView* pView, FILTER_APPLICATION eFilter );
void setupExternalLink( PushButton* pButton );
void dispatchURL( const OUString& i_rURL,
@@ -97,6 +117,8 @@ class BackingWindow
);
DECL_LINK( ClickHdl, Button* );
+ DECL_LINK( RecentTemplateToggleHdl, Button* );
+ DECL_LINK( OpenTemplateHdl, ThumbnailViewItem* );
DECL_LINK( ExtLinkClickHdl, Button* );
DECL_LINK( WindowEventListener, VclSimpleEvent* );
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index 2274155..9285bf9 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -7,6 +7,52 @@
<property name="can_focus">False</property>
<property name="pixbuf">framework/res/addtemplate_32.png</property>
</object>
+ <object class="GtkImage" id="calc_all_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">res/ods_32_8.png</property>
+ </object>
+ <object class="GtkImage" id="calc_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">res/ods_32_8.png</property>
+ </object>
+ <object class="GtkImage" id="database_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">res/odb_32_8.png</property>
+ </object>
+ <object class="GtkImage" id="database_all_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">res/odb_32_8.png</property>
+ </object>
+ <object class="GtkImage" id="draw_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">res/odg_32_8.png</property>
+ </object>
+ <object class="GtkImage" id="draw_all_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">res/odg_32_8.png</property>
+ </object>
+ <object class="GtkImage" id="extension_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">framework/res/extension.png</property>
+ </object>
+ <object class="GtkImage" id="impress_all_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">New Presentation</property>
+ <property name="pixbuf">res/odp_32_8.png</property>
+ </object>
+ <object class="GtkImage" id="info_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">framework/res/info_26.png</property>
+ </object>
<object class="GtkBox" id="StartCenter">
<property name="can_focus">False</property>
<child>
@@ -187,6 +233,47 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="show_writer_template">
+ <property name="label" translatable="yes">Show Templates</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="show_writer_recent">
+ <property name="label" translatable="yes">Show Recent</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -196,11 +283,39 @@
</packing>
</child>
<child>
- <object class="sfxlo-RecentDocsView" id="writer_recent">
+ <object class="GtkGrid" id="grid21">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <child>
+ <object class="sfxlo-RecentDocsView" id="writer_recent">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-TemplateLocalView" id="writer_templates">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -251,6 +366,47 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="show_calc_template">
+ <property name="label" translatable="yes">Show Templates</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="show_calc_recent">
+ <property name="label" translatable="yes">Show Recent</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -260,11 +416,39 @@
</packing>
</child>
<child>
- <object class="sfxlo-RecentDocsView" id="calc_recent">
+ <object class="GtkGrid" id="grid20">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <child>
+ <object class="sfxlo-RecentDocsView" id="calc_recent">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-TemplateLocalView" id="calc_templates">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -315,6 +499,47 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="show_impress_template">
+ <property name="label" translatable="yes">Show Templates</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="show_impress_recent">
+ <property name="label" translatable="yes">Show Recent</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -324,11 +549,39 @@
</packing>
</child>
<child>
- <object class="sfxlo-RecentDocsView" id="impress_recent">
+ <object class="GtkGrid" id="grid18">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <child>
+ <object class="sfxlo-RecentDocsView" id="impress_recent">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-TemplateLocalView" id="impress_templates">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -379,6 +632,47 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="show_draw_template">
+ <property name="label" translatable="yes">Show Templates</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="show_draw_recent">
+ <property name="label" translatable="yes">Show Recent</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -388,11 +682,39 @@
</packing>
</child>
<child>
- <object class="sfxlo-RecentDocsView" id="draw_recent">
+ <object class="GtkGrid" id="grid19">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <child>
+ <object class="sfxlo-RecentDocsView" id="draw_recent">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-TemplateLocalView" id="draw_templates">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -696,57 +1018,11 @@
</packing>
</child>
</object>
- <object class="GtkImage" id="calc_all_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">res/ods_32_8.png</property>
- </object>
- <object class="GtkImage" id="calc_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">res/ods_32_8.png</property>
- </object>
- <object class="GtkImage" id="database_all_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">res/odb_32_8.png</property>
- </object>
- <object class="GtkImage" id="database_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">res/odb_32_8.png</property>
- </object>
- <object class="GtkImage" id="draw_all_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">res/odg_32_8.png</property>
- </object>
- <object class="GtkImage" id="draw_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">res/odg_32_8.png</property>
- </object>
- <object class="GtkImage" id="extension_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">framework/res/extension.png</property>
- </object>
- <object class="GtkImage" id="impress_all_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">New Presentation</property>
- <property name="pixbuf">res/odp_32_8.png</property>
- </object>
<object class="GtkImage" id="impress_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">res/odp_32_8.png</property>
</object>
- <object class="GtkImage" id="info_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">framework/res/info_26.png</property>
- </object>
<object class="GtkImage" id="math_all_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -767,12 +1043,12 @@
<property name="can_focus">False</property>
<property name="pixbuf">framework/res/templates_32.png</property>
</object>
- <object class="GtkImage" id="writer_all_image">
+ <object class="GtkImage" id="writer_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">res/odt_32_8.png</property>
</object>
- <object class="GtkImage" id="writer_image">
+ <object class="GtkImage" id="writer_all_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">res/odt_32_8.png</property>
More information about the Libreoffice-commits
mailing list