Commit e896a6e5 authored by Andrew Flegg's avatar Andrew Flegg

Get rid of grey bar on Harmattan, but keep system status bar (thanks to vivainio)

Auto-detect presence of Qt Quick Components (thanks to achipa)
Tidy up shared files from Qt Creator view
parent 5d4042ed
......@@ -4,7 +4,7 @@ folder_01.target = qml
DEPLOYMENTFOLDERS = folder_01
TARGET=Attitude
VERSION=0.9.0
VERSION=0.9.2
# Additional import path used to resolve QML modules in Creator's code model
QML_IMPORT_PATH =
......@@ -31,11 +31,6 @@ HEADERS += activemonitor.h
OTHER_FILES += \
qtc_packaging/debian_harmattan/rules \
qtc_packaging/debian_harmattan/README \
qtc_packaging/debian_harmattan/copyright \
qtc_packaging/debian_harmattan/control \
qtc_packaging/debian_harmattan/compat \
qtc_packaging/debian_harmattan/changelog \
attitude.desktop \
qtc_packaging/debian_fremantle/changelog \
qtc_packaging/debian_fremantle/compat \
......@@ -49,9 +44,3 @@ unix:!symbian:!maemo5 {
desktopfile.path = /usr/share/applications
INSTALLS += desktopfile
}
unix:!symbian:!maemo5 {
desktopfile.files = $${TARGET}.desktop
desktopfile.path = /usr/share/applications
INSTALLS += desktopfile
}
......@@ -2,7 +2,7 @@
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
<value type="int">1</value>
<value type="int">2</value>
</data>
<data>
<variable>ProjectExplorer.Project.EditorSettings</variable>
......@@ -153,16 +153,20 @@
<value key="Qt4ProjectManager.MaemoRunConfiguration.DeployToSysroot" type="bool">false</value>
<value key="Qt4ProjectManager.MaemoRunConfiguration.DeviceId" type="qulonglong">4</value>
<valuelist key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles" type="QVariantList">
<value type="QString">/home/andrew/src/attitude-build-maemo/attitude_0_9_2_armel.deb</value>
<value type="QString">/home/andrew/src/attitude-build-maemo/attitude_0_9_0_armel.deb</value>
</valuelist>
<valuelist key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts" type="QVariantList">
<value type="QString">n900.config</value>
<value type="QString">n900.config</value>
</valuelist>
<valuelist key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths" type="QVariantList">
<value type="QString"></value>
<value type="QString"></value>
</valuelist>
<valuelist key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes" type="QVariantList">
<value type="QDateTime">2011-06-26T14:00:57</value>
<value type="QDateTime">2011-06-28T23:04:26</value>
<value type="QDateTime">2011-06-28T21:42:27</value>
</valuelist>
</valuemap>
<value key="ProjectExplorer.BuildStepList.StepsCount" type="int">2</value>
......@@ -607,15 +611,23 @@
<value key="Qt4ProjectManager.MaemoRunConfiguration.DeviceId" type="qulonglong">25</value>
<valuelist key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles" type="QVariantList">
<value type="QString">/home/andrew/src/attitude-build-harmattan/attitude_0_9_0_armel.deb</value>
<value type="QString">/home/andrew/src/attitude-build-harmattan/attitude_0_9_1_armel.deb</value>
<value type="QString">/home/andrew/src/attitude-build-harmattan/attitude_0_9_2_armel.deb</value>
</valuelist>
<valuelist key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts" type="QVariantList">
<value type="QString">localhost</value>
<value type="QString">localhost</value>
<value type="QString">localhost</value>
</valuelist>
<valuelist key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths" type="QVariantList">
<value type="QString"></value>
<value type="QString"></value>
<value type="QString"></value>
</valuelist>
<valuelist key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes" type="QVariantList">
<value type="QDateTime">2011-06-27T21:02:26</value>
<value type="QDateTime">2011-06-28T22:06:40</value>
<value type="QDateTime">2011-06-28T22:47:42</value>
<value type="QDateTime">2011-06-28T23:07:34</value>
</valuelist>
</valuemap>
<value key="ProjectExplorer.BuildStepList.StepsCount" type="int">2</value>
......
......@@ -4,10 +4,9 @@
#include "activemonitor.h"
#include <stdio.h>
int main(int argc, char *argv[])
{
// This doesn't work; so let's get hacky later on...
// qputenv("N900_PORTRAIT_SENSORS", "1");
#if defined(Q_WS_MAEMO_5)
bool portrait = false;
bool fullscreen = false;
......@@ -35,17 +34,10 @@ int main(int argc, char *argv[])
monitor, SLOT(activeChanged(bool)));
viewer.rootContext()->setContextProperty("activeMonitor", monitor);
viewer.engine()->rootContext()->setContextProperty("portraitDevice", portrait);
// Ideally, we'd work out is Qt Components was available, but that seems too tricky
#if defined(USE_QTC)
printf("Using the Qt Quick Components root...\n");
viewer.setMainQmlFile("qml/attitude/qtc-root.qml");
#else
printf("Using the pure QML root...\n");
viewer.setMainQmlFile("qml/attitude/Main.qml");
#endif
if (viewer.status() != QDeclarativeView::Ready || viewer.errors().length() != 0)
viewer.setMainQmlFile("qml/attitude/Main.qml");
viewer.setOrientation(QmlApplicationViewer::ScreenOrientationLockLandscape);
......
......@@ -4,8 +4,8 @@ import com.meego 1.0
PageStackWindow {
id: window
anchors.fill: parent
showStatusBar: true
showToolBar: false
showStatusBar: false
initialPage: Main {}
......@@ -19,6 +19,6 @@ PageStackWindow {
function updateVisible() {
console.log(platformWindow.visible)
console.log("Visible = " + platformWindow.visible)
}
}
attitude (0.9.0) unstable; urgency=low
attitude (0.9.2) unstable; urgency=low
* Initial Release.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment