[SCM] ktp-send-file packaging branch, master, updated. debian/15.12.1-2-216-g8f07cdf

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-send-file.git;a=commitdiff;h=38e0bb5

The following commit has been merged in the master branch:
commit 38e0bb5408e42d033aa51b98ccc9d9085fd7abbf
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Jun 8 13:26:41 2011 +0100

    Take file to send from file argument
---
 main.cpp       | 11 +++++++++--
 mainwindow.cpp | 13 ++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/main.cpp b/main.cpp
index 9e54da6..5bffcea 100644
--- a/main.cpp
+++ b/main.cpp
@@ -4,6 +4,8 @@
 #include <KAboutData>
 #include <KLocale>
 
+#include <QDebug>
+
 #include "mainwindow.h"
 
 int main(int argc, char *argv[])
@@ -19,13 +21,18 @@ int main(int argc, char *argv[])
     KCmdLineArgs::init(argc, argv, &aboutData);
 
     KCmdLineOptions options;
+    options.add("+file", ki18n("A required argument 'file'"));
     KCmdLineArgs::addCmdLineOptions(options);
-    KCmdLineArgs::parsedArgs();
+    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
     KApplication app;
 
+    if (args->count() != 1) {
+        KCmdLineArgs::usageError(i18n("You must supply a file argument"));
+    }
+
     MainWindow *w = new MainWindow();
     w->show();
-
     return app.exec();
+
 }
 
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 855fe2f..e36d02e 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -4,6 +4,10 @@
 #include <KFileItem>
 #include <KFileItemList>
 #include <KIO/PreviewJob>
+#include <KApplication>
+#include <KCmdLineArgs>
+#include <KMimeType>
+
 
 #include <TelepathyQt4/AccountManager>
 #include <TelepathyQt4/PendingReady>
@@ -22,7 +26,14 @@ MainWindow::MainWindow(QWidget *parent) :
 
     ui->setupUi(this);
 
-    KFileItem file(KUrl("/home/david/a.png"), "image/png", KFileItem::Unknown);
+    qDebug() << KApplication::arguments();
+
+    QString fileName = KCmdLineArgs::parsedArgs()->arg(0);
+
+    //FIXME if remote make it local.
+
+
+    KFileItem file(KUrl(fileName), "image/png", KFileItem::Unknown);
 
     KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << file, ui->filePreviewLabel->size());
 

-- 
ktp-send-file packaging