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

The following commit has been merged in the master branch:
commit adef5dcc4d2639ab914344c12511acbd6876d200
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Sat Nov 12 17:51:21 2011 +0100

    UI Polish and min. required KDE version is now 4.7 because of KIO:PreviewJob
    
    Reviewed-by: David Edmundson
    REVIEW: 103120
---
 CMakeLists.txt |   9 +---
 mainwindow.cpp |   1 +
 mainwindow.ui  | 127 ++++++++++++++++++++++++++++++++-------------------------
 3 files changed, 75 insertions(+), 62 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 303bf15..1bd0777 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,7 @@ set (CMAKE_MODULE_PATH
      ${CMAKE_MODULE_PATH}
 )
 
+set(KDE_MIN_VERSION "4.7.0")
 find_package(KDE4 REQUIRED)
 find_package(TelepathyQt4 0.7.1 REQUIRED)
 
@@ -16,14 +17,8 @@ add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 include_directories(
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}
-#   ${QT_QTNETWORK_INCLUDE_DIR}
-#   ${QT_QTDBUS_INCLUDE_DIR}
-#   ${QT_QTSQL_INCLUDE_DIR}
-#   ${QT_QTWEBKIT_INCLUDE_DIR}
   ${KDE4_INCLUDES}
   ${TELEPATHY_QT4_INCLUDE_DIR}
-
-#   ${SOPRANO_INCLUDE_DIR}
 )
 
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
@@ -31,7 +26,7 @@ execute_process(COMMAND git submodule init
                 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-execute_process(COMMAND git submodule update                                                                                                                 
+execute_process(COMMAND git submodule update
                 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 9029e8f..89cf586 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -113,6 +113,7 @@ MainWindow::MainWindow(const KUrl &url, QWidget *parent) :
     Tp::registerTypes();
 
     ui->setupUi(this);
+    setWindowTitle(i18n("Send file - %1", url.fileName());
 
     kDebug() << KApplication::arguments();
 
diff --git a/mainwindow.ui b/mainwindow.ui
index 0dc57de..1479f3e 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -16,28 +16,25 @@
     <height>120</height>
    </size>
   </property>
-  <property name="windowTitle">
-   <string>Select Recipient</string>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
-    <widget class="QLabel" name="label">
-     <property name="font">
-      <font>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string>Select a recipient</string>
-     </property>
-    </widget>
-   </item>
-   <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
+        <widget class="QLabel" name="label_3">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>You are about to send this file</string>
+         </property>
+        </widget>
+       </item>
+       <item>
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -95,48 +92,68 @@
       </layout>
      </item>
      <item>
-     <layout class="QVBoxLayout" name="verticalLayout2">
-     <item>
-      <widget class="QListView" name="listView">
-       <property name="minimumSize">
-        <size>
-         <width>80</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="sizeIncrement">
-        <size>
-         <width>80</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="baseSize">
-        <size>
-         <width>260</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>256</width>
-         <height>192</height>
-        </size>
-       </property>
-       <property name="movement">
-        <enum>QListView::Static</enum>
-       </property>
-       <property name="resizeMode">
-        <enum>QListView::Adjust</enum>
-       </property>
-       <property name="spacing">
-        <number>5</number>
-       </property>
-       <property name="viewMode">
-        <enum>QListView::IconMode</enum>
+      <widget class="Line" name="line">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
        </property>
       </widget>
      </item>
-     </layout>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout2">
+       <item>
+        <widget class="QLabel" name="label">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Select a recipient</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QListView" name="listView">
+         <property name="minimumSize">
+          <size>
+           <width>80</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="sizeIncrement">
+          <size>
+           <width>80</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="baseSize">
+          <size>
+           <width>260</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>256</width>
+           <height>192</height>
+          </size>
+         </property>
+         <property name="movement">
+          <enum>QListView::Static</enum>
+         </property>
+         <property name="resizeMode">
+          <enum>QListView::Adjust</enum>
+         </property>
+         <property name="spacing">
+          <number>5</number>
+         </property>
+         <property name="viewMode">
+          <enum>QListView::IconMode</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
     </layout>
    </item>

-- 
ktp-send-file packaging