[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=e9d573b

The following commit has been merged in the master branch:
commit e9d573b9a73b6afea1c8a4a39670361fa895a5b0
Author: Francesco Nwokeka <francesco.nwokeka at gmail.com>
Date:   Wed Jun 8 18:08:57 2011 +0200

    merge
---
 main.cpp       | 14 +++++++-------
 mainwindow.cpp | 34 ++++++++++++++--------------------
 mainwindow.h   |  2 --
 mainwindow.ui  | 17 ++++++-----------
 4 files changed, 27 insertions(+), 40 deletions(-)

diff --git a/main.cpp b/main.cpp
index 21dae49..71a43dd 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,6 +5,8 @@
 #include <KLocale>
 #include <KUrl>
 
+#include <QDebug>
+
 #include "mainwindow.h"
 
 int main(int argc, char *argv[])
@@ -20,21 +22,19 @@ int main(int argc, char *argv[])
     KCmdLineArgs::init(argc, argv, &aboutData);
 
     KCmdLineOptions options;
-    options.add("+[file]", ki18n("File to send"));
-
+    options.add("+file", ki18n("A required argument 'file'"));
     KCmdLineArgs::addCmdLineOptions(options);
 
     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    KApplication app;
 
-    if (args->count()) {
-        qDebug() << "FILE URL IS: " << args->url(0).url();
+    if (args->count() != 1) {
+        KCmdLineArgs::usageError(i18n("You must supply a file argument"));
     }
 
-    KApplication app;
-
     MainWindow *w = new MainWindow();
     w->show();
-
     return app.exec();
+
 }
 
diff --git a/mainwindow.cpp b/mainwindow.cpp
index ab63bdf..e10a0be 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,17 +26,19 @@ MainWindow::MainWindow(QWidget *parent) :
 
     ui->setupUi(this);
 
-    KFileItem file(KUrl("/home/david/a.png"), "image/png", KFileItem::Unknown);
+//     KFileItem file(KUrl("/home/david/a.png"), "image/png", KFileItem::Unknown);
+//
+//     KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << file, ui->filePreviewLabel->width(), ui->filePreviewLabel->height());
+//
+//     ui->fileNameLabel->setText(file.name());
+//     ui->filePreviewLabel->setText(QString());
 
-    KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << file, ui->filePreviewLabel->width(), ui->filePreviewLabel->height());
+    qDebug() << KApplication::arguments();
 
-    ui->fileNameLabel->setText(file.name());
-    ui->filePreviewLabel->setText(QString());
 
-    connect(job, SIGNAL(gotPreview(KFileItem, QPixmap)),
-            this, SLOT(showPreview(KFileItem, QPixmap)));
-    connect(job, SIGNAL(failed(KFileItem)),
-            this, SLOT(showIcon(KFileItem)));
+    KUrl filePath (KCmdLineArgs::parsedArgs()->arg(0));
+    ui->filePreview->showPreview(filePath);
+    ui->fileNameLabel->setText(filePath.fileName());
 
 
     Tp::AccountFactoryPtr  accountFactory = Tp::AccountFactory::create(QDBusConnection::sessionBus(),
@@ -69,18 +75,6 @@ MainWindow::~MainWindow()
     delete ui;
 }
 
-void MainWindow::showPreview(const KFileItem &file, const QPixmap &pixmap)
-{
-    ui->filePreviewLabel->setMinimumSize(pixmap.size());
-    ui->filePreviewLabel->setPixmap(pixmap);
-}
-
-void MainWindow::showIcon(const KFileItem &file)
-{
-    //icon is     file.iconName();
-
-}
-
 void MainWindow::onAccountManagerReady()
 {
     AccountsModel *model = new AccountsModel(m_accountManager, this);
diff --git a/mainwindow.h b/mainwindow.h
index ff4eda6..2bd1f82 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -21,8 +21,6 @@ public:
     ~MainWindow();
 
 private slots:
-    void showPreview(const KFileItem &file, const QPixmap &pixmap);
-    void showIcon(const KFileItem &file);
     void onAccountManagerReady();
 
 
diff --git a/mainwindow.ui b/mainwindow.ui
index a8d8d26..a15081e 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -54,17 +54,7 @@
         </spacer>
        </item>
        <item>
-        <widget class="QLabel" name="filePreviewLabel">
-         <property name="minimumSize">
-          <size>
-           <width>120</width>
-           <height>120</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>TextLabel</string>
-         </property>
-        </widget>
+        <widget class="KImageFilePreview" name="filePreview"/>
        </item>
        <item>
         <widget class="QLabel" name="fileNameLabel">
@@ -152,6 +142,11 @@
    <extends>QListView</extends>
    <header>kcategorizedview.h</header>
   </customwidget>
+  <customwidget>
+   <class>KImageFilePreview</class>
+   <extends>QWidget</extends>
+   <header>kimagefilepreview.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

-- 
ktp-send-file packaging