[prev in list] [next in list] [prev in thread] [next in thread] 

List:       koffice-devel
Subject:    koffice/kpresenter [POSSIBLY UNSAFE]
From:       Brad Hards <bradh () frogmouth ! net>
Date:       2004-04-18 11:49:32
Message-ID: 20040418114932.3D6B99A52 () office ! kde ! org
[Download RAW message or body]

CVS commit by bhards: 

Initial checkin of code to export presentations to the special
format used by Sony projectors. Basically you copy a couple of
directories to the memory stick, plug the memory stick into 
the projector, and then you can run the presentation directly
from the memory stick - no need to have a PC or laptop connected.

For those with a technical bent, the presentation format is a
set of 1024x768 baseline-encoded JPEGs (one for each slide,
plus a pair of preliminary slides), and an index file in a 
binary format.

This should be OK to use now. Additional work is required to
add WhatsThis texts, and some additional help. I'm doing that
next.

CCMAIL: koffice-devel@kde.org


  A            mspresentation.cc   1.1 [POSSIBLY UNSAFE: printf] [LGPL (v2+)]
  A            mspresentation.h   1.1 [LGPL (v2+)]
  M +5 -0      KPresenterViewIface.cc   1.56
  M +1 -0      KPresenterViewIface.h   1.55
  M +3 -2      Makefile.am   1.214
  M +1 -0      kpresenter.rc   1.160
  M +18 -0     kpresenter_view.cc   1.1007
  M +4 -0      kpresenter_view.h   1.323


--- koffice/kpresenter/KPresenterViewIface.cc  #1.55:1.56
@@ -231,4 +231,9 @@ void KPresenterViewIface::extraWebPres()
 }
 
+void KPresenterViewIface::extraMSPres()
+{
+    view->extraMSPres();
+}
+
 void KPresenterViewIface::extraAlignObjLeft()
 {

--- koffice/kpresenter/KPresenterViewIface.h  #1.54:1.55
@@ -93,4 +93,5 @@ k_dcop:
     virtual void extraLineEnd();
     virtual void extraWebPres();
+    virtual void extraMSPres();
     virtual void extraGroup();
     virtual void extraUnGroup();

--- koffice/kpresenter/Makefile.am  #1.213:1.214
@@ -7,5 +7,6 @@
 lib_LTLIBRARIES =
 kde_module_LTLIBRARIES = libkpresenterpart.la
-libkpresenterpart_la_SOURCES = koPointArray.cc kprcanvas.cc kprpage.cc searchdia.cc \
backdia.cc webpresentation.cc kpresenter_view.cc \ +libkpresenterpart_la_SOURCES = \
koPointArray.cc kprcanvas.cc kprpage.cc searchdia.cc backdia.cc \ +        \
webpresentation.cc kpresenter_view.cc  mspresentation.cc \  kpresenter_doc.cc \
         styledia.cc kpresenter_sound_player.cc \
@@ -71,5 +72,5 @@
                 kppixmapobject.h kppieobject.h kppartobject.h kpgroupobject.h \
                 kpbackground.h kpgradient.h kpgradientcollection.h \
-                gotopage.h webpresentation.h \
+                gotopage.h webpresentation.h mspresentation.h \
                 kpresenter_factory.h kpresenter_aboutdata.h \
                 KPresenterDocIface.h KPresenterViewIface.h KPresenterObjectIface.h \

--- koffice/kpresenter/kpresenter.rc  #1.159:1.160
@@ -4,4 +4,5 @@
   <Separator/>
   <Action name="extra_webpres"/>
+  <Action name="extra_mspres"/>
   <Action name="extra_template"/>
   <Action name="extra_defaulttemplate"/>

--- koffice/kpresenter/kpresenter_view.cc  #1.1006:1.1007
@@ -74,4 +74,5 @@
 #include "kpresenter_doc.h"
 #include "webpresentation.h"
+#include "mspresentation.h"
 #include "kptextobject.h"
 
@@ -241,4 +242,5 @@ KPresenterView::KPresenterView( KPresent
     rndY = 0;
     allowWebPres = true;
+    allowMSPres = true;
     currPg = 0;
     sidebar = 0;
@@ -1311,4 +1313,12 @@ void KPresenterView::extraWebPres()
 }
 
+void KPresenterView::extraMSPres()
+{
+    if ( !allowMSPres )
+        return;
+
+    KPMSPresentationSetup::createMSPresentation( m_pKPresenterDoc, this );
+}
+
 void KPresenterView::extraLineBegin()
 {
@@ -2717,4 +2727,8 @@ void KPresenterView::setupActions()
                                       actionCollection(), "extra_webpres" );
 
+    actionExtraMSPres = new KAction( i18n( "Create Memor&y Stick Slideshow..." ),
+                                     0, this, SLOT( extraMSPres() ),
+                                     actionCollection(), "extra_mspres" );
+
     actionExtraCreateTemplate = new KAction( i18n( "Template Manager" ), 0,
                                              this, SLOT( extraCreateTemplate() ),
@@ -4297,4 +4311,8 @@ void KPresenterView::enableWebPres()
 }
 
+void KPresenterView::enableMSPres()
+{
+}
+
 bool KPresenterView::doubleClickActivation() const
 {

--- koffice/kpresenter/kpresenter_view.h  #1.322:1.323
@@ -242,4 +242,5 @@ public slots:
     void extraLineEnd();
     void extraWebPres();
+    void extraMSPres();
     void extraCreateTemplate();
     void extraDefaultTemplate();
@@ -509,4 +510,5 @@ public:
 
     void enableWebPres();
+    void enableMSPres();
 
     /**
@@ -859,4 +861,5 @@ private:
     bool presStarted;
     bool allowWebPres;
+    bool allowMSPres;
     int currPg; // 0-based
 
@@ -965,4 +968,5 @@ private:
     KAction *actionExtraConfigure;
     KAction *actionExtraWebPres;
+    KAction *actionExtraMSPres;
     KAction *actionExtraCreateTemplate;
     KAction *actionExtraLineBegin;


_______________________________________________
koffice-devel mailing list
koffice-devel@mail.kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel


[prev in list] [next in list] [prev in thread] [next in thread]