Commit 3c239f26 authored by Emmanuel Lepage's avatar Emmanuel Lepage

[#7021] More cleanup for release

parent 19a0ad8b
......@@ -6,50 +6,51 @@
MainWidget::MainWidget() : Plasma::Frame(), m_mainLayout(0), frmCalls(0), frmContact(0), frmHistory(0),currentMode(CALL)
{
mainTabs = new Plasma::TabBar(this);
mainTabs = new Plasma::TabBar ( this );
frmCalls = new Plasma::Frame ( this );
callLayout = new QGraphicsLinearLayout ( Qt::Vertical );
callScrollArea = new Plasma::ScrollWidget ( this );
frmContact = new Plasma::Frame ( this );
contactScrollArea = new Plasma::ScrollWidget ( this );
frmHistory = new Plasma::Frame ( this );
historyLayout = new QGraphicsLinearLayout ( Qt::Vertical );
historyScrollArea = new Plasma::ScrollWidget ( this );
mainLayout()->addItem(mainTabs);
//connect(mainTabs, SIGNAL(currentChanged(int)), this, SLOT(modeChanged(int)));
frmCalls = new Plasma::Frame(this);
frmCalls->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
callLayout = new QGraphicsLinearLayout(Qt::Vertical);
frmCalls->setLayout(callLayout);
callScrollArea = new Plasma::ScrollWidget(this);
callScrollArea->setWidget(frmCalls);
frmContact = new Plasma::Frame(this);
frmContact->setText("Contact");
frmContact->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
contactScrollArea = new Plasma::ScrollWidget(this);
contactScrollArea->setWidget(frmContact);
frmHistory = new Plasma::Frame(this);
frmHistory->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
historyLayout = new QGraphicsLinearLayout(Qt::Vertical);
frmHistory->setLayout(historyLayout);
historyScrollArea = new Plasma::ScrollWidget(this);
historyScrollArea->setWidget(frmHistory);
dialPage = new DialPage();
connect(dialPage, SIGNAL(call(QString)), this, SLOT(call(QString)));
QGraphicsLinearLayout* callTabLayout = new QGraphicsLinearLayout(Qt::Vertical);
QGraphicsLinearLayout* historyTabLayout = new QGraphicsLinearLayout(Qt::Vertical);
QGraphicsLinearLayout* contactTabLayout = new QGraphicsLinearLayout(Qt::Vertical);
QGraphicsLinearLayout* addTabLayout = new QGraphicsLinearLayout(Qt::Vertical);
callTabLayout->addItem(callScrollArea);
historyTabLayout->addItem(historyScrollArea);
contactTabLayout->addItem(contactScrollArea);
QGraphicsLinearLayout* callTabLayout = new QGraphicsLinearLayout( Qt::Vertical );
QGraphicsLinearLayout* historyTabLayout = new QGraphicsLinearLayout( Qt::Vertical );
QGraphicsLinearLayout* contactTabLayout = new QGraphicsLinearLayout( Qt::Vertical );
QGraphicsLinearLayout* addTabLayout = new QGraphicsLinearLayout( Qt::Vertical );
callTabLayout->addItem ( callScrollArea );
historyTabLayout->addItem ( historyScrollArea );
contactTabLayout->addItem ( contactScrollArea );
addTabLayout->addItem(dialPage);
mainTabs->addTab("Call", callTabLayout);
mainTabs->addTab("History", historyTabLayout);
mainTabs->addTab("Contact", contactTabLayout);
mainTabs->addTab(KIcon("list-add"),"", addTabLayout);
mainTabs->addTab( "Call" , callTabLayout );
mainTabs->addTab( "History" , historyTabLayout );
mainTabs->addTab( "Contact" , contactTabLayout );
mainTabs->addTab( KIcon("list-add") , "", addTabLayout );
//mainLayout()->addItem(callTabLayout);
......@@ -58,9 +59,10 @@ MainWidget::MainWidget() : Plasma::Frame(), m_mainLayout(0), frmCalls(0), frmCon
//mainLayout()->addItem(contactScrollArea);
initPos = frmCalls->pos();
frmCalls->setPos(initPos);
frmHistory->setPos(initPos);
frmContact->setPos(initPos);
frmCalls->setPos ( initPos );
frmHistory->setPos( initPos );
frmContact->setPos( initPos );
setMinimumSize(285,390);
}
......@@ -72,15 +74,15 @@ void MainWidget::dataUpdated(const QString& source, const Plasma::DataEngine::Da
bool modified = false;
foreach(QVariant call, value) {
if (!callWidgetList[value.key(call)]) {
callWidgetList[value.key(call)] = new CallItem();
callWidgetList[value.key(call)]->setCallId(value.key(call));
callWidgetList[ value.key(call) ] = new CallItem();
callWidgetList[ value.key(call) ]->setCallId(value.key(call));
callLayout->insertItem(0,callWidgetList[value.key(call)]);
mainTabs->setCurrentIndex(CALL);
modified = true;
}
callWidgetList[value.key(call)]->setCallerName(call.toHash()["Name"].toString());
callWidgetList[value.key(call)]->setCallerNumber(call.toHash()["Number"].toString());
callWidgetList[value.key(call)]->setState(call.toHash()["State"].toInt());
callWidgetList[value.key(call)]->setCallerName(call.toHash() [ "Name" ].toString());
callWidgetList[value.key(call)]->setCallerNumber(call.toHash()[ "Number" ].toString());
callWidgetList[value.key(call)]->setState(call.toHash() [ "State" ].toInt());
if (call.toHash()["State"].toInt() == CALL_STATE_INCOMING) {
emit requierAttention();
......@@ -93,7 +95,8 @@ void MainWidget::dataUpdated(const QString& source, const Plasma::DataEngine::Da
//sflphoneEngine->connectSource("conferences", this,0/*Update only if something happen*/);
}
else if (source == "info") {
currentAccountId = data["Account"].toString();
if (!data["Account"].isNull() || data["Account"].isValid())
currentAccountId = data["Account"].toString();
}
else if (source == "conferences") {
QHash<QString, QVariant> value = data;
......@@ -122,15 +125,17 @@ void MainWidget::dataUpdated(const QString& source, const Plasma::DataEngine::Da
}
else if (source == "history") {
QHash<QString, QVariant> value = data;
foreach(QVariant call, value) {
if (!historyWidgetList[value.key(call)]) {
historyWidgetList[value.key(call)] = new CallItem();
historyWidgetList[value.key(call)]->setCallId(value.key(call));
historyLayout->addItem(historyWidgetList[value.key(call)]);
for (QHash<QString, QVariant>::iterator i = value.begin(); i != value.end(); ++i) {
QString key = i.key();
//QHash<QString, CallItem*> historyWidgetList;
if ( ! historyWidgetList[key]) {
historyWidgetList[ i.key() ] = new CallItem();
historyWidgetList[ i.key() ]->setCallId(i.key());
historyLayout->addItem(historyWidgetList[i.key()]);
}
historyWidgetList[value.key(call)]->setCallerName(call.toHash()["Name"].toString());
historyWidgetList[value.key(call)]->setCallerNumber(call.toHash()["Number"].toString());
historyWidgetList[value.key(call)]->setDate(call.toHash()["Date"].toInt());
historyWidgetList[ i.key() ]->setCallerName(i.value().toHash() [ "Name" ].toString());
historyWidgetList[ i.key() ]->setCallerNumber(i.value().toHash() [ "Number" ].toString());
historyWidgetList[ i.key() ]->setDate(i.value().toHash() [ "Date" ].toInt()) ;
}
}
}
......@@ -148,7 +153,7 @@ QGraphicsLinearLayout* MainWidget::mainLayout()
void MainWidget::call(QString number)
{
qDebug() << "Calling " << number << " with account " << currentAccountId << ", " << CallModelConvenience::getAccountList()->size() << " account registred";
CallManagerInterface& callManager = CallManagerInterfaceSingleton::getInstance();
callManager.placeCall(currentAccountId, CallModelConvenience::generateCallId(), number);
// qDebug() << "Calling " << number << " with account " << currentAccountId << ", " << CallModelConvenience::getAccountList()->size() << " account registred";
// CallManagerInterface& callManager = CallManagerInterfaceSingleton::getInstance();
// callManager.placeCall(currentAccountId, CallModelConvenience::generateCallId(), number);
}
......@@ -12,6 +12,7 @@
#include <Plasma/DataEngine>
#include <Plasma/ExtenderItem>
#include <KIcon>
#include <QHash>
#include "CallItem.h"
#include "ConferenceItem.h"
......
......@@ -12,7 +12,7 @@ SFLPhonePlasmoid::SFLPhonePlasmoid(QObject* parent, const QVariantList& args)
{
//m_svg.setImagePath("widgets/background");
setBackgroundHints(DefaultBackground);
CallModelConvenience::init();
setMinimumSize(24,24);
......
This diff is collapsed.
......@@ -23,7 +23,7 @@ AkonadiBackend::AkonadiBackend(QObject* parent) : ContactBackend(parent)
//QTimer::singleShot( 0, this, SLOT( delayedInit() ) );
m_pSession = new Akonadi::Session( "SFLPhone::instance" );
// fetching all collections containing emails recursively, starting at the root collection
// fetching all collections containing emails recursively, starting at the root collection
Akonadi::CollectionFetchJob *job = new Akonadi::CollectionFetchJob( Akonadi::Collection::root(), Akonadi::CollectionFetchJob::Recursive, this );
job->fetchScope().setContentMimeTypes( QStringList() << "text/directory" );
connect( job, SIGNAL( collectionsReceived( const Akonadi::Collection::List& ) ), this, SLOT( collectionsReceived( const Akonadi::Collection::List& ) ) );
......
......@@ -159,8 +159,8 @@ bool CallView::phoneNumberToCall(QTreeWidgetItem *parent, int index, const QMime
bool CallView::contactToCall(QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action)
{
qDebug() << "contactToCall";
Q_UNUSED(index)
Q_UNUSED(action)
Q_UNUSED( index )
Q_UNUSED( action )
QByteArray encodedContact = data->data( MIME_CONTACT );
if (!QString(encodedContact).isEmpty()) {
Contact* contact = AkonadiBackend::getInstance()->getContactByUid(encodedContact);
......@@ -321,7 +321,6 @@ Call* CallView::getCurrentItem()
///Remove a TreeView item and delete it
bool CallView::removeItem(Call* item)
{
exit(66);
if (indexOfTopLevelItem(SFLPhone::model()->getIndex(item)) != -1) {//TODO To remove once safe
removeItemWidget(SFLPhone::model()->getIndex(item),0);
return true;
......@@ -533,32 +532,7 @@ void CallView::clearHistory()
//SFLPhone::model()->getHistory().clear();
}
// void CallView::conferenceCreatedSignal(const QString& confId)
// {
// addConference(confId);
// }
//
// void CallView::conferenceChangedSignal(const QString& confId, const QString& state)
// {
// qDebug() << "Conf changed signal";
// conferenceChanged(confId, state);
// }
//
// void CallView::conferenceRemovedSignal(const QString& confId)
// {
// conferenceRemoved(confId);
// }
//
// void CallView::incomingMessageSignal(const QString& accountId, const QString& message)
// {
// Q_UNUSED(accountId)
// Q_UNUSED(message)
// //TODO
// }
//
// void CallView::voiceMailNotifySignal(const QString& accountId, int count)
// {
// Q_UNUSED(accountId)
// Q_UNUSED(count)
// //TODO
// }
\ No newline at end of file
///Redirect keypresses to parent
void CallView::keyPressEvent(QKeyEvent* event) {
SFLPhone::app()->view()->keyPressEvent(event);
}
......@@ -27,48 +27,40 @@ typedef CallModel<CallTreeItem*,QTreeWidgetItem*> TreeWidgetCallModel;
class CallView : public QTreeWidget/*, public TreeWidgetCallModel*/ {
Q_OBJECT
public:
CallView(QWidget* parent =0);
bool selectItem(Call* item);
Call* getCurrentItem();
bool removeItem(Call* item);
QWidget* getWidget();
void setTitle(QString title);
bool dropMimeData(QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action);
virtual QMimeData* mimeData( const QList<QTreeWidgetItem *> items) const;
CallView ( QWidget* parent = 0 );
Call* getCurrentItem ( );
QWidget* getWidget ( );
void setTitle ( QString title );
bool selectItem ( Call* item );
bool removeItem ( Call* item );
bool dropMimeData ( QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action );
virtual QMimeData* mimeData ( const QList<QTreeWidgetItem *> items ) const;
private:
QTreeWidgetItem* extractItem(QString callId);
QTreeWidgetItem* extractItem(QTreeWidgetItem* item);
CallTreeItem* insertItem(QTreeWidgetItem* item, QTreeWidgetItem* parent=0);
CallTreeItem* insertItem(QTreeWidgetItem* item, Call* parent);
void clearArtefact(QTreeWidgetItem* item);
QTreeWidgetItem* extractItem ( QString callId );
QTreeWidgetItem* extractItem ( QTreeWidgetItem* item );
CallTreeItem* insertItem ( QTreeWidgetItem* item, QTreeWidgetItem* parent=0 );
CallTreeItem* insertItem ( QTreeWidgetItem* item, Call* parent );
void clearArtefact ( QTreeWidgetItem* item );
protected:
void dragEnterEvent(QDragEnterEvent *e) { e->accept(); }
void dragMoveEvent(QDragMoveEvent *e) { e->accept(); }
bool callToCall(QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action);
bool phoneNumberToCall(QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action);
bool contactToCall(QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action);
void dragEnterEvent( QDragEnterEvent *e) { e->accept(); }
void dragMoveEvent ( QDragMoveEvent *e) { e->accept(); }
bool callToCall ( QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action );
bool phoneNumberToCall ( QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action );
bool contactToCall ( QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action );
public slots:
void destroyCall(Call* toDestroy);
void itemDoubleClicked(QTreeWidgetItem* item, int column);
void itemClicked(QTreeWidgetItem* item, int column);
Call* addCall(Call* call, Call* parent =0);
Call* addConference(Call* conf);
bool conferenceChanged(Call* conf);
void conferenceRemoved(Call* conf);
//D-Bus handling
// void callStateChangedSignal(const QString& callId, const QString& state);
// void incomingCallSignal(const QString& accountId, const QString& callId);
// void conferenceCreatedSignal(const QString& confId);
// void conferenceChangedSignal(const QString& confId, const QString& state);
// void conferenceRemovedSignal(const QString& confId);
// void incomingMessageSignal(const QString& accountId, const QString& message);
// void voiceMailNotifySignal(const QString& accountId, int count);
void destroyCall ( Call* toDestroy);
void itemDoubleClicked ( QTreeWidgetItem* item, int column );
void itemClicked ( QTreeWidgetItem* item, int column );
Call* addCall ( Call* call, Call* parent =0 );
Call* addConference ( Call* conf );
bool conferenceChanged ( Call* conf );
void conferenceRemoved ( Call* conf );
virtual void keyPressEvent(QKeyEvent* event);
public slots:
void clearHistory();
......
......@@ -17,79 +17,92 @@
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
**************************************************************************/
#include "Codec.h"
#include "lib/configurationmanager_interface_singleton.h"
#include "lib/sflphone_const.h"
///Constructor
Codec::Codec(int payload, bool enabled)
{
ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
QStringList details = configurationManager.getAudioCodecDetails(payload);
this->payload = QString::number(payload);
this->enabled = enabled;
this->name = details[CODEC_NAME];
this->payload = QString::number(payload);
this->enabled = enabled;
this->name = details[CODEC_NAME];
this->frequency = details[CODEC_SAMPLE_RATE];
this->bitrate = details[CODEC_BIT_RATE];
this->bitrate = details[CODEC_BIT_RATE];
this->bandwidth = details[CODEC_BANDWIDTH];
}
///Return the payload
QString Codec::getPayload() const
{
return payload;
}
///Return the codec name
QString Codec::getName() const
{
return name;
}
///Return the frequency
QString Codec::getFrequency() const
{
return frequency;
}
///Return the bitrate
QString Codec::getBitrate() const
{
return bitrate;
}
///Return the bandwidth
QString Codec::getBandwidth() const
{
return bandwidth;
}
///Is this codec enabled
bool Codec::isEnabled() const
{
return enabled;
}
///Set the payload
void Codec::setPayload(QString payload)
{
this->payload = payload;
}
///Set the codec name
void Codec::setName(QString name)
{
this->name = name;
}
///Set the frequency
void Codec::setFrequency(QString frequency)
{
this->frequency = frequency;
}
///Set the bitrate
void Codec::setBitrate(QString bitrate)
{
this->bitrate = bitrate;
}
///Set the bandwidth
void Codec::setBandwidth(QString bandwidth)
{
this->bandwidth = bandwidth;
}
///Make this cedec enabled
void Codec::setEnabled(bool enabled)
{
this->enabled = enabled;
......
......@@ -17,7 +17,7 @@
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
**************************************************************************/
#ifndef CODEC_H
#define CODEC_H
......@@ -31,36 +31,31 @@ class Codec : public QObject
{
Q_OBJECT
private:
QString payload;
QString name;
QString frequency;
QString bitrate;
QString bandwidth;
QString payload ;
QString name ;
QString frequency ;
QString bitrate ;
QString bandwidth ;
bool enabled;
public:
Codec(int payload, bool enabled);
// Codec(const Codec & codec);
// ~Codec();
QString getPayload() const;
QString getName() const;
QString getFrequency() const;
QString getBitrate() const;
QString getBandwidth() const;
bool isEnabled() const;
QString getPayload () const;
QString getName () const;
QString getFrequency () const;
QString getBitrate () const;
QString getBandwidth () const;
bool isEnabled () const;
void setPayload(QString payload);
void setName(QString name);
void setFrequency(QString frequency);
void setBitrate(QString bitrate);
void setBandwidth(QString bandwidth);
void setEnabled(bool enabled);
void setPayload ( QString payload );
void setName ( QString name );
void setFrequency ( QString frequency );
void setBitrate ( QString bitrate );
void setBandwidth ( QString bandwidth );
void setEnabled ( bool enabled );
Codec & operator=(const Codec&);
};
#endif
......@@ -86,7 +86,7 @@ BookmarkDock* SFLPhone::bookmarkDock()
SFLPhone::~SFLPhone()
{
saveState();
//saveState();
}
bool SFLPhone::initialize()
......@@ -112,6 +112,7 @@ bool SFLPhone::initialize()
// tell the KXmlGuiWindow that this is indeed the main widget
//setCentralWidget(m_pView);
m_pCentralDW = new QDockWidget(this);
m_pCentralDW->setObjectName("callDock");
m_pCentralDW->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding);
m_pCentralDW->setWidget(m_pView);
m_pCentralDW->setWindowTitle("Call");
......@@ -133,11 +134,10 @@ bool SFLPhone::initialize()
addDockWidget(Qt::TopDockWidgetArea,m_pCentralDW);
m_pHistoryDW = new HistoryDock(this);
addDockWidget(Qt::TopDockWidgetArea,m_pHistoryDW);
m_pBookmarkDW = new BookmarkDock(this);
addDockWidget(Qt::TopDockWidgetArea,m_pBookmarkDW);
addDockWidget( Qt::TopDockWidgetArea,m_pHistoryDW );
addDockWidget( Qt::TopDockWidgetArea,m_pBookmarkDW );
tabifyDockWidget(m_pBookmarkDW,m_pHistoryDW);
setWindowIcon(QIcon(ICON_SFLPHONE));
......@@ -174,9 +174,9 @@ bool SFLPhone::initialize()
void SFLPhone::setObjectNames()
{
m_pView->setObjectName("m_pView");
statusBar()->setObjectName("statusBar");
trayIcon->setObjectName("trayIcon");
m_pView->setObjectName ( "m_pView" );
statusBar()->setObjectName ( "statusBar" );
trayIcon->setObjectName ( "trayIcon" );
}
void SFLPhone::setupActions()
......@@ -200,6 +200,7 @@ void SFLPhone::setupActions()
action_screen = new QActionGroup(this);
action_screen->setExclusive(true);
action_main = new KAction(KIcon(QIcon(ICON_SCREEN_MAIN)), i18n("Main screen"), action_screen);
action_main->setCheckable(true);
action_main->setChecked(true);
......@@ -211,13 +212,14 @@ void SFLPhone::setupActions()
action_configureSflPhone = KStandardAction::preferences(m_pView, SLOT(configureSflPhone()), this);
action_configureSflPhone->setText(i18n("Configure SFLphone"));
action_displayVolumeControls = new KAction(KIcon(QIcon(ICON_DISPLAY_VOLUME_CONSTROLS)), i18n("Display volume controls"), this);
action_displayDialpad = new KAction(KIcon(QIcon(ICON_DISPLAY_DIALPAD)), i18n("Display dialpad"), this);
action_displayDialpad->setCheckable(true);
action_displayDialpad->setChecked(ConfigurationSkeleton::displayDialpad());
action_displayVolumeControls = new KAction(KIcon(QIcon(ICON_DISPLAY_VOLUME_CONSTROLS)), i18n("Display volume controls"), this);
action_displayVolumeControls->setCheckable(true);
action_displayVolumeControls->setChecked(ConfigurationSkeleton::displayVolume());
action_displayDialpad->setChecked(ConfigurationSkeleton::displayDialpad());
action_accountCreationWizard = new KAction(i18n("Account creation wizard"), this);
connect(action_accept, SIGNAL(triggered()), m_pView , SLOT(accept() ));
......@@ -247,25 +249,8 @@ void SFLPhone::setupActions()
actionCollection()->addAction("action_configureSflPhone" , action_configureSflPhone );
actionCollection()->addAction("action_accountCreationWizard" , action_accountCreationWizard );
QString rcFilePath = QString(DATA_INSTALL_DIR) + "/sflphone-client-kde/sflphone-client-kdeui.rc";
if(! QFile::exists(rcFilePath)) {
QDir dir;
dir.cdUp();
dir.cd("data");
rcFilePath = dir.filePath("sflphone-client-kdeui.rc");
qDebug() << "rcFilePath = " << rcFilePath ;
if(! QFile::exists(rcFilePath)) {
QDir dir;
dir.cdUp();
dir.cdUp();
dir.cd("data");
rcFilePath = dir.filePath("sflphone-client-kdeui.rc");
}
}
qDebug() << "rcFilePath = " << rcFilePath ;
createGUI(rcFilePath);
setAutoSaveSettings();
createGUI();
}
......@@ -283,12 +268,6 @@ bool SFLPhone::queryClose()
void SFLPhone::quitButton()
{
//qDebug() << "quitButton : " << m_pView->callTree->count() << " calls open.";
//if(m_pView->callTree->count() > 0 && instance.getRegistrationCount() <= 1) {
//qDebug() << "Attempting to quit when still having some calls open.";
//}
m_pView->saveState();
qApp->quit();
}
......
......@@ -69,42 +69,44 @@ Q_OBJECT
public:
enum CallAction {
Accept,
Refuse,
Hold,
Transfer,
Record,
Mailbox,
NumberOfCallActions};
Accept ,
Refuse ,
Hold ,
Transfer ,
Record ,
Mailbox ,
NumberOfCallActions
};
private:
// Whether or not the object has been initialized
bool initialized_;
KAction * action_accept;
KAction * action_refuse;
KAction * action_hold;
KAction * action_transfer;
KAction * action_record;
KAction * action_main;
KAction * action_mailBox;
KAction * action_close;
KAction * action_quit;
KAction * action_displayVolumeControls;
KAction * action_displayDialpad;
KAction * action_configureSflPhone;
KAction * action_accountCreationWizard;
KAction* action_accept ;
KAction* action_refuse ;
KAction* action_hold ;
KAction* action_transfer ;
KAction* action_record ;
KAction* action_main ;
KAction* action_mailBox ;
KAction* action_close ;
KAction* action_quit ;
KAction* action_displayVolumeControls ;
KAction* action_displayDialpad ;
KAction* action_configureSflPhone ;
KAction* action_accountCreationWizard ;
QActionGroup * action_screen;
SFLPhoneView * m_pView;
QMenu *trayIconMenu;
bool iconChanged;
SFLPhoneTray *trayIcon;
KNotification *notification;
QLabel* statusBarWidget;
ContactDock* m_pContactCD;
QDockWidget* m_pCentralDW;
HistoryDock* m_pHistoryDW;
BookmarkDock* m_pBookmarkDW;
SFLPhoneView* m_pView ;
QMenu* trayIconMenu ;
bool iconChanged ;
SFLPhoneTray* trayIcon ;
KNotification* notification ;
QLabel* statusBarWidget ;
ContactDock* m_pContactCD ;
QDockWidget* m_pCentralDW ;
HistoryDock* m_pHistoryDW ;
BookmarkDock* m_pBookmarkDW ;
static SFLPhone* m_sApp;
static TreeWidgetCallModel* m_pModel;
......@@ -118,33 +120,33 @@ protected:
public:
SFLPhone(QWidget *parent = 0);
~SFLPhone();
bool initialize();
void setupActions();
void trayIconSignal();
SFLPhoneView * getView();
QList<QAction *> getCallActions();
~SFLPhone ();
bool initialize ();
void setupActions ();
void trayIconSignal ();
SFLPhoneView* getView ();
QList<QAction *> getCallActions ();
friend class SFLPhoneView;
static SFLPhone* app();
SFLPhoneView* view();
static TreeWidgetCallModel* model();
static SFLPhone* app ();
static TreeWidgetCallModel* model ();
SFLPhoneView* view ();
ContactDock* contactDock();
HistoryDock* historyDock();
BookmarkDock* bookmarkDock();
private slots:
void on_m_pView_statusMessageChangeAsked(const QString & message);
void on_m_pView_windowTitleChangeAsked(const QString & message);
void on_m_pView_enabledActionsChangeAsked(const bool * enabledActions);
void on_m_pView_actionIconsChangeAsked(const QString * actionIcons);
void on_m_pView_actionTextsChangeAsked(const QString * actionTexts);
void on_m_pView_transferCheckStateChangeAsked(bool transferCheckState);
void on_m_pView_recordCheckStateChangeAsked(bool recordCheckState);
void on_m_pView_screenChanged(int screen);
void on_m_pView_incomingCall(const Call * call);
void on_m_pView_statusMessageChangeAsked ( const QString& message );
void on_m_pView_windowTitleChangeAsked ( const QString& message );
void on_m_pView_enabledActionsChangeAsked ( const bool* enabledActions );