KSnapshot: Implement Open With... options using TDETrader

This allows us to dynamically determine which applications can be
used to open the snapshot.

Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>

ksnapshot/ksnapshot.cpp

@@ -36,6 +36,9 @@
 #include <tdepopupmenu.h>
 #include <kpushbutton.h>
 #include <tdestartupinfo.h>
+#include <kiconloader.h>
+#include <kprocess.h>
+#include <krun.h>
 
 #include <tqcursor.h>
 #include <tqregexp.h>
@@ -60,8 +63,6 @@
 
 #define kApp TDEApplication::kApplication()
 
-#define KOLOURPAINT_EXE "/opt/trinity/bin/kolourpaint"
-
 KSnapshot::KSnapshot(TQWidget *parent, const char *name, bool grabCurrent)
   : DCOPObject("interface"), 
     KDialogBase(parent, name, true, TQString(), Help|User1, User1, 
@@ -82,7 +83,7 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name, bool grabCurrent)
     connect( mainWidget, TQT_SIGNAL( saveClicked() ), TQT_SLOT( slotSaveAs() ) );
     connect( mainWidget, TQT_SIGNAL( printClicked() ), TQT_SLOT( slotPrint() ) );
     connect( mainWidget, TQT_SIGNAL( copyClicked() ), TQT_SLOT( slotCopy() ) );
-    connect( mainWidget, TQT_SIGNAL( openKolourPaint() ), TQT_SLOT( slotOpenKolourPaint() ) );
+    connect( mainWidget, TQT_SIGNAL( openWithKPClicked() ), TQT_SLOT( slotOpenWithKP() ) );
 
     grabber->show();
     grabber->grabMouse( waitCursor );
@@ -120,6 +121,24 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name, bool grabCurrent)
     TQPushButton *helpButton = actionButton( Help );
     helpButton->setPopup(helpMenu->menu());
 
+    // Populate Open With... menu
+    TDEPopupMenu *popupOpenWith = new TDEPopupMenu(this);
+    openWithOffers = TDETrader::self()->query("image/png", "Type == 'Application'");
+    int i = 0;
+    for (TDETrader::OfferList::Iterator it = openWithOffers.begin(); it != openWithOffers.end(); ++it)
+    {
+        popupOpenWith->insertItem(SmallIcon((*it)->icon()), (*it)->name(), i);
+        ++i; // we need menu ids to match with OfferList indexes
+    }
+    mainWidget->btnOpenWith->setPopup(popupOpenWith);
+    connect(popupOpenWith, SIGNAL(activated(int)), this, SLOT(slotOpenWith(int)));
+
+    // Check for KolourPaint availability
+    KService::Ptr kpaint = KService::serviceByDesktopName("kolourpaint");
+    if (!kpaint) {
+        mainWidget->btnOpenWithKP->hide();
+    }
+
     TDEAccel* accel = new TDEAccel(this);
     accel->insert(TDEStdAccel::Quit, TQT_TQOBJECT(kapp), TQT_SLOT(quit()));
     accel->insert( "QuickSave", i18n("Quick Save Snapshot &As..."),
@@ -364,22 +383,27 @@ void KSnapshot::slotWindowGrabbed( const TQPixmap &pix )
     show();
 }
 
-void KSnapshot::slotOpenKolourPaint()
+void KSnapshot::slotOpenWith(int id)
 {
-    slotCopy();
+    openWithExternalApp(*openWithOffers[id]);
+}
 
-    TQFileInfo kolourPaintExeFile( KOLOURPAINT_EXE );
-    if (!kolourPaintExeFile.exists())
-    {
-        tqWarning( "koulourpaint executable was not found\nMake sure the executable is in the default location");
+void KSnapshot::slotOpenWithKP() {
+    KService::Ptr kpaint = KService::serviceByDesktopName("kolourpaint");
+    if (kpaint) {
+        openWithExternalApp(*kpaint);
     }
+}
+
+static KTempFile *tmpFile = nullptr;
 
-    // Write to temporary file
+void KSnapshot::openWithExternalApp(const KService &service) {
+    // Write snapshot to temporary file
     bool ok = false;
-    KTempFile tmpFile;
-    if (tmpFile.status() == 0) {
-        if (snapshot.save(tmpFile.file(), "PNG")) {
-            if (tmpFile.close()) {
+    tmpFile = new KTempFile;
+    if (tmpFile->status() == 0) {
+        if (snapshot.save(tmpFile->file(), "PNG")) {
+            if (tmpFile->close()) {
                 ok = true;
             }
         }
@@ -392,28 +416,28 @@ void KSnapshot::slotOpenKolourPaint()
         return;
     }
 
-    // Launch KolourPaint
-    TDEProcess *kpaint = new TDEProcess;
-    *kpaint << kolourPaintExeFile.filePath();
-    *kpaint << tmpFile.name();
-    if (!kpaint->start(TDEProcess::OwnGroup)) {
-        KMessageBox::error(this, i18n("Cannot start KolourPaint!"));
-        return;
-    }
+    // Launch application
+    KURL::List list;
+    list.append(tmpFile->name());
+    TQStringList args = KRun::processDesktopExec(service, list, false, false);
 
-    // Update screenshot when KolourPaint is closed
-    connect(kpaint, SIGNAL(processExited(TDEProcess*)),
-            this, SLOT(slotKolourPaintClosed(TDEProcess*)));
-}
+    TDEProcess *externalApp = new TDEProcess;
+    *externalApp << args;
+    connect(externalApp, SIGNAL(processExited(TDEProcess*)),
+            this, SLOT(slotExternalAppClosed()));
 
-void KSnapshot::slotKolourPaintClosed(TDEProcess *kpaint) {
-    TQFile tmpFile(kpaint->args()[1]);
-    if (!tmpFile.exists()) {
+    if (!externalApp->start(TDEProcess::OwnGroup)) {
+        KMessageBox::error(this, i18n("Cannot start %1!").arg(service.name()));
         return;
     }
-    snapshot.load(tmpFile.name());
-    tmpFile.remove();
+}
+
+void KSnapshot::slotExternalAppClosed() {
+    snapshot.load(tmpFile->name());
     updatePreview();
+    tmpFile->unlink();
+    delete tmpFile;
+    tmpFile = nullptr;
 }
 
 void KSnapshot::closeEvent( TQCloseEvent * e )

ksnapshot/ksnapshot.h

@@ -14,7 +14,7 @@
 #include <tdeglobalsettings.h>
 #include <kdialogbase.h>
 #include <kurl.h>
-#include <kprocess.h>
+#include <ktrader.h>
 
 class RegionGrabber;
 class KSnapshotWidget;
@@ -106,8 +106,9 @@ protected slots:
   void slotSaveAs();
   void slotCopy();
   void slotPrint();
-  void slotOpenKolourPaint();
-  void slotKolourPaintClosed(TDEProcess *proc);
+  void slotOpenWith(int id);
+  void slotOpenWithKP();
+  void slotExternalAppClosed();
   void slotMovePointer( int x, int y );
 
   void setTime(int newTime);
@@ -132,6 +133,7 @@ private slots:
 
 private:
     bool save( const KURL& url );
+    void openWithExternalApp(const KService &service);
     void performGrab();
     void autoincFilename();
     int grabMode();
@@ -145,6 +147,7 @@ private:
     KSnapshotWidget *mainWidget;
     RegionGrabber *rgnGrab;
     bool modified;
+    TDETrader::OfferList openWithOffers;
 };
 
 #endif // KSNAPSHOT_H

ksnapshot/ksnapshotwidget.ui

@@ -244,21 +244,32 @@ If <i>no delay</i> is set, the program will wait for a mouse click b
                 </widget>
                 <widget class="KPushButton">
                     <property name="name">
-                        <cstring>btnOpenInKP</cstring>
+                        <cstring>btnOpenWithKP</cstring>
                     </property>
                     <property name="text">
                         <string>Open in &amp;KolourPaint</string>
                     </property>
-                    <property name="accel">
-                        <string>Alt+K</string>
+                    <property name="whatsThis" stdset="0">
+                        <string>Click this button to edit the snapshot in KolourPaint.</string>
                     </property>
                     <property name="iconSet">
-                        <iconset>"document-save"</iconset>
+                        <iconset>"kolourpaint"</iconset>
+                    </property>
+                </widget>
+                <widget class="KPushButton">
+                    <property name="name">
+                        <cstring>btnOpenWith</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Open &amp;with...</string>
+                    </property>
+                    <property name="iconSet">
+                        <iconset>"document-open"</iconset>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>Click this button to open in KolourPaint.</string>
+                        <string>Click this button to open the snapshot in another application.</string>
                     </property>
-                </widget>                
+                </widget>
             </vbox>
         </widget>
     </grid>
@@ -307,10 +318,16 @@ If &lt;i&gt;no delay&lt;/i&gt; is set, the program will wait for a mouse click b
         <slot>slotPrintClicked()</slot>
     </connection>
     <connection>
-        <sender>btnOpenInKP</sender>
+        <sender>btnOpenWithKP</sender>
+        <signal>clicked()</signal>
+        <receiver>KSnapshotWidget</receiver>
+        <slot>slotOpenWithKPClicked()</slot>
+    </connection>
+    <connection>
+        <sender>btnOpenWith</sender>
         <signal>clicked()</signal>
         <receiver>KSnapshotWidget</receiver>
-        <slot>slotOpenKolourPaint()</slot>
+        <slot>slotOpenWithClicked()</slot>
     </connection>
     <connection>
         <sender>btnSave</sender>
@@ -351,7 +368,7 @@ If &lt;i&gt;no delay&lt;/i&gt; is set, the program will wait for a mouse click b
     <signal>saveClicked()</signal>
     <signal>copyClicked()</signal>
     <signal>printClicked()</signal>
-    <signal>openKolourPaint()</signal>
+    <signal>openWithKPClicked()</signal>
     <signal>startImageDrag()</signal>
 </Q_SIGNALS>
 <Q_SLOTS>
@@ -361,7 +378,7 @@ If &lt;i&gt;no delay&lt;/i&gt; is set, the program will wait for a mouse click b
     <slot access="protected" specifier="non virtual">slotCopyClicked()</slot>
     <slot access="protected" specifier="non virtual">slotPrintClicked()</slot>
     <slot access="protected" specifier="non virtual">slotStartDrag()</slot>
-    <slot access="protected" specifier="non virtual">slotOpenKolourPaint()</slot>
+    <slot access="protected" specifier="non virtual">slotOpenWithKPClicked()</slot>
     <slot specifier="non virtual" returnType="int">previewWidth()</slot>
     <slot specifier="non virtual" returnType="int">previewHeight()</slot>
 </Q_SLOTS>

ksnapshot/ksnapshotwidget.ui.h

@@ -137,7 +137,7 @@ void KSnapshotWidget::slotCopyClicked()
     emit copyClicked();
 }
 
-void KSnapshotWidget::slotOpenKolourPaint()
+void KSnapshotWidget::slotOpenWithKPClicked()
 {
-    emit openKolourPaint();
+    emit openWithKPClicked();
 }