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

List:       kde-commits
Subject:    [bluedevil] src/sendfile: sendfile: Show names of selected files next to select files button
From:       David Rosca <nowrep () gmail ! com>
Date:       2015-04-30 20:59:25
Message-ID: E1YnvYL-0005Pt-3d () scm ! kde ! org
[Download RAW message or body]

Git commit 67758db8a3118b189a19b6995c2591de96219b69 by David Rosca.
Committed on 30/04/2015 at 09:09.
Pushed by drosca into branch 'master'.

sendfile: Show names of selected files next to select files button

M  +1    -0    src/sendfile/CMakeLists.txt
M  +6    -1    src/sendfile/pages/selectdeviceandfilespage.cpp
M  +16   -13   src/sendfile/pages/selectfilediscover.ui

http://commits.kde.org/bluedevil/67758db8a3118b189a19b6995c2591de96219b69

diff --git a/src/sendfile/CMakeLists.txt b/src/sendfile/CMakeLists.txt
index 185e972..a93203c 100644
--- a/src/sendfile/CMakeLists.txt
+++ b/src/sendfile/CMakeLists.txt
@@ -25,6 +25,7 @@ target_link_libraries(bluedevil-sendfile
     KF5::I18n
     KF5::CoreAddons
     KF5::DBusAddons
+    KF5::WidgetsAddons
     KF5::IconThemes
     KF5::KIOFileWidgets
     KF5::BluezQt
diff --git a/src/sendfile/pages/selectdeviceandfilespage.cpp \
b/src/sendfile/pages/selectdeviceandfilespage.cpp index d45f296..3a091ae 100644
--- a/src/sendfile/pages/selectdeviceandfilespage.cpp
+++ b/src/sendfile/pages/selectdeviceandfilespage.cpp
@@ -69,7 +69,12 @@ void SelectDeviceAndFilesPage::openFileDialog()
     if (files.isEmpty()) {
         selectLbl->setText(i18n("Select one or more files:"));
     } else {
-        selectLbl->setText(i18n("Selected files: <b>%1</b>", files.count()));
+        QStringList fileNames;
+        Q_FOREACH (const QString &file, files) {
+            QFileInfo info(file);
+            fileNames.append(info.fileName());
+        }
+        selectLbl->setText(i18n("Selected files: <b>%1</b>", \
fileNames.join(QLatin1String(", "))));  }
 
     m_wizard->setFiles(files);
diff --git a/src/sendfile/pages/selectfilediscover.ui \
b/src/sendfile/pages/selectfilediscover.ui index 1915cae..274b1df 100644
--- a/src/sendfile/pages/selectfilediscover.ui
+++ b/src/sendfile/pages/selectfilediscover.ui
@@ -88,23 +88,19 @@
        <number>4</number>
       </property>
       <item>
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
+       <widget class="KSqueezedTextLabel" name="selectLbl">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
         </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>289</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QLabel" name="selectLbl">
         <property name="text">
          <string>Select one or more files:</string>
         </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
        </widget>
       </item>
       <item>
@@ -119,6 +115,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>KSqueezedTextLabel</class>
+   <extends>QLabel</extends>
+   <header location="global">ksqueezedtextlabel.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>


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