Skip to content
Snippets Groups Projects
Commit 5136e092 authored by Jérémy Quentin's avatar Jérémy Quentin
Browse files

[#1548] add close button that hides windowand just hide on clicking the cross

parent d1584064
Branches
No related tags found
No related merge requests found
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
<Separator /> <Separator />
<Action name="action_mailBox" /> <Action name="action_mailBox" />
<Separator /> <Separator />
<Action name="action_close" />
<Separator />
<Action name="action_quit" /> <Action name="action_quit" />
</Menu> </Menu>
<Menu name="Settings" > <Menu name="Settings" >
......
...@@ -64,6 +64,7 @@ SFLPhone::SFLPhone(QWidget *parent) ...@@ -64,6 +64,7 @@ SFLPhone::SFLPhone(QWidget *parent)
{ {
QDir dir; QDir dir;
dir.cdUp(); dir.cdUp();
dir.cd("data");
rcFilePath = dir.filePath("sflphone-client-kdeui.rc"); rcFilePath = dir.filePath("sflphone-client-kdeui.rc");
} }
qDebug() << "rcFilePath = " << rcFilePath ; qDebug() << "rcFilePath = " << rcFilePath ;
...@@ -89,7 +90,9 @@ void SFLPhone::setupActions() ...@@ -89,7 +90,9 @@ void SFLPhone::setupActions()
actionCollection()->addAction("action_history", view->action_history); actionCollection()->addAction("action_history", view->action_history);
actionCollection()->addAction("action_addressBook", view->action_addressBook); actionCollection()->addAction("action_addressBook", view->action_addressBook);
actionCollection()->addAction("action_mailBox", view->action_mailBox); actionCollection()->addAction("action_mailBox", view->action_mailBox);
KAction * action_quit = KStandardAction::quit(qApp, SLOT(closeAllWindows()), 0); KAction * action_close = KStandardAction::close(this, SLOT(close()), 0);
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);
...@@ -131,21 +134,27 @@ void SFLPhone::setupActions() ...@@ -131,21 +134,27 @@ void SFLPhone::setupActions()
} }
bool SFLPhone::queryClose() bool SFLPhone::queryClose()
{
qDebug() << "queryClose";
hide();
return false;
}
void SFLPhone::quitButton()
{ {
InstanceInterface & instance = InstanceInterfaceSingleton::getInstance(); InstanceInterface & instance = InstanceInterfaceSingleton::getInstance();
qDebug() << "queryClose : " << view->listWidget_callList->count() << " calls open."; qDebug() << "quitButton : " << view->listWidget_callList->count() << " calls open.";
if(view->listWidget_callList->count() > 0 && instance.getRegistrationCount() <= 1) if(view->listWidget_callList->count() > 0 && instance.getRegistrationCount() <= 1)
{ {
qDebug() << "Attempting to quit when still having some calls open."; qDebug() << "Attempting to quit when still having some calls open.";
view->getErrorWindow()->showMessage(tr2i18n("You still have some calls open. Please close all calls before quitting.", 0)); view->getErrorWindow()->showMessage(tr2i18n("You still have some calls open. Please close all calls before quitting.", 0));
return false;
} }
instance.Unregister(getpid()); instance.Unregister(getpid());
return true; qApp->quit();
} }
void SFLPhone::putForeground() void SFLPhone::putForeground()
{ {
activateWindow(); activateWindow();
......
...@@ -57,6 +57,7 @@ protected: ...@@ -57,6 +57,7 @@ protected:
virtual bool queryClose(); virtual bool queryClose();
virtual void changeEvent(QEvent * event); virtual void changeEvent(QEvent * event);
public: public:
SFLPhone(QWidget *parent = 0); SFLPhone(QWidget *parent = 0);
~SFLPhone(); ~SFLPhone();
...@@ -70,6 +71,7 @@ private slots: ...@@ -70,6 +71,7 @@ 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 quitButton();
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment