Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
c25a09e6
Commit
c25a09e6
authored
13 years ago
by
Emmanuel Lepage
Browse files
Options
Downloads
Patches
Plain Diff
Remove useless icon in toolbar
parent
6313d19e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
kde/data/sflphone-client-kdeui.rc
+0
-7
0 additions, 7 deletions
kde/data/sflphone-client-kdeui.rc
kde/src/SFLPhone.cpp
+0
-14
0 additions, 14 deletions
kde/src/SFLPhone.cpp
kde/src/SFLPhone.h
+0
-2
0 additions, 2 deletions
kde/src/SFLPhone.h
with
0 additions
and
23 deletions
kde/data/sflphone-client-kdeui.rc
+
0
−
7
View file @
c25a09e6
...
...
@@ -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>
This diff is collapsed.
Click to expand it.
kde/src/SFLPhone.cpp
+
0
−
14
View file @
c25a09e6
...
...
@@ -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
)
{
...
...
This diff is collapsed.
Click to expand it.
kde/src/SFLPhone.h
+
0
−
2
View file @
c25a09e6
...
...
@@ -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
(
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment