summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Klapetek <[email protected]>2015-07-20 16:37:47 +0200
committerMartin Klapetek <[email protected]>2015-07-20 16:37:47 +0200
commitae5179d6f3b8aec82e39172370a1cdf88bb6c863 (patch)
treef427670bd542b7b21f342e25a66293fce11a92d0
parent91ec4bd2701270301ae900c249815f9f03cca9cb (diff)
Port and enable the sipe plugin
-rw-r--r--plugins/CMakeLists.txt2
-rw-r--r--plugins/sipe/CMakeLists.txt16
-rw-r--r--plugins/sipe/sipe-account-ui-plugin.cpp1
-rw-r--r--plugins/sipe/sipe-advanced-options-widget.ui39
-rw-r--r--plugins/sipe/sipe-main-options-widget.ui17
5 files changed, 30 insertions, 45 deletions
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 1f8e34b..ecf610b 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -6,6 +6,6 @@ add_subdirectory (idle)
# macro_optional_add_subdirectory (salut)
# macro_optional_add_subdirectory (sunshine)
# macro_optional_add_subdirectory (pintxo)
-# macro_optional_add_subdirectory (sipe)
# macro_optional_add_subdirectory (morse)
+add_subdirectory(sipe)
add_subdirectory(kaccounts)
diff --git a/plugins/sipe/CMakeLists.txt b/plugins/sipe/CMakeLists.txt
index e63bb07..8586e62 100644
--- a/plugins/sipe/CMakeLists.txt
+++ b/plugins/sipe/CMakeLists.txt
@@ -11,20 +11,20 @@ set (ktpaccountskcm_plugin_sipe_SRCS
sipe-advanced-options-widget.cpp
)
-kde4_add_ui_files (ktpaccountskcm_plugin_sipe_SRCS
- sipe-main-options-widget.ui
- sipe-advanced-options-widget.ui
+qt5_wrap_ui (ktpaccountskcm_plugin_sipe_SRCS
+ sipe-main-options-widget.ui
+ sipe-advanced-options-widget.ui
)
-kde4_add_plugin (ktpaccountskcm_plugin_sipe
- ${ktpaccountskcm_plugin_sipe_SRCS}
+add_library (ktpaccountskcm_plugin_sipe MODULE
+ ${ktpaccountskcm_plugin_sipe_SRCS}
)
target_link_libraries (ktpaccountskcm_plugin_sipe
ktpaccountskcminternal
- ${QT_LIBRARIES}
- ${KDE4_KDEUI_LIBS}
- ${TELEPATHY_QT4_LIBRARIES}
+ Qt5::Core
+ Qt5::Widgets
+ ${TELEPATHY_QT5_LIBRARIES}
)
# Install:
diff --git a/plugins/sipe/sipe-account-ui-plugin.cpp b/plugins/sipe/sipe-account-ui-plugin.cpp
index e30b29a..dcb7732 100644
--- a/plugins/sipe/sipe-account-ui-plugin.cpp
+++ b/plugins/sipe/sipe-account-ui-plugin.cpp
@@ -50,6 +50,5 @@ AbstractAccountUi* SipeAccountUiPlugin::accountUi(
}
K_PLUGIN_FACTORY(factory, registerPlugin<SipeAccountUiPlugin>();)
-K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_sipe"))
#include "sipe-account-ui-plugin.moc"
diff --git a/plugins/sipe/sipe-advanced-options-widget.ui b/plugins/sipe/sipe-advanced-options-widget.ui
index 67a7277..268addf 100644
--- a/plugins/sipe/sipe-advanced-options-widget.ui
+++ b/plugins/sipe/sipe-advanced-options-widget.ui
@@ -33,7 +33,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="KLineEdit" name="loginLineEdit"/>
+ <widget class="QLineEdit" name="loginLineEdit"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="serverLabel">
@@ -43,7 +43,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">
@@ -53,7 +53,17 @@
</widget>
</item>
<item row="2" column="1">
- <widget class="KIntSpinBox" name="portSpinBox"/>
+ <widget class="QSpinBox" name="portSpinBox">
+ <property name="minimum">
+ <number>0</number>
+ </property>
+ <property name="maximum">
+ <number>65535</number>
+ </property>
+ <property name="value">
+ <number>5060</number>
+ </property>
+ </widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="transportLabel">
@@ -63,7 +73,7 @@
</widget>
</item>
<item row="3" column="1">
- <widget class="KComboBox" name="transportComboBox">
+ <widget class="QComboBox" name="transportComboBox">
<item>
<property name="text">
<string>auto</string>
@@ -89,7 +99,7 @@
</widget>
</item>
<item row="4" column="1">
- <widget class="KLineEdit" name="useragentLineEdit"/>
+ <widget class="QLineEdit" name="useragentLineEdit"/>
</item>
<item row="5" column="0">
<widget class="QLabel" name="authenticationLabel">
@@ -99,7 +109,7 @@
</widget>
</item>
<item row="5" column="1">
- <widget class="KComboBox" name="authenticationComboBox">
+ <widget class="QComboBox" name="authenticationComboBox">
<item>
<property name="text">
<string>ntlm</string>
@@ -135,23 +145,6 @@
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KComboBox</class>
- <extends>QComboBox</extends>
- <header>kcombobox.h</header>
- </customwidget>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- <customwidget>
- <class>KIntSpinBox</class>
- <extends>QSpinBox</extends>
- <header>knuminput.h</header>
- </customwidget>
- </customwidgets>
<resources/>
<connections/>
</ui>
diff --git a/plugins/sipe/sipe-main-options-widget.ui b/plugins/sipe/sipe-main-options-widget.ui
index 00aa09e..4a80325 100644
--- a/plugins/sipe/sipe-main-options-widget.ui
+++ b/plugins/sipe/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>[email protected]</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>