diff --git a/kde/data/sflphone-client-kdeui.rc b/kde/data/sflphone-client-kdeui.rc index 2485812adbd809b6346d86c466987214fefc51cd..c91fd23094c0203c46ec6d287136dfd297983f12 100755 --- a/kde/data/sflphone-client-kdeui.rc +++ b/kde/data/sflphone-client-kdeui.rc @@ -17,10 +17,6 @@ <Action name="action_record" /> <Action name="action_mailBox" /> <Separator /> - <Action name="action_main" /> - <Action name="action_history" /> - <Action name="action_addressBook" /> - <Separator /> <Action name="action_close" /> <Separator /> <Action name="action_quit" /> @@ -44,8 +40,5 @@ <Action name="action_hold" /> <Action name="action_transfer" /> <Action name="action_record" /> - <Action name="action_main" /> - <Action name="action_history" /> - <Action name="action_addressBook" /> </ToolBar> </gui> diff --git a/kde/src/SFLPhone.cpp b/kde/src/SFLPhone.cpp index 31f6f4c293af32fb46a65aa22648df1bbcf8f83d..ce24a9b10fd786042a0e3c1d10490ad64e069152 100755 --- a/kde/src/SFLPhone.cpp +++ b/kde/src/SFLPhone.cpp @@ -178,11 +178,6 @@ 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 ); - action_screen->addAction(action_main); - action_close = KStandardAction::close(this, SLOT(close()), this); action_quit = KStandardAction::quit(this, SLOT(quitButton()), this); @@ -214,14 +209,12 @@ void SFLPhone::setupActions() /**/connect(action_configureShortcut, SIGNAL(triggered()), this , SLOT(showShortCutEditor() )); /* */ - action_screen->addAction(action_main); 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_mailBox" , action_mailBox ); actionCollection()->addAction("action_close" , action_close ); actionCollection()->addAction("action_quit" , action_quit ); @@ -400,13 +393,6 @@ void SFLPhone::on_m_pView_recordCheckStateChangeAsked(bool recordCheckState) action_record->setChecked(recordCheckState); } -///Do nothing -/// @deprecated This function can be removed -void SFLPhone::on_m_pView_screenChanged(int screen) -{ - if(screen == SCREEN_MAIN) action_main->setChecked(true); -} - ///Called when a call is coming void SFLPhone::on_m_pView_incomingCall(const Call * call) { diff --git a/kde/src/SFLPhone.h b/kde/src/SFLPhone.h index 11110e3b3dc4ca230500c74624693b1a6c5abaf6..e58c412851a39776d2a58907bdb163b6abec2eff 100755 --- a/kde/src/SFLPhone.h +++ b/kde/src/SFLPhone.h @@ -82,7 +82,6 @@ private: KAction* action_hold ; KAction* action_transfer ; KAction* action_record ; - KAction* action_main ; KAction* action_mailBox ; KAction* action_close ; KAction* action_quit ; @@ -139,7 +138,6 @@ private slots: 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 showShortCutEditor ( );