[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:06:07 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=1bd854d
The following commit has been merged in the master branch:
commit 1bd854d9005afb68fd50402127d9fb28e7720767
Author: Martin Klapetek <mklapetek at kde.org>
Date: Thu Oct 9 18:10:22 2014 +0200
Port haze plugin to KF5
---
CMakeLists.txt | 2 +-
plugins/CMakeLists.txt | 4 +--
plugins/haze/CMakeLists.txt | 11 ++++----
plugins/haze/aim-main-options-widget.ui | 17 ++++--------
plugins/haze/aim-server-settings-widget.ui | 19 +++----------
plugins/haze/groupwise-advanced-settings-widget.ui | 17 ++----------
plugins/haze/groupwise-main-options-widget.ui | 17 ++++--------
plugins/haze/haze-account-ui-plugin.cpp | 1 -
plugins/haze/icq-main-options-widget.ui | 16 ++++-------
plugins/haze/icq-server-settings-widget.cpp | 11 ++++----
plugins/haze/icq-server-settings-widget.ui | 24 +++-------------
plugins/haze/msn-main-options-widget.ui | 17 +++---------
plugins/haze/myspaceim-advanced-settings-widget.ui | 17 ++----------
plugins/haze/myspaceim-main-options-widget.ui | 18 ++++--------
plugins/haze/sipe-advanced-settings-widget.ui | 32 +++++++++-------------
plugins/haze/sipe-main-options-widget.ui | 18 ++++--------
plugins/haze/skype-main-options-widget.ui | 10 ++-----
plugins/haze/steam-main-options-widget.ui | 22 ++++++---------
plugins/haze/yahoo-main-options-widget.ui | 16 ++++-------
plugins/haze/yahoo-server-settings-widget.cpp | 7 +++--
plugins/haze/yahoo-server-settings-widget.ui | 28 ++++---------------
21 files changed, 97 insertions(+), 227 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43d13bf..3543406 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ find_package(ECM 1.0.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
find_package(Qt5 5.2.0 CONFIG REQUIRED Core Widgets DBus)
-find_package(KF5 5.0.0 REQUIRED KCMUtils KIO I18n WidgetsAddons CoreAddons ConfigWidgets IconThemes ItemViews)
+find_package(KF5 5.0.0 REQUIRED KCMUtils KIO I18n WidgetsAddons Codecs CoreAddons ConfigWidgets IconThemes ItemViews)
set(KTP_ACCOUNTS_KCM_VERSION "0.9.99")
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index b280a31..4a24516 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -1,9 +1,9 @@
add_subdirectory (gabble)
+add_subdirectory (haze)
# macro_optional_add_subdirectory (butterfly)
# macro_optional_add_subdirectory (idle)
-# macro_optional_add_subdirectory (haze)
# macro_optional_add_subdirectory (rakia)
# macro_optional_add_subdirectory (salut)
# macro_optional_add_subdirectory (sunshine)
# macro_optional_add_subdirectory (pintxo)
-# macro_optional_add_subdirectory (sipe)
+# macro_optional_add_subdirectory (sipe)
\ No newline at end of file
diff --git a/plugins/haze/CMakeLists.txt b/plugins/haze/CMakeLists.txt
index 1995106..39b99e0 100644
--- a/plugins/haze/CMakeLists.txt
+++ b/plugins/haze/CMakeLists.txt
@@ -33,7 +33,7 @@ set (ktpaccountskcm_plugin_haze_SRCS
sipe-advanced-settings-widget.cpp
)
-kde4_add_ui_files (ktpaccountskcm_plugin_haze_SRCS
+ki18n_wrap_ui (ktpaccountskcm_plugin_haze_SRCS
icq-main-options-widget.ui
icq-server-settings-widget.ui
myspaceim-main-options-widget.ui
@@ -52,15 +52,16 @@ kde4_add_ui_files (ktpaccountskcm_plugin_haze_SRCS
sipe-advanced-settings-widget.ui
)
-kde4_add_plugin (ktpaccountskcm_plugin_haze
+add_library (ktpaccountskcm_plugin_haze MODULE
${ktpaccountskcm_plugin_haze_SRCS}
)
target_link_libraries (ktpaccountskcm_plugin_haze
ktpaccountskcminternal
- ${QT_LIBRARIES}
- ${KDE4_KDEUI_LIBS}
- ${TELEPATHY_QT4_LIBRARIES}
+ Qt5::Core
+ Qt5::Widgets
+ KF5::Codecs
+ ${TELEPATHY_QT5_LIBRARIES}
)
# Install:
diff --git a/plugins/haze/aim-main-options-widget.ui b/plugins/haze/aim-main-options-widget.ui
index bb3a949..fb9fc92 100644
--- a/plugins/haze/aim-main-options-widget.ui
+++ b/plugins/haze/aim-main-options-widget.ui
@@ -31,11 +31,11 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="KLineEdit" name="accountLineEdit">
+ <widget class="QLineEdit" name="accountLineEdit">
<property name="text">
<string/>
</property>
- <property name="clickMessage">
+ <property name="placeholderText">
<string/>
</property>
</widget>
@@ -48,21 +48,14 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="KLineEdit" name="passwordLineEdit">
- <property name="passwordMode">
- <bool>true</bool>
+ <widget class="QLineEdit" name="passwordLineEdit">
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- </customwidgets>
<resources/>
<connections/>
</ui>
diff --git a/plugins/haze/aim-server-settings-widget.ui b/plugins/haze/aim-server-settings-widget.ui
index 24182ee..b2c0cea 100644
--- a/plugins/haze/aim-server-settings-widget.ui
+++ b/plugins/haze/aim-server-settings-widget.ui
@@ -41,7 +41,7 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="KLineEdit" name="serverAddress"/>
+ <widget class="QLineEdit" name="serverAddress"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="serverPortLabel">
@@ -51,7 +51,7 @@
</widget>
</item>
<item row="2" column="1">
- <widget class="KIntSpinBox" name="serverPort">
+ <widget class="QSpinBox" name="serverPort">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -84,7 +84,7 @@
</widget>
</item>
<item row="4" column="1">
- <widget class="KLineEdit" name="encryption"/>
+ <widget class="QLineEdit" name="encryption"/>
</item>
<item row="5" column="1">
<widget class="QCheckBox" name="rvProxy">
@@ -125,18 +125,7 @@
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KIntSpinBox</class>
- <extends>QSpinBox</extends>
- <header>knuminput.h</header>
- </customwidget>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- </customwidgets>
+ <customwidgets/>
<resources/>
<connections/>
</ui>
diff --git a/plugins/haze/groupwise-advanced-settings-widget.ui b/plugins/haze/groupwise-advanced-settings-widget.ui
index 5ae0923..83a57dc 100644
--- a/plugins/haze/groupwise-advanced-settings-widget.ui
+++ b/plugins/haze/groupwise-advanced-settings-widget.ui
@@ -33,7 +33,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="KLineEdit" name="serverLineEdit"/>
+ <widget class="QLineEdit" name="serverLineEdit"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="portLabel">
@@ -43,7 +43,7 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="KIntSpinBox" name="portSpinBox">
+ <widget class="QSpinBox" name="portSpinBox">
<property name="maximum">
<number>65535</number>
</property>
@@ -66,18 +66,7 @@
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KIntSpinBox</class>
- <extends>QSpinBox</extends>
- <header>knuminput.h</header>
- </customwidget>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- </customwidgets>
+ <customwidgets/>
<resources/>
<connections/>
</ui>
diff --git a/plugins/haze/groupwise-main-options-widget.ui b/plugins/haze/groupwise-main-options-widget.ui
index e7e0675..60e4b67 100644
--- a/plugins/haze/groupwise-main-options-widget.ui
+++ b/plugins/haze/groupwise-main-options-widget.ui
@@ -36,14 +36,14 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="KLineEdit" name="accountLineEdit">
+ <widget class="QLineEdit" name="accountLineEdit">
<property name="toolTip">
<string>The GroupWise username is your email address.</string>
</property>
<property name="text">
<string/>
</property>
- <property name="clickMessage">
+ <property name="placeholderText">
<string/>
</property>
</widget>
@@ -56,9 +56,9 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="KLineEdit" name="passwordLineEdit">
- <property name="passwordMode">
- <bool>true</bool>
+ <widget class="QLineEdit" name="passwordLineEdit">
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
@@ -66,13 +66,6 @@
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- </customwidgets>
<resources/>
<connections/>
</ui>
diff --git a/plugins/haze/haze-account-ui-plugin.cpp b/plugins/haze/haze-account-ui-plugin.cpp
index 5ec07c2..102e139 100644
--- a/plugins/haze/haze-account-ui-plugin.cpp
+++ b/plugins/haze/haze-account-ui-plugin.cpp
@@ -84,6 +84,5 @@ AbstractAccountUi* HazeAccountUiPlugin::accountUi(const QString &connectionManag
K_PLUGIN_FACTORY(factory, registerPlugin<HazeAccountUiPlugin>();)
-K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_haze"))
#include "haze-account-ui-plugin.moc"
diff --git a/plugins/haze/icq-main-options-widget.ui b/plugins/haze/icq-main-options-widget.ui
index 32c8c77..ebfe188 100644
--- a/plugins/haze/icq-main-options-widget.ui
+++ b/plugins/haze/icq-main-options-widget.ui
@@ -36,7 +36,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="KLineEdit" name="accountLineEdit"/>
+ <widget class="QLineEdit" name="accountLineEdit"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="passwordLabel">
@@ -46,9 +46,9 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="KLineEdit" name="passwordLineEdit">
- <property name="passwordMode">
- <bool>true</bool>
+ <widget class="QLineEdit" name="passwordLineEdit">
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
@@ -56,13 +56,7 @@
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- </customwidgets>
+ <customwidgets/>
<resources/>
<connections/>
</ui>
diff --git a/plugins/haze/icq-server-settings-widget.cpp b/plugins/haze/icq-server-settings-widget.cpp
index f3b199a..e5d3074 100644
--- a/plugins/haze/icq-server-settings-widget.cpp
+++ b/plugins/haze/icq-server-settings-widget.cpp
@@ -20,9 +20,7 @@
#include "icq-server-settings-widget.h"
-#include <KDE/KLocale>
-#include <KDE/KGlobal>
-#include <KDE/KCharsets>
+#include <KCharsets>
#include <KCMTelepathyAccounts/ParameterEditModel>
@@ -41,14 +39,15 @@ IcqServerSettingsWidget::IcqServerSettingsWidget(ParameterEditModel *model,
handleParameter(QLatin1String("always-use-rv-proxy"), QVariant::Bool, m_ui->alwaysUseRvProxyCheckBox, 0);
// update combo box for charset parameter
- Q_FOREACH (const QString &name, KGlobal::charsets()->descriptiveEncodingNames()) {
+ Q_FOREACH (const QString &name, KCharsets::charsets()->descriptiveEncodingNames()) {
m_ui->charsetComboBox->addItem(name);
}
const QString encName = parameterModel()->data(
parameterModel()->indexForParameter(parameterModel()->parameter(QLatin1String("charset"))),
ParameterEditModel::ValueRole).toString();
- m_ui->charsetComboBox->setCurrentItem(KGlobal::charsets()->descriptionForEncoding(encName));
+//KF5 TODO
+// m_ui->charsetComboBox->setCurrentItem(KCharsets::charsets()->descriptionForEncoding(encName));
}
IcqServerSettingsWidget::~IcqServerSettingsWidget()
@@ -60,7 +59,7 @@ void IcqServerSettingsWidget::submit()
{
AbstractAccountParametersWidget::submit();
- const QString name = KGlobal::charsets()->encodingForName(m_ui->charsetComboBox->currentText());
+ const QString name = KCharsets::charsets()->encodingForName(m_ui->charsetComboBox->currentText());
parameterModel()->setData(
parameterModel()->indexForParameter(parameterModel()->parameter(QLatin1String("charset"))),
name, ParameterEditModel::ValueRole);
diff --git a/plugins/haze/icq-server-settings-widget.ui b/plugins/haze/icq-server-settings-widget.ui
index 8970d48..dfc457a 100644
--- a/plugins/haze/icq-server-settings-widget.ui
+++ b/plugins/haze/icq-server-settings-widget.ui
@@ -46,7 +46,7 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="KLineEdit" name="serverLineEdit"/>
+ <widget class="QLineEdit" name="serverLineEdit"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="portLabel">
@@ -56,7 +56,7 @@
</widget>
</item>
<item row="2" column="1">
- <widget class="KIntSpinBox" name="portSpinBox">
+ <widget class="QSpinBox" name="portSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -130,7 +130,7 @@
</widget>
</item>
<item row="8" column="1">
- <widget class="KComboBox" name="charsetComboBox">
+ <widget class="QComboBox" name="charsetComboBox">
</widget>
</item>
</layout>
@@ -150,23 +150,7 @@
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KIntSpinBox</class>
- <extends>QSpinBox</extends>
- <header>knuminput.h</header>
- </customwidget>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- <customwidget>
- <class>KComboBox</class>
- <extends>QComboBox</extends>
- <header>kcombobox.h</header>
- </customwidget>
- </customwidgets>
+ <customwidgets/>
<resources/>
<connections/>
</ui>
diff --git a/plugins/haze/msn-main-options-widget.ui b/plugins/haze/msn-main-options-widget.ui
index b2b6f9c..48b38f1 100644
--- a/plugins/haze/msn-main-options-widget.ui
+++ b/plugins/haze/msn-main-options-widget.ui
@@ -34,7 +34,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="KLineEdit" name="accountLineEdit">
+ <widget class="QLineEdit" name="accountLineEdit">
<property name="showClearButton" stdset="0">
<bool>false</bool>
</property>
@@ -58,27 +58,18 @@
</widget>
</item>
<item row="2" column="1">
- <widget class="KLineEdit" name="passwordLineEdit">
+ <widget class="QLineEdit" name="passwordLineEdit">
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
- <property name="showClearButton" stdset="0">
- <bool>true</bool>
- </property>
- <property name="passwordMode">
+ <property name="clearButtonEnabled" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- </customwidgets>
+ <customwidgets/>
<tabstops>
<tabstop>accountLineEdit</tabstop>
<tabstop>passwordLineEdit</tabstop>
diff --git a/plugins/haze/myspaceim-advanced-settings-widget.ui b/plugins/haze/myspaceim-advanced-settings-widget.ui
index a13c23d..b54036b 100644
--- a/plugins/haze/myspaceim-advanced-settings-widget.ui
+++ b/plugins/haze/myspaceim-advanced-settings-widget.ui
@@ -33,7 +33,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="KLineEdit" name="serverLineEdit"/>
+ <widget class="QLineEdit" name="serverLineEdit"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="portLabel">
@@ -43,7 +43,7 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="KIntSpinBox" name="portSpinBox">
+ <widget class="QSpinBox" name="portSpinBox">
<property name="maximum">
<number>65535</number>
</property>
@@ -66,18 +66,7 @@
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KIntSpinBox</class>
- <extends>QSpinBox</extends>
- <header>knuminput.h</header>
- </customwidget>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- </customwidgets>
+ <customwidgets/>
<resources/>
<connections/>
</ui>
diff --git a/plugins/haze/myspaceim-main-options-widget.ui b/plugins/haze/myspaceim-main-options-widget.ui
index 0951f38..a86a5a9 100644
--- a/plugins/haze/myspaceim-main-options-widget.ui
+++ b/plugins/haze/myspaceim-main-options-widget.ui
@@ -36,14 +36,14 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="KLineEdit" name="accountLineEdit">
+ <widget class="QLineEdit" name="accountLineEdit">
<property name="toolTip">
<string>The MySpaceIM username is your email address.</string>
</property>
<property name="text">
<string/>
</property>
- <property name="clickMessage">
+ <property name="placeholderText">
<string>john at doe.com</string>
</property>
</widget>
@@ -56,9 +56,9 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="KLineEdit" name="passwordLineEdit">
- <property name="passwordMode">
- <bool>true</bool>
+ <widget class="QLineEdit" name="passwordLineEdit">
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
@@ -66,13 +66,7 @@
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- </customwidgets>
+ <customwidgets/>
<resources/>
<connections/>
</ui>
diff --git a/plugins/haze/sipe-advanced-settings-widget.ui b/plugins/haze/sipe-advanced-settings-widget.ui
index 18d57c3..ccd7709 100644
--- a/plugins/haze/sipe-advanced-settings-widget.ui
+++ b/plugins/haze/sipe-advanced-settings-widget.ui
@@ -33,10 +33,10 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="KLineEdit" name="loginLineEdit"/>
+ <widget class="QLineEdit" name="loginLineEdit"/>
</item>
<item row="1" column="1">
- <widget class="KLineEdit" name="serverLineEdit"/>
+ <widget class="QLineEdit" name="serverLineEdit"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="transportLabel">
@@ -46,7 +46,7 @@
</widget>
</item>
<item row="2" column="1">
- <widget class="KLineEdit" name="transportLineEdit">
+ <widget class="QLineEdit" name="transportLineEdit">
<property name="text">
<string>auto</string>
</property>
@@ -60,7 +60,7 @@
</widget>
</item>
<item row="3" column="1">
- <widget class="KLineEdit" name="useragentLineEdit"/>
+ <widget class="QLineEdit" name="useragentLineEdit"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="authenticationLabel">
@@ -70,7 +70,7 @@
</widget>
</item>
<item row="4" column="1">
- <widget class="KLineEdit" name="authenticationLineEdit">
+ <widget class="QLineEdit" name="authenticationLineEdit">
<property name="text">
<string>ntlm</string>
</property>
@@ -94,7 +94,7 @@
</widget>
</item>
<item row="6" column="1">
- <widget class="KLineEdit" name="emailurlLineEdit"/>
+ <widget class="QLineEdit" name="emailurlLineEdit"/>
</item>
<item row="7" column="0">
<widget class="QLabel" name="emailLabel">
@@ -104,7 +104,7 @@
</widget>
</item>
<item row="7" column="1">
- <widget class="KLineEdit" name="emailLineEdit"/>
+ <widget class="QLineEdit" name="emailLineEdit"/>
</item>
<item row="8" column="0">
<widget class="QLabel" name="emailloginLabel">
@@ -114,7 +114,7 @@
</widget>
</item>
<item row="8" column="1">
- <widget class="KLineEdit" name="emailloginLineEdit"/>
+ <widget class="QLineEdit" name="emailloginLineEdit"/>
</item>
<item row="9" column="0">
<widget class="QLabel" name="emailpasswordLabel">
@@ -131,12 +131,12 @@
</widget>
</item>
<item row="10" column="1">
- <widget class="KLineEdit" name="groupchatuserLineEdit"/>
+ <widget class="QLineEdit" name="groupchatuserLineEdit"/>
</item>
<item row="9" column="1">
- <widget class="KLineEdit" name="emailpasswordLineEdit">
- <property name="passwordMode">
- <bool>true</bool>
+ <widget class="QLineEdit" name="emailpasswordLineEdit">
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
@@ -151,13 +151,7 @@
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- </customwidgets>
+ <customwidgets/>
<resources/>
<connections/>
</ui>
diff --git a/plugins/haze/sipe-main-options-widget.ui b/plugins/haze/sipe-main-options-widget.ui
index 5025cec..4f73fb3 100644
--- a/plugins/haze/sipe-main-options-widget.ui
+++ b/plugins/haze/sipe-main-options-widget.ui
@@ -36,14 +36,14 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="KLineEdit" name="accountLineEdit">
+ <widget class="QLineEdit" name="accountLineEdit">
<property name="toolTip">
<string>The Sipe username is your email address.</string>
</property>
<property name="text">
<string/>
</property>
- <property name="clickMessage">
+ <property name="placeholderText">
<string>john at doe.com</string>
</property>
</widget>
@@ -56,9 +56,9 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="KLineEdit" name="passwordLineEdit">
- <property name="passwordMode">
- <bool>true</bool>
+ <widget class="QLineEdit" name="passwordLineEdit">
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
@@ -66,13 +66,7 @@
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- </customwidgets>
+ <customwidgets/>
<resources/>
<connections/>
</ui>
diff --git a/plugins/haze/skype-main-options-widget.ui b/plugins/haze/skype-main-options-widget.ui
index 30e1a33..498e820 100644
--- a/plugins/haze/skype-main-options-widget.ui
+++ b/plugins/haze/skype-main-options-widget.ui
@@ -39,19 +39,13 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="KLineEdit" name="accountLineEdit"/>
+ <widget class="QLineEdit" name="accountLineEdit"/>
</item>
</layout>
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- </customwidgets>
+ <customwidgets/>
<resources/>
<connections/>
</ui>
diff --git a/plugins/haze/steam-main-options-widget.ui b/plugins/haze/steam-main-options-widget.ui
index 92385e5..f28b750 100644
--- a/plugins/haze/steam-main-options-widget.ui
+++ b/plugins/haze/steam-main-options-widget.ui
@@ -36,11 +36,11 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="KLineEdit" name="accountLineEdit">
+ <widget class="QLineEdit" name="accountLineEdit">
<property name="text">
<string/>
</property>
- <property name="clickMessage">
+ <property name="placeholderText">
<string/>
</property>
</widget>
@@ -53,19 +53,19 @@
</widget>
</item>
<item row="2" column="1">
- <widget class="KLineEdit" name="steamguardEdit">
+ <widget class="QLineEdit" name="steamguardEdit">
<property name="text">
<string/>
</property>
- <property name="clickMessage">
+ <property name="placeholderText">
<string/>
</property>
</widget>
</item>
<item row="1" column="1">
- <widget class="KLineEdit" name="passwordLineEdit">
- <property name="passwordMode">
- <bool>true</bool>
+ <widget class="QLineEdit" name="passwordLineEdit">
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
@@ -90,13 +90,7 @@
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- </customwidgets>
+ <customwidgets/>
<resources/>
<connections/>
</ui>
diff --git a/plugins/haze/yahoo-main-options-widget.ui b/plugins/haze/yahoo-main-options-widget.ui
index 2fab597..1779094 100644
--- a/plugins/haze/yahoo-main-options-widget.ui
+++ b/plugins/haze/yahoo-main-options-widget.ui
@@ -36,7 +36,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="KLineEdit" name="accountLineEdit">
+ <widget class="QLineEdit" name="accountLineEdit">
<property name="text">
<string/>
</property>
@@ -50,9 +50,9 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="KLineEdit" name="passwordLineEdit">
- <property name="passwordMode">
- <bool>true</bool>
+ <widget class="QLineEdit" name="passwordLineEdit">
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
@@ -60,13 +60,7 @@
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- </customwidgets>
+ <customwidgets/>
<resources/>
<connections/>
</ui>
diff --git a/plugins/haze/yahoo-server-settings-widget.cpp b/plugins/haze/yahoo-server-settings-widget.cpp
index 5d139a0..6bbb412 100644
--- a/plugins/haze/yahoo-server-settings-widget.cpp
+++ b/plugins/haze/yahoo-server-settings-widget.cpp
@@ -42,9 +42,10 @@ YahooServerSettingsWidget::YahooServerSettingsWidget(ParameterEditModel *model,
handleParameter(QLatin1String("ignore-invites"), QVariant::Bool, m_ui->ignoreInvites, 0);
// update combo box for charset parameter
- m_ui->charsetComboBox->setCurrentItem(parameterModel()->data(
- parameterModel()->indexForParameter(parameterModel()->parameter(QLatin1String("charset"))),
- ParameterEditModel::ValueRole).toString());
+ //KF5 TODO
+// m_ui->charsetComboBox->setCurrentItem(parameterModel()->data(
+// parameterModel()->indexForParameter(parameterModel()->parameter(QLatin1String("charset"))),
+// ParameterEditModel::ValueRole).toString());
}
YahooServerSettingsWidget::~YahooServerSettingsWidget()
diff --git a/plugins/haze/yahoo-server-settings-widget.ui b/plugins/haze/yahoo-server-settings-widget.ui
index 40eb155..4e9a03d 100644
--- a/plugins/haze/yahoo-server-settings-widget.ui
+++ b/plugins/haze/yahoo-server-settings-widget.ui
@@ -46,7 +46,7 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="KIntSpinBox" name="serverPort">
+ <widget class="QSpinBox" name="serverPort">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -89,7 +89,7 @@
</widget>
</item>
<item row="4" column="1">
- <widget class="KIntSpinBox" name="xferPort">
+ <widget class="QSpinBox" name="xferPort">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -132,7 +132,7 @@
</widget>
</item>
<item row="7" column="1">
- <widget class="KComboBox" name="charsetComboBox">
+ <widget class="QComboBox" name="charsetComboBox">
<item>
<property name="text">
<string>UTF-8</string>
@@ -168,10 +168,10 @@
</widget>
</item>
<item row="3" column="1">
- <widget class="KLineEdit" name="xferHost"/>
+ <widget class="QLineEdit" name="xferHost"/>
</item>
<item row="6" column="1">
- <widget class="KLineEdit" name="roomListLocale"/>
+ <widget class="QLineEdit" name="roomListLocale"/>
</item>
</layout>
</item>
@@ -190,23 +190,7 @@
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KIntSpinBox</class>
- <extends>QSpinBox</extends>
- <header>knuminput.h</header>
- </customwidget>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- <customwidget>
- <class>KComboBox</class>
- <extends>QComboBox</extends>
- <header>kcombobox.h</header>
- </customwidget>
- </customwidgets>
+ <customwidgets/>
<tabstops>
<tabstop>serverPort</tabstop>
<tabstop>xferHost</tabstop>
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list