Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: Igalia/aura
base: 6cd6b5d5a7
...
head fork: Igalia/aura
compare: 19f744ddba
  • 4 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
View
49 src/AboutView.qml
@@ -30,7 +30,7 @@ import com.nokia.meego 1.0
import com.nokia.extras 1.1
import "file:///usr/lib/qt4/imports/com/meego/UIConstants.js" as UIConstants
-Page {
+Item {
id: page
property string license: 'This program is free software: you can redistribute it and/or modify ' +
@@ -59,6 +59,7 @@ Page {
property string websiteUrl: ''
property string copyright: ''
property string disclaimer: ''
+ property color backgroundColor: '#080808'
property int __numItems: 0
@@ -72,21 +73,13 @@ Page {
onStoreUrlChanged: modelSetValues()
onTwitterUrlChanged: modelSetValues()
onPublisherUrlChanged: modelSetValues()
- onWebsiteUrlChanged: modelSetValued()
+ onWebsiteUrlChanged: modelSetValues()
function modelSetValues() {
console.debug("modelSetValues()")
aboutOptions.setValues()
}
- tools: ToolBarLayout {
- ToolIcon {
- id: backIcon
- iconId: 'toolbar-back'
- onClicked: pageStack.pop()
- }
- }
-
ListModel {
id: aboutOptions
@@ -191,6 +184,13 @@ Page {
}
}
+ Rectangle {
+ id: fullBackgroundRectangle
+ anchors.fill: parent
+ radius: 30
+ color: backgroundColor
+ }
+
Flickable {
id: flick
clip: true
@@ -221,13 +221,13 @@ Page {
platformStyle: LabelStyle {
fontPixelSize: UIConstants.FONT_XLARGE
}
- color: UIConstants.COLOR_FOREGROUND
+ color: UIConstants.COLOR_BACKGROUND
}
Rectangle {
width: parent.width
height: __numItems * UIConstants.LIST_ITEM_HEIGHT_SMALL
- color: 'white'
+ color: backgroundColor
Column {
id: subcolumn
@@ -246,7 +246,7 @@ Page {
BorderImage {
anchors.fill: parent
visible: mouseArea.pressed
- source: 'image://theme/meegotouch-list-fullwidth-background-pressed-vertical-center'
+ source: 'image://theme/meegotouch-list-fullwidth-inverted-background-pressed-vertical-center'
}
Label {
@@ -258,6 +258,7 @@ Page {
platformStyle: LabelStyle {
fontPixelSize: UIConstants.FONT_SLARGE
}
+ color: UIConstants.COLOR_BACKGROUND
text: model.title
}
@@ -267,6 +268,7 @@ Page {
rightMargin: UIConstants.DEFAULT_MARGIN
verticalCenter: parent.verticalCenter
}
+ source: "image://theme/icon-m-common-drilldown-arrow-inverse"
}
Rectangle {
@@ -292,12 +294,13 @@ Page {
}
}
- BorderImage {
- id: border
- source: 'qrc:/resources/round-corners-shadow.png'
+ Rectangle {
+ id: borderRectangle
anchors.fill: parent
- border.left: 18; border.top: 18
- border.right: 18; border.bottom: 18
+ border.color: 'grey'
+ border.width: 2
+ color: 'transparent'
+ radius: 20
}
}
@@ -310,7 +313,7 @@ Page {
fontPixelSize: UIConstants.FONT_LSMALL
fontFamily: UIConstants.FONT_FAMILY_LIGHT
}
- color: UIConstants.COLOR_FOREGROUND
+ color: UIConstants.COLOR_BACKGROUND
visible: copyright != ''
}
@@ -323,7 +326,7 @@ Page {
fontPixelSize: UIConstants.FONT_LSMALL
fontFamily: UIConstants.FONT_FAMILY_LIGHT
}
- color: UIConstants.COLOR_FOREGROUND
+ color: UIConstants.COLOR_BACKGROUND
onLinkActivated: Qt.openUrlExternally(link)
visible: disclaimer != ''
}
@@ -331,6 +334,7 @@ Page {
Button {
anchors.horizontalCenter: parent.horizontalCenter
text: 'License'
+ platformStyle: ButtonStyle { inverted: true }
onClicked: licenseDialog.open()
}
}
@@ -341,9 +345,4 @@ Page {
message: license
acceptButtonText: 'OK'
}
-
- ScrollDecorator {
- flickableItem: flick
- anchors.rightMargin: -UIConstants.DEFAULT_MARGIN
- }
}
View
113 src/aura.qml
@@ -52,7 +52,8 @@ PageStackWindow {
property bool windowActive : platformWindow.active
property bool __dialogsVisible: effects.visible || colorFilters.visible
- property bool __aboutVisible: false
+ property real __dimmedOpacity: 0.3
+ property int __animationDuration: 50
Item {
id: mainPage
@@ -64,7 +65,7 @@ PageStackWindow {
onActiveChanged: {
if (!platformWindow.active) {
controller.stopPipeline()
- } else if (!page.__aboutVisible) {
+ } else if (!aboutView.visible) {
controller.startPipeline()
}
}
@@ -124,58 +125,57 @@ PageStackWindow {
height: 50
width: 198
text: "About"
- enabled: controller.pipelineReady
+ enabled: controller.pipelineReady || aboutView.visible
visible: !controller.recording && !page.__dialogsVisible
+ onClicked: aboutView.visible = !aboutView.visible
+ }
- onClicked: {
- controller.pausePipeline()
- appWindow.pageStack.push(aboutView)
+ AboutView {
+ id: aboutView
+ visible: false
+ anchors {
+ horizontalCenter: parent.horizontalCenter
+ horizontalCenterOffset: -115
+ verticalCenter: parent.verticalCenter
}
-
- Component {
- id: aboutView
- AboutView {
- orientationLock: PageOrientation.LockLandscape
- appString: "Aura"
- iconSource: "file:///opt/aura/share/icons/hicolor/" +
- "64x64/apps/aura.png"
- email: "info@igalia.com"
- twitterUrl: "https://twitter.com/#!/Igalia"
- copyright: "Copyright © 2012 Igalia"
- storeUrl: "http://store.ovi.com/content/266783"
- websiteUrl: "http://www.igalia.com"
- license:
- "This program is free software; you can " +
- "redistribute it and/or modify it under the " +
- "terms of the GNU Lesser General Public " +
- "License as published by the Free Software " +
- "Foundation; version 2.1 of the License, or " +
- "(at your option) any later version." +
- "<br/><br/>" +
-
- "This program is distributed in the hope " +
- "that it will be useful, but WITHOUT ANY " +
- "WARRANTY; without even the implied warranty " +
- "of MERCHANTABILITY or FITNESS FOR A " +
- "PARTICULAR PURPOSE. See the GNU Lesser " +
- "General Public License for more details." +
- "<br/><br/>" +
-
- "You should have received a copy of the GNU " +
- "Lesser General Public License along with " +
- "this program. If not, see " +
- "<a href=\"http://www.gnu.org/licenses\">" +
- "http://www.gnu.org/licenses</a><br/><br/>"
- onStatusChanged: {
- if (status == PageStatus.Inactive) {
- controller.startPipeline()
- }
- }
- Binding {
- target: page
- property: "__aboutVisible"
- value: status == PageStatus.Active || status == PageStatus.Activating
- }
+ width: 560
+ height: 420
+ clip: true
+
+ appString: "Aura"
+ iconSource: "file:///opt/aura/share/icons/hicolor/" +
+ "64x64/apps/aura.png"
+ email: "info@igalia.com"
+ twitterUrl: "https://twitter.com/#!/Igalia"
+ copyright: "Copyright © 2012 Igalia"
+ storeUrl: "http://store.ovi.com/content/266783"
+ websiteUrl: "http://www.igalia.com"
+ license:
+ "This program is free software; you can redistribute " +
+ "it and/or modify it under the terms of the GNU " +
+ "Lesser General Public License as published by the " +
+ "Free Software Foundation; version 2.1 of the " +
+ "License, or (at your option) any later version." +
+ "<br/><br/>" +
+
+ "This program is distributed in the hope that it " +
+ "will be useful, but WITHOUT ANY WARRANTY; without " +
+ "even the implied warranty of MERCHANTABILITY or " +
+ "FITNESS FOR A PARTICULAR PURPOSE. See the GNU " +
+ "Lesser General Public License for more details." +
+ "<br/><br/>" +
+
+ "You should have received a copy of the GNU Lesser " +
+ "General Public License along with this program. If " +
+ "not, see " +
+ "<a href=\"http://www.gnu.org/licenses\">" +
+ "http://www.gnu.org/licenses</a><br/><br/>"
+
+ onVisibleChanged: {
+ if (visible) {
+ controller.pausePipeline()
+ } else {
+ controller.startPipeline()
}
}
}
@@ -191,7 +191,8 @@ PageStackWindow {
enabled: controller.pipelineReady && file != ""
visible: !controller.recording && !page.__dialogsVisible
onClicked: controller.stopPipeline()
- opacity: enabled ? 1 : 0.3
+ opacity: enabled ? 1 : page.__dimmedOpacity
+ Behavior on opacity { NumberAnimation { duration: page.__animationDuration } }
}
Button {
@@ -215,6 +216,8 @@ PageStackWindow {
iconSource: controller.recording ? "qrc:/resources/recording-icon.png" : "qrc:/resources/video-icon.png"
visible: !page.__dialogsVisible
enabled: controller.pipelineReady
+ opacity: enabled ? 1 : page.__dimmedOpacity
+ Behavior on opacity { NumberAnimation { duration: page.__animationDuration } }
onClicked: {
controller.shutterClicked()
@@ -301,6 +304,8 @@ PageStackWindow {
}
height: 50
enabled: controller.pipelineReady
+ opacity: enabled ? 1 : page.__dimmedOpacity
+ Behavior on opacity { NumberAnimation { duration: page.__animationDuration } }
Image {
anchors.centerIn: parent
source: "qrc:/resources/switch-bg.png"
@@ -355,6 +360,8 @@ PageStackWindow {
text: colorFilters.effectNames[controller.colorFilter]
visible: !page.__dialogsVisible
enabled: controller.pipelineReady
+ opacity: enabled ? 1 : page.__dimmedOpacity
+ Behavior on opacity { NumberAnimation { duration: page.__animationDuration } }
onClicked: colorFilters.show()
}
@@ -393,6 +400,8 @@ PageStackWindow {
text: controller.videoEffect
visible: !page.__dialogsVisible
enabled: controller.pipelineReady
+ opacity: enabled ? 1 : page.__dimmedOpacity
+ Behavior on opacity { NumberAnimation { duration: page.__animationDuration } }
onClicked: effects.show()
}
}
View
1  src/res.qrc
@@ -15,7 +15,6 @@
<file>resources/timer-bg.png</file>
<file>resources/video-icon.png</file>
<file>resources/recording-icon.png</file>
- <file>resources/round-corners-shadow.png</file>
<file>resources/switch-bg.png</file>
<file>resources/switch-handle.png</file>
<file>resources/switch-handle-pressed.png</file>
View
BIN  src/resources/round-corners-shadow.png
Deleted file not rendered

No commit comments for this range

Something went wrong with that request. Please try again.