qtcreator-plugin-ubuntu

Merge lp:~mzanetti/qtcreator-plugin-ubuntu/devicepage-high-res into lp:qtcreator-plugin-ubuntu

  1. devicepage-high-res
  2. Merge into trunk
Proposed by Michael Zanetti
Status: Merged
Approved by: Benjamin Zeller
Approved revision: 356
Merged at revision: 357
Proposed branch: lp:~mzanetti/qtcreator-plugin-ubuntu/devicepage-high-res
Merge into: lp:qtcreator-plugin-ubuntu
Diff against target: 100 lines (+27/-7)
1 file modified
share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml (+27/-7)
To merge this branch: bzr merge lp:~mzanetti/qtcreator-plugin-ubuntu/devicepage-high-res
Reviewer Review Type Date Requested Status
Zoltan Balogh Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+250555@code.launchpad.net

Commit message

fix some issues with high-res in DevicePage

Description of the change

fix some issues with high-res in DevicePage

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:356
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/520/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/54
        deb: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/54/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-armhf-ci/54

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/520/rebuild

review: Approve (continuous-integration)
Revision history for this message
Zoltan Balogh (bzoltan) wrote :

OK

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml'
2--- share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml 2015-02-05 08:28:21 +0000
3+++ share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml 2015-02-22 15:41:26 +0000
4@@ -81,9 +81,9 @@
5 visible: !devicesModel.busy
6 Controls.SplitView {
7 orientation: Qt.Vertical
8- width: 200
9- Layout.minimumWidth: 200
10- Layout.maximumWidth: 400
11+ width: units.gu(25)
12+ Layout.minimumWidth: units.gu(25)
13+ Layout.maximumWidth: units.gu(50)
14
15 Controls.ScrollView {
16 Layout.fillHeight: true
17@@ -101,7 +101,12 @@
18
19 TextField{
20 id: editor
21- anchors.fill: parent
22+ anchors {
23+ left: parent.left
24+ right: parent.right
25+ verticalCenter: parent.verticalCenter
26+ margins: units.gu(1)
27+ }
28 visible: false
29
30 property bool changed: false
31@@ -169,10 +174,13 @@
32 Layout.maximumHeight: units.gu(5)
33 Row{
34 anchors.fill: parent
35- spacing: units.gu(2)
36+ spacing: units.gu(1)
37 Controls.ToolButton {
38 text: i18n.tr("Refresh devices")
39 tooltip: text
40+ height: parent.height - units.gu(1)
41+ width: height
42+ anchors.verticalCenter: parent.verticalCenter
43 iconSource: "qrc:/ubuntu/images/reload.svg"
44 onClicked: devicesModel.refresh()
45 }
46@@ -180,6 +188,9 @@
47 text: i18n.tr("Add Emulator")
48 tooltip: text
49 iconSource: "qrc:/ubuntu/images/list-add.svg"
50+ height: parent.height - units.gu(1)
51+ width: height
52+ anchors.verticalCenter: parent.verticalCenter
53 onClicked: {
54 if(!devicesModel.emulatorInstalled){
55 PopupUtils.open(resourceRoot+"/DevicesPage/EmulatorNotInstalled.qml",devicePage);
56@@ -199,7 +210,7 @@
57
58 Item {
59 id: centerItem
60- Layout.minimumWidth: 400
61+ Layout.minimumWidth: units.gu(50)
62 Layout.fillWidth: true
63
64 Repeater {
65@@ -226,11 +237,14 @@
66 anchors.top: parent.top
67 Row{
68 anchors.fill: parent
69- spacing: units.gu(2)
70+ spacing: units.gu(1)
71 Controls.ToolButton {
72 text: i18n.tr("Run Emulator")
73 tooltip: text
74 iconSource: "qrc:/projectexplorer/images/run.png"
75+ height: parent.height - units.gu(1)
76+ width: height
77+ anchors.verticalCenter: parent.verticalCenter
78 onClicked: devicesModel.startEmulator(emulatorImageName)
79 visible: connectionState === DeviceConnectionState.Disconnected && machineType === DeviceMachineType.Emulator
80 }
81@@ -238,6 +252,9 @@
82 text: i18n.tr("Stop Emulator")
83 tooltip: text
84 iconSource: "qrc:/projectexplorer/images/stop.png"
85+ height: parent.height - units.gu(1)
86+ width: height
87+ anchors.verticalCenter: parent.verticalCenter
88 onClicked: devicesModel.stopEmulator(emulatorImageName)
89 visible: connectionState !== DeviceConnectionState.Disconnected && machineType === DeviceMachineType.Emulator
90 }
91@@ -245,6 +262,9 @@
92 text: i18n.tr("Delete")
93 tooltip: text
94 iconSource: "qrc:/core/images/clear.png"
95+ height: parent.height - units.gu(1)
96+ width: height
97+ anchors.verticalCenter: parent.verticalCenter
98 onClicked: {
99 if(machineType === DeviceMachineType.Emulator)
100 PopupUtils.open(resourceRoot+"/DevicesPage/DeleteDeviceDialog.qml",devicePage, {"emulatorImageName": emulatorImageName,"deviceId": -1 });

Subscribers

People subscribed via source and target branches