ubuntu-touch-coreapps-reviewers team mailing list archive
-
ubuntu-touch-coreapps-reviewers team
-
Mailing list archive
-
Message #08735
[Merge] lp:~verzegnassi-stefano/ubuntu-docviewer-app/uitk-theming-silo-50 into lp:ubuntu-docviewer-app
Stefano Verzegnassi has proposed merging lp:~verzegnassi-stefano/ubuntu-docviewer-app/uitk-theming-silo-50 into lp:ubuntu-docviewer-app.
Commit message:
* Updated copyright
* Removed usage of deprecated colors (e.g. UbuntuColors.midAubergine)
* Align to the latest clock-app specs (i.e. don't use purple as accent color)
* Use the section divider from the latest calendar-app specs
* Don't use DemiBold in PDF ToC
* Fixed font color broken after UITK theming changes in Silo 50 (OTA 10)
* ResizeableSidebar: fixed vertical divider margins
Requested reviews:
Ubuntu Document Viewer Developers (ubuntu-docviewer-dev)
Related bugs:
Bug #1551259 in Ubuntu Document Viewer App: "Potential document-viewer app updates needed due to a change in theming/UI toolkit in OTA10"
https://bugs.launchpad.net/ubuntu-docviewer-app/+bug/1551259
For more details, see:
https://code.launchpad.net/~verzegnassi-stefano/ubuntu-docviewer-app/uitk-theming-silo-50/+merge/288555
* Updated copyright
* Removed usage of deprecated colors (e.g. UbuntuColors.midAubergine)
* Align to the latest clock-app specs (i.e. don't use purple as accent color)
* Use the section divider from the latest calendar-app specs
* Don't use DemiBold in PDF ToC
* Fixed font color broken after UITK theming changes in Silo 50 (OTA 10)
* ResizeableSidebar: fixed vertical divider margins
--
Your team Ubuntu Document Viewer Developers is requested to review the proposed merge of lp:~verzegnassi-stefano/ubuntu-docviewer-app/uitk-theming-silo-50 into lp:ubuntu-docviewer-app.
=== modified file 'src/app/qml/common/ResizeableSidebar.qml'
--- src/app/qml/common/ResizeableSidebar.qml 2015-10-27 20:19:05 +0000
+++ src/app/qml/common/ResizeableSidebar.qml 2016-03-09 18:19:39 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Canonical, Ltd.
+ * Copyright (C) 2015, 2016 Canonical, Ltd.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -35,11 +35,9 @@
bottom: parent.bottom
right: resizeableSidebar.anchors.left ? parent.right : undefined
left: resizeableSidebar.anchors.left ? undefined : parent.left
- leftMargin: units.dp(2)
- rightMargin: units.dp(2)
}
- width: units.dp(2)
- color: Theme.palette.selected.background
+ width: units.dp(1)
+ color: theme.palette.normal.base
// Stay above the sidebar content
z: 10
@@ -68,7 +66,7 @@
when: resizerSensing.pressed || resizerSensing.containsMouse
PropertyChanges {
target: verticalDivider
- color: Qt.darker(Theme.palette.normal.background, 1.5)
+ color: Qt.darker(theme.palette.normal.background, 1.5)
}
}
transitions: Transition {
=== modified file 'src/app/qml/common/SubtitledListItem.qml'
--- src/app/qml/common/SubtitledListItem.qml 2015-12-27 12:10:06 +0000
+++ src/app/qml/common/SubtitledListItem.qml 2016-03-09 18:19:39 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Canonical, Ltd.
+ * Copyright (C) 2015, 2016 Canonical, Ltd.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -26,12 +26,7 @@
ListItemLayout {
id: listItemLayout
-
- title {
- text: listItemSubtitled.text
- color: UbuntuColors.midAubergine
- }
-
+ title.text: listItemSubtitled.text
subtitle {
text: listItemSubtitled.subText
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
=== modified file 'src/app/qml/documentPage/DocumentListDelegate.qml'
--- src/app/qml/documentPage/DocumentListDelegate.qml 2015-12-29 17:13:25 +0000
+++ src/app/qml/documentPage/DocumentListDelegate.qml 2016-03-09 18:19:39 +0000
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2015 Stefano Verzegnassi
+ Copyright (C) 2015, 2016 Stefano Verzegnassi
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License 3 as published by
@@ -51,9 +51,6 @@
// FIXME: We may want to reserve 2 lines for displaying the title.
// 2015.12.29: that's not possible because of bug lp:1529909
text: model.name
- elide: Text.ElideRight
- wrapMode: Text.WrapAnywhere
- color: UbuntuColors.midAubergine
}
subtitle.text: internal.formattedDateTime()
=== modified file 'src/app/qml/documentPage/SectionHeader.qml'
--- src/app/qml/documentPage/SectionHeader.qml 2015-10-23 14:00:16 +0000
+++ src/app/qml/documentPage/SectionHeader.qml 2016-03-09 18:19:39 +0000
@@ -1,29 +1,55 @@
import QtQuick 2.4
import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItems
import DocumentViewer 1.0
-ListItems.Header {
- text: {
- if (sortSettings.sortMode === 1) // sort by name
- return section.toUpperCase()
-
- if (sortSettings.sortMode === 0) { // sort by date
- if (section == DocumentsModel.Today)
- return i18n.tr("Today")
-
- if (section == DocumentsModel.Yesterday)
- return i18n.tr("Yesterday")
-
- if (section == DocumentsModel.LastWeek)
- return i18n.tr("Earlier this week")
-
- if (section == DocumentsModel.LastMonth)
- return i18n.tr("Earlier this month")
-
- return i18n.tr("Even earlier...")
- }
-
- return ""
+import "../common"
+
+Rectangle {
+ anchors { left: parent.left; right: parent.right }
+ height: units.gu(4)
+
+ color: theme.palette.normal.foreground
+
+ property alias text: label.text
+
+ Label {
+ id: label
+ anchors {
+ left: parent.left;
+ right: parent.right
+ margins: units.gu(2)
+ verticalCenter: parent.verticalCenter
+ }
+
+ text: {
+ if (sortSettings.sortMode === 1) // sort by name
+ return section.toUpperCase()
+
+ if (sortSettings.sortMode === 0) { // sort by date
+ if (section == DocumentsModel.Today)
+ return i18n.tr("Today")
+
+ if (section == DocumentsModel.Yesterday)
+ return i18n.tr("Yesterday")
+
+ if (section == DocumentsModel.LastWeek)
+ return i18n.tr("Earlier this week")
+
+ if (section == DocumentsModel.LastMonth)
+ return i18n.tr("Earlier this month")
+
+ return i18n.tr("Even earlier...")
+ }
+
+ return ""
+ }
+ }
+
+ HorizontalDivider {
+ anchors {
+ left: parent.left
+ right: parent.right
+ bottom: parent.bottom
+ }
}
}
=== modified file 'src/app/qml/loView/PartsView.qml'
--- src/app/qml/loView/PartsView.qml 2016-01-24 20:37:45 +0000
+++ src/app/qml/loView/PartsView.qml 2016-03-09 18:19:39 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Stefano Verzegnassi
+ * Copyright (C) 2015, 2016 Stefano Verzegnassi
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -113,8 +113,8 @@
wrapMode: Text.WordWrap
text: model.name
visible: view.isWide
- color: (loView.currentPart === model.index) ? UbuntuColors.orange
- : theme.palette.selected.backgroundText
+ color: (loView.currentPart === model.index) ? theme.palette.selected.backgroundText
+ : theme.palette.normal.backgroundText
}
/* UITK 1.3 specs: Slot C */
@@ -122,8 +122,8 @@
SlotsLayout.position: SlotsLayout.Trailing
text: model.index + 1
- color: (loView.currentPart === model.index) ? UbuntuColors.orange
- : theme.palette.selected.backgroundText
+ color: (loView.currentPart === model.index) ? theme.palette.selected.backgroundText
+ : theme.palette.normal.backgroundText
}
}
}
@@ -180,8 +180,8 @@
Label {
Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
text: model.index + 1
- color: (loView.currentPart === model.index) ? UbuntuColors.orange
- : theme.palette.selected.backgroundText
+ color: (loView.currentPart === model.index) ? theme.palette.selected.backgroundText
+ : theme.palette.normal.backgroundText
}
}
}
=== modified file 'src/app/qml/loView/SpreadsheetSelector.qml'
--- src/app/qml/loView/SpreadsheetSelector.qml 2016-01-16 12:59:38 +0000
+++ src/app/qml/loView/SpreadsheetSelector.qml 2016-03-09 18:19:39 +0000
@@ -62,7 +62,8 @@
// TRANSLATORS: Please don't add any space between "Sheet" and "%1".
// This is the default name for a sheet in LibreOffice.
text: model.name || i18n.tr("Sheet%1").arg(model.index + 1)
- color: del.selected ? UbuntuColors.orange : theme.palette.normal.baseText
+ color: del.selected ? theme.palette.selected.backgroundText
+ : theme.palette.normal.backgroundTertiaryText
}
Rectangle {
@@ -72,7 +73,7 @@
bottom: parent.bottom
}
height: units.dp(2)
- color: UbuntuColors.orange
+ color: theme.palette.selected.backgroundText
visible: del.selected
}
}
=== modified file 'src/app/qml/pdfView/PdfContentsPage.qml'
--- src/app/qml/pdfView/PdfContentsPage.qml 2016-01-13 19:39:35 +0000
+++ src/app/qml/pdfView/PdfContentsPage.qml 2016-03-09 18:19:39 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014, 2015
+ * Copyright (C) 2014-2016
* Stefano Verzegnassi <verzegnassi.stefano@xxxxxxxxx>
*
* This program is free software; you can redistribute it and/or modify
@@ -62,12 +62,6 @@
id: delegate
objectName: "delegate" + index
- anchors {
- left: parent.left; right: parent.right
- leftMargin: units.gu(2) + (model.level * units.gu(2))
- rightMargin: units.gu(2)
- }
-
onClicked: {
pdfView.positionAtIndex(model.pageIndex);
contentsBottomEdge.collapse();
@@ -92,14 +86,15 @@
id: listItemLayout
objectName: "listItemLayout" + index
anchors.fill: parent
+ anchors.leftMargin: model.level * units.gu(4)
/* UITK 1.3 specs: Slot A */
title {
text: model.title
elide: Text.ElideRight
- font.weight: model.level == 0 ? Font.DemiBold : Font.Normal
- color: (model.level == 0) ? UbuntuColors.midAubergine
- : theme.palette.selected.backgroundText
+// font.weight: model.level == 0 ? Font.DemiBold : Font.Normal
+// color: (model.level == 0) ? UbuntuColors.midAubergine
+// : theme.palette.normal.backgroundText
}
/* UITK 1.3 specs: Slot B */
@@ -116,9 +111,9 @@
objectName: "pageindex"
SlotsLayout.position: SlotsLayout.Last
text: model.pageIndex + 1
- font.weight: model.level == 0 ? Font.DemiBold : Font.Normal
- color: (model.level == 0) ? UbuntuColors.midAubergine
- : theme.palette.selected.backgroundText
+// font.weight: model.level == 0 ? Font.DemiBold : Font.Normal
+// color: (model.level == 0) ? UbuntuColors.midAubergine
+// : theme.palette.normal.backgroundText
}
}
}
Follow ups
