Skip to content

C
core
Kaydet (Commit) fe421533 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

Resolves: fdo#83003 provide a means to return from template view 

Change-Id: Ie6d2cfb5ee28fbd9395a49fa074a252c9c6e20ec
üst fab88063
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 57 deletions
sfx2/source/dialog/backingwindow.cxx
Dosyayı görüntüle @ fe421533
...@@ -101,6 +101,7 @@ BackingWindow::BackingWindow( vcl::Window* i_pParent ) : ...@@ -101,6 +101,7 @@ BackingWindow::BackingWindow( vcl::Window* i_pParent ) :
m_pUIBuilder = new VclBuilder(this, getUIRootDir(), "sfx/ui/startcenter.ui", "StartCenter" ); m_pUIBuilder = new VclBuilder(this, getUIRootDir(), "sfx/ui/startcenter.ui", "StartCenter" );
get(mpOpenButton, "open_all"); get(mpOpenButton, "open_all");
get(mpRecentButton, "open_recent");
get(mpTemplateButton, "templates_all"); get(mpTemplateButton, "templates_all");
get(mpCreateLabel, "create_label"); get(mpCreateLabel, "create_label");
...@@ -274,6 +275,7 @@ void BackingWindow::initControls() ...@@ -274,6 +275,7 @@ void BackingWindow::initControls()
mpLocalView->setOpenTemplateHdl(LINK(this,BackingWindow,OpenTemplateHdl)); mpLocalView->setOpenTemplateHdl(LINK(this,BackingWindow,OpenTemplateHdl));
setupButton( mpOpenButton ); setupButton( mpOpenButton );
setupButton( mpRecentButton );
setupButton( mpTemplateButton ); setupButton( mpTemplateButton );
setupButton( mpWriterAllButton ); setupButton( mpWriterAllButton );
setupButton( mpDrawAllButton ); setupButton( mpDrawAllButton );
...@@ -545,6 +547,11 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton ) ...@@ -545,6 +547,11 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
dispatchURL( OPEN_URL, OUString(), xFrame, aArgs ); dispatchURL( OPEN_URL, OUString(), xFrame, aArgs );
} }
else if( pButton == mpRecentButton )
{
mpLocalView->Hide();
mpAllRecentThumbnails->Show();
}
else if( pButton == mpTemplateButton ) else if( pButton == mpTemplateButton )
{ {
mpAllRecentThumbnails->Hide(); mpAllRecentThumbnails->Hide();
......
sfx2/source/dialog/backingwindow.hxx
Dosyayı görüntüle @ fe421533
...@@ -62,6 +62,7 @@ class BackingWindow ...@@ -62,6 +62,7 @@ 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* mpRecentButton;
MenuButton* mpTemplateButton; MenuButton* mpTemplateButton;
FixedText* mpCreateLabel; FixedText* mpCreateLabel;
......
sfx2/uiconfig/ui/startcenter.ui
Dosyayı görüntüle @ fe421533
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.0 on Fri Aug 8 17:26:41 2014 --> <!-- Generated with glade 3.16.1 -->
<interface> <interface>
<!-- interface-requires gtk+ 3.0 --> <requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.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>
...@@ -18,6 +18,51 @@ ...@@ -18,6 +18,51 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="pixbuf">res/odg_32_8.png</property> <property name="pixbuf">res/odg_32_8.png</property>
</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>
</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>
</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>
</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="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>
<object class="GtkImage" id="impress_all_image"> <object class="GtkImage" id="impress_all_image">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
...@@ -33,6 +78,11 @@ ...@@ -33,6 +78,11 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="pixbuf">framework/res/folder_32.png</property> <property name="pixbuf">framework/res/folder_32.png</property>
</object> </object>
<object class="GtkImage" id="open_all_image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">framework/res/folder_32.png</property>
</object>
<object class="GtkImage" id="templates_all_image"> <object class="GtkImage" id="templates_all_image">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
...@@ -85,6 +135,26 @@ ...@@ -85,6 +135,26 @@
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkButton" id="open_recent">
<property name="label" translatable="yes">_Recent Files</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="margin_left">6</property>
<property name="margin_right">6</property>
<property name="margin_top">6</property>
<property name="image">open_all_image1</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child> <child>
<object class="GtkButton" id="templates_all:filtermenu"> <object class="GtkButton" id="templates_all:filtermenu">
<property name="label" translatable="yes">T_emplates</property> <property name="label" translatable="yes">T_emplates</property>
...@@ -101,7 +171,7 @@ ...@@ -101,7 +171,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -114,7 +184,7 @@ ...@@ -114,7 +184,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">2</property> <property name="position">3</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -129,7 +199,7 @@ ...@@ -129,7 +199,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">3</property> <property name="position">4</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -149,7 +219,7 @@ ...@@ -149,7 +219,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">4</property> <property name="position">5</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -169,7 +239,7 @@ ...@@ -169,7 +239,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">5</property> <property name="position">6</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -189,7 +259,7 @@ ...@@ -189,7 +259,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">6</property> <property name="position">7</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -209,7 +279,7 @@ ...@@ -209,7 +279,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">7</property> <property name="position">8</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -229,7 +299,7 @@ ...@@ -229,7 +299,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">8</property> <property name="position">9</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -249,7 +319,7 @@ ...@@ -249,7 +319,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">9</property> <property name="position">10</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -260,7 +330,7 @@ ...@@ -260,7 +330,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">10</property> <property name="position">11</property>
</packing> </packing>
</child> </child>
</object> </object>
...@@ -430,49 +500,4 @@ ...@@ -430,49 +500,4 @@
</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>
</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>
</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>
</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="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