[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=5ad5fbd

The following commit has been merged in the master branch:
commit 5ad5fbde2d9fb8b32360d0ecc8f2cab1595d3944
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Jan 3 02:54:14 2013 +0000

    Allow setting pluralised suffix on "Show last n messages"
    
    This moves the code to KIntSpinBox and the word "messages" from being a label to being a suffix in the spin box.
    
    (As requested by i18n team)
    
    REVIEW: 108101
---
 config/behavior-config.cpp |  3 +++
 config/behavior-config.ui  | 24 +++++++++---------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/config/behavior-config.cpp b/config/behavior-config.cpp
index 84651a0..f2bfe76 100644
--- a/config/behavior-config.cpp
+++ b/config/behavior-config.cpp
@@ -23,6 +23,8 @@
 
 #include <KDebug>
 #include <KPluginFactory>
+#include <KLocalizedString>
+
 
 K_PLUGIN_FACTORY(KCMTelepathyChatBehaviorConfigFactory, registerPlugin<BehaviorConfig>();)
 K_EXPORT_PLUGIN(KCMTelepathyChatBehaviorConfigFactory("ktp_chat_behavior", "kcm_ktp_chat_behavior"))
@@ -45,6 +47,7 @@ BehaviorConfig::BehaviorConfig(QWidget *parent, const QVariantList& args)
     ui->newTabButtonGroup->button(m_openMode)->setChecked(true);
     connect(ui->newTabButtonGroup, SIGNAL(buttonClicked(int)), this, SLOT(onRadioSelected(int)));
 
+    ui->scrollbackLength->setSuffix(ki18ncp("Part of config 'show last [spin box] messages' This is the suffix to the spin box. Be sure to include leading space"," message", " messages"));
     ui->scrollbackLength->setValue(m_scrollbackLength);
     connect(ui->scrollbackLength, SIGNAL(valueChanged(int)), this, SLOT(onScrollbackLengthChanged()));
 }
diff --git a/config/behavior-config.ui b/config/behavior-config.ui
index 7de9d10..c2cdd7b 100644
--- a/config/behavior-config.ui
+++ b/config/behavior-config.ui
@@ -30,7 +30,7 @@
          <string>A new window</string>
         </property>
         <attribute name="buttonGroup">
-         <string>newTabButtonGroup</string>
+         <string notr="true">newTabButtonGroup</string>
         </attribute>
        </widget>
       </item>
@@ -40,7 +40,7 @@
          <string>A new tab in the first window</string>
         </property>
         <attribute name="buttonGroup">
-         <string>newTabButtonGroup</string>
+         <string notr="true">newTabButtonGroup</string>
         </attribute>
        </widget>
       </item>
@@ -50,7 +50,7 @@
          <string>A new tab in the last focused window</string>
         </property>
         <attribute name="buttonGroup">
-         <string>newTabButtonGroup</string>
+         <string notr="true">newTabButtonGroup</string>
         </attribute>
        </widget>
       </item>
@@ -71,20 +71,9 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="QSpinBox" name="scrollbackLength">
-        <property name="value">
-         <number>4</number>
-        </property>
-       </widget>
+       <widget class="KIntSpinBox" name="scrollbackLength"/>
       </item>
       <item row="0" column="2">
-       <widget class="QLabel" name="label_p2">
-        <property name="text">
-         <string extracomment="Second part of "Show last %1 messages" string">messages</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="3">
        <spacer name="horizontalSpacer">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -122,6 +111,11 @@
    <header>kbuttongroup.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>KIntSpinBox</class>
+   <extends>QSpinBox</extends>
+   <header>knuminput.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

-- 
ktp-text-ui packaging