Changeset 101996 in webkit
- Timestamp:
- Dec 5, 2011, 6:47:46 AM (15 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 edited
-
ChangeLog (modified) (1 diff)
-
MiniBrowser/qt/qml/BrowserWindow.qml (modified) (12 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r101979 r101996 1 2011-12-05 Kenneth Rohde Christiansen <kenneth@webkit.org> 2 3 [Qt] Make the UI of the MiniBrowser slightly nicer 4 5 Rubberstamped by Simon Hausmann. 6 7 - Add proper padding 8 - Show feedback when pressing on the toolbar icons 9 - Make the text entry better looking 10 11 * MiniBrowser/qt/qml/BrowserWindow.qml: 12 1 13 2011-12-05 Kristóf Kosztyó <kkristof@inf.u-szeged.hu> 2 14 -
trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml
r99946 r101996 49 49 id: navigationBar 50 50 color: "#efefef" 51 height: 3 051 height: 38 52 52 anchors { 53 53 top: parent.top … … 57 57 58 58 Row { 59 height: parent.height - 6 60 anchors { 61 verticalCenter: parent.verticalCenter 62 left: parent.left 63 leftMargin: 3 64 } 65 spacing: 3 59 66 id: controlsRow 60 spacing: 461 67 Rectangle { 62 68 id: backButton 63 height: navigationBar.height - 269 height: parent.height 64 70 width: height 65 71 color: "#efefef" 72 radius: 6 73 74 property alias enabled: webView.canGoBack 66 75 67 76 Image { … … 72 81 Rectangle { 73 82 anchors.fill: parent 74 color: reloadButton.color 83 color: parent.color 84 radius: parent.radius 75 85 opacity: 0.8 76 visible: ! webView.canGoBack86 visible: !parent.enabled 77 87 } 78 88 79 89 MouseArea { 80 90 anchors.fill: parent 91 onPressed: { if (parent.enabled) parent.color = "#cfcfcf" } 92 onReleased: { parent.color = "#efefef" } 81 93 onClicked: { 82 console.log("going back") 83 webView.goBack() 94 if (parent.enabled) { 95 console.log("MiniBrowser: Going backward in session history.") 96 webView.goBack() 97 } 84 98 } 85 99 } … … 87 101 Rectangle { 88 102 id: forwardButton 89 height: navigationBar.height - 2103 height: parent.height 90 104 width: height 91 105 color: "#efefef" 106 radius: 6 107 108 property alias enabled: webView.canGoForward 92 109 93 110 Image { … … 98 115 Rectangle { 99 116 anchors.fill: parent 100 color: forwardButton.color 117 color: parent.color 118 radius: parent.radius 101 119 opacity: 0.8 102 visible: ! webView.canGoForward120 visible: !parent.enabled 103 121 } 104 122 105 123 MouseArea { 106 124 anchors.fill: parent 125 onPressed: { if (parent.enabled) parent.color = "#cfcfcf" } 126 onReleased: { parent.color = "#efefef" } 107 127 onClicked: { 108 console.log("going forward") 109 webView.goForward() 128 if (parent.enabled) { 129 console.log("MiniBrowser: Going forward in session history.") 130 webView.goForward() 131 } 110 132 } 111 133 } … … 113 135 Rectangle { 114 136 id: reloadButton 115 height: navigationBar.height - 2137 height: parent.height 116 138 width: height 117 139 color: "#efefef" 140 radius: 6 118 141 119 142 Image { … … 124 147 MouseArea { 125 148 anchors.fill: parent 149 onPressed: { parent.color = "#cfcfcf" } 150 onReleased: { parent.color = "#efefef" } 126 151 onClicked: { 127 152 if (webView.canStop) { … … 138 163 Rectangle { 139 164 color: "white" 140 height: navigationBar.height - 4165 height: 26 141 166 border.width: 1 167 border.color: "#bfbfbf" 168 radius: 3 142 169 anchors { 143 170 left: controlsRow.right 144 171 right: parent.right 145 margins: 2172 margins: 6 146 173 verticalCenter: parent.verticalCenter 147 174 } … … 152 179 left: parent.left 153 180 } 181 radius: 3 154 182 width: parent.width / 100 * webView.loadProgress 155 183 color: "blue" … … 157 185 visible: webView.loadProgress != 100 158 186 } 159 160 187 TextInput { 161 188 id: addressLine … … 163 190 selectByMouse: true 164 191 font { 165 pointSize: 1 4166 family: " Helvetica"192 pointSize: 11 193 family: "Sans" 167 194 } 168 195 anchors { … … 170 197 left: parent.left 171 198 right: parent.right 172 margins: 2199 margins: 6 173 200 } 174 201
Note:
See TracChangeset
for help on using the changeset viewer.