[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=4878fef

The following commit has been merged in the master branch:
commit 4878fefd3cc019bce267a1d2c063a9ca9e6adb4c
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Sep 18 14:43:59 2011 +0100

    If no file argument is specified open a file dialog
    REVIEW: 102659
    
    BUG: 282212
---
 main.cpp       | 23 ++++++++++++++++-------
 mainwindow.cpp |  8 +++-----
 mainwindow.h   |  4 +++-
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/main.cpp b/main.cpp
index 46bb25a..bd85193 100644
--- a/main.cpp
+++ b/main.cpp
@@ -24,8 +24,9 @@
 #include <KAboutData>
 #include <KLocale>
 #include <KUrl>
+#include <KFileDialog>
+#include <KDebug>
 
-#include <QDebug>
 
 #include "mainwindow.h"
 
@@ -42,19 +43,27 @@ int main(int argc, char *argv[])
     KCmdLineArgs::init(argc, argv, &aboutData);
 
     KCmdLineOptions options;
-    options.add("+file", ki18n("A required argument 'file'"));
+    options.add("+file", ki18n("The file to send"));
     KCmdLineArgs::addCmdLineOptions(options);
 
     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
     KApplication app;
 
-    if (args->count() != 1) {
-        KCmdLineArgs::usageError(i18n("You must supply a file argument"));
+    KUrl fileToSend;
+
+    if (args->count() == 0) {
+        fileToSend = KFileDialog::getOpenUrl(KUrl("kfiledialog://telepathySendFile"), QString(), 0, i18n("Select File To Send"));
+    } else {
+        fileToSend = KCmdLineArgs::parsedArgs()->arg(0);
     }
 
-    MainWindow *w = new MainWindow();
-    w->show();
-    return app.exec();
+    if (! fileToSend.isEmpty()) {
+        MainWindow *w = new MainWindow(fileToSend);
+        w->show();
+        return app.exec();
+    } else {
+        return -1;
+    }
 
 }
 
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 155baa1..b762330 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -100,7 +100,7 @@ QSize ContactGridDelegate::sizeHint(const QStyleOptionViewItem &option, const QM
 }
 
 
-MainWindow::MainWindow(QWidget *parent) :
+MainWindow::MainWindow(const KUrl &url, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::MainWindow),
     m_accountsModel(0)
@@ -111,10 +111,8 @@ MainWindow::MainWindow(QWidget *parent) :
 
     kDebug() << KApplication::arguments();
 
-
-    KUrl filePath (KCmdLineArgs::parsedArgs()->arg(0));
-    ui->filePreview->showPreview(filePath);
-    ui->fileNameLabel->setText(filePath.fileName());
+    ui->filePreview->showPreview(url);
+    ui->fileNameLabel->setText(url.fileName());
 
 
     Tp::AccountFactoryPtr  accountFactory = Tp::AccountFactory::create(QDBusConnection::sessionBus(),
diff --git a/mainwindow.h b/mainwindow.h
index dd00ec4..4c40102 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -23,6 +23,8 @@
 
 #include <QWidget>
 
+#include <KUrl>
+
 #include <TelepathyQt4/AccountManager>
 
 
@@ -38,7 +40,7 @@ class MainWindow : public QWidget
     Q_OBJECT
 
 public:
-    explicit MainWindow(QWidget *parent = 0);
+    explicit MainWindow(const KUrl &url, QWidget *parent = 0);
     ~MainWindow();
 
 private slots:

-- 
ktp-send-file packaging