Popup blocking support. View -> Popup Windows.

4 files changed, 220 insertions, 0 deletions

diff --git a/data/art/Makefile.am b/data/art/Makefile.am
index a884cb18f..4960dae23 100644
--- a/data/art/Makefile.am
+++ b/data/art/Makefile.am
@@ -4,6 +4,7 @@ art_DATA = \
 	epiphany-entry.png \
 	epiphany-download.png \
 	epiphany-history.png	\
+	epiphany-popup-hidden.png \
 	epiphany-bookmarks.png \
 	epiphany-tab-loading.gif \
 	hand-open.png
diff --git a/data/art/epiphany-popup-hidden.png b/data/art/epiphany-popup-hidden.png
new file mode 100644
index 000000000..b990f90da
--- /dev/null
+++ b/data/art/epiphany-popup-hidden.png
diff --git a/data/art/epiphany-popup-hidden.svg b/data/art/epiphany-popup-hidden.svg
new file mode 100644
index 000000000..8e89f653b
--- /dev/null
+++ b/data/art/epiphany-popup-hidden.svg
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+<svg
+   version="1.0"
+   x="0"
+   y="0"
+   width="528.2800pt"
+   height="490.8900pt"
+   id="svg602"
+   xml:space="preserve"
+   sodipodi:version="0.33"
+   sodipodi:docname="popup-blocker.svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xml="http://www.w3.org/XML/1998/namespace"
+   xmlns:xlink="http://www.w3.org/1999/xlink">
+  <sodipodi:namedview
+     id="base" />
+  <defs
+     id="defs604">
+    <linearGradient
+       id="linearGradient715">
+      <stop
+         style="stop-color:#990000;stop-opacity:1;"
+         offset="0"
+         id="stop716" />
+      <stop
+         style="stop-color:#df421e;stop-opacity:1;"
+         offset="1"
+         id="stop717" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient705">
+      <stop
+         style="stop-color:#00003a;stop-opacity:1;"
+         offset="0"
+         id="stop706" />
+      <stop
+         style="stop-color:#00008f;stop-opacity:1;"
+         offset="1"
+         id="stop707" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient702">
+      <stop
+         style="stop-color:#1782c2;stop-opacity:1;"
+         offset="0"
+         id="stop703" />
+      <stop
+         style="stop-color:#454fb7;stop-opacity:1;"
+         offset="1"
+         id="stop704" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient699">
+      <stop
+         style="stop-color:#4b6983;stop-opacity:1;"
+         offset="0"
+         id="stop700" />
+      <stop
+         style="stop-color:#7590ae;stop-opacity:1;"
+         offset="1"
+         id="stop701" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient695">
+      <stop
+         style="stop-color:#174d87;stop-opacity:1;"
+         offset="0"
+         id="stop696" />
+      <stop
+         style="stop-color:#454f8a;stop-opacity:1;"
+         offset="1"
+         id="stop697" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient685">
+      <stop
+         style="stop-color:#cccccc;stop-opacity:1;"
+         offset="0"
+         id="stop686" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop687" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient611">
+      <stop
+         style="stop-color:#b8b7b5;stop-opacity:1;"
+         offset="0"
+         id="stop612" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop613" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient607">
+      <stop
+         style="stop-color:#8f8f8f;stop-opacity:1;"
+         offset="0"
+         id="stop608" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop609" />
+    </linearGradient>
+    <linearGradient
+       x1="1.11229956"
+       y1="0.03124872"
+       x2="-0.18181817"
+       y2="0.69531250"
+       id="linearGradient610"
+       xlink:href="#linearGradient611" />
+    <linearGradient
+       x1="1.00444412"
+       y1="5.80643155e-2"
+       x2="2.7020219e-8"
+       y2="1.08387113"
+       id="linearGradient614"
+       xlink:href="#linearGradient705" />
+    <linearGradient
+       x1="-0.10190773"
+       y1="0.89680094"
+       x2="1.14012647"
+       y2="-0.21290262"
+       id="linearGradient684"
+       xlink:href="#linearGradient611" />
+    <radialGradient
+       id="radialGradient688"
+       xlink:href="#linearGradient715" />
+    <radialGradient
+       cx="1.22481334"
+       cy="0.05469547"
+       r="1.98268783"
+       fx="1.22481334"
+       fy="0.05469547"
+       id="radialGradient690"
+       xlink:href="#linearGradient611" />
+    <linearGradient
+       x1="0.99999976"
+       y1="0.21093579"
+       x2="0.99999988"
+       y2="0.22656254"
+       id="linearGradient698"
+       xlink:href="#linearGradient699"
+       spreadMethod="reflect" />
+    <linearGradient
+       x1="0.48942447"
+       y1="-0.09708764"
+       x2="0.06760809"
+       y2="1.80522752"
+       id="linearGradient714"
+       xlink:href="#linearGradient715" />
+  </defs>
+  <rect
+     width="550.7690"
+     height="452.4174"
+     x="14.21332"
+     y="15.14543"
+     style="font-size:12;fill:url(#linearGradient698);fill-rule:evenodd;stroke:#314e6c;stroke-width:10.625;stroke-opacity:1;"
+     id="rect605" />
+  <rect
+     width="488.4797"
+     height="337.6739"
+     x="43.71883"
+     y="100.3835"
+     style="font-size:12;fill:url(#linearGradient610);fill-rule:evenodd;stroke:#314e6c;stroke-width:5.1125;stroke-opacity:1;"
+     id="rect606" />
+  <rect
+     width="49.49750"
+     height="49.49746"
+     x="485.3400"
+     y="32.88261"
+     style="font-size:12;fill:url(#radialGradient690);fill-rule:evenodd;stroke:url(#linearGradient684);stroke-width:3.71875;"
+     id="rect691" />
+  <rect
+     width="49.49750"
+     height="49.49746"
+     x="421.7003"
+     y="32.88258"
+     style="font-size:12;fill:url(#radialGradient690);fill-rule:evenodd;stroke:url(#linearGradient684);stroke-width:3.71875;"
+     id="rect692" />
+  <rect
+     width="49.49750"
+     height="49.49746"
+     x="358.0607"
+     y="32.88255"
+     style="font-size:12;fill:url(#radialGradient690);fill-rule:evenodd;stroke:url(#linearGradient684);stroke-width:3.71875;"
+     id="rect693" />
+  <rect
+     width="49.49750"
+     height="49.49746"
+     x="46.93361"
+     y="32.88252"
+     style="font-size:12;fill:url(#radialGradient690);fill-rule:evenodd;stroke:url(#linearGradient684);stroke-width:3.71875;"
+     id="rect694" />
+  <path
+     d="M 584.5339 539.1726 C 493.7369 629.9696 346.5259 629.9696 255.7288 539.1725 C 164.9318 448.3755 164.9317 301.1644 255.7288 210.3674 C 346.5258 119.5703 493.7369 119.5703 584.5339 210.3674 C 675.3310 301.1644 675.3310 448.3755 584.5339 539.1726 z "
+     style="font-size:12.000;fill:url(#linearGradient714);fill-rule:evenodd;stroke:#000000;stroke-width:9.637834;"
+     id="path648" />
+  <g
+     transform="matrix(1.047217,0,0,1.047217,-1127.623,-286.0443)"
+     style="font-size:12;stroke:#df421e;stroke-opacity:1;"
+     id="g711">
+    <path
+       d="M 1348.416 714.203 C 1300.301 666.0883 1307.851 580.5294 1365.278 523.1027 C 1422.705 465.6754 1508.264 458.1261 1556.378 506.2408 L 1348.416 714.203 z "
+       style="fill:#ffffff;fill-rule:evenodd;stroke-width:5.57963;stroke:#df421e;stroke-opacity:1;"
+       id="path647" />
+    <path
+       d="M 1394.786 760.5729 C 1442.901 808.6876 1528.46 801.138 1585.886 743.7113 C 1643.314 686.2841 1650.863 600.7254 1602.748 552.6107 L 1394.786 760.5729 z "
+       style="fill:#ffffff;fill-rule:evenodd;stroke-width:5.57963;stroke:#df421e;stroke-opacity:1;"
+       id="path679" />
+  </g>
+</svg>
diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml
index 73a740796..6a5cfbbfb 100644
--- a/data/ui/epiphany-ui.xml
+++ b/data/ui/epiphany-ui.xml
@@ -49,6 +49,7 @@
 	<placeholder name="ViewEncodingPlaceholder"/>
 	</menu>
 	<menuitem name="ViewPageSourceMenu" action="ViewPageSource"/>
+	<menuitem name="ViewPopupsMenu" action="ViewPopupWindows"/>
 	<separator name="ViewSep3"/>
 	<menuitem name="ViewStopMenu" action="ViewStop"/> 
 	<menuitem name="ViewReloadMenu" action="ViewReload"/>