1
=== modified file 'src/app/webbrowser/Browser.qml'
2
--- src/app/webbrowser/Browser.qml	2015-04-22 10:25:50 +0000
3
+++ src/app/webbrowser/Browser.qml	2015-04-27 07:25:56 +0000
4
@@ -34,6 +34,10 @@
5
34
34
6
35
    property var historyModel: (historyModelLoader.status == Loader.Ready) ? historyModelLoader.item : null
35
    property var historyModel: (historyModelLoader.status == Loader.Ready) ? historyModelLoader.item : null
7
36
    property var bookmarksModel: (bookmarksModelLoader.status == Loader.Ready) ? bookmarksModelLoader.item : null
36
    property var bookmarksModel: (bookmarksModelLoader.status == Loader.Ready) ? bookmarksModelLoader.item : null
8
37
    property alias browserWidth: settings.width
9
38
    property alias browserHeight: settings.height
10
39
    property alias browserX: settings.x
11
40
    property alias browserY: settings.y
12
37
41
13
38
    property bool newSession: false
42
    property bool newSession: false
14
39
43
15
@@ -82,12 +86,20 @@
16
82
        property string searchEngine: settingsDefaults.searchEngine
86
        property string searchEngine: settingsDefaults.searchEngine
17
83
        property string allowOpenInBackgroundTab: settingsDefaults.allowOpenInBackgroundTab
87
        property string allowOpenInBackgroundTab: settingsDefaults.allowOpenInBackgroundTab
18
84
        property bool restoreSession: settingsDefaults.restoreSession
88
        property bool restoreSession: settingsDefaults.restoreSession
19
89
        property int height: settingsDefaults.height
20
90
        property int width: settingsDefaults.width
21
91
        property int x: settingsDefaults.x
22
92
        property int y: settingsDefaults.y
23
85
93
24
86
        function restoreDefaults() {
94
        function restoreDefaults() {
25
87
            homepage  = settingsDefaults.homepage
95
            homepage  = settingsDefaults.homepage
26
88
            searchEngine = settingsDefaults.searchEngine
96
            searchEngine = settingsDefaults.searchEngine
27
89
            allowOpenInBackgroundTab = settingsDefaults.allowOpenInBackgroundTab
97
            allowOpenInBackgroundTab = settingsDefaults.allowOpenInBackgroundTab
28
90
            restoreSession = settingsDefaults.restoreSession
98
            restoreSession = settingsDefaults.restoreSession
29
99
            height = settingsDefaults.height
30
100
            width = settingsDefaults.width
31
101
            x = settingsDefaults.x
32
102
            y = settingsDefaults.y
33
91
        }
103
        }
34
92
    }
104
    }
35
93
105
36
@@ -98,6 +110,10 @@
37
98
        readonly property string searchEngine: "google"
110
        readonly property string searchEngine: "google"
38
99
        readonly property string allowOpenInBackgroundTab: "default"
111
        readonly property string allowOpenInBackgroundTab: "default"
39
100
        readonly property bool restoreSession: true
112
        readonly property bool restoreSession: true
40
113
        readonly property int height: 600
41
114
        readonly property int width: 800
42
115
        readonly property int x: 0
43
116
        readonly property int y: 0
44
101
    }
117
    }
45
102
118
46
103
    Item {
119
    Item {
47
104
120
48
=== modified file 'src/app/webbrowser/webbrowser-app.qml'
49
--- src/app/webbrowser/webbrowser-app.qml	2015-03-23 22:35:12 +0000
50
+++ src/app/webbrowser/webbrowser-app.qml	2015-04-27 07:25:56 +0000
51
@@ -25,9 +25,23 @@
52
25
25
53
26
    property alias urls: browser.initialUrls
26
    property alias urls: browser.initialUrls
54
27
    property alias newSession: browser.newSession
27
    property alias newSession: browser.newSession
55
28
    property alias browserHeight: browser.browserHeight
56
29
    property alias browserWidth: browser.browserWidth
57
30
    property alias browserX: browser.browserX
58
31
    property alias browserY: browser.browserY
59
28
32
60
29
    currentWebview: browser.currentWebview
33
    currentWebview: browser.currentWebview
61
30
34
62
35
    height: browserHeight
63
36
    width: browserWidth
64
37
    x: browserX
65
38
    y: browserY
66
39
67
40
    Binding { target: window; property: "browserHeight"; value: height }
68
41
    Binding { target: window; property: "browserWidth"; value: width }
69
42
    Binding { target: window; property: "browserX"; value: x }
70
43
    Binding { target: window; property: "browserY"; value: y }
71
44
72
31
    title: {
45
    title: {
73
32
        if (browser.title) {
46
        if (browser.title) {
74
33
            // TRANSLATORS: %1 refers to the current page’s title
47
            // TRANSLATORS: %1 refers to the current page’s title
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-04-27
Ubuntu Phablet Team		2015-04-13	Pending
Review via email: mp+256004@code.launchpad.net