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

List:       kde-commits
Subject:    extragear/graphics/kipi-plugins/ipodexport
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2008-11-09 20:00:24
Message-ID: 1226260824.435290.16104.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 882107 by cgilles:

add about data


 M  +51 -8     ipodexportdialog.cpp  
 M  +17 -11    ipodexportdialog.h  


--- trunk/extragear/graphics/kipi-plugins/ipodexport/ipodexportdialog.cpp #882106:882107
@@ -28,10 +28,6 @@
 #include "ipodexportdialog.h"
 #include "ipodlistitem.h"
 
-#if KIPI_PLUGIN
-#include "imagedialog.h"
-#endif
-
 // Qt includes.
 
 #include <Q3Frame>
@@ -52,15 +48,21 @@
 
 #include <kdebug.h>
 #include <kfileitem.h>
-#include <kfiledialog.h> // add images
 #include <kiconloader.h>
-#include <kinputdialog.h> //new album
+#include <kinputdialog.h>
 #include <kio/previewjob.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kmountpoint.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
+#include <kconfig.h>
+#include <kapplication.h>
+#include <kpushbutton.h>
+#include <kmenu.h>
+#include <khelpmenu.h>
+#include <ktoolinvocation.h>
+#include <kguiitem.h>
 
 namespace KIPIIpodExportPlugin
 {
@@ -90,9 +92,37 @@
     QWidget *box = new QWidget();
     setMainWidget(box);
     setCaption(caption);
-    setButtons(KDialog::Close);
+    setButtons(Close|Help);
     setModal(false);
 
+    // ---------------------------------------------------------------
+    // About data and help button.
+
+    m_about = new KIPIPlugins::KPAboutData(ki18n("iPod Export"),
+                                           0,
+                                           KAboutData::License_GPL,
+                                           ki18n("A tool to export image to an iPod device"),
+                                           ki18n("(c) 2006-2008, Seb Ruiz"));
+
+    m_about->addAuthor(ki18n("Seb Ruiz"), ki18n("Author and Maintainer"),
+                       "me at sebruiz dot net");
+
+    m_about->addAuthor(ki18n("Gilles Caulier"), ki18n("Developer"),
+                       "caulier dot gilles at gmail dot com");
+
+    disconnect(this, SIGNAL(helpClicked()),
+               this, SLOT(slotHelp()));
+
+    KHelpMenu* helpMenu = new KHelpMenu(this, m_about, false);
+    helpMenu->menu()->removeAction(helpMenu->menu()->actions().first());
+    QAction *handbook   = new QAction(i18n("Plugin Handbook"), this);
+    connect(handbook, SIGNAL(triggered(bool)),
+            this, SLOT(slotHelp()));
+    helpMenu->menu()->insertAction(helpMenu->menu()->actions().first(), handbook);
+    button(Help)->setDelayedMenu(helpMenu->menu());
+
+    // ------------------------------------------------------------
+
     QGridLayout *grid = new QGridLayout(box);
     m_ipodHeader      = new IpodHeader(box);
 
@@ -228,9 +258,22 @@
             this, SLOT( startTransfer() ));
 }
 
+UploadDialog::~UploadDialog()
+{
+    if(m_itdb)
+        itdb_photodb_free(m_itdb);
+
+    delete m_about;
+}
+
+void UploadDialog::slotHelp()
+{
+    KToolInvocation::invokeHelp("ipodexport", "kipi-plugins");
+}
+
 void UploadDialog::getIpodAlbums()
 {
-    if( !m_itdb ) return;
+    if(!m_itdb) return;
 
     kDebug(51000) << "populating ipod view" << endl;
 
--- trunk/extragear/graphics/kipi-plugins/ipodexport/ipodexportdialog.h #882106:882107
@@ -43,6 +43,9 @@
 
 #if KIPI_PLUGIN
 #include <libkipi/interface.h>
+#include "kpaboutdata.h"
+#include "pluginsversion.h"
+#include "imagedialog.h"
 #endif
 
 class Q3ListViewItem;
@@ -60,6 +63,9 @@
 class KLineEdit;
 class KUrl;
 
+using namespace KIPI;
+using namespace KIPIPlugins;
+
 namespace KIPIIpodExportPlugin
 {
 
@@ -80,11 +86,7 @@
 #endif
                  const QString& caption, QWidget *parent=0 );
 
-    ~UploadDialog()
-    {
-        if( m_itdb )
-            itdb_photodb_free( m_itdb );
-    }
+    ~UploadDialog();
 
     static UploadDialog *instance() { return s_instance; }
 
@@ -102,7 +104,7 @@
     void gotImagePreview( const KFileItem* , const QPixmap &pixmap );
 
     void ipodItemSelected( Q3ListViewItem *item );
-    void ipodShowContextMenu( Q3ListViewItem * ) { }
+    void ipodShowContextMenu( Q3ListViewItem * ) {};
 
     void imagesFilesButtonAdd();
     void imagesFilesButtonRem();
@@ -114,6 +116,8 @@
     void refreshDevices();
     void updateSysInfo();
 
+    void slotHelp();
+
 private:
 
     void addUrlToList( QString file );
@@ -128,17 +132,19 @@
     bool openDevice(); // connect to the ipod
 
 #if KIPI_PLUGIN
-    KIPI::Interface *m_interface;
+    Interface       *m_interface;
+    KPAboutData     *m_about;
 #endif
+
     Itdb_PhotoDB    *m_itdb;
     Itdb_IpodInfo   *m_ipodInfo;
     IpodHeader      *m_ipodHeader;
     bool             m_transferring;
 
-    Q3ListViewItem   *m_destinationAlbum;
+    Q3ListViewItem  *m_destinationAlbum;
 
-    Q3HGroupBox      *m_destinationBox;
-    Q3HGroupBox      *m_urlListBox;
+    Q3HGroupBox     *m_destinationBox;
+    Q3HGroupBox     *m_urlListBox;
 
     QPushButton     *m_createAlbumButton;
     QPushButton     *m_removeAlbumButton;
@@ -153,7 +159,7 @@
     QString          m_mountPoint;
     QString          m_deviceNode;
 
-    K3ListView       *m_ipodAlbumList;
+    K3ListView      *m_ipodAlbumList;
 
     ImageList       *m_uploadList;
 
[prev in list] [next in list] [prev in thread] [next in thread]