diff --git a/plugins/gabble/main-options-widget-kde-talk.cpp b/plugins/gabble/main-options-widget-kde-talk.cpp index 8d9950e..f70846c 100644 --- a/plugins/gabble/main-options-widget-kde-talk.cpp +++ b/plugins/gabble/main-options-widget-kde-talk.cpp @@ -1,95 +1,95 @@ /* * This file is part of telepathy-accounts-kcm * * Copyright (C) 2011 David Edmundson * Copyright (C) 2012 Daniele E. Domenichelli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "main-options-widget-kde-talk.h" #include "ui_main-options-widget-kde-talk.h" #include const QString serverAddress = QLatin1String("kdetalk.net"); MainOptionsWidgetKDETalk::MainOptionsWidgetKDETalk(ParameterEditModel *model, QWidget *parent) : AbstractAccountParametersWidget(model, parent) { // Set up the UI. m_ui = new Ui::MainOptionsWidgetKDETalk; m_ui->setupUi(this); Tp::ProtocolParameter parameter = parameterModel()->parameter(QLatin1String("account")); const QModelIndex index = parameterModel()->indexForParameter(parameter); QString account; if (index.isValid()) { account = index.data().toString(); //strip off any "@kdetalk.net" from the parameter when displaying it in the text edit. account = account.left(account.indexOf(QLatin1Char('@'))); m_ui->accountLineEdit->setText(account); } // test if account name is set -> don't show registerCheckBox in edit mode if (!account.isEmpty()) { - m_ui->registerCheckBox->setVisible(false); + m_ui->registerCheckBox->setVisible(false); } handleParameter(QLatin1String("password"), QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel); handleParameter(QLatin1String("register"), QVariant::Bool, m_ui->registerCheckBox); QTimer::singleShot(0, m_ui->accountLineEdit, SLOT(setFocus())); } MainOptionsWidgetKDETalk::~MainOptionsWidgetKDETalk() { delete m_ui; } void MainOptionsWidgetKDETalk::submit() { Tp::ProtocolParameter parameter = parameterModel()->parameter(QLatin1String("account")); QModelIndex index = parameterModel()->indexForParameter(parameter); if (index.isValid()) { QString account = m_ui->accountLineEdit->text(); //append "@kdetalk.net" account.append(QLatin1Char('@')); account.append(serverAddress); //update the model with the account value from the text box. parameterModel()->setData(index, account, Qt::EditRole); } AbstractAccountParametersWidget::submit(); } bool MainOptionsWidgetKDETalk::validateParameterValues() { if (m_ui->accountLineEdit->text().isEmpty() || m_ui->passwordLineEdit->text().isEmpty()) { return false; } return true; } QString MainOptionsWidgetKDETalk::defaultDisplayName() const { return m_ui->accountLineEdit->text(); } #include "main-options-widget-kde-talk.moc" diff --git a/plugins/gabble/main-options-widget.cpp b/plugins/gabble/main-options-widget.cpp index 77ebc13..40c3a9e 100644 --- a/plugins/gabble/main-options-widget.cpp +++ b/plugins/gabble/main-options-widget.cpp @@ -1,61 +1,61 @@ /* * This file is part of telepathy-accounts-kcm * * Copyright (C) 2009 Collabora Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "main-options-widget.h" #include MainOptionsWidget::MainOptionsWidget(ParameterEditModel *model, QWidget *parent) : AbstractAccountParametersWidget(model, parent) { // Set up the UI. m_ui = new Ui::MainOptionsWidget; m_ui->setupUi(this); Tp::ProtocolParameter parameter = parameterModel()->parameter(QLatin1String("account")); const QModelIndex index = parameterModel()->indexForParameter(parameter); QString account; if (index.isValid()) { account = index.data().toString(); } // test if account name is set -> don't show registerCheckBox in edit mode if (!account.isEmpty()) { - m_ui->registerCheckBox->setVisible(false); + m_ui->registerCheckBox->setVisible(false); } handleParameter(QLatin1String("account"), QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel); handleParameter(QLatin1String("password"), QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel); handleParameter(QLatin1String("register"), QVariant::Bool, m_ui->registerCheckBox); QTimer::singleShot(0, m_ui->accountLineEdit, SLOT(setFocus())); } MainOptionsWidget::~MainOptionsWidget() { delete m_ui; } QString MainOptionsWidget::defaultDisplayName() const { return m_ui->accountLineEdit->text(); } #include "main-options-widget.moc"