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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
bc9ce367
Commit
bc9ce367
authored
15 years ago
by
Jérémy Quentin
Browse files
Options
Downloads
Patches
Plain Diff
[#1886] clean debug
parent
128bb4fc
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
sflphone-client-kde/src/SFLPhoneView.cpp
+3
-4
3 additions, 4 deletions
sflphone-client-kde/src/SFLPhoneView.cpp
sflphone-client-kde/src/conf/dlgaccountsbase.ui
+270
-137
270 additions, 137 deletions
sflphone-client-kde/src/conf/dlgaccountsbase.ui
with
273 additions
and
141 deletions
sflphone-client-kde/src/SFLPhoneView.cpp
+
3
−
4
View file @
bc9ce367
...
...
@@ -21,7 +21,6 @@
#include
"SFLPhoneView.h"
#include
<klocale.h>
#include
<QtGui/QLabel>
#include
<QtGui/QContextMenuEvent>
#include
<QtGui/QMenu>
...
...
@@ -29,6 +28,7 @@
#include
<QtGui/QPalette>
#include
<QtGui/QInputDialog>
#include
<klocale.h>
#include
<kstandardaction.h>
#include
<kactioncollection.h>
#include
<kaction.h>
...
...
@@ -602,7 +602,6 @@ void SFLPhoneView::updateCallHistory()
while
(
listWidget_callHistory
->
count
()
>
0
)
{
QListWidgetItem
*
item
=
listWidget_callHistory
->
takeItem
(
0
);
qDebug
()
<<
"take item "
<<
item
->
text
()
<<
" ; widget = "
<<
callList
->
findCallByHistoryItem
(
item
);
}
QString
textSearched
=
lineEdit_searchHistory
->
text
();
for
(
int
i
=
callList
->
size
()
-
1
;
i
>=
0
;
i
--
)
...
...
@@ -628,7 +627,6 @@ void SFLPhoneView::updateAddressBook()
while
(
listWidget_addressBook
->
count
()
>
0
)
{
QListWidgetItem
*
item
=
listWidget_addressBook
->
takeItem
(
0
);
qDebug
()
<<
"take item "
<<
item
->
text
();
delete
item
;
}
if
(
isAddressBookEnabled
())
...
...
@@ -1040,7 +1038,8 @@ void SFLPhoneView::on_stackedWidget_screen_currentChanged(int index)
void
SFLPhoneView
::
contextMenuEvent
(
QContextMenuEvent
*
event
)
{
QMenu
menu
(
this
);
if
(
stackedWidget_screen
->
currentWidget
()
==
page_callHistory
||
stackedWidget_screen
->
currentWidget
()
==
page_addressBook
)
if
(
(
stackedWidget_screen
->
currentWidget
()
==
page_callHistory
&&
listWidget_callHistory
->
currentItem
()
)
||
(
stackedWidget_screen
->
currentWidget
()
==
page_addressBook
&&
listWidget_addressBook
->
currentItem
()
)
)
{
QAction
*
action_edit
=
new
QAction
(
&
menu
);
action_edit
->
setText
(
i18n
(
"Edit before call"
));
...
...
This diff is collapsed.
Click to expand it.
sflphone-client-kde/src/conf/dlgaccountsbase.ui
+
270
−
137
View file @
bc9ce367
...
...
@@ -7,7 +7,7 @@
<x>
0
</x>
<y>
0
</y>
<width>
603
</width>
<height>
314
</height>
<height>
455
</height>
</rect>
</property>
<property
name=
"windowTitle"
>
...
...
@@ -229,23 +229,21 @@
</widget>
</item>
<item>
<widget
class=
"Q
Frame
"
name=
"frame2_editAccounts"
>
<widget
class=
"Q
TabWidget
"
name=
"frame2_editAccounts"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Expanding"
vsizetype=
"Expanding"
>
<horstretch>
1
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<property
name=
"frameShape"
>
<enum>
QFrame::StyledPanel
</enum>
</property>
<property
name=
"frameShadow"
>
<enum>
QFrame::Raised
</enum>
</property>
<layout
class=
"QFormLayout"
name=
"formLayout_2"
>
<property
name=
"fieldGrowthPolicy"
>
<enum>
QFormLayout::ExpandingFieldsGrow
</enum>
<property
name=
"currentIndex"
>
<number>
0
</number>
</property>
<widget
class=
"QWidget"
name=
"tab_basic"
>
<attribute
name=
"title"
>
<string>
Basic
</string>
</attribute>
<layout
class=
"QFormLayout"
name=
"formLayout"
>
<item
row=
"0"
column=
"0"
>
<widget
class=
"QLabel"
name=
"label1_alias"
>
<property
name=
"text"
>
...
...
@@ -368,6 +366,12 @@
</item>
<item
row=
"6"
column=
"1"
>
<widget
class=
"QLabel"
name=
"edit7_state"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Expanding"
vsizetype=
"Preferred"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<property
name=
"text"
>
<string/>
</property>
...
...
@@ -375,6 +379,114 @@
</item>
</layout>
</widget>
<widget
class=
"QWidget"
name=
"tab_security"
>
<attribute
name=
"title"
>
<string>
Security
</string>
</attribute>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout_2"
>
<item>
<widget
class=
"QCheckBox"
name=
"checkBox_useSRTP"
>
<property
name=
"text"
>
<string>
Use SRTP
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QWidget"
name=
"widget"
native=
"true"
>
<property
name=
"enabled"
>
<bool>
false
</bool>
</property>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout_3"
>
<property
name=
"leftMargin"
>
<number>
0
</number>
</property>
<item>
<widget
class=
"QWidget"
name=
"widget_keyExchange"
native=
"true"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Preferred"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout"
>
<property
name=
"spacing"
>
<number>
-1
</number>
</property>
<property
name=
"margin"
>
<number>
0
</number>
</property>
<item>
<widget
class=
"QLabel"
name=
"label_keyExchange"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Preferred"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<property
name=
"text"
>
<string>
Key exchange
</string>
</property>
<property
name=
"buddy"
>
<cstring>
combo_keyExchange
</cstring>
</property>
</widget>
</item>
<item>
<widget
class=
"KComboBox"
name=
"combo_keyExchange"
/>
</item>
</layout>
</widget>
</item>
<item>
<widget
class=
"QCheckBox"
name=
"checkBox_helloSDP"
>
<property
name=
"text"
>
<string>
Send hello hash in SDP
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QCheckBox"
name=
"checkBox_confirmSAS"
>
<property
name=
"text"
>
<string>
Ask user to confirm SAS
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QCheckBox"
name=
"checkBox_warnZRTP"
>
<property
name=
"text"
>
<string>
Warn if ZRTP is not supported
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QCheckBox"
name=
"checkBox_displaySASOnce"
>
<property
name=
"text"
>
<string>
Display SAS once for hold events
</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer
name=
"verticalSpacer"
>
<property
name=
"orientation"
>
<enum>
Qt::Vertical
</enum>
</property>
<property
name=
"sizeType"
>
<enum>
QSizePolicy::Expanding
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
20
</width>
<height>
1
</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
...
...
@@ -434,6 +546,11 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>
KComboBox
</class>
<extends>
QComboBox
</extends>
<header>
kcombobox.h
</header>
</customwidget>
<customwidget>
<class>
KLineEdit
</class>
<extends>
QLineEdit
</extends>
...
...
@@ -452,11 +569,27 @@
<hints>
<hint
type=
"sourcelabel"
>
<x>
71
</x>
<y>
273
</y>
<y>
414
</y>
</hint>
<hint
type=
"destinationlabel"
>
<x>
167
</x>
<y>
278
</y>
<y>
419
</y>
</hint>
</hints>
</connection>
<connection>
<sender>
checkBox_useSRTP
</sender>
<signal>
toggled(bool)
</signal>
<receiver>
widget
</receiver>
<slot>
setEnabled(bool)
</slot>
<hints>
<hint
type=
"sourcelabel"
>
<x>
377
</x>
<y>
61
</y>
</hint>
<hint
type=
"destinationlabel"
>
<x>
380
</x>
<y>
70
</y>
</hint>
</hints>
</connection>
...
...
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