Skip to content
Snippets Groups Projects
Commit 2c879d67 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'qt-client'

parents 5ded4d32 54b7ec68
No related branches found
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 408 additions and 418 deletions
sflphone-client-kde/data/sflphone-client-kdeui.rc
+ 9
− 9
View file @ 2c879d67
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
<Action name="action_hold" /> <Action name="action_hold" />
<Action name="action_transfer" /> <Action name="action_transfer" />
<Action name="action_record" /> <Action name="action_record" />
<Action name="action_mailBox" />
<Separator /> <Separator />
<Action name="action_main" />
<Action name="action_history" /> <Action name="action_history" />
<Action name="action_addressBook" /> <Action name="action_addressBook" />
<Separator /> <Separator />
<Action name="action_mailBox" />
<Separator />
<Action name="action_close" /> <Action name="action_close" />
<Separator /> <Separator />
<Action name="action_quit" /> <Action name="action_quit" />
...@@ -32,24 +32,24 @@ ...@@ -32,24 +32,24 @@
<Action name="action_displayVolumeControls" /> <Action name="action_displayVolumeControls" />
<Action name="action_displayDialpad" /> <Action name="action_displayDialpad" />
<Separator /> <Separator />
<!-- <Action name="action_configureAccounts" /> -->
<!-- <Action name="action_configureAudio" /> -->
<Action name="action_configureSflPhone" /> <Action name="action_configureSflPhone" />
<Separator /> <Separator />
<Action name="action_accountCreationWizard" /> <Action name="action_accountCreationWizard" />
</Menu> </Menu>
</MenuBar> </MenuBar>
<!--<ToolBar name="mainToolBar" position="Top" noMerge="1" fullWidth="true" newline="true" > <ToolBar name="callsToolBar" iconText="icononly" position="Top" noMerge="1" fullWidth="true" newline="true" >
<Action name="action_accept" /> <Action name="action_accept" />
<Action name="action_refuse" /> <Action name="action_refuse" />
<Action name="action_hold" /> <Action name="action_hold" />
<Action name="action_transfer" /> <Action name="action_transfer" />
<Action name="action_record" /> <Action name="action_record" />
<Separator /> <Action name="action_mailBox" />
</ToolBar>
<ToolBar name="screenToolBar" iconText="icononly" position="Top" noMerge="1" fullWidth="true" newline="true" >
<Action name="action_main" />
<Action name="action_history" /> <Action name="action_history" />
<Action name="action_addressBook" /> <Action name="action_addressBook" />
<Separator /> </ToolBar>
<Action name="action_mailBox" />
</ToolBar> -->
</gui> </gui>
\ No newline at end of file
sflphone-client-kde/src/SFLPhone.cpp
+ 172
− 57
View file @ 2c879d67
...@@ -53,33 +53,16 @@ SFLPhone::SFLPhone(QWidget *parent) ...@@ -53,33 +53,16 @@ SFLPhone::SFLPhone(QWidget *parent)
// tell the KXmlGuiWindow that this is indeed the main widget // tell the KXmlGuiWindow that this is indeed the main widget
setCentralWidget(view); setCentralWidget(view);
// add a status bar
// statusBar()->show();
setWindowIcon(QIcon(ICON_SFLPHONE)); setWindowIcon(QIcon(ICON_SFLPHONE));
setWindowTitle(i18n("SFLphone")); setWindowTitle(i18n("SFLphone"));
setupActions(); setupActions();
qDebug() << "currentPath = " << QDir::currentPath() ;
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 ;
createGUI(rcFilePath);
setObjectNames(); setObjectNames();
QMetaObject::connectSlotsByName(this); QMetaObject::connectSlotsByName(this);
view->updateStatusMessage(); view->on_stackedWidget_screen_currentChanged(SCREEN_MAIN);
view->loadWindow();
move(QCursor::pos().x() - geometry().width()/2, QCursor::pos().y() - geometry().height()/2); move(QCursor::pos().x() - geometry().width()/2, QCursor::pos().y() - geometry().height()/2);
if( ! configurationManager.isStartHidden()) if( ! configurationManager.isStartHidden())
...@@ -91,7 +74,6 @@ SFLPhone::SFLPhone(QWidget *parent) ...@@ -91,7 +74,6 @@ SFLPhone::SFLPhone(QWidget *parent)
{ {
(new AccountWizard())->show(); (new AccountWizard())->show();
} }
} }
SFLPhone::~SFLPhone() SFLPhone::~SFLPhone()
...@@ -108,46 +90,75 @@ void SFLPhone::setObjectNames() ...@@ -108,46 +90,75 @@ void SFLPhone::setObjectNames()
void SFLPhone::setupActions() void SFLPhone::setupActions()
{ {
qDebug() << "setupActions"; qDebug() << "setupActions";
ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
actionCollection()->addAction("action_accept", view->action_accept); action_accept = new KAction(this);
actionCollection()->addAction("action_refuse", view->action_refuse); action_refuse = new KAction(this);
actionCollection()->addAction("action_hold", view->action_hold); action_hold = new KAction(this);
actionCollection()->addAction("action_transfer", view->action_transfer); action_transfer = new KAction(this);
actionCollection()->addAction("action_record", view->action_record); action_record = new KAction(this);
actionCollection()->addAction("action_history", view->action_history); action_mailBox = new KAction(this);
actionCollection()->addAction("action_addressBook", view->action_addressBook);
actionCollection()->addAction("action_mailBox", view->action_mailBox); action_screen = new QActionGroup(this);
KAction * action_close = KStandardAction::close(this, SLOT(close()), 0); action_screen->setExclusive(true);
action_main = new KAction(KIcon(QIcon(ICON_SCREEN_MAIN)), i18n("Main screen"), action_screen);
action_history = new KAction(KIcon(QIcon(ICON_SCREEN_HISTORY)), i18n("Call history"), action_screen);
action_addressBook = new KAction(KIcon(QIcon(ICON_SCREEN_ADDRESS)), i18n("Address book"), action_screen);
action_main->setCheckable(true);
action_history->setCheckable(true);
action_addressBook->setCheckable(true);
action_main->setChecked(true);
action_screen->addAction(action_main);
action_screen->addAction(action_history);
action_screen->addAction(action_addressBook);
action_close = KStandardAction::close(this, SLOT(close()), this);
action_quit = KStandardAction::quit(this, SLOT(quitButton()), this);
action_configureSflPhone = KStandardAction::preferences(view, 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_displayVolumeControls->setChecked(configurationManager.getVolumeControls());
action_displayDialpad->setChecked(configurationManager.getDialpad());
action_accountCreationWizard = new KAction(i18n("Account creation wizard"), this);
connect(action_accept, SIGNAL(triggered()), view, SLOT(accept()));
connect(action_refuse, SIGNAL(triggered()), view, SLOT(refuse()));
connect(action_hold, SIGNAL(triggered()), view, SLOT(hold()));
connect(action_transfer, SIGNAL(triggered()), view, SLOT(transfer()));
connect(action_record, SIGNAL(triggered()), view, SLOT(record()));
connect(action_screen, SIGNAL(triggered(QAction *)), this, SLOT(updateScreen(QAction *)));
connect(action_mailBox, SIGNAL(triggered()), view, SLOT(mailBox()));
connect(action_displayVolumeControls, SIGNAL(triggered()), view, SLOT(displayVolumeControls()));
connect(action_displayDialpad, SIGNAL(triggered()), view, SLOT(displayDialpad()));
connect(action_accountCreationWizard, SIGNAL(triggered()), view, SLOT(accountCreationWizard()));
action_screen->addAction(action_main);
action_screen->addAction(action_history);
action_screen->addAction(action_addressBook);
actionCollection()->addAction("action_accept", action_accept);
actionCollection()->addAction("action_refuse", action_refuse);
actionCollection()->addAction("action_hold", action_hold);
actionCollection()->addAction("action_transfer", action_transfer);
actionCollection()->addAction("action_record", action_record);
actionCollection()->addAction("action_main", action_main);
actionCollection()->addAction("action_history", action_history);
actionCollection()->addAction("action_addressBook", action_addressBook);
actionCollection()->addAction("action_mailBox", action_mailBox);
actionCollection()->addAction("action_close", action_close); actionCollection()->addAction("action_close", action_close);
KAction * action_quit = KStandardAction::quit(this, SLOT(quitButton()), 0);
actionCollection()->addAction("action_quit", action_quit); actionCollection()->addAction("action_quit", action_quit);
actionCollection()->addAction("action_displayVolumeControls", action_displayVolumeControls);
actionCollection()->addAction("action_displayVolumeControls", view->action_displayVolumeControls); actionCollection()->addAction("action_displayDialpad", action_displayDialpad);
actionCollection()->addAction("action_displayDialpad", view->action_displayDialpad); actionCollection()->addAction("action_configureSflPhone", action_configureSflPhone);
actionCollection()->addAction("action_configureSflPhone", view->action_configureSflPhone); actionCollection()->addAction("action_accountCreationWizard", action_accountCreationWizard);
// actionCollection()->addAction("action_configureAccounts", view->action_configureAccounts);
// actionCollection()->addAction("action_configureAudio", view->action_configureAudio);
actionCollection()->addAction("action_accountCreationWizard", view->action_accountCreationWizard);
statusBarWidget = new QLabel(); statusBarWidget = new QLabel();
statusBar()->addWidget(statusBarWidget); statusBar()->addWidget(statusBarWidget);
QToolBar * toolbar = new QToolBar(this);
this->addToolBar(Qt::TopToolBarArea, toolbar);
toolbar->addAction(view->action_accept);
toolbar->addAction(view->action_refuse);
toolbar->addAction(view->action_hold);
toolbar->addAction(view->action_transfer);
toolbar->addAction(view->action_record);
toolbar->addSeparator();
toolbar->addAction(view->action_history);
toolbar->addAction(view->action_addressBook);
toolbar->addSeparator();
toolbar->addAction(view->action_mailBox);
toolbar->setIconSize(QSize(TOOLBAR_SIZE,TOOLBAR_SIZE));
trayIconMenu = new QMenu(this); trayIconMenu = new QMenu(this);
trayIconMenu->addAction(action_quit); trayIconMenu->addAction(action_quit);
...@@ -157,6 +168,17 @@ void SFLPhone::setupActions() ...@@ -157,6 +168,17 @@ void SFLPhone::setupActions()
iconChanged = false; iconChanged = false;
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 ;
createGUI(rcFilePath);
} }
sflphone_kdeView * SFLPhone::getView() sflphone_kdeView * SFLPhone::getView()
...@@ -252,9 +274,102 @@ void SFLPhone::on_trayIcon_activated(QSystemTrayIcon::ActivationReason reason) ...@@ -252,9 +274,102 @@ void SFLPhone::on_trayIcon_activated(QSystemTrayIcon::ActivationReason reason)
} }
void SFLPhone::on_view_statusMessageChanged(const QString & message) void SFLPhone::on_view_statusMessageChangeAsked(const QString & message)
{ {
qDebug() << "on_view_statusMessageChanged : " + message; qDebug() << "on_view_statusMessageChangeAsked : " + message;
statusBarWidget->setText(message); statusBarWidget->setText(message);
} }
void SFLPhone::on_view_windowTitleChangeAsked(const QString & message)
{
qDebug() << "on_view_windowTitleChangeAsked : " + message;
setWindowTitle(message);
}
void SFLPhone::on_view_enabledActionsChangeAsked(const bool * enabledActions)
{
qDebug() << "on_view_enabledActionsChangeAsked";
action_accept->setEnabled(enabledActions[SFLPhone::Accept]);
action_refuse->setEnabled(enabledActions[SFLPhone::Refuse]);
action_hold->setEnabled(enabledActions[SFLPhone::Hold]);
action_transfer->setEnabled(enabledActions[SFLPhone::Transfer]);
action_record->setEnabled(enabledActions[SFLPhone::Record]);
action_mailBox->setEnabled(enabledActions[SFLPhone::Mailbox]);
}
void SFLPhone::on_view_actionIconsChangeAsked(const QString * actionIcons)
{
qDebug() << "on_view_actionIconsChangeAsked";
action_accept->setIcon(QIcon(actionIcons[SFLPhone::Accept]));
action_refuse->setIcon(QIcon(actionIcons[SFLPhone::Refuse]));
action_hold->setIcon(QIcon(actionIcons[SFLPhone::Hold]));
action_transfer->setIcon(QIcon(actionIcons[SFLPhone::Transfer]));
action_record->setIcon(QIcon(actionIcons[SFLPhone::Record]));
action_mailBox->setIcon(QIcon(actionIcons[SFLPhone::Mailbox]));
}
void SFLPhone::on_view_actionTextsChangeAsked(const QString * actionTexts)
{
qDebug() << "on_view_actionTextsChangeAsked";
action_accept->setText(actionTexts[SFLPhone::Accept]);
action_refuse->setText(actionTexts[SFLPhone::Refuse]);
action_hold->setText(actionTexts[SFLPhone::Hold]);
action_transfer->setText(actionTexts[SFLPhone::Transfer]);
action_record->setText(actionTexts[SFLPhone::Record]);
action_mailBox->setText(actionTexts[SFLPhone::Mailbox]);
}
void SFLPhone::on_view_transferCheckStateChangeAsked(bool transferCheckState)
{
qDebug() << "Changing transfer action checkState";
action_transfer->setChecked(transferCheckState);
}
void SFLPhone::on_view_recordCheckStateChangeAsked(bool recordCheckState)
{
qDebug() << "Changing record action checkState";
action_record->setChecked(recordCheckState);
}
void SFLPhone::updateScreen(QAction * action)
{
if(action == action_main) view->changeScreen(SCREEN_MAIN);
else if(action == action_history) view->changeScreen(SCREEN_HISTORY);
else if(action == action_addressBook) view->changeScreen(SCREEN_ADDRESS);
}
void SFLPhone::on_view_screenChanged(int screen)
{
qDebug() << "on_view_screenChanged";
if(screen == SCREEN_MAIN) action_main->setChecked(true);
else if(screen == SCREEN_HISTORY) action_history->setChecked(true);
else if(screen == SCREEN_ADDRESS) action_addressBook->setChecked(true);
}
QList <QAction *> SFLPhone::getCallActions()
{
QList<QAction *> callActions = QList<QAction *>();
callActions.insert((int) Accept, action_accept);
callActions.insert((int) Refuse, action_refuse);
callActions.insert((int) Hold, action_hold);
callActions.insert((int)Transfer, action_transfer);
callActions.insert((int) Record, action_record);
callActions.insert((int) Mailbox, action_mailBox);
return callActions;
}
void SFLPhone::on_view_incomingCall(const Call * call)
{
ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
trayIconSignal();
if(configurationManager.popupMode())
{
putForeground();
}
if(configurationManager.getNotify())
{
sendNotif(call->getPeerName().isEmpty() ? call->getPeerPhoneNumber() : call->getPeerName());
}
}
sflphone-client-kde/src/SFLPhone.h
+ 40
− 2
View file @ 2c879d67
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
#include <QSystemTrayIcon> #include <QSystemTrayIcon>
#include <KXmlGuiWindow> #include <KXmlGuiWindow>
#include <KAction>
#include <QActionGroup>
#include "ui_sflphone_kdeview_base.h" #include "ui_sflphone_kdeview_base.h"
#include "CallList.h" #include "CallList.h"
...@@ -42,10 +44,36 @@ class sflphone_kdeView; ...@@ -42,10 +44,36 @@ class sflphone_kdeView;
class SFLPhone : public KXmlGuiWindow class SFLPhone : public KXmlGuiWindow
{ {
Q_OBJECT Q_OBJECT
public:
enum CallAction {
Accept,
Refuse,
Hold,
Transfer,
Record,
Mailbox,
NumberOfCallActions};
private: private:
KAction * action_accept;
KAction * action_refuse;
KAction * action_hold;
KAction * action_transfer;
KAction * action_record;
QActionGroup * action_screen;
KAction * action_main;
KAction * action_history;
KAction * action_addressBook;
KAction * action_mailBox;
KAction * action_close;
KAction * action_quit;
KAction * action_displayVolumeControls;
KAction * action_displayDialpad;
KAction * action_configureSflPhone;
KAction * action_accountCreationWizard;
sflphone_kdeView * view; sflphone_kdeView * view;
QMenu *trayIconMenu; QMenu *trayIconMenu;
bool iconChanged; bool iconChanged;
...@@ -68,12 +96,22 @@ public: ...@@ -68,12 +96,22 @@ public:
void putForeground(); void putForeground();
void trayIconSignal(); void trayIconSignal();
sflphone_kdeView * getView(); sflphone_kdeView * getView();
QList<QAction *> getCallActions();
private slots: private slots:
void on_trayIcon_activated(QSystemTrayIcon::ActivationReason reason); void on_trayIcon_activated(QSystemTrayIcon::ActivationReason reason);
void on_trayIcon_messageClicked(); void on_trayIcon_messageClicked();
void on_view_statusMessageChanged(const QString & message); void on_view_statusMessageChangeAsked(const QString & message);
void on_view_windowTitleChangeAsked(const QString & message);
void on_view_enabledActionsChangeAsked(const bool * enabledActions);
void on_view_actionIconsChangeAsked(const QString * actionIcons);
void on_view_actionTextsChangeAsked(const QString * actionTexts);
void on_view_transferCheckStateChangeAsked(bool transferCheckState);
void on_view_recordCheckStateChangeAsked(bool recordCheckState);
void updateScreen(QAction * action);
void on_view_screenChanged(int screen);
void on_view_incomingCall(const Call * call);
void quitButton(); void quitButton();
......
sflphone-client-kde/src/main.cpp
+ 4
− 4
View file @ 2c879d67
...@@ -62,10 +62,10 @@ int main(int argc, char **argv) ...@@ -62,10 +62,10 @@ int main(int argc, char **argv)
// SortableCodecListWidget * cl = new SortableCodecListWidget(); // SortableCodecListWidget * cl = new SortableCodecListWidget();
// cl->show(); // cl->show();
QListView * v = new QListView(); // QListView * v = new QListView();
v->setFlow(QListView::TopToBottom); // v->setFlow(QListView::TopToBottom);
v->setModel(new AccountListModel()); // v->setModel(new AccountListModel());
v->show(); // v->show();
return app.exec(); return app.exec();
} }
......
sflphone-client-kde/src/sflphone_const.h
+ 12
− 1
View file @ 2c879d67
...@@ -48,8 +48,11 @@ ...@@ -48,8 +48,11 @@
#define ACTION_LABEL_UNHOLD i18n("Hold off") #define ACTION_LABEL_UNHOLD i18n("Hold off")
#define ACTION_LABEL_GIVE_UP_TRANSF i18n("Give up transfer") #define ACTION_LABEL_GIVE_UP_TRANSF i18n("Give up transfer")
#define ACTION_LABEL_CALL_BACK i18n("Call back") #define ACTION_LABEL_CALL_BACK i18n("Call back")
// #define ACTION_LABEL_GIVE_UP_SEARCH i18n("Give up search") #define ACTION_LABEL_MAILBOX i18n("Voicemail")
#define SCREEN_MAIN 0
#define SCREEN_HISTORY 1
#define SCREEN_ADDRESS 2
#define ICON_INCOMING ":/images/icons/ring.svg" #define ICON_INCOMING ":/images/icons/ring.svg"
#define ICON_RINGING ":/images/icons/ring.svg" #define ICON_RINGING ":/images/icons/ring.svg"
...@@ -70,6 +73,7 @@ ...@@ -70,6 +73,7 @@
#define ICON_EXEC_TRANSF ":/images/icons/call.svg" #define ICON_EXEC_TRANSF ":/images/icons/call.svg"
#define ICON_REC_DEL_OFF ":/images/icons/record_disabled.svg" #define ICON_REC_DEL_OFF ":/images/icons/record_disabled.svg"
#define ICON_REC_DEL_ON ":/images/icons/record.svg" #define ICON_REC_DEL_ON ":/images/icons/record.svg"
#define ICON_MAILBOX ":/images/icons/mailbox.svg"
#define ICON_REC_VOL_0 ":/images/icons/mic.svg" #define ICON_REC_VOL_0 ":/images/icons/mic.svg"
#define ICON_REC_VOL_1 ":/images/icons/mic_25.svg" #define ICON_REC_VOL_1 ":/images/icons/mic_25.svg"
...@@ -81,6 +85,13 @@ ...@@ -81,6 +85,13 @@
#define ICON_SND_VOL_2 ":/images/icons/speaker_50.svg" #define ICON_SND_VOL_2 ":/images/icons/speaker_50.svg"
#define ICON_SND_VOL_3 ":/images/icons/speaker_75.svg" #define ICON_SND_VOL_3 ":/images/icons/speaker_75.svg"
#define ICON_SCREEN_MAIN ":/images/icons/sflphone.svg"
#define ICON_SCREEN_HISTORY ":/images/icons/history2.svg"
#define ICON_SCREEN_ADDRESS ":/images/icons/x-office-address-book.png"
#define ICON_DISPLAY_VOLUME_CONSTROLS ":/images/icons/icon_volume_off.svg"
#define ICON_DISPLAY_DIALPAD ":/images/icons/icon_dialpad.svg"
#define ICON_HISTORY_INCOMING ":/images/icons/incoming.svg" #define ICON_HISTORY_INCOMING ":/images/icons/incoming.svg"
#define ICON_HISTORY_OUTGOING ":/images/icons/outgoing.svg" #define ICON_HISTORY_OUTGOING ":/images/icons/outgoing.svg"
#define ICON_HISTORY_MISSED ":/images/icons/missed.svg" #define ICON_HISTORY_MISSED ":/images/icons/missed.svg"
......
sflphone-client-kde/src/sflphone_kdeview.cpp
+ 137
− 203
View file @ 2c879d67
This diff is collapsed.
sflphone-client-kde/src/sflphone_kdeview.h
+ 34
− 15
View file @ 2c879d67
...@@ -79,6 +79,15 @@ protected: ...@@ -79,6 +79,15 @@ protected:
public: public:
//Constructors & Destructors //Constructors & Destructors
/**
* This constructor does not load the window as it would
* better wait for the parent window to connect to the signals
* for updating it (statusMessageChangeAsked...).
* You should call the loadWindow() method once
* you have constructed the object and connected the
* expected signals.
* @param parent
*/
sflphone_kdeView(QWidget *parent); sflphone_kdeView(QWidget *parent);
virtual ~sflphone_kdeView(); virtual ~sflphone_kdeView();
...@@ -236,11 +245,13 @@ public slots: ...@@ -236,11 +245,13 @@ public slots:
void updateStatusMessage(); void updateStatusMessage();
/** /**
* Enable the address book search line edit. * Enable the address book search line edit.
* To be called once the address book loading has finished. * To be called once the address book loading has finished.
*/ */
void enableAddressBook(); void enableAddressBook();
/** /**
* Loads the address book asynchronously. * Loads the address book asynchronously.
* Calls enableAddressBook() once the address book * Calls enableAddressBook() once the address book
...@@ -277,20 +288,16 @@ public slots: ...@@ -277,20 +288,16 @@ public slots:
} }
} }
void on_action_displayVolumeControls_triggered(); void displayVolumeControls();
void on_action_displayDialpad_triggered(); void displayDialpad();
// void on_action_configureAccounts_triggered(); void configureSflPhone();
// void on_action_configureAudio_triggered(); void accountCreationWizard();
void on_action_configureSflPhone_triggered(); void accept();
void on_action_accountCreationWizard_triggered(); void refuse();
void on_action_accept_triggered(); void hold();
void on_action_refuse_triggered(); void transfer();
void on_action_hold_triggered(); void record();
void on_action_transfer_triggered(); void mailBox();
void on_action_record_triggered();
void on_action_history_triggered(bool checked);
void on_action_addressBook_triggered(bool checked);
void on_action_mailBox_triggered();
void on_widget_dialpad_typed(QString text); void on_widget_dialpad_typed(QString text);
...@@ -320,8 +327,20 @@ public slots: ...@@ -320,8 +327,20 @@ public slots:
void on1_voiceMailNotify(const QString &accountID, int count); void on1_voiceMailNotify(const QString &accountID, int count);
void on1_volumeChanged(const QString &device, double value); void on1_volumeChanged(const QString &device, double value);
void changeScreen(int screen);
signals: signals:
void statusMessageChanged(const QString & message); void statusMessageChangeAsked(const QString & message);
void windowTitleChangeAsked(const QString & title);
void enabledActionsChangeAsked(const bool * enabledActions);
void actionIconsChangeAsked(const QString * actionIcons);
void actionTextsChangeAsked(const QString * actionTexts);
void transferCheckStateChangeAsked(bool transferCheckState);
void recordCheckStateChangeAsked(bool recordCheckState);
void addressBookEnableAsked(bool enableAddressBook);
void screenChanged(int screen);
void incomingCall(const Call * call);
}; };
......
sflphone-client-kde/src/ui/sflphone_kdeview_base.ui
+ 0
− 127
View file @ 2c879d67
...@@ -327,133 +327,6 @@ ...@@ -327,133 +327,6 @@
</widget> </widget>
</item> </item>
</layout> </layout>
<action name="action_accept">
<property name="icon">
<iconset resource="../qrc/resources.qrc">
<normaloff>:/images/icons/call.svg</normaloff>:/images/icons/call.svg</iconset>
</property>
<property name="text">
<string>Pick up</string>
</property>
</action>
<action name="action_refuse">
<property name="icon">
<iconset resource="../qrc/resources.qrc">
<normaloff>:/images/icons/hang_up.svg</normaloff>:/images/icons/hang_up.svg</iconset>
</property>
<property name="text">
<string>Hang up</string>
</property>
</action>
<action name="action_hold">
<property name="icon">
<iconset resource="../qrc/resources.qrc">
<normaloff>:/images/icons/hold.svg</normaloff>:/images/icons/hold.svg</iconset>
</property>
<property name="text">
<string>Hold on</string>
</property>
</action>
<action name="action_transfer">
<property name="checkable">
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../qrc/resources.qrc">
<normaloff>:/images/icons/transfert.svg</normaloff>:/images/icons/transfert.svg</iconset>
</property>
<property name="text">
<string>Transfer</string>
</property>
</action>
<action name="action_history">
<property name="checkable">
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../qrc/resources.qrc">
<normaloff>:/images/icons/history2.svg</normaloff>:/images/icons/history2.svg</iconset>
</property>
<property name="text">
<string>History</string>
</property>
</action>
<action name="action_mailBox">
<property name="icon">
<iconset resource="../qrc/resources.qrc">
<normaloff>:/images/icons/mailbox.svg</normaloff>:/images/icons/mailbox.svg</iconset>
</property>
<property name="text">
<string>Voicemail</string>
</property>
</action>
<action name="action_configureSflPhone">
<property name="text">
<string>Configure SFLphone</string>
</property>
<property name="toolTip">
<string>Configure SFLphone</string>
</property>
</action>
<action name="action_displayVolumeControls">
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../qrc/resources.qrc">
<normaloff>:/images/icons/icon_volume_off.svg</normaloff>:/images/icons/icon_volume_off.svg</iconset>
</property>
<property name="text">
<string>Display volume controls</string>
</property>
</action>
<action name="action_displayDialpad">
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../qrc/resources.qrc">
<normaloff>:/images/icons/icon_dialpad.svg</normaloff>:/images/icons/icon_dialpad.svg</iconset>
</property>
<property name="text">
<string>Display dialpad</string>
</property>
</action>
<action name="action_record">
<property name="checkable">
<bool>true</bool>
</property>
<property name="icon">
<iconset>
<normaloff>:/images/icons/del_off.png</normaloff>:/images/icons/del_off.png</iconset>
</property>
<property name="text">
<string>Record</string>
</property>
</action>
<action name="action_accountCreationWizard">
<property name="text">
<string>Account creation wizard</string>
</property>
</action>
<action name="action_addressBook">
<property name="checkable">
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../qrc/resources.qrc">
<normaloff>:/images/icons/x-office-address-book.png</normaloff>:/images/icons/x-office-address-book.png</iconset>
</property>
<property name="text">
<string>Address book</string>
</property>
</action>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment