projects
/
harmattan
/
cameraplus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
First attempt at removing QtQuick 1.1 hardcoding from qml files.
[harmattan/cameraplus]
/
qml
/
main.qml
diff --git
a/qml/main.qml
b/qml/main.qml
index
6693eb5
..
6676ff6
100644
(file)
--- a/
qml/main.qml
+++ b/
qml/main.qml
@@
-20,7
+20,7
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+@IMPORT_QT_QUICK@
import com.nokia.meego 1.1
import com.nokia.extras 1.1
import QtCamera 1.0
import com.nokia.meego 1.1
import com.nokia.extras 1.1
import QtCamera 1.0
@@
-32,7
+32,6
@@
import QtMobility.location 1.2
Window {
id: root
property alias camera: cam
Window {
id: root
property alias camera: cam
-// property bool cameraVisible: mainView.currentIndex == 1
VisualItemModel {
id: mainModel
VisualItemModel {
id: mainModel
@@
-269,9
+268,9
@@
Window {
repeat: !settings.zoomAsShutter
}
repeat: !settings.zoomAsShutter
}
-
//
Standby {
-
//
policyLost: pipelineManager.state == "policyLost"
-// TODO:
-
// show: !pageStack.currentPage || (pageStack.currentPage.activationData.standbyVisible && pageStack.currentPage.status == PageStatus.Active && pipelineManager.showStandBy
)
-
//
}
+ Standby {
+ policyLost: pipelineManager.state == "policyLost"
+ show: !Qt.application.active || pipelineManager.showStandBy ||
+
(mainView.currentIndex == 1 && !camera.running
)
+ }
}
}