Skip to content

Commit

Permalink
[port] Now uses qtcomponents, added preliminary orientationLock suppo…
Browse files Browse the repository at this point in the history
…rt, qml code more robust

- Added PageStackWindow and Page elements to exploit qtcomponents' screen orientation support.
To do that part of QML code had to be modified a bit because many function calls assumed that the "window" element was in their scope, which has always been the case so far because it was the root QML item, but not anymore, now that the root item is a PageStackWindow, and "window" has been moved as a child of the initialPage.

- A new Orientation Lock setting has been added in Fingerterm's menu. It lets you choose between Auto, Portrait Lock and Landscape Lock (defaults to Auto).
  • Loading branch information
faenil committed Aug 14, 2013
1 parent f8573e5 commit e2f5a26
Show file tree
Hide file tree
Showing 11 changed files with 403 additions and 312 deletions.
2 changes: 1 addition & 1 deletion fingerterm.pro
Expand Up @@ -40,7 +40,7 @@ OTHER_FILES += \
qtc_packaging/debian_harmattan/compat \
qtc_packaging/debian_harmattan/changelog \
qml/Button.qml \
qml/Menu.qml \
qml/MenuFingerterm.qml \
qml/NotifyWin.qml \
qml/UrlWindow.qml \
qml/LayoutWindow.qml
Expand Down
10 changes: 7 additions & 3 deletions main.cpp
Expand Up @@ -135,14 +135,16 @@ int main(int argc, char *argv[])

view.setSource(QUrl("qrc:/qml/Main.qml"));

QObject *win = view.rootObject();
if(!win)
QObject *root = view.rootObject();
if(!root)
qFatal("no root object - qml error");

QObject* win = root->findChild<QObject*>("window");

if(!startupErrorMsg.isEmpty())
QMetaObject::invokeMethod(win, "showErrorMessage", Qt::QueuedConnection, Q_ARG(QVariant, startupErrorMsg));

TextRender *tr = win->findChild<TextRender*>("textrender");
TextRender *tr = root->findChild<TextRender*>("textrender");
tr->setUtil(&util);
tr->setTerminal(&term);
term.setRenderer(tr);
Expand Down Expand Up @@ -178,6 +180,8 @@ int main(int argc, char *argv[])

void defaultSettings(QSettings* settings)
{
if(!settings->contains("ui/orientationLockMode"))
settings->setValue("ui/orientationLockMode", "auto");
if(!settings->contains("general/execCmd"))
settings->setValue("general/execCmd", "");
if(!settings->contains("general/visualBell"))
Expand Down
2 changes: 1 addition & 1 deletion qml/Key.qml
Expand Up @@ -125,7 +125,7 @@ Rectangle {
key.color = keyboard.keyBgColor

setStickiness(-1)
vkbKeypress(currentCode, keyboard.keyModifiers);
window.vkbKeypress(currentCode, keyboard.keyModifiers);

if( !sticky && keyboard.resetSticky != 0 && keyboard.resetSticky !== key ) {
resetSticky.setStickiness(0);
Expand Down
2 changes: 1 addition & 1 deletion qml/LayoutWindow.qml
Expand Up @@ -125,7 +125,7 @@ Rectangle {
to: "*"
SequentialAnimation {
PropertyAnimation { target: layoutWindow; properties: "y"; duration: 200; easing.type: Easing.InOutCubic }
ScriptAction { script: updateGesturesAllowed(); }
ScriptAction { script: window.updateGesturesAllowed(); }
}
}
]
Expand Down

0 comments on commit e2f5a26

Please sign in to comment.