diff options
| author | Philipp Andreas <github@smurfy.de> | 2014-07-12 09:29:47 +0200 |
|---|---|---|
| committer | Philipp Andreas <github@smurfy.de> | 2014-07-12 09:30:49 +0200 |
| commit | 2101baf2911d7965c86e5308e4d8350790a6956c (patch) | |
| tree | 2acb875cabca055797620458baad26d5f8612105 /app/qml | |
| parent | 959e251f2336e21d3615b1525a38773fe58ab2e7 (diff) | |
| parent | 84e775d768f0675ee733132b3762db647f1409ac (diff) | |
Merge branch 'master' into notifications
Conflicts:
daemon/manager.cpp
Diffstat (limited to 'app/qml')
| -rw-r--r-- | app/qml/cover/CoverPage.qml | 1 | ||||
| -rw-r--r-- | app/qml/pages/ManagerPage.qml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/qml/cover/CoverPage.qml b/app/qml/cover/CoverPage.qml index 767799e..186de30 100644 --- a/app/qml/cover/CoverPage.qml +++ b/app/qml/cover/CoverPage.qml @@ -58,6 +58,7 @@ CoverBackground { CoverActionList { id: coverAction + enabled: pebbled.active CoverAction { iconSource: pebbled.connected ? "image://theme/icon-cover-transfers" : "image://theme/icon-cover-sync" diff --git a/app/qml/pages/ManagerPage.qml b/app/qml/pages/ManagerPage.qml index adb1cf4..92d79b1 100644 --- a/app/qml/pages/ManagerPage.qml +++ b/app/qml/pages/ManagerPage.qml @@ -107,7 +107,7 @@ Page { if (pebbled.connected) { pebbled.disconnect(); } else { - pebbled.connect(); + pebbled.reconnect(); } } } |