datastreams: add toolbar buttons to stop / resume streaming

Change-Id: I601a4a174ea191c799623d29ed6eb229f9f372da

datastreams: add toolbar buttons to stop / resume streaming
Change-Id: I601a4a174ea191c799623d29ed6eb229f9f372da
4dc9dc6a · Matúš Kukan · 2c945010 · 4dc9dc6a · 4dc9dc6a · 4dc9dc6a
Kaydet (Commit) 4dc9dc6a authored Kas 12, 2013 tarafından Matúš Kukan
13 changed files
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1293,6 +1293,22 @@
          <value xml:lang="en-US">Strea~ms...</value>
        </prop>
      </node>
+      <node oor:name=".uno:DataStreamsPlay" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Resume streaming</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:DataStreamsStop" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Stop streaming</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
      <node oor:name=".uno:ManageXMLSource" oor:op="replace">
        <prop oor:name="Label" oor:type="xs:string">
          <value xml:lang="en-US">~XML Source...</value>

--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
@@ -54,6 +54,17 @@
          <value>true</value>
        </prop>
      </node>
+      <node oor:name="private:resource/toolbar/datastreams" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Data Streams</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
      <node oor:name="private:resource/toolbar/drawobjectbar" oor:op="replace">
        <prop oor:name="DockPos" oor:type="xs:string">
          <value>0,1</value>

--- a/postprocess/packimages/image-sort.lst
+++ b/postprocess/packimages/image-sort.lst
@@ -103,6 +103,7 @@ modules/scalc/toolbar/arrowshapes.xml
 modules/scalc/toolbar/basicshapes.xml
 modules/scalc/toolbar/calloutshapes.xml
 modules/scalc/toolbar/colorbar.xml
+modules/scalc/toolbar/datastreams.xml
 modules/scalc/toolbar/drawbar.xml
 modules/scalc/toolbar/drawobjectbar.xml
 modules/scalc/toolbar/extrusionobjectbar.xml

--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/scalc,\
 	sc/uiconfig/scalc/toolbar/basicshapes \
 	sc/uiconfig/scalc/toolbar/calloutshapes \
 	sc/uiconfig/scalc/toolbar/colorbar \
+	sc/uiconfig/scalc/toolbar/datastreams \
 	sc/uiconfig/scalc/toolbar/drawbar \
 	sc/uiconfig/scalc/toolbar/drawobjectbar \
 	sc/uiconfig/scalc/toolbar/extrusionobjectbar \

--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -91,6 +91,8 @@
 #define SID_SCFORMULAOPTIONS    (SC_VIEW_START + 20)
 #define SID_SCDEFAULTSOPTIONS   (SC_VIEW_START + 21)

+#define SID_DATA_STREAMS_PLAY   (SC_VIEW_START + 33)
+#define SID_DATA_STREAMS_STOP   (SC_VIEW_START + 34)
 #define SID_DATA_STREAMS        (SC_VIEW_START + 35)

 // slot-IDs for attributes

--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -52,6 +52,8 @@ interface CellSelection
    SID_SBA_BRW_INSERT      [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
    SID_SELECT_DB           [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
    SID_DATA_STREAMS        [ ExecMethod = ExecuteDB; ]
+    SID_DATA_STREAMS_PLAY   [ ExecMethod = ExecuteDB; ]
+    SID_DATA_STREAMS_STOP   [ ExecMethod = ExecuteDB; ]
    SID_MANAGE_XML_SOURCE   [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
    SID_SORT                [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
    SID_DATA_FORM           [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]

--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -6148,6 +6148,52 @@ SfxVoidItem DataStreams SID_DATA_STREAMS
    GroupId = GID_DATA;
 ]

+SfxVoidItem DataStreamsPlay SID_DATA_STREAMS_PLAY
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = FALSE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Synchron;
+
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
+    GroupId = GID_DATA;
+]
+
+SfxVoidItem DataStreamsStop SID_DATA_STREAMS_STOP
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = FALSE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Synchron;
+
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
+    GroupId = GID_DATA;
+]
+
 SfxVoidItem ManageXMLSource SID_MANAGE_XML_SOURCE
 (SfxStringItem DbName SID_MANAGE_XML_SOURCE)
 [

--- a/sc/source/ui/inc/datastreams.hxx
+++ b/sc/source/ui/inc/datastreams.hxx
@@ -43,13 +43,13 @@ public:
    ~DataStreams();
    bool ImportData();
    void ShowDialog(Window *pParent);
+    void Start();
+    void Stop();

 private:
    void MoveData();
    void Set(const OUString& rUrl, bool bIsScript, const OUString& rRange,
            sal_Int32 nLimit, MoveEnum eMove);
-    void Start();
-    void Stop();
 };

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/sc/source/ui/miscdlgs/datastreams.cxx
+++ b/sc/source/ui/miscdlgs/datastreams.cxx
@@ -57,6 +57,7 @@ DataStreams::DataStreams(ScDocShell *pScDocShell):
    mpScDocShell(pScDocShell)
    , mpScDocument(mpScDocShell->GetDocument())
    , meMove(NO_MOVE)
+    , mbRunning(false)
 {
    mxThread = new datastreams::CallerThread( this );
    mxThread->launch();
@@ -73,6 +74,8 @@ DataStreams::~DataStreams()

 void DataStreams::Start()
 {
+    if (mbRunning)
+        return;
    mbIsUndoEnabled = mpScDocument->IsUndoEnabled();
    mpScDocument->EnableUndo(false);
    mbRunning = true;
@@ -81,6 +84,8 @@ void DataStreams::Start()

 void DataStreams::Stop()
 {
+    if (!mbRunning)
+        return;
    mbRunning = false;
    mpScDocument->EnableUndo(mbIsUndoEnabled);
 }

--- a/sc/source/ui/miscdlgs/datastreamsdlg.cxx
+++ b/sc/source/ui/miscdlgs/datastreamsdlg.cxx
@@ -20,7 +20,6 @@ class DataStreamsDlg : public ModalDialog

    SvtURLBox*      m_pCbUrl;
    PushButton*     m_pBtnBrowse;
-    PushButton*     m_pBtnStop;
    RadioButton*    m_pRBDirectData;
    RadioButton*    m_pRBScriptData;
    RadioButton*    m_pRBDataDown;
@@ -34,7 +33,6 @@ class DataStreamsDlg : public ModalDialog

    DECL_LINK(UpdateHdl, void *);
    DECL_LINK(BrowseHdl, void *);
-    DECL_LINK(StopHdl, void *);

    void UpdateEnable();

@@ -50,7 +48,6 @@ DataStreamsDlg::DataStreamsDlg(DataStreams *pDataStreams, Window* pParent)
 {
    get(m_pCbUrl, "url");
    get(m_pBtnBrowse, "browse");
-    get(m_pBtnStop, "stop");
    get(m_pRBDirectData, "directdata");
    get(m_pRBScriptData, "scriptdata");
    get(m_pRBDataDown, "datadown");
@@ -65,7 +62,6 @@ DataStreamsDlg::DataStreamsDlg(DataStreams *pDataStreams, Window* pParent)
    m_pCbUrl->SetSelectHdl( LINK( this, DataStreamsDlg, UpdateHdl ) );
    m_pEdRange->SetModifyHdl( LINK( this, DataStreamsDlg, UpdateHdl ) );
    m_pBtnBrowse->SetClickHdl( LINK( this, DataStreamsDlg, BrowseHdl ) );
-    m_pBtnStop->SetClickHdl( LINK( this, DataStreamsDlg, StopHdl ) );
    UpdateEnable();
 }

@@ -92,12 +88,6 @@ IMPL_LINK_NOARG(DataStreamsDlg, BrowseHdl)
    return 0;
 }

-IMPL_LINK_NOARG(DataStreamsDlg, StopHdl)
-{
-    mpDataStreams->Stop();
-    return 0;
-}
-
 IMPL_LINK_NOARG(DataStreamsDlg, UpdateHdl)
 {
    UpdateEnable();

--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -738,6 +738,14 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                pImpl->m_pDataStreams = new DataStreams(GetViewData()->GetDocShell());
            pImpl->m_pDataStreams->ShowDialog( pTabViewShell->GetDialogParent() );
            break;
+        case SID_DATA_STREAMS_PLAY:
+            if (pImpl->m_pDataStreams)
+                pImpl->m_pDataStreams->Start();
+            break;
+        case SID_DATA_STREAMS_STOP:
+            if (pImpl->m_pDataStreams)
+                pImpl->m_pDataStreams->Stop();
+            break;
        case SID_MANAGE_XML_SOURCE:
            ExecuteXMLSourceDialog();
        break;

--- a/sc/uiconfig/scalc/toolbar/datastreams.xml
+++ b/sc/uiconfig/scalc/toolbar/datastreams.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+ <toolbar:toolbaritem xlink:href=".uno:DataStreamsPlay"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:DataStreamsStop"/>
+</toolbar:toolbar>
--- a/sc/uiconfig/scalc/ui/datastreams.ui
+++ b/sc/uiconfig/scalc/ui/datastreams.ui
@@ -447,20 +447,6 @@
                <property name="position">2</property>
              </packing>
            </child>
-            <child>
-              <object class="GtkButton" id="stop">
-                <property name="label" translatable="yes">Stop</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
          </object>
          <packing>
            <property name="expand">False</property>
@@ -475,7 +461,6 @@
      <action-widget response="0">ok</action-widget>
      <action-widget response="0">cancel</action-widget>
      <action-widget response="0">help</action-widget>
-      <action-widget response="0">stop</action-widget>
    </action-widgets>
  </object>
  <object class="GtkAdjustment" id="adjustment1">