Title: [120921] trunk/Tools
- Revision
- 120921
- Author
- commit-qu...@webkit.org
- Date
- 2012-06-21 06:12:43 -0700 (Thu, 21 Jun 2012)
Log Message
[Qt] Add a custom Color Chooser widget to MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=87988
Patch by Thiago Marcos P. Santos <thiago.san...@intel.com> on 2012-06-21
Reviewed by Alexis Menard.
Added custom color chooser example for the MiniBrowser.
* MiniBrowser/qt/MiniBrowser.qrc:
* MiniBrowser/qt/qml/BrowserWindow.qml:
* MiniBrowser/qt/qml/ColorChooser.qml: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/ChangeLog (120920 => 120921)
--- trunk/Tools/ChangeLog 2012-06-21 12:27:54 UTC (rev 120920)
+++ trunk/Tools/ChangeLog 2012-06-21 13:12:43 UTC (rev 120921)
@@ -1,3 +1,16 @@
+2012-06-21 Thiago Marcos P. Santos <thiago.san...@intel.com>
+
+ [Qt] Add a custom Color Chooser widget to MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=87988
+
+ Reviewed by Alexis Menard.
+
+ Added custom color chooser example for the MiniBrowser.
+
+ * MiniBrowser/qt/MiniBrowser.qrc:
+ * MiniBrowser/qt/qml/BrowserWindow.qml:
+ * MiniBrowser/qt/qml/ColorChooser.qml: Added.
+
2012-06-21 Vivek Galatage <vivekgalat...@gmail.com>
Remove the warning "File not found" in MiniBrowser post-build event
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowser.qrc (120920 => 120921)
--- trunk/Tools/MiniBrowser/qt/MiniBrowser.qrc 2012-06-21 12:27:54 UTC (rev 120920)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowser.qrc 2012-06-21 13:12:43 UTC (rev 120921)
@@ -20,6 +20,7 @@
<file>qml/AuthenticationDialog.qml</file>
<file>qml/BrowserWindow.qml</file>
<file>qml/CheckBox.qml</file>
+ <file>qml/ColorChooser.qml</file>
<file>qml/ConfirmDialog.qml</file>
<file>qml/Dialog.qml</file>
<file>qml/DialogButton.qml</file>
Modified: trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml (120920 => 120921)
--- trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml 2012-06-21 12:27:54 UTC (rev 120920)
+++ trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml 2012-06-21 13:12:43 UTC (rev 120921)
@@ -377,6 +377,7 @@
}
}
}
+ experimental.colorChooser: ColorChooser { }
experimental.onEnterFullScreenRequested : {
navigationBar.visible = false;
Window.showFullScreen();
Added: trunk/Tools/MiniBrowser/qt/qml/ColorChooser.qml (0 => 120921)
--- trunk/Tools/MiniBrowser/qt/qml/ColorChooser.qml (rev 0)
+++ trunk/Tools/MiniBrowser/qt/qml/ColorChooser.qml 2012-06-21 13:12:43 UTC (rev 120921)
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2012 Intel Corporation. All rights reserved.
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import QtQuick 2.0
+
+MouseArea {
+ anchors.fill: parent
+ onClicked: model.reject()
+
+ Rectangle {
+ id: dialog
+ property int spacing: 10
+
+ color: "gainsboro"
+ opacity: 0.8
+ radius: 5
+ width: parent.width / 4
+ height: parent.height / 4
+ anchors.centerIn: parent
+
+ Rectangle {
+ color: "red"
+ anchors.left: parent.left
+ anchors.top: parent.top
+ anchors.margins: dialog.spacing
+ width: parent.width / 2 - dialog.spacing
+ height: parent.height / 2 - dialog.spacing
+
+ MouseArea {
+ anchors.fill: parent
+ onClicked: model.accept(parent.color)
+ }
+ }
+
+ Rectangle {
+ color: "blue"
+ anchors.right: parent.right
+ anchors.top: parent.top
+ anchors.margins: dialog.spacing
+ width: parent.width / 2 - dialog.spacing
+ height: parent.height / 2 - dialog.spacing
+
+ MouseArea {
+ anchors.fill: parent
+ onClicked: model.accept(parent.color)
+ }
+ }
+
+ Rectangle {
+ color: "green"
+ anchors.bottom: parent.bottom
+ anchors.left: parent.left
+ anchors.margins: dialog.spacing
+ width: parent.width / 2 - dialog.spacing
+ height: parent.height / 2 - dialog.spacing
+
+ MouseArea {
+ anchors.fill: parent
+ onClicked: model.accept(parent.color)
+ }
+ }
+
+ Rectangle {
+ color: model.currentColor
+ anchors.bottom: parent.bottom
+ anchors.right: parent.right
+ anchors.margins: dialog.spacing * 2
+ width: parent.width / 2 - dialog.spacing * 4
+ height: parent.height / 2 - dialog.spacing * 4
+
+ Text {
+ text: "Current"
+ anchors.bottom: parent.top
+ anchors.horizontalCenter: parent.horizontalCenter
+ }
+ }
+ }
+}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
