diff options
| author | Juho Annunen <juho.annunen@qt.io> | 2018-04-23 15:17:33 +0300 |
|---|---|---|
| committer | Juho Annunen <juho.annunen@qt.io> | 2018-05-07 09:31:23 +0000 |
| commit | da6035233fc3bcfbc4a3d65075ee4099349c09d0 (patch) | |
| tree | 0419ef297d5fe3c91e216c765efb6525802be845 /basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src | |
| parent | e513aed3b9cb8ff3124c21ed01e45128fa686eee (diff) | |
Move common definitions to shared settings
Task-number: QTBUG-65302
Change-Id: I2153e2f2b4aa295e87098256354ed034480294df
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src')
3 files changed, 6 insertions, 11 deletions
diff --git a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/BrowserWindow.qml b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/BrowserWindow.qml index 91dd074..bb8c231 100644 --- a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/BrowserWindow.qml +++ b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/BrowserWindow.qml @@ -59,28 +59,22 @@ Item { property int toolBarSize: 80 property string uiColor: settingsView.privateBrowsingEnabled ? "#3a4055" : "#09102b" - //property string uiColor: "#09102b" - //property string uiSeparatorColor: settingsView.privateBrowsingEnabled ? "#717273" : "#7ebee5" property string uiSeparatorColor: "#9d9faa" - //property string toolBarSeparatorColor: settingsView.privateBrowsingEnabled ? "#929495" : "#a3d1ed" property string toolBarSeparatorColor: "#9d9faa" property string toolBarFillColor: settingsView.privateBrowsingEnabled ? "#3a4055" : "#09102b" - //property string toolBarFillColor: "#09102b" - //property string buttonPressedColor: settingsView.privateBrowsingEnabled ? "#3b3c3e" : "#3f91c4" property string buttonPressedColor: "#41cd52" property string emptyBackgroundColor: "#09102b" - //property string uiHighlightColor: "#fddd5c" property string uiHighlightColor: "#41cd52" property string inactivePagerColor: "#bcbdbe" property string textFieldStrokeColor: "#9d9faa" property string placeholderColor: "#a0a1a2" property string iconOverlayColor: "#0e202c" property string iconStrokeColor: "#9d9faa" - property string defaultFontFamily: appFont //"Open Sans" + property string defaultFontFamily: appFont property int gridViewPageItemCount: 8 property int gridViewMaxBookmarks: 3 * gridViewPageItemCount diff --git a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/CustomSwitch.qml b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/CustomSwitch.qml index d73f940..7f8f674 100644 --- a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/CustomSwitch.qml +++ b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/CustomSwitch.qml @@ -35,6 +35,7 @@ Switch { property alias indicatorWidth: indicatorImg.width property alias indicatorHeight: indicatorImg.height + property string switchTextColor: "#3b4155" indicator: Image { id: indicatorImg @@ -54,7 +55,7 @@ Switch { fontSizeMode: Text.Fit minimumPixelSize: 1 font.pixelSize: parent.height * 0.55 - color: "#3b4155" + color: switchTextColor text: "OFF" font.family: defaultFontFamily } @@ -68,7 +69,7 @@ Switch { fontSizeMode: Text.Fit minimumPixelSize: 1 font.pixelSize: parent.height * 0.55 - color: "#3b4155" + color: switchTextColor text: "ON" font.family: defaultFontFamily } @@ -90,7 +91,7 @@ Switch { anchors.verticalCenter: parent.verticalCenter width: parent.width * 0.475 height: parent.height * 0.9 - fillColor: control.checked ? "#41cd52" : "#9d9faa"//viewSettings.buttonGreenColor : viewSettings.buttonGrayColor + fillColor: control.checked ? buttonPressedColor : toolBarSeparatorColor text: control.checked ? "ON" : "OFF" borderColor: "transparent" Behavior on x { diff --git a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml index 678b966..81397fd 100644 --- a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml +++ b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml @@ -73,7 +73,7 @@ Rectangle { } Rectangle{ - color: "#9d9faa" + color: toolBarSeparatorColor height: 2 anchors.top: root.top anchors.right: root.right |