[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5
Maximiliano Curia
maxy at moszumanska.debian.org
Fri May 27 23:59:14 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=d4f0e00
The following commit has been merged in the master branch:
commit d4f0e00599c9950e3b995ecfd34cd4b304d9995c
Author: Lasath Fernando <kde at lasath.org>
Date: Fri Feb 18 21:36:53 2011 +1100
fixed some copyright issues
---
...widget.cpp => yahoo-server-settings-widget.cpp} | 28 +++--
...ngs-widget.h => yahoo-server-settings-widget.h} | 18 +--
...s-widget.ui => yahoo-server-settings-widget.ui} | 133 ++++++++++++++-------
3 files changed, 113 insertions(+), 66 deletions(-)
diff --git a/haze/icq-server-settings-widget.cpp b/haze/yahoo-server-settings-widget.cpp
similarity index 56%
copy from haze/icq-server-settings-widget.cpp
copy to haze/yahoo-server-settings-widget.cpp
index 8fcbef0..710704b 100644
--- a/haze/icq-server-settings-widget.cpp
+++ b/haze/yahoo-server-settings-widget.cpp
@@ -1,7 +1,7 @@
/*
* This file is part of telepathy-accounts-kcm
*
- * Copyright (C) 2011 Dominik Schmidt <kde at dominik-schmidt.de>
+ * Copyright (C) 2011 Lasath Fernando <kde at lasath.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,34 +18,38 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "icq-server-settings-widget.h"
+#include "yahoo-server-settings-widget.h"
#include <KDebug>
-IcqServerSettingsWidget::IcqServerSettingsWidget(ParameterEditModel *model,
+YahooServerSettingsWidget::YahooServerSettingsWidget(ParameterEditModel *model,
QWidget *parent)
: AbstractAccountParametersWidget(model, parent)
{
kDebug();
// Set up the UI.
- m_ui = new Ui::IcqServerSettingsWidget;
+ m_ui = new Ui::YahooServerSettingsWidget;
m_ui->setupUi(this);
-
- handleParameter("server", QVariant::String, m_ui->serverLineEdit, m_ui->serverLabel);
- handleParameter("port", QVariant::Int, m_ui->portSpinBox, m_ui->portLabel);
- handleParameter("use-ssl", QVariant::Bool, m_ui->useSslCheckBox, 0);
- handleParameter("allow-multiple-logins", QVariant::Bool, m_ui->allowMultipleLoginsCheckBox, 0);
- handleParameter("always-use-rv-proxy", QVariant::Bool, m_ui->alwaysUseRvProxyCheckBox, 0);
+
+ //server
+ handleParameter("port", QVariant::UInt, m_ui->serverPort, m_ui->serverPortLabel);
+ //file transfer
+ handleParameter("xfer-host", QVariant::String, m_ui->xferHost, m_ui->xferHostLabel);
+ handleParameter("xfer-port", QVariant::UInt, m_ui->xferPort, m_ui->xferPortLabel);
+ //locale
+ handleParameter("room-list-locale", QVariant::String, m_ui->roomListLocale, m_ui->roomListLocaleLablel);
handleParameter("charset", QVariant::String, m_ui->charsetComboBox, m_ui->charsetLabel);
+ //other
+ handleParameter("proxy-ssl", QVariant::Bool, m_ui->SslProxy, 0);
+ handleParameter("ignore-invites", QVariant::Bool, m_ui->ignoreInvites, 0);
}
-IcqServerSettingsWidget::~IcqServerSettingsWidget()
+YahooServerSettingsWidget::~YahooServerSettingsWidget()
{
kDebug();
delete m_ui;
}
-#include "icq-server-settings-widget.moc"
diff --git a/haze/icq-server-settings-widget.h b/haze/yahoo-server-settings-widget.h
similarity index 65%
copy from haze/icq-server-settings-widget.h
copy to haze/yahoo-server-settings-widget.h
index 848343b..cef13c3 100644
--- a/haze/icq-server-settings-widget.h
+++ b/haze/yahoo-server-settings-widget.h
@@ -1,7 +1,7 @@
/*
* This file is part of telepathy-accounts-kcm
*
- * Copyright (C) 2011 Dominik Schmidt <kde at dominik-schmidt.de>
+ * Copyright (C) 2011 Lasath Fernando <kde at lasath.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,25 +18,25 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_ICQ_SERVER_SETTINGS_WIDGET_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_ICQ_SERVER_SETTINGS_WIDGET_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_YAHOO_SERVER_SETTINGS_WIDGET_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_YAHOO_SERVER_SETTINGS_WIDGET_H
-#include "ui_icq-server-settings-widget.h"
+#include "ui_yahoo-server-settings-widget.h"
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-class IcqServerSettingsWidget : public AbstractAccountParametersWidget
+class YahooServerSettingsWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
public:
- explicit IcqServerSettingsWidget(ParameterEditModel *model,
+ explicit YahooServerSettingsWidget(ParameterEditModel *model,
QWidget *parent = 0);
- virtual ~IcqServerSettingsWidget();
+ virtual ~YahooServerSettingsWidget();
private:
- Q_DISABLE_COPY(IcqServerSettingsWidget);
- Ui::IcqServerSettingsWidget *m_ui;
+ Q_DISABLE_COPY(YahooServerSettingsWidget);
+ Ui::YahooServerSettingsWidget *m_ui;
};
diff --git a/haze/icq-server-settings-widget.ui b/haze/yahoo-server-settings-widget.ui
similarity index 56%
copy from haze/icq-server-settings-widget.ui
copy to haze/yahoo-server-settings-widget.ui
index 15b425e..a9896fb 100644
--- a/haze/icq-server-settings-widget.ui
+++ b/haze/yahoo-server-settings-widget.ui
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>IcqServerSettingsWidget</class>
- <widget class="QWidget" name="IcqServerSettingsWidget">
+ <class>YahooServerSettingsWidget</class>
+ <widget class="QWidget" name="YahooServerSettingsWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>400</width>
- <height>431</height>
+ <width>448</width>
+ <height>303</height>
</rect>
</property>
<property name="windowTitle">
- <string>Connection Settings</string>
+ <string>Advanced Options</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="margin">
@@ -34,29 +34,23 @@
</sizepolicy>
</property>
<property name="text">
- <string><b>Server</string>
+ <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Server</span></p></body></html></string>
</property>
</widget>
</item>
<item row="1" column="0">
- <widget class="QLabel" name="serverLabel">
- <property name="text">
- <string>Address:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="KLineEdit" name="serverLineEdit"/>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="portLabel">
+ <widget class="QLabel" name="serverPortLabel">
<property name="text">
<string>Port:</string>
</property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="KIntSpinBox" name="portSpinBox">
+ <item row="1" column="1">
+ <widget class="KIntSpinBox" name="serverPort">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -64,12 +58,15 @@
</sizepolicy>
</property>
<property name="maximum">
- <number>60000</number>
+ <number>65536</number>
+ </property>
+ <property name="value">
+ <number>5050</number>
</property>
</widget>
</item>
- <item row="3" column="0">
- <widget class="QLabel" name="securityHeadlineLabel">
+ <item row="2" column="0">
+ <widget class="QLabel" name="transferHeadlineLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -80,36 +77,45 @@
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">Security</span></p></body></html></string>
+</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">File Transfer</span></p></body></html></string>
</property>
</widget>
</item>
- <item row="4" column="1">
- <widget class="QCheckBox" name="useSslCheckBox">
+ <item row="3" column="0">
+ <widget class="QLabel" name="xferHostLabel">
<property name="text">
- <string>Use SSL</string>
+ <string>Host</string>
</property>
</widget>
</item>
- <item row="5" column="1">
- <widget class="QCheckBox" name="allowMultipleLoginsCheckBox">
+ <item row="4" column="0">
+ <widget class="QLabel" name="xferPortLabel">
<property name="text">
- <string>Allow Multiple Logins</string>
+ <string>Port</string>
</property>
</widget>
</item>
- <item row="5" column="0">
- <widget class="QLabel" name="allowMultipleLoginsLabel">
- <property name="text">
- <string/>
+ <item row="4" column="1">
+ <widget class="KIntSpinBox" name="xferPort">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximum">
+ <number>65536</number>
+ </property>
+ <property name="value">
+ <number>80</number>
</property>
</widget>
</item>
- <item row="6" column="0">
- <widget class="QLabel" name="otherHeadlineLabel">
+ <item row="5" column="0">
+ <widget class="QLabel" name="localeHeadlineLabel">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+ <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -118,26 +124,26 @@ p, li { white-space: pre-wrap; }
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Other</span></p></body></html></string>
+</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Locale</span></p></body></html></string>
</property>
</widget>
</item>
- <item row="7" column="1">
- <widget class="QCheckBox" name="alwaysUseRvProxyCheckBox">
+ <item row="6" column="0">
+ <widget class="QLabel" name="roomListLocaleLablel">
<property name="text">
- <string>Always use RV-Proxy</string>
+ <string>Room List</string>
</property>
</widget>
</item>
- <item row="8" column="0">
+ <item row="7" column="0">
<widget class="QLabel" name="charsetLabel">
<property name="text">
<string>Charset</string>
</property>
</widget>
</item>
- <item row="8" column="1">
+ <item row="7" column="1">
<widget class="KComboBox" name="charsetComboBox">
<item>
<property name="text">
@@ -146,6 +152,43 @@ p, li { white-space: pre-wrap; }
</item>
</widget>
</item>
+ <item row="8" column="0">
+ <widget class="QLabel" name="otherHeadlineLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Other</span></p></body></html></string>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="1">
+ <widget class="QCheckBox" name="SslProxy">
+ <property name="text">
+ <string>Use SSL on Proxy</string>
+ </property>
+ </widget>
+ </item>
+ <item row="10" column="1">
+ <widget class="QCheckBox" name="ignoreInvites">
+ <property name="text">
+ <string>Ignore Invites</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="KLineEdit" name="xferHost"/>
+ </item>
+ <item row="6" column="1">
+ <widget class="KLineEdit" name="roomListLocale"/>
+ </item>
</layout>
</item>
<item>
@@ -156,7 +199,7 @@ p, li { white-space: pre-wrap; }
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
- <height>40</height>
+ <height>0</height>
</size>
</property>
</spacer>
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list