marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-03 10:14:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove the correct call

Browse source
This commit is contained in:
Marco Martin 2015-04-27 13:25:47 +02:00
parent 7050b65686
commit 5efb820769
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dialer/package/contents/ui/Dialer/History.qml
View file

@ -39,7 +39,7 @@ Item {
PlasmaComponents.Label { PlasmaComponents.Label {
anchors.centerIn: parent anchors.centerIn: parent
text: i18n("No recent calls") text: i18n("No recent calls")
visible: false visible: historyModel.count == 0
} }
PlasmaExtras.ScrollArea { PlasmaExtras.ScrollArea {

2
dialer/package/contents/ui/Dialer/HistoryDelegate.qml
View file

@ -48,7 +48,7 @@ Item {
easing.type: Easing.InOutQuad easing.type: Easing.InOutQuad
} }
ScriptAction { ScriptAction {
script: removeCallFromHistory(index); script: removeCallFromHistory(model.originalIndex);
} }
} }

21
dialer/package/contents/ui/main.qml
View file

@ -106,18 +106,20 @@ ApplicationWindow {
function(tx) { function(tx) {
var rs = tx.executeSql("INSERT INTO History VALUES(NULL, ?, date('now'), datetime('now'), ?, ? )", [number, duration, callType]); var rs = tx.executeSql("INSERT INTO History VALUES(NULL, ?, date('now'), datetime('now'), ?, ? )", [number, duration, callType]);
// Show all added greetings
var rs = tx.executeSql('SELECT * FROM History where id=?', [rs.insertId]); var rs = tx.executeSql('SELECT * FROM History where id=?', [rs.insertId]);
for(var i = 0; i < rs.rows.length; i++) { for(var i = 0; i < rs.rows.length; i++) {
historyModel.append(rs.rows.item(i)); var row = rs.rows.item(i);
row.originalIndex = historyModel.count;
historyModel.append(row);
} }
} }
) )
} }
function removeCallFromHistory(id) { //index is historyModel row number, not db id and not sortmodel row number
var item = historyModel.get(id); function removeCallFromHistory(index) {
var item = historyModel.get(index);
if (!item) { if (!item) {
return; return;
@ -131,7 +133,8 @@ ApplicationWindow {
} }
) )
historyModel.remove(id); historyModel.remove(index);
} }
//END FUNCTIONS //END FUNCTIONS
@ -150,14 +153,12 @@ ApplicationWindow {
//callType: wether is incoming, outgoing, unanswered //callType: wether is incoming, outgoing, unanswered
tx.executeSql('CREATE TABLE IF NOT EXISTS History(id INTEGER PRIMARY KEY AUTOINCREMENT, number TEXT, date DATE, time DATETIME, duration INTEGER, callType INTEGER)'); tx.executeSql('CREATE TABLE IF NOT EXISTS History(id INTEGER PRIMARY KEY AUTOINCREMENT, number TEXT, date DATE, time DATETIME, duration INTEGER, callType INTEGER)');
// Add (another) greeting row
// tx.executeSql("INSERT INTO History VALUES(NULL, ?, date('now'), time('now'), ? )", ['+39000', 0]);
// Show all added greetings
var rs = tx.executeSql('SELECT * FROM History'); var rs = tx.executeSql('SELECT * FROM History');
for(var i = 0; i < rs.rows.length; i++) { for(var i = 0; i < rs.rows.length; i++) {
historyModel.append(rs.rows.item(i)); var row = rs.rows.item(i);
row.originalIndex = historyModel.count;
historyModel.append(row);
} }
} }
) )