From 7ef995c918e4c43a87296a299bc262d24d617d07 Mon Sep 17 00:00:00 2001 From: Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> Date: Tue, 30 Mar 2010 11:35:35 -0400 Subject: [PATCH] Code cleanup --- sflphone-client-kde/src/CMakeLists.txt | 4 - sflphone-client-kde/src/CodecListModel.cpp | 204 ------------------ sflphone-client-kde/src/CodecListModel.h | 57 ----- .../src/conf/ConfigurationDialog.cpp | 15 +- .../src/conf/ConfigurationDialog.h | 1 - .../src/conf/ConfigurationSkeleton.cpp | 0 .../src/conf/ConfigurationSkeleton.h | 0 sflphone-client-kde/src/conf/dlgaccounts.cpp | 22 +- sflphone-client-kde/src/conf/dlgaccounts.h | 0 .../src/conf/dlgaddressbook.cpp | 0 sflphone-client-kde/src/conf/dlgaddressbook.h | 0 sflphone-client-kde/src/conf/dlgaudio.cpp | 0 sflphone-client-kde/src/conf/dlgaudio.h | 0 sflphone-client-kde/src/conf/dlgdisplay.cpp | 0 sflphone-client-kde/src/conf/dlgdisplay.h | 0 sflphone-client-kde/src/conf/dlggeneral.cpp | 0 sflphone-client-kde/src/conf/dlggeneral.h | 0 sflphone-client-kde/src/conf/dlghooks.cpp | 0 sflphone-client-kde/src/conf/dlghooks.h | 0 sflphone-client-kde/src/conf/dlgrecord.cpp | 40 ---- sflphone-client-kde/src/conf/dlgrecord.h | 41 ---- sflphone-client-kde/src/conf/dlgrecordbase.ui | 76 ------- 22 files changed, 17 insertions(+), 443 deletions(-) mode change 100644 => 100755 sflphone-client-kde/src/CMakeLists.txt delete mode 100644 sflphone-client-kde/src/CodecListModel.cpp delete mode 100644 sflphone-client-kde/src/CodecListModel.h mode change 100644 => 100755 sflphone-client-kde/src/conf/ConfigurationDialog.cpp mode change 100644 => 100755 sflphone-client-kde/src/conf/ConfigurationDialog.h mode change 100644 => 100755 sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp mode change 100644 => 100755 sflphone-client-kde/src/conf/ConfigurationSkeleton.h mode change 100644 => 100755 sflphone-client-kde/src/conf/dlgaccounts.cpp mode change 100644 => 100755 sflphone-client-kde/src/conf/dlgaccounts.h mode change 100644 => 100755 sflphone-client-kde/src/conf/dlgaddressbook.cpp mode change 100644 => 100755 sflphone-client-kde/src/conf/dlgaddressbook.h mode change 100644 => 100755 sflphone-client-kde/src/conf/dlgaudio.cpp mode change 100644 => 100755 sflphone-client-kde/src/conf/dlgaudio.h mode change 100644 => 100755 sflphone-client-kde/src/conf/dlgdisplay.cpp mode change 100644 => 100755 sflphone-client-kde/src/conf/dlgdisplay.h mode change 100644 => 100755 sflphone-client-kde/src/conf/dlggeneral.cpp mode change 100644 => 100755 sflphone-client-kde/src/conf/dlggeneral.h mode change 100644 => 100755 sflphone-client-kde/src/conf/dlghooks.cpp mode change 100644 => 100755 sflphone-client-kde/src/conf/dlghooks.h delete mode 100644 sflphone-client-kde/src/conf/dlgrecord.cpp delete mode 100644 sflphone-client-kde/src/conf/dlgrecord.h delete mode 100644 sflphone-client-kde/src/conf/dlgrecordbase.ui diff --git a/sflphone-client-kde/src/CMakeLists.txt b/sflphone-client-kde/src/CMakeLists.txt old mode 100644 new mode 100755 index 52c679452b..a3faeb6fb3 --- a/sflphone-client-kde/src/CMakeLists.txt +++ b/sflphone-client-kde/src/CMakeLists.txt @@ -43,14 +43,11 @@ SET( sflphone_client_kde_SRCS conf/dlgdisplay.cpp conf/dlgaccounts.cpp conf/dlgaudio.cpp - #conf/dlgrecord.cpp conf/dlgaddressbook.cpp conf/dlghooks.cpp conf/ConfigurationSkeleton.cpp Dialpad.cpp Codec.cpp - #CodecListModel.cpp - #SortableCodecListWidget.cpp Item.cpp AccountListModel.cpp ) @@ -113,7 +110,6 @@ SET( config_ui_files conf/dlgdisplaybase.ui conf/dlgaccountsbase.ui conf/dlgaudiobase.ui - conf/dlgrecordbase.ui conf/dlgaddressbookbase.ui conf/dlghooksbase.ui ) diff --git a/sflphone-client-kde/src/CodecListModel.cpp b/sflphone-client-kde/src/CodecListModel.cpp deleted file mode 100644 index 440592e5b0..0000000000 --- a/sflphone-client-kde/src/CodecListModel.cpp +++ /dev/null @@ -1,204 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2009 by Savoir-Faire Linux * - * Author : Jérémy Quentin * - * jeremy.quentin@savoirfairelinux.com * - * * - * 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 3 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., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ -#include "CodecListModel.h" - -#include <QtCore/QSize> -#include <QtCore/QDebug> -#include <KLocale> -#include "configurationmanager_interface_singleton.h" - -CodecListModel::CodecListModel(QObject *parent) - : QAbstractTableModel(parent) -{ - this->codecs = QList<Codec *>(); - ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance(); - QStringList activeCodecList = configurationManager.getActiveCodecList(); - setActiveCodecList(activeCodecList); -} - - -CodecListModel::~CodecListModel() -{ -} - - -QVariant CodecListModel::data ( const QModelIndex & index, int role) const -{ - if (!index.isValid()) - return QVariant(); - - const Codec * codec = codecs[index.row()]; - if(index.column() == 1 && role == Qt::DisplayRole) - { - return QVariant(codec->getName()); - } - else if(index.column() == 0 && role == Qt::CheckStateRole) - { - return QVariant(codec->isEnabled() ? Qt::Checked : Qt::Unchecked); - } - else if(index.column() == 2 && role == Qt::DisplayRole) - { - return QVariant(codec->getFrequency()); - } - else if(index.column() == 3 && role == Qt::DisplayRole) - { - return QVariant(codec->getBitrate()); - } - else if(index.column() == 4 && role == Qt::DisplayRole) - { - return QVariant(codec->getBandwidth()); - } - - return QVariant(); -} - - -int CodecListModel::rowCount(const QModelIndex & /*parent*/) const -{ - return codecs.count(); -} - -int CodecListModel::columnCount(const QModelIndex & /*parent*/) const -{ - return 5; -} - - -QVariant CodecListModel::headerData(int section , Qt::Orientation orientation, int role) const -{ - if (section == 0 && orientation == Qt::Horizontal && role == Qt::DisplayRole) - { - return QVariant(i18n("")); - } - else if (section == 1 && orientation == Qt::Horizontal && role == Qt::DisplayRole) - { - return QVariant(i18n("Codec")); - } - else if (section == 2 && orientation == Qt::Horizontal && role == Qt::DisplayRole) - { - return QVariant(i18n("Frequency")); - } - else if (section == 3 && orientation == Qt::Horizontal && role == Qt::DisplayRole) - { - return QVariant(i18n("Bitrate")); - } - else if (section == 4 && orientation == Qt::Horizontal && role == Qt::DisplayRole) - { - return QVariant(i18n("Bandwidth")); - } - return QVariant(); -} - -Qt::ItemFlags CodecListModel::flags(const QModelIndex & index) const -{ - if (index.column() == 0) - { - return QAbstractItemModel::flags(index) | Qt::ItemIsUserCheckable; - } - return QAbstractItemModel::flags(index); -} - -bool CodecListModel::setData ( const QModelIndex & index, const QVariant &value, int role) -{ - qDebug() << "setData"; - if (index.isValid() && index.column() == 0 && role == Qt::CheckStateRole) { - codecs[index.row()]->setEnabled(value.toBool()); - emit dataChanged(index, index); - return true; - } - return false; -} - -bool CodecListModel::codecUp( int index ) -{ - if(index > 0 && index <= rowCount()) - { - codecs.swap(index - 1, index); - emit dataChanged(this->index(index - 1, 0, QModelIndex()), this->index(index, columnCount(), QModelIndex())); - return true; - } - return false; -} - -bool CodecListModel::codecDown( int index ) -{ - if(index >= 0 && index < rowCount()) - { - codecs.swap(index + 1, index); - emit dataChanged(this->index(index, 0, QModelIndex()), this->index(index + 1, columnCount(), QModelIndex())); - return true; - } - return false; -} - -QStringList CodecListModel::getActiveCodecList() const -{ - QStringList codecList; - for(int i = 0 ; i < rowCount() ; i++) - { - if(codecs[i]->isEnabled()) - codecList.append(codecs[i]->getPayload()); - } - return codecList; -} - -void CodecListModel::setActiveCodecList(const QStringList & activeCodecListToSet) -{ - this->codecs = QList<Codec *>(); - ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance(); - QStringList codecList = configurationManager.getCodecList(); - QStringList activeCodecList = activeCodecListToSet; - #if QT_VERSION >= 0x040500 - activeCodecList.removeDuplicates(); - #else - for (int i = 0 ; i < activeCodecList.size() ; i++) - { - if(activeCodecList.lastIndexOf(activeCodecList[i]) != i || ! codecList.contains(activeCodecList[i])) - { - activeCodecList.removeAt(i); - i--; - } - } - #endif - - QStringList codecListToDisplay = activeCodecList; - for (int i=0 ; i<codecList.size() ; i++) - { - if(! activeCodecList.contains(codecList[i])) - { - codecListToDisplay << codecList[i]; - } - } - for(int i=0 ; i<codecListToDisplay.size() ; i++) - { - bool ok; - QString payloadStr = QString(codecListToDisplay[i]); - int payload = payloadStr.toInt(&ok); - if(!ok) - qDebug() << "The codec's payload sent by the configurationManager is not a number : " << codecListToDisplay[i]; - else - { - codecs << new Codec(payload, activeCodecList.contains(codecListToDisplay[i])); - } - } - - emit dataChanged(this->index(0, 0, QModelIndex()), this->index(rowCount(), columnCount(), QModelIndex())); -} diff --git a/sflphone-client-kde/src/CodecListModel.h b/sflphone-client-kde/src/CodecListModel.h deleted file mode 100644 index bf2082c443..0000000000 --- a/sflphone-client-kde/src/CodecListModel.h +++ /dev/null @@ -1,57 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2009 by Savoir-Faire Linux * - * Author : Jérémy Quentin * - * jeremy.quentin@savoirfairelinux.com * - * * - * 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 3 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., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ -#ifndef CODECLISTMODEL_H -#define CODECLISTMODEL_H - -#include <QAbstractItemModel> -#include "Codec.h" - -/** - @author Jérémy Quentin <jeremy.quentin@gmail.com> -*/ -class CodecListModel : public QAbstractTableModel -{ -Q_OBJECT -private: - QList<Codec *> codecs; - -public: - CodecListModel(QObject *parent = 0); - - ~CodecListModel(); - - QVariant data ( const QModelIndex & index, int role = Qt::DisplayRole ) const; - int rowCount(const QModelIndex & parent = QModelIndex()) const; - int columnCount(const QModelIndex & parent = QModelIndex()) const; - QVariant headerData(int section , Qt::Orientation orientation, int role) const; - Qt::ItemFlags flags(const QModelIndex & index) const; - virtual bool setData ( const QModelIndex & index, const QVariant &value, int role); - - bool codecUp( int index ); - bool codecDown( int index ); - QStringList getActiveCodecList() const ; - void setActiveCodecList(const QStringList & activeCodecListToSet); - -signals: -// void dataChanged(const QModelIndex &, const QModelIndex &); -}; - -#endif diff --git a/sflphone-client-kde/src/conf/ConfigurationDialog.cpp b/sflphone-client-kde/src/conf/ConfigurationDialog.cpp old mode 100644 new mode 100755 index 08873dc4aa..c9a832b020 --- a/sflphone-client-kde/src/conf/ConfigurationDialog.cpp +++ b/sflphone-client-kde/src/conf/ConfigurationDialog.cpp @@ -27,7 +27,6 @@ #include "dlgaccounts.h" #include "dlgaudio.h" #include "dlgaddressbook.h" -#include "dlgrecord.h" #include "dlghooks.h" #include "sflphone_const.h" @@ -42,15 +41,13 @@ ConfigurationDialog::ConfigurationDialog(SFLPhoneView *parent) dlgAccounts = new DlgAccounts(this); dlgAudio = new DlgAudio(this); dlgAddressBook = new DlgAddressBook(this); - //dlgRecord = new DlgRecord(this); dlgHooks = new DlgHooks(this); addPage( dlgGeneral , i18n("General") , "sflphone-client-kde" ); addPage( dlgDisplay , i18n("Display") , "applications-graphics" ); addPage( dlgAccounts , i18n("Accounts") , "personal" ); addPage( dlgAudio , i18n("Audio") , "voicecall" ); - addPage( dlgAddressBook , i18n("Address Book") , "x-office-address-book" ); - //addPage( dlgRecord , i18n("Recordings") , "media-record" ); + addPage( dlgAddressBook , i18n("Address Book") , "x-office-address-book" ); addPage( dlgHooks , i18n("Hooks") , "insert-link" ); connect(this, SIGNAL(applyClicked()), this, SLOT(applyCustomSettings())); @@ -89,18 +86,16 @@ void ConfigurationDialog::updateButtons() { bool changed = hasChanged(); qDebug() << "updateButtons , hasChanged = " << changed; -// if(hasChanged()) -// enableButtonApply( true ); enableButtonApply( changed ); } void ConfigurationDialog::applyCustomSettings() { qDebug() << "\napplyCustomSettings"; -// if(hasChanged()) -// { - ConfigurationSkeleton::self()->writeConfig(); -// } + if(hasChanged()) + { + ConfigurationSkeleton::self()->writeConfig(); + } updateSettings(); updateWidgets(); updateButtons(); diff --git a/sflphone-client-kde/src/conf/ConfigurationDialog.h b/sflphone-client-kde/src/conf/ConfigurationDialog.h old mode 100644 new mode 100755 index 80fdd4f770..33c6dac81a --- a/sflphone-client-kde/src/conf/ConfigurationDialog.h +++ b/sflphone-client-kde/src/conf/ConfigurationDialog.h @@ -62,7 +62,6 @@ private: DlgAccounts * dlgAccounts; DlgAudio * dlgAudio; DlgAddressBook * dlgAddressBook; - //DlgRecord * dlgRecord; DlgHooks * dlgHooks; public: diff --git a/sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp b/sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp old mode 100644 new mode 100755 diff --git a/sflphone-client-kde/src/conf/ConfigurationSkeleton.h b/sflphone-client-kde/src/conf/ConfigurationSkeleton.h old mode 100644 new mode 100755 diff --git a/sflphone-client-kde/src/conf/dlgaccounts.cpp b/sflphone-client-kde/src/conf/dlgaccounts.cpp old mode 100644 new mode 100755 index 9f270d89ff..134a26a4c3 --- a/sflphone-client-kde/src/conf/dlgaccounts.cpp +++ b/sflphone-client-kde/src/conf/dlgaccounts.cpp @@ -233,20 +233,18 @@ void DlgAccounts::saveAccount(QListWidgetItem * item) account->setAccountDetail(TLS_ENABLE,group_security_tls->isChecked()?"true":"false"); account->setAccountDetail(TLS_METHOD, QString::number(combo_security_STRP->currentIndex())); - QStringList test; - //QString test2; + QStringList _codecList; foreach (QString aCodec, keditlistbox_codec->items()) { foreach (StringHash _aCodec, codecList) { if (_aCodec["alias"] == aCodec) { - test << _aCodec["id"]; - //test2 += _aCodec["id"] + "/"; + _codecList << _aCodec["id"]; } } } ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance(); - configurationManager.setActiveCodecList(test, account->getAccountDetail(ACCOUNT_ID)); - qDebug() << "Account codec have been saved" << test << account->getAccountDetail(ACCOUNT_ID); + configurationManager.setActiveCodecList(_codecList, account->getAccountDetail(ACCOUNT_ID)); + qDebug() << "Account codec have been saved" << _codecList << account->getAccountDetail(ACCOUNT_ID); } void DlgAccounts::loadAccount(QListWidgetItem * item) @@ -543,7 +541,8 @@ void DlgAccounts::updateWidgets() accountListHasChanged = false; } -void DlgAccounts::loadCodecList() { +void DlgAccounts::loadCodecList() +{ ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance(); QStringList codecIdList = configurationManager.getCodecList(); QStringList tmpNameList; @@ -574,7 +573,8 @@ void DlgAccounts::loadCodecList() { } -void DlgAccounts::codecClicked(const QModelIndex & model) { +void DlgAccounts::codecClicked(const QModelIndex & model) +{ foreach (StringHash aCodec, codecList) { if (aCodec["alias"] == keditlistbox_codec->currentText()) { label_bandwidth_value->setText(aCodec["bandwidth"]); @@ -588,7 +588,8 @@ void DlgAccounts::codecClicked(const QModelIndex & model) { keditlistbox_codec->addButton()->setEnabled(true); } -void DlgAccounts::addCodec(QString name) { +void DlgAccounts::addCodec(QString name) +{ if (name.isEmpty()) { Private_AddCodecDialog* aDialog = new Private_AddCodecDialog(codecList, keditlistbox_codec->items(), this); aDialog->show(); @@ -601,7 +602,8 @@ void DlgAccounts::addCodec(QString name) { } } -void DlgAccounts::codecChanged() { +void DlgAccounts::codecChanged() +{ if (keditlistbox_codec->items().size() == codecList.size()) keditlistbox_codec->addButton()->setEnabled(false); else diff --git a/sflphone-client-kde/src/conf/dlgaccounts.h b/sflphone-client-kde/src/conf/dlgaccounts.h old mode 100644 new mode 100755 diff --git a/sflphone-client-kde/src/conf/dlgaddressbook.cpp b/sflphone-client-kde/src/conf/dlgaddressbook.cpp old mode 100644 new mode 100755 diff --git a/sflphone-client-kde/src/conf/dlgaddressbook.h b/sflphone-client-kde/src/conf/dlgaddressbook.h old mode 100644 new mode 100755 diff --git a/sflphone-client-kde/src/conf/dlgaudio.cpp b/sflphone-client-kde/src/conf/dlgaudio.cpp old mode 100644 new mode 100755 diff --git a/sflphone-client-kde/src/conf/dlgaudio.h b/sflphone-client-kde/src/conf/dlgaudio.h old mode 100644 new mode 100755 diff --git a/sflphone-client-kde/src/conf/dlgdisplay.cpp b/sflphone-client-kde/src/conf/dlgdisplay.cpp old mode 100644 new mode 100755 diff --git a/sflphone-client-kde/src/conf/dlgdisplay.h b/sflphone-client-kde/src/conf/dlgdisplay.h old mode 100644 new mode 100755 diff --git a/sflphone-client-kde/src/conf/dlggeneral.cpp b/sflphone-client-kde/src/conf/dlggeneral.cpp old mode 100644 new mode 100755 diff --git a/sflphone-client-kde/src/conf/dlggeneral.h b/sflphone-client-kde/src/conf/dlggeneral.h old mode 100644 new mode 100755 diff --git a/sflphone-client-kde/src/conf/dlghooks.cpp b/sflphone-client-kde/src/conf/dlghooks.cpp old mode 100644 new mode 100755 diff --git a/sflphone-client-kde/src/conf/dlghooks.h b/sflphone-client-kde/src/conf/dlghooks.h old mode 100644 new mode 100755 diff --git a/sflphone-client-kde/src/conf/dlgrecord.cpp b/sflphone-client-kde/src/conf/dlgrecord.cpp deleted file mode 100644 index 49181a1b63..0000000000 --- a/sflphone-client-kde/src/conf/dlgrecord.cpp +++ /dev/null @@ -1,40 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2009 by Savoir-Faire Linux * - * Author : Jérémy Quentin * - * jeremy.quentin@savoirfairelinux.com * - * * - * 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 3 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., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ -#include "dlgrecord.h" - -#include <KLineEdit> - -DlgRecord::DlgRecord(QWidget *parent) - : QWidget(parent) -{ - setupUi(this); - KUrlRequester_destinationFolder->setMode(KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly); - KUrlRequester_destinationFolder->setUrl(KUrl(QDir::home().path())); - KUrlRequester_destinationFolder->lineEdit()->setObjectName("kcfg_destinationFolder"); - KUrlRequester_destinationFolder->lineEdit()->setReadOnly(true); -} - - -DlgRecord::~DlgRecord() -{ -} - - diff --git a/sflphone-client-kde/src/conf/dlgrecord.h b/sflphone-client-kde/src/conf/dlgrecord.h deleted file mode 100644 index 3212034591..0000000000 --- a/sflphone-client-kde/src/conf/dlgrecord.h +++ /dev/null @@ -1,41 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2009 by Savoir-Faire Linux * - * Author : Jérémy Quentin * - * jeremy.quentin@savoirfairelinux.com * - * * - * 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 3 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., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ -#ifndef DLGRECORD_H -#define DLGRECORD_H - -#include <QWidget> - -#include "ui_dlgrecordbase.h" - -/** - @author Jérémy Quentin <jeremy.quentin@gmail.com> -*/ -class DlgRecord : public QWidget, public Ui_DlgRecordBase -{ -Q_OBJECT -public: - DlgRecord(QWidget *parent = 0); - - ~DlgRecord(); - -}; - -#endif diff --git a/sflphone-client-kde/src/conf/dlgrecordbase.ui b/sflphone-client-kde/src/conf/dlgrecordbase.ui deleted file mode 100644 index 9074020145..0000000000 --- a/sflphone-client-kde/src/conf/dlgrecordbase.ui +++ /dev/null @@ -1,76 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>DlgRecordBase</class> - <widget class="QWidget" name="DlgRecordBase"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>520</width> - <height>263</height> - </rect> - </property> - <property name="windowTitle"> - <string notr="true">Form</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QGroupBox" name="groupBox1_recordGeneral"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="title"> - <string>General</string> - </property> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QLabel" name="label_destinationFolderd"> - <property name="text"> - <string>Destination folder</string> - </property> - <property name="buddy"> - <cstring>KUrlRequester_destinationFolder</cstring> - </property> - </widget> - </item> - <item> - <widget class="KUrlRequester" name="KUrlRequester_destinationFolder"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <spacer name="verticalSpacer_configRecord"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>499</width> - <height>214</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <customwidgets> - <customwidget> - <class>KUrlRequester</class> - <extends>QFrame</extends> - <header>kurlrequester.h</header> - </customwidget> - </customwidgets> - <resources/> - <connections/> -</ui> -- GitLab