[SCM] ktp-auth-handler packaging branch, master, updated. debian/15.12.1-2-282-g080758e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=d6fbe9a

The following commit has been merged in the master branch:
commit d6fbe9a89ace903834345d61ff0dcaf501468f21
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Thu Aug 21 17:55:31 2014 +0200

    Fix the password prompt dialog
    
    The QDialogButtonBox needs to be added into the layout, so this changes
    the layouts a bit so that the button box can be fitted at the bottom of
    the dialog.
    
    /me misses KDialog :(
---
 x-telepathy-password-prompt.cpp |   4 +-
 x-telepathy-password-prompt.ui  | 128 +++++++++++++++++++++-------------------
 2 files changed, 69 insertions(+), 63 deletions(-)

diff --git a/x-telepathy-password-prompt.cpp b/x-telepathy-password-prompt.cpp
index 07b7cf1..b53b1f5 100644
--- a/x-telepathy-password-prompt.cpp
+++ b/x-telepathy-password-prompt.cpp
@@ -48,9 +48,11 @@ XTelepathyPasswordPrompt::XTelepathyPasswordPrompt(const Tp::AccountPtr &account
         ui->savePassword->setDisabled(true);
     }
 
-    QDialogButtonBox *dbb = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
+    QDialogButtonBox *dbb = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     connect(dbb, SIGNAL(accepted()), this, SLOT(accept()));
     connect(dbb, SIGNAL(rejected()), this, SLOT(reject()));
+
+    ui->mainLayout->addWidget(dbb);
 }
 
 XTelepathyPasswordPrompt::~XTelepathyPasswordPrompt()
diff --git a/x-telepathy-password-prompt.ui b/x-telepathy-password-prompt.ui
index e7cf52a..08b568d 100644
--- a/x-telepathy-password-prompt.ui
+++ b/x-telepathy-password-prompt.ui
@@ -6,85 +6,89 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>389</width>
-    <height>246</height>
+    <width>398</width>
+    <height>128</height>
    </rect>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
+  <layout class="QVBoxLayout" name="mainLayout">
    <item>
-    <widget class="QLabel" name="accountIcon">
-     <property name="text">
-      <string comment="KDE::DoNotExtract">TextLabel</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <layout class="QVBoxLayout" name="verticalLayout">
+    <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QWidget" name="widget" native="true"/>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
      </item>
      <item>
-      <widget class="KTitleWidget" name="title">
+      <widget class="QLabel" name="accountIcon">
        <property name="text">
-        <string>Please Enter Your Account Password</string>
+        <string comment="KDE::DoNotExtract">TextLabel</string>
        </property>
       </widget>
      </item>
      <item>
-      <layout class="QFormLayout" name="formLayout">
-       <property name="fieldGrowthPolicy">
-        <enum>QFormLayout::ExpandingFieldsGrow</enum>
-       </property>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_2">
-         <property name="text">
-          <string>Account:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <widget class="QLabel" name="accountName">
-         <property name="text">
-          <string comment="KDE::DoNotExtract">TextLabel</string>
-         </property>
-        </widget>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QWidget" name="widget" native="true"/>
        </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label">
+       <item>
+        <widget class="KTitleWidget" name="title">
          <property name="text">
-          <string>Password:</string>
+          <string>Please Enter Your Account Password</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="1">
-        <widget class="QLineEdit" name="passwordLineEdit">
-         <property name="echoMode">
-          <enum>QLineEdit::Password</enum>
+       <item>
+        <layout class="QFormLayout" name="formLayout">
+         <property name="fieldGrowthPolicy">
+          <enum>QFormLayout::ExpandingFieldsGrow</enum>
          </property>
-        </widget>
-       </item>
-       <item row="3" column="0">
-        <widget class="QCheckBox" name="savePassword">
-         <property name="text">
-          <string>Save Password</string>
-         </property>
-        </widget>
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_2">
+           <property name="text">
+            <string>Account:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QLabel" name="accountName">
+           <property name="text">
+            <string comment="KDE::DoNotExtract">TextLabel</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0">
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>Password:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1">
+          <widget class="QLineEdit" name="passwordLineEdit">
+           <property name="echoMode">
+            <enum>QLineEdit::Password</enum>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="0">
+          <widget class="QCheckBox" name="savePassword">
+           <property name="text">
+            <string>Save Password</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </item>
       </layout>
      </item>

-- 
ktp-auth-handler packaging