[kde-doc-english] [plasma-desktop] /: Remove the attica-kde aka "The Social Desktop" KCM
Vishesh Handa
me at vhanda.in
Wed Jul 2 12:52:04 UTC 2014
Git commit e6e1948c49b455ef1865dd76d4ffccaa43970880 by Vishesh Handa.
Committed on 02/07/2014 at 12:56.
Pushed by vhanda into branch 'master'.
Remove the attica-kde aka "The Social Desktop" KCM
This KCM was only used for providing credentials for loging into
opendesktop.org (or other mythical providers which do not exist). The
KCM says it is used for this -
* Community Applet (not shipped with Plasma5)
* Social News Applet (not shipped with Plasma5)
* Get Hot new Stuff (knewstuff has a TODO - Implement support for
authorization)
It does not make sense to ship with a KCM which is
a.) Useless
b.) Targets a proprietary service
c.) Crashes on exit
M +0 -1 attica-kde/CMakeLists.txt
D +0 -15 attica-kde/kcm/CMakeLists.txt
D +0 -3 attica-kde/kcm/Messages.sh
D +0 -3 attica-kde/kcm/TODO
D +0 -158 attica-kde/kcm/atticamodule.cpp
D +0 -64 attica-kde/kcm/atticamodule.h
D +0 -108 attica-kde/kcm/kcm_attica.desktop
D +0 -322 attica-kde/kcm/providerconfigwidget.cpp
D +0 -78 attica-kde/kcm/providerconfigwidget.h
D +0 -572 attica-kde/kcm/providerconfigwidget.ui
D +0 -119 attica-kde/kcm/providermanagement.ui
M +0 -6 attica-kde/kdeplugin/kdeplatformdependent.cpp
M +0 -1 doc/kcontrol/CMakeLists.txt
D +0 -2 doc/kcontrol/attica/CMakeLists.txt
D +0 -61 doc/kcontrol/attica/index.docbook
http://commits.kde.org/plasma-desktop/e6e1948c49b455ef1865dd76d4ffccaa43970880
diff --git a/attica-kde/CMakeLists.txt b/attica-kde/CMakeLists.txt
index 11d3e3b..ae4d3ae 100644
--- a/attica-kde/CMakeLists.txt
+++ b/attica-kde/CMakeLists.txt
@@ -1,5 +1,4 @@
include_directories(${LIBATTICA_INCLUDE_DIR})
add_subdirectory(kdeplugin)
-add_subdirectory(kcm)
diff --git a/attica-kde/kcm/CMakeLists.txt b/attica-kde/kcm/CMakeLists.txt
deleted file mode 100644
index b3c0b09..0000000
--- a/attica-kde/kcm/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-add_definitions(-DTRANSLATION_DOMAIN=\"kcm_attica\")
-
-set(kcm_attica_PART_SRCS
- providerconfigwidget.cpp
- atticamodule.cpp
-)
-
-ki18n_wrap_ui(kcm_attica_PART_SRCS providermanagement.ui providerconfigwidget.ui)
-
-add_library(kcm_attica MODULE ${kcm_attica_PART_SRCS})
-
-target_link_libraries(kcm_attica KF5::Attica KF5::KDELibs4Support KF5::KIOWidgets KF5::I18n KF5::Plasma)
-
-install(TARGETS kcm_attica DESTINATION ${PLUGIN_INSTALL_DIR})
-install(FILES kcm_attica.desktop DESTINATION ${SERVICES_INSTALL_DIR})
diff --git a/attica-kde/kcm/Messages.sh b/attica-kde/kcm/Messages.sh
deleted file mode 100644
index 543c21f..0000000
--- a/attica-kde/kcm/Messages.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-$EXTRACTRC `find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> rc.cpp
-$XGETTEXT *.cpp -o $podir/kcm_attica.pot
diff --git a/attica-kde/kcm/TODO b/attica-kde/kcm/TODO
deleted file mode 100644
index 9e6d8c9..0000000
--- a/attica-kde/kcm/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE4.5:
-- Check that password is more than 8 chars in length (something server should do)
-- Rename "Login" tab to "Login Settings" to not confuse user
diff --git a/attica-kde/kcm/atticamodule.cpp b/attica-kde/kcm/atticamodule.cpp
deleted file mode 100644
index 4b8997a..0000000
--- a/attica-kde/kcm/atticamodule.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- This file is part of KDE.
-
- Copyright (c) 2009 Eckhart Wörner <ewoerner at kde.org>
- Copyright (c) 2010 Frederik Gladhorn <gladhorn at kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#include "atticamodule.h"
-
-#include "plasma/version.h"
-#include <KPluginFactory>
-#include <KAboutData>
-#include <KDebug>
-#include <KLocalizedString>
-#include <kicon.h>
-#include <kurlrequesterdialog.h>
-
-#include <attica/providermanager.h>
-
-#include "providerconfigwidget.h"
-
-K_PLUGIN_FACTORY(AtticaModuleFactory, registerPlugin<AtticaModule>();)
-K_EXPORT_PLUGIN(AtticaModuleFactory("kcm_attica"))
-
-AtticaModule::AtticaModule(QWidget* parent, const QVariantList&)
- : KCModule(parent)
-{
- KAboutData *about = new KAboutData(
- "kcm_attica", i18n("Social Desktop"),
- PLASMA_VERSION_STRING, QString(), KAboutLicense::GPL,
- i18n("Copyright 2009 Eckhart Wörner"));
- about->addAuthor(i18n("Eckhart Wörner"), QString(), "ewoerner at kde.org");
- about->addAuthor(i18n("Dmitry Suzdalev"), QString(), "dimsuz at gmail.com");
- about->addAuthor(i18n("Frederik Gladhorn"), QString(), "gladhorn at kde.org");
- setAboutData(about);
-
- m_ui.setupUi(this);
-
- m_ui.addProviderButton->setIcon(KIcon("list-add"));
- m_ui.removeProviderButton->setIcon(KIcon("list-remove"));
-
- // FIXME
- m_ui.removeProviderButton->setEnabled(false);
-
- connect(m_ui.addProviderButton, SIGNAL(clicked()), this, SLOT(addProvider()));
- connect(m_ui.removeProviderButton, SIGNAL(clicked()), this, SLOT(removeProvider()));
-
- connect(m_ui.providerComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(providerSelected(int)));
-
- connect(m_ui.providerConfigWidget, SIGNAL(changed(bool)),
- this, SIGNAL(changed(bool)));
-
- m_manager.setAuthenticationSuppressed(true);
-
- connect(&m_manager, SIGNAL(providerAdded(const Attica::Provider&)), SLOT(providerAdded(const Attica::Provider&)));
- connect(&m_manager, SIGNAL(defaultProvidersLoaded()), SLOT(onDefaultProvidersLoaded()));
-
- startLoadingDefaultProviders();
-}
-
-AtticaModule::~AtticaModule()
-{
-}
-
-void AtticaModule::defaults()
-{
-}
-
-void AtticaModule::load()
-{
- startLoadingDefaultProviders();
-}
-
-
-void AtticaModule::save()
-{
- m_ui.providerConfigWidget->saveData();
-}
-
-void AtticaModule::startLoadingDefaultProviders()
-{
- emit changed(true);
- m_manager.clear();
- m_manager.loadDefaultProviders();
- m_ui.lblProviderList->setText(i18n("Loading provider list..."));
- m_ui.providerComboBox->hide();
- m_ui.providerConfigWidget->setEnabled(false);
-}
-
-void AtticaModule::providerAdded(const Attica::Provider& provider)
-{
- // Add new provider
- QString baseUrl = provider.baseUrl().toString();
- int idx = m_ui.providerComboBox->findData(baseUrl);
-
- if ( idx == -1)
- {
- kDebug() << "Adding provider" << baseUrl;
- QString name = provider.name();
- if (name.isEmpty())
- name = baseUrl;
- m_ui.providerComboBox->addItem(KIcon("system-users"), name, provider.baseUrl());
- }
-
- // set only if this is a first provider, otherwise it will be
- // set on explicit selection
- if (m_ui.providerComboBox->count() == 1) {
- m_ui.providerConfigWidget->setProvider(provider);
- }
-}
-
-void AtticaModule::providerSelected(int providerNumber)
-{
- QUrl providerUrl = m_ui.providerComboBox->itemData(providerNumber).toUrl();
- m_ui.providerConfigWidget->setProvider(m_manager.providerByUrl(providerUrl));
-}
-
-void AtticaModule::onDefaultProvidersLoaded()
-{
- m_ui.lblProviderList->setText(i18n("Choose a provider to manage:"));
- m_ui.providerComboBox->show();
- m_ui.providerConfigWidget->setEnabled(true);
-
- // at least now set it to not changed
- emit changed(false);
-}
-
-void AtticaModule::addProvider()
-{
- KUrlRequesterDialog dialog(QUrl("http://"), i18nc("addition of an attica/knewstuff provider by entering its url", "URL of the provider file (provider.xml)"), this);
- if (dialog.exec() == QDialog::Accepted) {
- kDebug() << "Add provider: " << dialog.selectedUrl();
- m_manager.addProviderFileToDefaultProviders(dialog.selectedUrl());
- }
-}
-
-void AtticaModule::removeProvider()
-{
- //m_manager.removeProviderFileToDefaultProviders(url);
-}
-
-
-#include "atticamodule.moc"
diff --git a/attica-kde/kcm/atticamodule.h b/attica-kde/kcm/atticamodule.h
deleted file mode 100644
index 6c18bfb..0000000
--- a/attica-kde/kcm/atticamodule.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- This file is part of KDE.
-
- Copyright (c) 2009 Eckhart Wörner <ewoerner at kde.org>
- Copyright (c) 2010 Frederik Gladhorn <gladhorn at kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#ifndef ATTICAMODULE_H
-#define ATTICAMODULE_H
-
-#include <KDE/KCModule>
-
-#include <attica/providermanager.h>
-
-#include "ui_providermanagement.h"
-
-
-namespace KWallet {
- class Wallet;
-}
-
-class AtticaModule : public KCModule
-{
- Q_OBJECT
-
-public:
- AtticaModule(QWidget* parent, const QVariantList&);
- ~AtticaModule();
- void save();
- void load();
- void defaults();
-
-private Q_SLOTS:
- void providerAdded(const Attica::Provider&);
- void onDefaultProvidersLoaded();
- void addProvider();
- void removeProvider();
- void providerSelected(int);
-
-private:
- void startLoadingDefaultProviders();
-
-private:
- Ui::ProviderManagement m_ui;
- Attica::ProviderManager m_manager;
-};
-
-
-#endif
diff --git a/attica-kde/kcm/kcm_attica.desktop b/attica-kde/kcm/kcm_attica.desktop
deleted file mode 100644
index e3827e9..0000000
--- a/attica-kde/kcm/kcm_attica.desktop
+++ /dev/null
@@ -1,108 +0,0 @@
-[Desktop Entry]
-Exec=kcmshell5 kcm_attica
-Type=Service
-Icon=get-hot-new-stuff
-
-X-KDE-ServiceTypes=KCModule
-X-KDE-Library=kcm_attica
-X-KDE-ParentApp=kcontrol
-X-KDE-System-Settings-Parent-Category=accountdetails
-X-KDE-Weight=60
-X-DocPath=kcontrol/attica/index.html
-
-Name=Social Desktop
-Name[ca]=Escriptori social
-Name[cs]=Sociální pracovní prostředí
-Name[de]=Social-Desktop
-Name[en_GB]=Social Desktop
-Name[es]=Escritorio social
-Name[fi]=Sosiaalinen työpöytä
-Name[gl]=Escritorio social
-Name[hr]=Društvena radna površina
-Name[ia]=Scriptorio social
-Name[id]=Desktop Sosial
-Name[ko]=사회적 데스크톱
-Name[nb]=Sosialt skrivebord
-Name[nds]=Deelt Schriefdisch
-Name[nl]=Sociale bureaublad
-Name[pa]=ਸਮਾਜਕ ਡੈਸਕਟਾਪ
-Name[pl]=Pulpit społecznościowy
-Name[pt]=Ambiente de Trabalho Social
-Name[pt_BR]=Área de Trabalho Social
-Name[sk]=Sociálne pracovné prostredie
-Name[sl]=Družabno namizje
-Name[sr]=Друштвена површ
-Name[sr at ijekavian]=Друштвена површ
-Name[sr at ijekavianlatin]=Društvena površ
-Name[sr at latin]=Društvena površ
-Name[sv]=Socialt skrivbord
-Name[tr]=Sosyal Masaüstü
-Name[uk]=Соціальна стільниця
-Name[x-test]=xxSocial Desktopxx
-Name[zh_TW]=Social 桌面
-Comment=Manage Social Desktop Providers
-Comment[ar]=أدر مزودي سطح المكتب الاجتماعي
-Comment[ast]=Xestionar fornidores del escritoriu social
-Comment[bg]=Управление на доставчици на социален работен плот
-Comment[bn]=সামাজিক ডেস্কটপ সরবরাহকারী ব্যবস্থাপনা
-Comment[bs]=Upravljanje dobavljačima društvene površi
-Comment[ca]=Gestiona els proveïdors de l'escriptori social
-Comment[ca at valencia]=Gestiona els proveïdors de l'escriptori social
-Comment[cs]=Spravovat poskytovatele sociálního pracovního prostředí
-Comment[da]=Håndtér udbydere af social desktop
-Comment[de]=Social-Desktop-Anbieter verwalten
-Comment[el]=Διαχείριση παρόχων κοινωνικής επιφάνειας εργασίας
-Comment[en_GB]=Manage Social Desktop Providers
-Comment[eo]=Mastrumi provizantojn de socia labortablo
-Comment[es]=Gestionar proveedores del escritorio social
-Comment[et]=Sotsiaalse töölaua pakkujate haldamine
-Comment[eu]=Mahaigain sozialen hornitzaileak kudeatzea
-Comment[fa]=مدیریت ارائه دهندگان میزکارهای اجتماعی
-Comment[fi]=Sosiaalisen työpöydän tarjoajien asetukset
-Comment[ga]=Bainistigh Soláthraithe na Deisce Shóisialta
-Comment[gl]=Xestión dos provedores de escritorio social
-Comment[gu]=સોશિઅલ ડેસ્કટોપ પૂરા પાડનારાઓનું સંચાલન કરો
-Comment[he]=משמש לניהול ספקי שולחן עבודה חברתי
-Comment[hi]=सामाजिक डेस्कटॉप प्रदाता को प्रबंधित करें
-Comment[hr]=Upravljanje pružateljima društvene radne površine
-Comment[hu]=Közösségiasztal-szolgáltatók kezelése
-Comment[ia]=Gere fornitores de Scriptorio Social
-Comment[id]=Atur Penyedia Desktop Sosial
-Comment[is]=Sýsla með efnisveitur fyrir samskiptaveftengt efni fyrir skjáborð
-Comment[it]=Gestisci i fornitori del desktop sociale
-Comment[ja]=ソーシャルデスクトッププロバイダを管理
-Comment[kk]=Әлеуметтік үстел провайдерлерін басқару
-Comment[km]=គ្រប់គ្រងក្រុមហ៊ុនផ្ដល់ផ្ទៃតុសង្គម
-Comment[kn]=ಸಾಮಾಜಿಕ ಗಣಕತೆರೆ ಪೂರೈಕೆದಾರರನ್ನು ನಿರ್ವಹಿಸು
-Comment[ko]=사회적 데스크톱 공급자 설정
-Comment[lt]=Tvarkyti socialinio darbastalio tiekėjus
-Comment[lv]=Pārvaldīt sociālās darbvirsmas sniedzējus
-Comment[ml]=സാമൂഹിക പണിയിട ദാതാക്കളെ കൈകാര്യം ചെയ്യുക
-Comment[mr]=सामाजिक डेस्कटॉप पुरवठाकर्ते नियंत्रीत करा
-Comment[nb]=Håndter sosialt skrivebord-leverandører
-Comment[nds]=Anbeders för deelt Schriefdischinholt plegen
-Comment[nl]=Leveranciers van sociale bureaubladen beheren
-Comment[pa]=ਸਮਾਜਿਕ ਡੈਸਕਟਾਪ ਪਰੋਵਾਇਡਰ ਪਰਬੰਧ
-Comment[pl]=Zarządzanie dostawcami dla pulpitu
-Comment[pt]=Gerir os Fornecedores do Ambiente de Trabalho Social
-Comment[pt_BR]=Gerencia os fornecedores da Área de Trabalho Social
-Comment[ro]=Gestionează furnizorii de birou social
-Comment[ru]=Настройка Social Desktop
-Comment[si]=සමාජීය වැඩපත් සපයන්නන් කළමනාකරනය කරන්
-Comment[sk]=Správa poskytovateľov sociálneho pracovného prostredia
-Comment[sl]=Upravljanje s ponudniki družabnega namizja
-Comment[sr]=Управљање добављачима друштвене површи
-Comment[sr at ijekavian]=Управљање добављачима друштвене површи
-Comment[sr at ijekavianlatin]=Upravljanje dobavljačima društvene površi
-Comment[sr at latin]=Upravljanje dobavljačima društvene površi
-Comment[sv]=Hantera leverantörer av socialt skrivbord
-Comment[tg]=Идоракунии провайдерҳои мизи кории ҷамъиятӣ
-Comment[th]=จัดการผู้ให้บริการแวดวงสังคมออนไลน์
-Comment[tr]=Sosyal Masaüstü Hizmetlerini Yönet
-Comment[ug]=ئىجتىمائىي ئۈستەلئۈستى تەمىنلىگۈچىنى باشقۇرىدۇ
-Comment[uk]=Керування постачальниками даних соціальної стільниці
-Comment[vi]=Quản lý các nhà cung cấp máy làm việc xã hội
-Comment[wa]=Manaedjî des ahesseus d' sicribanne sociå
-Comment[x-test]=xxManage Social Desktop Providersxx
-Comment[zh_CN]=管理社会化桌面信息提供方
-Comment[zh_TW]=管理 Social 桌面提供者
diff --git a/attica-kde/kcm/providerconfigwidget.cpp b/attica-kde/kcm/providerconfigwidget.cpp
deleted file mode 100644
index 4d4cc08..0000000
--- a/attica-kde/kcm/providerconfigwidget.cpp
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- This file is part of KDE.
-
- Copyright (c) 2009 Eckhart Wörner <ewoerner at kde.org>
- Copyright (c) 2009 Dmitry Suzdalev <dimsuz at gmail.com>
- Copyright (c) 2010 Frederik Gladhorn <gladhorn at kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#include "providerconfigwidget.h"
-
-#include <KDebug>
-#include <KMessageBox>
-#include <KColorScheme>
-#include <KLocalizedString>
-#include <kicon.h>
-#include <QFontDatabase>
-
-#include <attica/person.h>
-
-static const int loginTabIdx = 0;
-static const int registerTabIdx = 1;
-
-ProviderConfigWidget::ProviderConfigWidget(QWidget* parent)
- : QWidget(parent)
-{
- m_ui.setupUi(this);
-}
-
-void ProviderConfigWidget::setProvider(const Attica::Provider& provider)
-{
- m_provider = provider;
-
- // TODO ensure that it reinits all fields nicely for new provider!
- initLoginPage();
- initRegisterPage();
-
- m_ui.userEditLP->setFocus();
-}
-
-void ProviderConfigWidget::initLoginPage()
-{
- QString header;
- if (m_provider.name().isEmpty()) {
- header = i18n("Account details");
- } else {
- header = i18n("Account details for %1", m_provider.name());
- }
- m_ui.titleWidgetLogin->setText(header);
- m_ui.tabWidget->setTabIcon(loginTabIdx, KIcon("applications-internet"));
-
- if (m_provider.hasCredentials()) {
- QString user;
- QString password;
- m_provider.loadCredentials(user, password);
- kDebug() << "cred for: " << user;
- m_ui.userEditLP->setText(user);
- m_ui.passwordEditLP->setText(password);
- } else {
- m_ui.userEditLP->clear();
- m_ui.passwordEditLP->clear();
- }
- m_ui.enableProviderCheckBox->setChecked(m_provider.isEnabled());
- m_ui.testLoginButton->setIcon(KIcon("network-connect"));
- m_ui.iconLabelLP->setPixmap(KIcon("help-about").pixmap(24,24));
-
- connect(m_ui.userEditLP, SIGNAL(textChanged(const QString&)), this, SLOT(onLoginChanged()));
- connect(m_ui.passwordEditLP, SIGNAL(textChanged(const QString&)), this, SLOT(onLoginChanged()));
- connect(m_ui.testLoginButton, SIGNAL(clicked()), this, SLOT(onTestLogin()));
- connect(m_ui.infoLabelLP, SIGNAL(linkActivated(const QString&)), this, SLOT(onInfoLinkActivated()));
- connect(m_ui.enableProviderCheckBox, SIGNAL(clicked(bool)), this, SLOT(enableToggled(bool)));
-}
-
-void ProviderConfigWidget::initRegisterPage()
-{
- QString header;
- if (m_provider.name().isEmpty()) {
- header = i18n("Register new account");
- } else {
- header = i18n("Register new account at %1", m_provider.name());
- }
- m_ui.titleWidgetRegister->setText(header);
- m_ui.tabWidget->setTabIcon(registerTabIdx, KIcon("list-add-user"));
-
- m_ui.infoLabelRP->setFont(QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont));
-
- connect(m_ui.userEditRP, SIGNAL(textChanged(QString)), SLOT(onRegisterDataChanged()));
- connect(m_ui.mailEdit, SIGNAL(textChanged(QString)), SLOT(onRegisterDataChanged()));
- connect(m_ui.firstNameEdit, SIGNAL(textChanged(QString)), SLOT(onRegisterDataChanged()));
- connect(m_ui.lastNameEdit, SIGNAL(textChanged(QString)), SLOT(onRegisterDataChanged()));
- connect(m_ui.passwordEditRP, SIGNAL(textChanged(QString)), SLOT(onRegisterDataChanged()));
- connect(m_ui.passwordRepeatEdit, SIGNAL(textChanged(QString)), SLOT(onRegisterDataChanged()));
-
- connect(m_ui.registerButton, SIGNAL(clicked()), SLOT(onRegisterClicked()));
-
- onRegisterDataChanged();
-}
-
-void ProviderConfigWidget::onLoginChanged()
-{
- m_ui.testLoginButton->setText(i18n("Test login"));
- m_ui.testLoginButton->setEnabled(true);
- emit changed(true);
-}
-
-void ProviderConfigWidget::onTestLogin()
-{
- m_ui.testLoginButton->setEnabled(false);
- m_ui.testLoginButton->setText(i18n("Testing login..."));
-
- Attica::PostJob* postJob = m_provider.checkLogin(m_ui.userEditLP->text(), m_ui.passwordEditLP->text());
- connect(postJob, SIGNAL(finished(Attica::BaseJob*)), SLOT(onTestLoginFinished(Attica::BaseJob*)));
- postJob->start();
-}
-
-void ProviderConfigWidget::onTestLoginFinished(Attica::BaseJob* job)
-{
- Attica::PostJob* postJob = static_cast<Attica::PostJob*>(job);
-
- if (postJob->metadata().error() == Attica::Metadata::NoError) {
- m_ui.testLoginButton->setText(i18n("Success"));
- }
-
- if (postJob->metadata().error() == Attica::Metadata::OcsError) {
- m_ui.testLoginButton->setText(i18n("Login failed"));
- }
-}
-
-void ProviderConfigWidget::enableToggled(bool enabled)
-{
- m_provider.setEnabled(enabled);
-}
-
-void ProviderConfigWidget::onInfoLinkActivated()
-{
- m_ui.tabWidget->setCurrentIndex(registerTabIdx);
- m_ui.userEditRP->setFocus();
-}
-
-void ProviderConfigWidget::onRegisterDataChanged()
-{
- QString login = m_ui.userEditRP->text();
- QString mail = m_ui.mailEdit->text();
- QString firstName = m_ui.firstNameEdit->text();
- QString lastName = m_ui.lastNameEdit->text();
- QString password = m_ui.passwordEditRP->text();
- QString passwordRepeat = m_ui.passwordRepeatEdit->text();
-
- bool isDataValid = (!login.isEmpty() && !mail.isEmpty() && !firstName.isEmpty() &&
- !lastName.isEmpty() && !password.isEmpty());
- bool isPasswordLengthValid = password.size() > 7;
- bool isPasswordEqual = password == passwordRepeat;
-
- if (!isDataValid) {
- showRegisterHint("dialog-cancel", i18n("Not all required fields are filled"));
- } else if (!isPasswordLengthValid) {
- showRegisterHint("dialog-cancel", i18n("Password is too short"));
- } else if (!isPasswordEqual) {
- showRegisterHint("dialog-cancel", i18n("Passwords do not match"));
- } else {
- showRegisterHint("dialog-ok-apply", i18n("All required information is provided"));
- }
-
- m_ui.registerButton->setEnabled(isDataValid && isPasswordLengthValid && isPasswordEqual);
-
- emit changed(true);
-}
-
-void ProviderConfigWidget::showRegisterHint(const QString& iconName, const QString& hint)
-{
- m_ui.iconLabelRP->setPixmap(KIcon(iconName).pixmap(16,16));
- m_ui.infoLabelRP->setText(hint);
-}
-
-void ProviderConfigWidget::showRegisterError(const Attica::Metadata& metadata)
-{
- if (metadata.error() == Attica::Metadata::NetworkError) {
- showRegisterHint("dialog-close", i18n("Failed to register new account."));
- } else {
- /*
-# 100 - successful / valid account
-# 101 - please specify all mandatory fields
-# 102 - please specify a valid password
-# 103 - please specify a valid login
-# 104 - login already exists
-# 105 - email already taken
-*/
- // TODO: Looks like more correct place for this stuff is in libattica,
- // for example metadata().statusString() or smth like that.
- // So here will be only showRegisterHint("dialog-close", statusString);
- // no switch.
- QWidget* widgetToHighlight = 0;
- QString hint;
- switch (metadata.statusCode()) {
- case 102:
- hint = i18n("Failed to register new account: invalid password.");
- widgetToHighlight = m_ui.passwordEditRP;
- break;
- case 103:
- hint = i18n("Failed to register new account: invalid username.");
- widgetToHighlight = m_ui.userEditRP;
- break;
- case 104:
- hint = i18n("Failed to register new account: the requested username is already taken.");
- widgetToHighlight = m_ui.userEditRP;
- break;
- case 105:
- hint = i18n("Failed to register new account: the specified email address is already taken.");
- widgetToHighlight = m_ui.mailEdit;
- break;
- case 106:
- hint = i18n("Failed to register new account: the specified email address is invalid.");
- widgetToHighlight = m_ui.mailEdit;
- default:
- hint = i18n("Failed to register new account.");
- break;
- }
-
- if (!hint.isEmpty())
- showRegisterHint("dialog-close", hint);
-
- if (widgetToHighlight) {
- QPalette pal = widgetToHighlight->palette();
- KColorScheme::adjustBackground(pal, KColorScheme::NegativeBackground, QPalette::Base);
- widgetToHighlight->setPalette(pal);
- widgetToHighlight->setFocus();
- }
- }
-}
-
-void ProviderConfigWidget::clearHighlightedErrors()
-{
- QList<QWidget*> widList = allRegisterWidgets();
- foreach (QWidget* wid, widList) {
- QPalette pal = wid->palette();
- KColorScheme::adjustBackground(pal, KColorScheme::NormalBackground, QPalette::Base);
- wid->setPalette(pal);
- }
-}
-
-void ProviderConfigWidget::onRegisterClicked()
-{
- // here we assume that all data has been checked in onRegisterDataChanged()
-
- clearHighlightedErrors();
-
- QString login = m_ui.userEditRP->text();
- QString mail = m_ui.mailEdit->text();
- QString firstName = m_ui.firstNameEdit->text();
- QString lastName = m_ui.lastNameEdit->text();
- QString password = m_ui.passwordEditRP->text();
- //QString passwordRepeat = m_ui.passwordRepeatEdit->text();
-
- Attica::PostJob* postJob = m_provider.registerAccount(login, password, mail, firstName, lastName);
- connect(postJob, SIGNAL(finished(Attica::BaseJob*)), SLOT(onRegisterAccountFinished(Attica::BaseJob*)));
- postJob->start();
- showRegisterHint("help-about", i18n("Registration is in progress..."));
- m_ui.registerButton->setEnabled(false); // should be disabled while registering
-}
-
-void ProviderConfigWidget::onRegisterAccountFinished(Attica::BaseJob* job)
-{
- Attica::PostJob* postJob = static_cast<Attica::PostJob*>(job);
-
- // this will enable "register" button if possible
- onRegisterDataChanged();
-
- if (postJob->metadata().error() == Attica::Metadata::NoError)
- {
- KMessageBox::information(this, i18n("Registration complete. New account was successfully registered. Please <b>check your Email</b> to <b>activate</b> the account."));
-
- QString user = m_ui.userEditRP->text();
- QString password = m_ui.passwordEditRP->text();
- m_ui.userEditLP->setText(user);
- m_ui.passwordEditLP->setText(password);
-
- // clear register fields and switch to login page
- foreach (QWidget* wid, allRegisterWidgets())
- {
- QLineEdit* le = qobject_cast<QLineEdit*>(wid);
- if (le)
- le->clear();
- }
- m_ui.tabWidget->setCurrentIndex(loginTabIdx);
- m_ui.userEditLP->setFocus();
- }
- else
- {
- kDebug() << "register error:" << postJob->metadata().error() << "statusCode:" << postJob->metadata().statusCode();
- showRegisterError( postJob->metadata() );
- }
-}
-
-void ProviderConfigWidget::saveData()
-{
- m_provider.saveCredentials(m_ui.userEditLP->text(), m_ui.passwordEditLP->text());
-}
-
-QList<QWidget*> ProviderConfigWidget::allRegisterWidgets() const
-{
- QList<QWidget*> widList;
- widList << m_ui.userEditRP << m_ui.mailEdit << m_ui.firstNameEdit
- << m_ui.lastNameEdit << m_ui.passwordEditRP << m_ui.passwordRepeatEdit;
-
- return widList;
-}
-
-#include "providerconfigwidget.moc"
diff --git a/attica-kde/kcm/providerconfigwidget.h b/attica-kde/kcm/providerconfigwidget.h
deleted file mode 100644
index 2524e3c..0000000
--- a/attica-kde/kcm/providerconfigwidget.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- This file is part of KDE.
-
- Copyright (c) 2009 Eckhart Wörner <ewoerner at kde.org>
- Copyright (c) 2009 Dmitry Suzdalev <dimsuz at gmail.com>
- Copyright (c) 2010 Frederik Gladhorn <gladhorn at kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
-*/
-
-#ifndef PROVIDERCONFIGWIDGET_H
-#define PROVIDERCONFIGWIDGET_H
-
-#include <QWidget>
-
-#include <attica/provider.h>
-
-#include "ui_providerconfigwidget.h"
-
-namespace Attica
-{
- class Metadata;
-}
-
-class ProviderConfigWidget : public QWidget
-{
- Q_OBJECT
-
-public:
- explicit ProviderConfigWidget(QWidget* parent = 0);
- void setProvider(const Attica::Provider& provider);
- void saveData();
-
-Q_SIGNALS:
- void changed(bool hasChanged);
-
-private Q_SLOTS:
- // login page
- void onLoginChanged();
- void onTestLogin();
- void onTestLoginFinished(Attica::BaseJob* job);
- void enableToggled(bool enabled);
-
- // register page
- void onInfoLinkActivated();
- void onRegisterDataChanged();
- void onRegisterClicked();
- void onRegisterAccountFinished(Attica::BaseJob* job);
-
-
-private:
- void initLoginPage();
- void initRegisterPage();
- void showRegisterHint(const QString&, const QString&);
- void showRegisterError(const Attica::Metadata&);
- void clearHighlightedErrors();
-
- QList<QWidget*> allRegisterWidgets() const;
-
-private:
- Attica::Provider m_provider;
- Ui::ProviderConfigWidget m_ui;
-};
-
-#endif
diff --git a/attica-kde/kcm/providerconfigwidget.ui b/attica-kde/kcm/providerconfigwidget.ui
deleted file mode 100644
index 902c5b7..0000000
--- a/attica-kde/kcm/providerconfigwidget.ui
+++ /dev/null
@@ -1,572 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ProviderConfigWidget</class>
- <widget class="QWidget" name="ProviderConfigWidget">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>467</width>
- <height>453</height>
- </rect>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QTabWidget" name="tabWidget">
- <property name="currentIndex">
- <number>0</number>
- </property>
- <widget class="QWidget" name="loginTab">
- <attribute name="title">
- <string>Login</string>
- </attribute>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
- <layout class="QGridLayout" name="gridLayout">
- <property name="leftMargin">
- <number>10</number>
- </property>
- <item row="3" column="1">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>&Username:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy">
- <cstring>userEditLP</cstring>
- </property>
- </widget>
- </item>
- <item row="3" column="2">
- <widget class="KLineEdit" name="userEditLP"/>
- </item>
- <item row="4" column="1">
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>&Password:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy">
- <cstring>passwordEditLP</cstring>
- </property>
- </widget>
- </item>
- <item row="4" column="2">
- <widget class="KLineEdit" name="passwordEditLP">
- <property name="echoMode">
- <enum>QLineEdit::Password</enum>
- </property>
- </widget>
- </item>
- <item row="5" column="2">
- <widget class="QPushButton" name="testLoginButton">
- <property name="text">
- <string>&Test Login</string>
- </property>
- </widget>
- </item>
- <item row="3" column="3" rowspan="3">
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="3" column="0" rowspan="3">
- <spacer name="horizontalSpacer_2">
- <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 row="0" column="0" colspan="4">
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>10</width>
- <height>10</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0" colspan="4">
- <widget class="QLabel" name="titleWidgetLogin">
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="4">
- <spacer name="verticalSpacer_3">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>10</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="6" column="2">
- <widget class="QCheckBox" name="enableProviderCheckBox">
- <property name="toolTip">
- <string>If a provider is not enabled, it will be ignored by the applications using the social desktop</string>
- </property>
- <property name="text">
- <string>Enabled</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="2" column="0" colspan="2">
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>443</width>
- <height>174</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="4" column="0" colspan="2">
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="iconLabelLP">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>16</width>
- <height>16</height>
- </size>
- </property>
- <property name="alignment">
- <set>Qt::AlignHCenter|Qt::AlignTop</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="infoLabelLP">
- <property name="text">
- <string>Do not have an account? Create one on the <a href="register">Register tab</a></string>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="5" column="0">
- <widget class="QLabel" name="infoLabelLP_2">
- <property name="text">
- <string>The Social Desktop Providers are used for "Get Hot New Stuff" and the "Community" and "Social News" Plasma applets.</string>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="registerTab">
- <attribute name="title">
- <string>Register</string>
- </attribute>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <layout class="QGridLayout" name="gridLayout_3">
- <property name="leftMargin">
- <number>10</number>
- </property>
- <item row="3" column="1" colspan="2">
- <widget class="QLabel" name="label_5">
- <property name="text">
- <string>Fill in the details below and click <b>Register...</b> button</string>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <spacer name="verticalSpacer_4">
- <property name="orientation">
- <enum>Qt::Vertical</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 row="6" column="0" colspan="2">
- <spacer name="verticalSpacer_6">
- <property name="orientation">
- <enum>Qt::Vertical</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 row="7" column="1">
- <spacer name="verticalSpacer_7">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>29</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="5" column="1">
- <layout class="QGridLayout" name="gridLayout_4">
- <item row="0" column="0">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>&User name:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy">
- <cstring>userEditRP</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="KLineEdit" name="userEditRP"/>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>&Email:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy">
- <cstring>mailEdit</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="KLineEdit" name="mailEdit"/>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="label_6">
- <property name="text">
- <string>&Password:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy">
- <cstring>passwordEditRP</cstring>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="KLineEdit" name="passwordEditRP">
- <property name="passwordMode">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="5" column="0">
- <widget class="QLabel" name="label_7">
- <property name="text">
- <string>Repeat password:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy">
- <cstring>passwordRepeatEdit</cstring>
- </property>
- </widget>
- </item>
- <item row="5" column="1">
- <widget class="KLineEdit" name="passwordRepeatEdit">
- <property name="passwordMode">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_8">
- <property name="text">
- <string>&First name:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy">
- <cstring>firstNameEdit</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QLineEdit" name="firstNameEdit"/>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="label_9">
- <property name="text">
- <string>&Last name:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy">
- <cstring>lastNameEdit</cstring>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QLineEdit" name="lastNameEdit"/>
- </item>
- <item row="7" column="1" colspan="2">
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <widget class="QLabel" name="iconLabelRP">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>16</width>
- <height>16</height>
- </size>
- </property>
- <property name="alignment">
- <set>Qt::AlignHCenter|Qt::AlignTop</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="infoLabelRP">
- <property name="text">
- <string/>
- </property>
- <property name="textFormat">
- <enum>Qt::RichText</enum>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="8" column="1" colspan="2">
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QPushButton" name="registerButton">
- <property name="text">
- <string>&Register...</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item row="6" column="0" colspan="2">
- <spacer name="verticalSpacer_5">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>15</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="2" rowspan="6">
- <spacer name="horizontalSpacer_4">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item row="1" column="0" colspan="2">
- <widget class="QLabel" name="titleWidgetRegister">
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="2">
- <spacer name="verticalSpacer_8">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>10</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="0" colspan="2">
- <spacer name="verticalSpacer_9">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>10</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="3" column="0" rowspan="3">
- <spacer name="horizontalSpacer_5">
- <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>
- </layout>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- </layout>
- </widget>
- <customwidgets>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- </customwidgets>
- <tabstops>
- <tabstop>tabWidget</tabstop>
- <tabstop>userEditLP</tabstop>
- <tabstop>passwordEditLP</tabstop>
- <tabstop>testLoginButton</tabstop>
- <tabstop>userEditRP</tabstop>
- <tabstop>mailEdit</tabstop>
- <tabstop>firstNameEdit</tabstop>
- <tabstop>lastNameEdit</tabstop>
- <tabstop>passwordEditRP</tabstop>
- <tabstop>passwordRepeatEdit</tabstop>
- <tabstop>registerButton</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/attica-kde/kcm/providermanagement.ui b/attica-kde/kcm/providermanagement.ui
deleted file mode 100644
index cf16921..0000000
--- a/attica-kde/kcm/providermanagement.ui
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ProviderManagement</class>
- <widget class="QWidget" name="ProviderManagement">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>585</width>
- <height>492</height>
- </rect>
- </property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="1" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="lblProviderList">
- <property name="text">
- <string>Choose a provider to manage:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="providerComboBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="sizeAdjustPolicy">
- <enum>QComboBox::AdjustToContents</enum>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="addProviderButton">
- <property name="text">
- <string>Add Provider</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="removeProviderButton">
- <property name="text">
- <string>Remove Provider</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="0" column="0">
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>15</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="2" column="0">
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>15</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="3" column="0">
- <widget class="ProviderConfigWidget" name="providerConfigWidget" native="true">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>1</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <customwidgets>
- <customwidget>
- <class>ProviderConfigWidget</class>
- <extends>QWidget</extends>
- <header>providerconfigwidget.h</header>
- <container>1</container>
- </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/attica-kde/kdeplugin/kdeplatformdependent.cpp b/attica-kde/kdeplugin/kdeplatformdependent.cpp
index f469936..489c03b 100644
--- a/attica-kde/kdeplugin/kdeplatformdependent.cpp
+++ b/attica-kde/kdeplugin/kdeplatformdependent.cpp
@@ -204,12 +204,6 @@ bool Attica::KdePlatformDependent::askForCredentials(const QUrl& baseUrl, QStrin
Q_UNUSED(baseUrl);
Q_UNUSED(user);
Q_UNUSED(password);
- kDebug() << "Attempting to start KCM for credentials";
- KCMultiDialog KCM;
- KCM.setWindowTitle( i18n( "Open Collaboration Providers" ) );
- KCM.addModule( "kcm_attica" );
-
- KCM.exec();
return false;
}
diff --git a/doc/kcontrol/CMakeLists.txt b/doc/kcontrol/CMakeLists.txt
index 7d800d1..b7e136c 100644
--- a/doc/kcontrol/CMakeLists.txt
+++ b/doc/kcontrol/CMakeLists.txt
@@ -16,7 +16,6 @@ add_subdirectory(khtml-plugins)
add_subdirectory(khtml-java-js)
add_subdirectory(khtml-behavior)
add_subdirectory(khtml-adblock)
-add_subdirectory(attica)
add_subdirectory(emoticons)
if ( Q_WS_X11 )
diff --git a/doc/kcontrol/attica/CMakeLists.txt b/doc/kcontrol/attica/CMakeLists.txt
deleted file mode 100644
index 369797c..0000000
--- a/doc/kcontrol/attica/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/attica)
diff --git a/doc/kcontrol/attica/index.docbook b/doc/kcontrol/attica/index.docbook
deleted file mode 100644
index 4cb02f6..0000000
--- a/doc/kcontrol/attica/index.docbook
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
-"dtd/kdedbx45.dtd" [
-<!ENTITY % addindex "IGNORE">
-<!ENTITY % English "INCLUDE" > <!-- change language only here -->
-]>
-
-<article id="attica" lang="&language;">
-<articleinfo>
-
-<title>Social Desktop</title>
-<authorgroup>
-<author><personname><firstname>Frederik</firstname><surname>Gladhorn</surname></personname>
-<email>gladhorn at kde.org</email>
-</author>
-
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-</authorgroup>
-
-<date>2013-11-05</date>
-<releaseinfo>&kde; 4.12</releaseinfo>
-
-<keywordset>
-<keyword>KDE</keyword>
-<keyword>Systemsettings</keyword>
-<keyword>Social Desktop</keyword>
-</keywordset>
-</articleinfo>
-
-<para>The Social Desktop (Open Collaboration Services) settings module lets you
-configure your user accounts for Open Collaboration Service Providers.</para>
-
-<para>At the time of writing <ulink url="http://opendesktop.org/">openDesktop.org
-</ulink> is the first provider that you can use.
-You can use the web site or this settings dialog to register and manage your account.
-</para>
-
-<para>The benefit is that you can do more things in <quote>Get Hot New Stuff</quote>:
-vote for items, become a fan of them and upload new content. A configured
-account also allows you to use the social Plasma widgets (<quote>Community</quote>,
-<quote>Social News</quote> &etc;) to their full extent.
-</para>
-
-<para>Using the &systemsettings; module:</para>
-
-<para>You can select which provider to configure at the top.
-Either enter your existing user name and password to let &kde; use them.
-You can verify that these work by using the <guibutton>Test Login</guibutton> button</para>
-
-<!--
-missing:
-Enable
-Add/Remove Providers-->
-
-<para>If you do not have an account yet, use the <guilabel>Register</guilabel> tab.
-Here you need to fill out all fields.
-After clicking <guibutton>Register...</guibutton> you will receive an email from the
-server to activate your account.
-</para>
-
-</article>
More information about the kde-doc-english
mailing list