[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~mrqtros/ubuntu-docviewer-app/lo-tiled-rendering-bgr-to-rgb into lp:~ubuntu-docviewer-dev/ubuntu-docviewer-app/lo-tiled-rendering
The proposal to merge lp:~mrqtros/ubuntu-docviewer-app/lo-tiled-rendering-bgr-to-rgb into lp:~ubuntu-docviewer-dev/ubuntu-docviewer-app/lo-tiled-rendering has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~mrqtros/ubuntu-docviewer-app/lo-tiled-rendering-bgr-to-rgb/+merge/264473 -- Your team Ubuntu Document Viewer Developers is subscribed to branch lp:~ubuntu-docviewer-dev/ubuntu-docviewer-app/lo-tiled-rendering. -- Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers More help : https://help.launchpad.net/ListHelp
[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~mrqtros/ubuntu-docviewer-app/lo-tiled-rendering-bgr-to-rgb into lp:~ubuntu-docviewer-dev/ubuntu-docviewer-app/lo-tiled-rendering
The proposal to merge lp:~mrqtros/ubuntu-docviewer-app/lo-tiled-rendering-bgr-to-rgb into lp:~ubuntu-docviewer-dev/ubuntu-docviewer-app/lo-tiled-rendering has been updated. Description changed to: Seems that LoDocument uses BGR rather than RGB. Fixed. Before: https://yadi.sk/i/QEAI8cY1hoVxV After: https://yadi.sk/i/MlMK6xtPhoVxT For more details, see: https://code.launchpad.net/~mrqtros/ubuntu-docviewer-app/lo-tiled-rendering-bgr-to-rgb/+merge/264473 -- Your team Ubuntu Document Viewer Developers is requested to review the proposed merge of lp:~mrqtros/ubuntu-docviewer-app/lo-tiled-rendering-bgr-to-rgb into lp:~ubuntu-docviewer-dev/ubuntu-docviewer-app/lo-tiled-rendering. -- Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers More help : https://help.launchpad.net/ListHelp
[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~mrqtros/ubuntu-docviewer-app/lo-tiled-rendering-bgr-to-rgb into lp:~ubuntu-docviewer-dev/ubuntu-docviewer-app/lo-tiled-rendering
The proposal to merge lp:~mrqtros/ubuntu-docviewer-app/lo-tiled-rendering-bgr-to-rgb into lp:~ubuntu-docviewer-dev/ubuntu-docviewer-app/lo-tiled-rendering has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~mrqtros/ubuntu-docviewer-app/lo-tiled-rendering-bgr-to-rgb/+merge/264473 -- Your team Ubuntu Document Viewer Developers is subscribed to branch lp:~ubuntu-docviewer-dev/ubuntu-docviewer-app/lo-tiled-rendering. -- Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers More help : https://help.launchpad.net/ListHelp
[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~popey/sudoku-app/add-authors into lp:sudoku-app
The proposal to merge lp:~popey/sudoku-app/add-authors into lp:sudoku-app has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~popey/sudoku-app/add-authors/+merge/263912 -- Your team Sudoku Touch developers is subscribed to branch lp:sudoku-app. -- Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers More help : https://help.launchpad.net/ListHelp
[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gary-wzl77/ubuntu-calendar-app/fix_1440583 into lp:ubuntu-calendar-app
Gary.Wang has proposed merging lp:~gary-wzl77/ubuntu-calendar-app/fix_1440583
into lp:ubuntu-calendar-app.
Commit message:
Remove recurrence rule for non-repeating event.
Requested reviews:
Alan Pope (popey)
Related bugs:
Bug #1440583 in Ubuntu Calendar App: calendar-app is generating invalid
RECUR values in RRULE property
https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1440583
For more details, see:
https://code.launchpad.net/~gary-wzl77/ubuntu-calendar-app/fix_1440583/+merge/264487
Remove recurrence rule for non-repeating event.
--
Your team Ubuntu Calendar Developers is subscribed to branch
lp:ubuntu-calendar-app.
=== modified file 'EventDetails.qml'
--- EventDetails.qml 2015-06-27 17:52:44 +
+++ EventDetails.qml 2015-07-12 03:29:02 +
@@ -72,6 +72,9 @@
if(event.recurrence.recurrenceRules[0] !== undefined){
var rule = event.recurrence.recurrenceRules[0];
repeatLabel.text = eventUtils.getRecurrenceString(rule)
+} else {
+//For event occurs once, event.recurrence.recurrenceRules == []
+repeatLabel.text = Defines.recurrenceLabel[0];
}
}
}
=== modified file 'EventRepetition.qml'
--- EventRepetition.qml 2015-04-05 09:46:59 +
+++ EventRepetition.qml 2015-07-12 03:29:02 +
@@ -29,8 +29,7 @@
id: repetition
property var weekDays : [];
-property var rule
-property var date
+property var eventRoot;
property var isEdit
visible: false
@@ -51,6 +50,7 @@
Component.onCompleted: {
//Fill Date limitcount if any
var index = 0;
+var rule = eventRoot.rule;
if(rule !== null rule !== undefined){
index = rule.frequency ;
if(index 0 )
@@ -87,7 +87,6 @@
index = Recurrence.Yearly
break;
}
-
}
}
recurrenceOption.selectedIndex = index;
@@ -98,7 +97,13 @@
iconName: back
onTriggered: {
var recurrenceRule = Defines.recurrenceValue[ recurrenceOption.selectedIndex ];
+
if (recurrenceRule !== RecurrenceRule.Invalid) {
+if (eventRoot.rule === null || eventRoot.rule === undefined ){
+eventRoot.rule = Qt.createQmlObject(import QtOrganizer 5.0; RecurrenceRule {}, eventRoot.event.recurrence,EventRepetition.qml);
+}
+
+var rule = eventRoot.rule;
rule.frequency = recurrenceRule;
switch(recurrenceOption.selectedIndex){
case 1: //daily
@@ -109,11 +114,11 @@
rule.daysOfWeek = eventUtils.getDaysOfWeek(recurrenceOption.selectedIndex, weekDays );
break;
case 6: //monthly
-rule.daysOfMonth = [date.getDate()];
+rule.daysOfMonth = [eventRoot.date.getDate()];
break;
case 7: //yearly
-rule.monthsOfYear = [date.getMonth()];
-rule.daysOfMonth = [date.getDate()];
+rule.monthsOfYear = [eventRoot.date.getMonth()];
+rule.daysOfMonth = [eventRoot.date.getDate()];
break;
case 0: //once
default:
@@ -134,7 +139,7 @@
}
}
else {
-rule.frequency = 0
+eventRoot.rule = null;
}
pop()
}
@@ -202,7 +207,7 @@
(checked) ? weekDays.push(index) : weekDays.splice(weekDays.indexOf(index),1);
}
checked:{
-(weekDays.length === 0 index === date.getDay() isEdit === false) ? true : false;
+(weekDays.length === 0 index === eventRoot.date.getDay() isEdit === false) ? true : false;
}
}
=== modified file 'MonthComponent.qml'
--- MonthComponent.qml 2015-06-11 14:07:51 +
+++ MonthComponent.qml 2015-07-12 03:29:02 +
@@ -30,6 +30,7 @@
property var currentMonth;
property var isYearView;
+property bool showWeekNumber:true;
property string dayLabelFontSize: medium
property string dateLabelFontSize: large
@@ -123,7 +124,10 @@
id: column
anchors {
-fill: parent
+left: weekNumLoader.right;
+right: parent.right;
+top: parent.top;
+bottom: parent.bottom;
topMargin: units.gu(1.5)
bottomMargin: units.gu(1)
}
@@ -191,6 +195,60 @@
}
}
+Loader {
+id: weekNumLoader;
+anchors.left: parent.left;
+width: showWeekNumber ? parent.width / 8:0;
+height: parent.height;
+visible: showWeekNumber;
+sourceComponent: showWeekNumber ?
[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~pkunal-parmar/ubuntu-calendar-app/ReminderRepeat into lp:ubuntu-calendar-app
Kunal Parmar has proposed merging
lp:~pkunal-parmar/ubuntu-calendar-app/ReminderRepeat into
lp:ubuntu-calendar-app.
Commit message:
Resolves Bug #1470583
Requested reviews:
Ubuntu Calendar Developers (ubuntu-calendar-dev)
For more details, see:
https://code.launchpad.net/~pkunal-parmar/ubuntu-calendar-app/ReminderRepeat/+merge/264488
Reminder repeat and delay changed
Resolves Bug #1470583
--
Your team Ubuntu Calendar Developers is requested to review the proposed merge
of lp:~pkunal-parmar/ubuntu-calendar-app/ReminderRepeat into
lp:ubuntu-calendar-app.
=== modified file 'EventReminder.qml'
--- EventReminder.qml 2014-11-11 12:41:18 +
+++ EventReminder.qml 2015-07-12 03:38:10 +
@@ -37,13 +37,26 @@
head.backAction: Action{
iconName:back
onTriggered:{
-visualReminder.repetitionCount = 3;
-visualReminder.repetitionDelay = 120;
+var repeatCount = 3;
+var repeatDelay = 5 * 60;
+
+print(reminder time : + reminderTime);
+
+//reminder on event time
+if( reminderTime === 0 ) {
+repeatCount = 0;
+repeatDelay = 0;
+} else if( reminderTime === 300) { //5 min
+repeatCount = 1;
+}
+
+visualReminder.repetitionCount = repeatCount;
+visualReminder.repetitionDelay = repeatDelay;
visualReminder.message = eventTitle
visualReminder.secondsBeforeStart = reminderTime;
-audibleReminder.repetitionCount = 3;
-audibleReminder.repetitionDelay = 120;
+audibleReminder.repetitionCount = repeatCount;
+audibleReminder.repetitionDelay = repeatDelay;
audibleReminder.secondsBeforeStart = reminderTime;
pop();
--
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help : https://help.launchpad.net/ListHelp
Re: [Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gary-wzl77/ubuntu-calendar-app/fix_1440583 into lp:ubuntu-calendar-app
Review: Approve continuous-integration PASSED: Continuous integration, rev:693 http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1211/ Executed test runs: SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3068 deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3068/artifact/work/output/*zip*/output.zip SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/682 SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/208 Click here to trigger a rebuild: http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1211/rebuild -- https://code.launchpad.net/~gary-wzl77/ubuntu-calendar-app/fix_1440583/+merge/264487 Your team Ubuntu Calendar Developers is subscribed to branch lp:ubuntu-calendar-app. -- Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers More help : https://help.launchpad.net/ListHelp
Re: [Ubuntu-touch-coreapps-reviewers] [Merge] lp:sudoku-app into lp:~dinko-metalac/sudoku-app/fix-for-1465453
Review: Approve -- https://code.launchpad.net/~sudoku-touch-dev/sudoku-app/trunk/+merge/264482 Your team Sudoku Touch developers is subscribed to branch lp:sudoku-app. -- Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers More help : https://help.launchpad.net/ListHelp
