Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
savoirfairelinux
jami-daemon
Commits
1a5d6250
Commit
1a5d6250
authored
Sep 26, 2011
by
Emmanuel Lepage
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SFLPhone KDE do not destroy history anymore
parent
33083583
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
6 deletions
+24
-6
kde/src/SFLPhoneView.cpp
kde/src/SFLPhoneView.cpp
+1
-1
kde/src/widgets/ContactItemWidget.cpp
kde/src/widgets/ContactItemWidget.cpp
+20
-5
kde/src/widgets/ContactItemWidget.h
kde/src/widgets/ContactItemWidget.h
+2
-0
kde/src/widgets/HistoryTreeItem.h
kde/src/widgets/HistoryTreeItem.h
+1
-0
No files found.
kde/src/SFLPhoneView.cpp
View file @
1a5d6250
...
...
@@ -111,7 +111,7 @@ SFLPhoneView::~SFLPhoneView()
void
SFLPhoneView
::
saveState
()
{
ConfigurationManagerInterface
&
configurationManager
=
ConfigurationManagerInterfaceSingleton
::
getInstance
();
configurationManager
.
setHistory
(
callTreeModel
->
getHistoryCallId
());
//
configurationManager.setHistory(callTreeModel->getHistoryCallId());
}
void
SFLPhoneView
::
loadWindow
()
...
...
kde/src/widgets/ContactItemWidget.cpp
View file @
1a5d6250
...
...
@@ -42,28 +42,38 @@ ContactItemWidget::ContactItemWidget(QWidget *parent)
m_pCallAgain
->
setShortcut
(
Qt
::
CTRL
+
Qt
::
Key_Enter
);
m_pCallAgain
->
setText
(
"Call Again"
);
m_pCallAgain
->
setIcon
(
KIcon
(
ICON_DIALING
));
m_pEditContact
=
new
KAction
(
this
);
m_pEditContact
->
setShortcut
(
Qt
::
CTRL
+
Qt
::
Key_E
);
m_pEditContact
->
setText
(
"Edit contact"
);
m_pEditContact
->
setIcon
(
KIcon
(
"contact-new"
));
m_pCopy
=
new
KAction
(
this
);
m_pCopy
->
setShortcut
(
Qt
::
CTRL
+
Qt
::
Key_C
);
m_pCopy
->
setText
(
"Copy"
);
m_pCopy
->
setIcon
(
KIcon
(
"edit-copy"
));
m_pEmail
=
new
KAction
(
this
);
m_pEmail
->
setShortcut
(
Qt
::
CTRL
+
Qt
::
Key_M
);
m_pEmail
->
setText
(
"Send Email"
);
m_pEmail
->
setIcon
(
KIcon
(
"mail-message-new"
));
m_pAddPhone
=
new
KAction
(
this
);
m_pAddPhone
->
setShortcut
(
Qt
::
CTRL
+
Qt
::
Key_N
);
m_pAddPhone
->
setText
(
"Add Phone Number"
);
m_pAddPhone
->
setIcon
(
KIcon
(
"list-resource-add"
));
connect
(
m_pCallAgain
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
callAgain
()
));
connect
(
m_pEditContact
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
editContact
()
));
connect
(
m_pCopy
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
copy
()
));
connect
(
m_pEmail
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
sendEmail
()
));
connect
(
m_pAddPhone
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
addPhone
()
));
m_pBookmark
=
new
KAction
(
this
);
m_pBookmark
->
setShortcut
(
Qt
::
CTRL
+
Qt
::
Key_N
);
m_pBookmark
->
setText
(
"Bookmark"
);
m_pBookmark
->
setIcon
(
KIcon
(
"bookmarks"
));
connect
(
m_pCallAgain
,
SIGNAL
(
triggered
())
,
this
,
SLOT
(
callAgain
()
));
connect
(
m_pEditContact
,
SIGNAL
(
triggered
())
,
this
,
SLOT
(
editContact
()
));
connect
(
m_pCopy
,
SIGNAL
(
triggered
())
,
this
,
SLOT
(
copy
()
));
connect
(
m_pEmail
,
SIGNAL
(
triggered
())
,
this
,
SLOT
(
sendEmail
()
));
connect
(
m_pAddPhone
,
SIGNAL
(
triggered
())
,
this
,
SLOT
(
addPhone
()
));
connect
(
m_pBookmark
,
SIGNAL
(
triggered
())
,
this
,
SLOT
(
bookmark
()
));
}
ContactItemWidget
::~
ContactItemWidget
()
...
...
@@ -226,4 +236,9 @@ void ContactItemWidget::editContact()
void
ContactItemWidget
::
addPhone
()
{
qDebug
()
<<
"Adding to contact"
;
}
void
ContactItemWidget
::
bookmark
()
{
}
\ No newline at end of file
kde/src/widgets/ContactItemWidget.h
View file @
1a5d6250
...
...
@@ -53,6 +53,7 @@ class ContactItemWidget : public QWidget
KAction
*
m_pCopy
;
KAction
*
m_pEmail
;
KAction
*
m_pAddPhone
;
KAction
*
m_pBookmark
;
QMenu
*
m_pMenu
;
KABC
::
Addressee
*
contact
()
const
;
...
...
@@ -92,6 +93,7 @@ private slots:
void
copy
();
void
editContact
();
void
addPhone
();
void
bookmark
();
};
#endif // CALLTREE_ITEM_H
kde/src/widgets/HistoryTreeItem.h
View file @
1a5d6250
...
...
@@ -78,6 +78,7 @@ class HistoryTreeItem : public QWidget
KAction
*
m_pAddToContact
;
KAction
*
m_pCopy
;
KAction
*
m_pEmail
;
KAction
*
m_pBookmark
;
QMenu
*
m_pMenu
;
uint
m_pTimeStamp
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment