Merge lp:~cm-t/dash-privacy-interface/quickly_trunk into lp:dash-privacy-interface

[cm-t 🦄🏂🌈🎵]

=== modified file 'dash_privacy_interface/DashPrivacyInterfaceWindow.py'
--- dash_privacy_interface/DashPrivacyInterfaceWindow.py	2012-10-21 19:01:43 +0000
+++ dash_privacy_interface/DashPrivacyInterfaceWindow.py	2012-10-22 21:06:21 +0000
@@ -1,21 +1,21 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
-# Copyright (C)
-# ubuntu-fr <LoCo Team>
+# Copyright (C) 
+# ubuntu-fr <LoCo Team> 
 # kanor <Romain DUBREIL> <[e-mail]>
 # cm-t <Rudy ANDRÉ> <[e-mail]>
 # olive <Olivier FRAYSSE> <[e-mail]>
 # quesh <Frédéric MANDE> <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
+# This program is free software: you can redistribute it and/or modify it 
+# under the terms of the GNU General Public License version 3, as published 
 # by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# 
+# This program is distributed in the hope that it will be useful, but 
+# WITHOUT ANY WARRANTY; without even the implied warranties of 
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
 # PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
+# 
+# You should have received a copy of the GNU General Public License along 
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 

=== modified file 'data/media/background.png'
Binary files data/media/background.png	2012-10-20 07:41:01 +0000 and data/media/background.png	2012-10-22 21:06:21 +0000 differ
=== modified file 'data/media/dash-privacy-interface.svg'
--- data/media/dash-privacy-interface.svg	2012-10-20 07:41:01 +0000
+++ data/media/dash-privacy-interface.svg	2012-10-22 21:06:21 +0000
@@ -7,19 +7,40 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64"
-   height="64.000008"
-   id="svg2"
+   width="64px"
+   height="64px"
+   id="svg5442"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   inkscape:export-filename="/home/daniel/Projects/test1/data/media/logo.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="logo1.svg">
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="dash-privacy-interface.svg">
   <defs
-     id="defs4" />
+     id="defs5444">
+    <linearGradient
+       id="linearGradient3789">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3791" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3793" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3789"
+       id="radialGradient3795"
+       cx="114.63716"
+       cy="-460.98196"
+       fx="114.63716"
+       fy="-460.98196"
+       r="28"
+       gradientTransform="translate(0,-4.0925739e-5)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -27,48 +48,74 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="37.013172"
-     inkscape:cy="128"
+     inkscape:zoom="2.75"
+     inkscape:cx="-32.746085"
+     inkscape:cy="38.75793"
+     inkscape:current-layer="layer1"
+     showgrid="true"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     showborder="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="753"
-     inkscape:window-x="0"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1215"
+     inkscape:window-height="776"
+     inkscape:window-x="65"
      inkscape:window-y="24"
      inkscape:window-maximized="1" />
   <metadata
-     id="metadata7">
+     id="metadata5447">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
+     id="layer1"
      inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-355.97817,-385.42867)">
-    <path
-       style="fill:#f37320"
-       d="m 384.83834,449.28391 c -8.14057,-0.84905 -15.49055,-4.63875 -20.99488,-10.8251 -8.42757,-9.47182 -10.28693,-23.7434 -4.58555,-35.19659 6.88824,-13.8374 22.76153,-20.85855 37.51104,-16.59205 11.98015,3.46543 20.6717,13.18933 22.83033,25.54204 0.67518,3.86376 0.42901,9.41585 -0.58713,13.24168 -2.42757,9.13998 -8.98351,17.01406 -17.44916,20.95748 -5.03786,2.34672 -11.35816,3.43226 -16.72465,2.87254 z"
-       id="path3061"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#ffffff"
-       d="m 398.73202,394.34273 c -1.08285,0.0211 -2.15589,0.48165 -2.98979,1.42969 -1.18348,1.34547 -1.40418,2.71621 -0.71223,4.38281 1.03576,2.49465 3.94418,3.42259 6.13611,1.96094 1.67694,-1.11824 2.46376,-3.57017 1.65143,-5.14844 -0.89738,-1.74353 -2.5029,-2.65576 -4.08552,-2.625 z m -10.89472,4.5625 c -2.42555,0.0486 -5.06336,0.54882 -7.13793,1.41406 l -0.98616,0.41407 1.4401,2.58593 c 0.7934,1.42317 1.57848,2.58594 1.73753,2.58594 0.15904,0 1.00483,-0.20744 1.8784,-0.46094 1.11892,-0.32468 2.32043,-0.42761 4.07769,-0.34375 2.11554,0.10097 2.79469,0.26709 4.4612,1.08594 3.49728,1.7184 6.43694,5.49864 6.88747,8.85156 l 0.15654,1.14063 3.12284,0 3.12285,0 -0.18785,-1.35156 c -0.4425,-3.10716 -2.22228,-7.05351 -4.21857,-9.35157 -0.98973,-1.13933 -0.99683,-1.14194 -2.84891,-1.04687 -1.42823,0.0733 -2.1054,-0.0309 -2.95848,-0.46875 -1.4763,-0.75774 -2.64614,-2.0279 -3.10719,-3.375 -0.36828,-1.07602 -0.42039,-1.11073 -2.33235,-1.46094 -0.94616,-0.1733 -2.00467,-0.24083 -3.10718,-0.21875 z m -10.40166,3.29688 c -0.21996,-0.004 -1.37809,0.98671 -2.57497,2.20312 -2.13408,2.16892 -3.79668,4.8071 -4.58642,7.27344 -0.30595,0.95543 -0.27996,1.1251 0.27392,1.71094 2.02961,2.14667 2.13473,5.62909 0.23481,7.78906 l -0.82964,0.95312 0.57918,1.64063 c 0.31829,0.90395 0.99768,2.35651 1.51055,3.22656 0.98269,1.66709 4.84642,5.73569 5.43954,5.72656 0.19139,-0.003 1.00069,-1.12768 1.7923,-2.5 l 1.44011,-2.49218 -1.46359,-1.42969 c -1.74469,-1.7009 -3.15687,-4.42419 -3.60027,-6.94531 -0.65587,-3.72915 0.73477,-7.91313 3.58462,-10.75782 l 1.4949,-1.48437 -1.44794,-2.45313 c -0.79721,-1.3482 -1.62713,-2.457 -1.8471,-2.46093 z m -11.48172,11.00781 c -0.9633,0.0352 -1.91614,0.41377 -2.69237,1.1875 -2.00987,2.00337 -1.64736,5.13021 0.77483,6.64844 1.21586,0.7621 3.46635,0.64626 4.72731,-0.25 0.50706,-0.3604 1.08552,-1.17918 1.36967,-1.92188 0.42186,-1.10264 0.44357,-1.46028 0.14089,-2.46875 -0.6246,-2.08092 -2.48131,-3.26251 -4.32033,-3.19531 z m 34.48431,5.39844 -0.21914,1.28125 c -0.3438,1.98869 -1.85107,4.75045 -3.48287,6.375 -3.52802,3.51233 -9.02028,4.5823 -13.61059,2.65625 -0.31683,-0.13294 -0.81591,0.51278 -1.90188,2.46093 l -1.47141,2.63282 1.08791,0.5 c 2.35906,1.08328 4.03098,1.35097 7.7171,1.25 1.9655,-0.0538 3.79469,-0.19399 4.06987,-0.3125 0.27517,-0.11852 0.50091,-0.41217 0.50091,-0.65625 0,-0.80589 1.40637,-2.86257 2.36365,-3.45313 1.32111,-0.81501 3.27853,-1.20069 4.58643,-0.90625 1.07501,0.24202 1.1022,0.22987 2.37147,-1.36719 0.70576,-0.88801 1.72249,-2.51849 2.25409,-3.61718 0.92244,-1.90647 2.06223,-6.31651 1.72186,-6.65625 -0.0888,-0.0886 -1.47469,-0.16332 -3.07588,-0.17188 l -2.91152,-0.0156 z m -1.72969,13.57031 c -0.6657,0.006 -1.3092,0.12563 -1.7923,0.375 -2.86148,1.47704 -2.99196,5.66848 -0.22699,7.35156 1.16072,0.70654 3.18099,0.68769 4.37512,-0.0391 2.51763,-1.53224 2.76259,-4.74097 0.52439,-6.82813 -0.60311,-0.56239 -1.77072,-0.86862 -2.88022,-0.85937 z"
-       id="path3059"
-       inkscape:connector-curvature="0" />
+     inkscape:groupmode="layer">
+    <g
+       id="g4962"
+       transform="matrix(1.0616883,0,0,-1.0616883,-89.909567,-457.08618)"
+       style="stroke:url(#radialGradient3795)">
+      <path
+         transform="matrix(0.71044698,0,0,-0.7176231,-662.08285,-363.97187)"
+         d="m 1132.6954,135.18251 c 0,21.54888 -17.6453,39.01769 -39.4118,39.01769 -21.7666,0 -39.4118,-17.46881 -39.4118,-39.01769 0,-21.54888 17.6452,-39.017692 39.4118,-39.017692 21.7665,0 39.4118,17.468812 39.4118,39.017692 z"
+         sodipodi:ry="39.017693"
+         sodipodi:rx="39.411808"
+         sodipodi:cy="135.18251"
+         sodipodi:cx="1093.2836"
+         id="path66022-5-6-8-9-8-2-0-6-9-9"
+         style="fill:#dd4814;fill-opacity:1;stroke:url(#radialGradient3795)"
+         sodipodi:type="arc" />
+      <g
+         style="fill:#ffffff;stroke:url(#radialGradient3795)"
+         transform="matrix(2.9000497,0,0,-2.9000497,91.426984,-434.93948)"
+         id="g4698">
+        <g
+           id="g5"
+           style="fill:#ffffff;fill-opacity:1;stroke:url(#radialGradient3795)"
+           transform="translate(-4,-0.023114)">
+          <path
+             inkscape:connector-curvature="0"
+             d="m 6.246,13.98 c -0.319,-0.319 -0.319,-0.837 0,-1.157 L 9.963,9.106 c 0.319,-0.319 0.837,-0.319 1.157,0 l 0.786,0.787 c 0.32,0.319 0.32,0.837 0,1.157 l -3.717,3.717 c -0.32,0.319 -0.838,0.319 -1.157,0 l -0.786,-0.787 0,0 z"
+             id="path7-5"
+             style="fill:#ffffff;fill-opacity:1;stroke:url(#radialGradient3795)" />
+          <path
+             inkscape:connector-curvature="0"
+             d="M 9.076,11.937"
+             id="path9"
+             style="fill:#ffffff;fill-opacity:1;stroke:url(#radialGradient3795)" />
+        </g>
+        <path
+           inkscape:connector-curvature="0"
+           clip-rule="evenodd"
+           d="m 7.25,7.476886 c 0,-1.243 1.007,-2.25 2.2499998,-2.25 1.2430002,0 2.2500002,1.007 2.2500002,2.25 0,1.243 -1.007,2.25 -2.2500002,2.25 C 8.257,9.726886 7.25,8.719886 7.25,7.476886 z m -2.25,0 c 0,-2.485 2.015,-4.5 4.4999998,-4.5 2.4850002,0 4.5000002,2.015 4.5000002,4.5 0,2.4849998 -2.015,4.5 -4.5000002,4.5 C 7.015,11.976886 5,9.9618858 5,7.476886 z"
+           id="path11-8"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient3795)" />
+      </g>
+    </g>
   </g>
 </svg>

=== modified file 'data/media/noonline.png'
Binary files data/media/noonline.png	2012-10-20 07:41:01 +0000 and data/media/noonline.png	2012-10-22 21:06:21 +0000 differ
=== added file 'data/media/noonline0.png'
Binary files data/media/noonline0.png	1970-01-01 00:00:00 +0000 and data/media/noonline0.png	2012-10-22 21:06:21 +0000 differ
=== added file 'data/media/noonline1.png'
Binary files data/media/noonline1.png	1970-01-01 00:00:00 +0000 and data/media/noonline1.png	2012-10-22 21:06:21 +0000 differ
=== modified file 'data/media/online.png'
Binary files data/media/online.png	2012-10-20 07:41:01 +0000 and data/media/online.png	2012-10-22 21:06:21 +0000 differ
=== modified file 'data/ui/AboutDashPrivacyInterfaceDialog.ui'
--- data/ui/AboutDashPrivacyInterfaceDialog.ui	2012-10-20 08:03:02 +0000
+++ data/ui/AboutDashPrivacyInterfaceDialog.ui	2012-10-22 21:06:21 +0000
@@ -2,7 +2,7 @@
   <!-- interface-requires about_dash_privacy_interface_dialog 1.0 -->
   <!-- interface-requires gtk+ 3.0 -->
   <object class="AboutDashPrivacyInterfaceDialog" id="about_dash_privacy_interface_dialog">
-    <property name="website">https://launchpad.net/dash-privacy-interface</property><property name="version">12.10.1</property><property translatable="yes" name="license"># Copyright (C) 
+    <property name="website">https://launchpad.net/dash-privacy-interface</property><property name="version">12.10.2</property><property translatable="yes" name="license"># Copyright (C) 
 # ubuntu-fr &lt;LoCo Team&gt; 
 # kanor &lt;Romain DUBREIL&gt; &lt;[e-mail]&gt;
 # cm-t &lt;Rudy ANDR&#201;&gt; &lt;[e-mail]&gt;

=== modified file 'data/ui/DashPrivacyInterfaceWindow.ui'
--- data/ui/DashPrivacyInterfaceWindow.ui	2012-10-21 10:38:53 +0000
+++ data/ui/DashPrivacyInterfaceWindow.ui	2012-10-22 21:06:21 +0000
@@ -4,25 +4,27 @@
   <!-- interface-requires dash_privacy_interface_window 1.0 -->
   <!-- interface-local-resource-path ../media -->
   <object class="GtkAction" id="action1"/>
+  <object class="GtkImage" id="imgOffline">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">../media/noonline.png</property>
+  </object>
   <object class="GtkImage" id="imgOnline">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="halign">start</property>
     <property name="pixbuf">../media/online.png</property>
   </object>
-  <object class="GtkImage" id="imgOffline">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">../media/noonline.png</property>
-  </object>
   <object class="DashPrivacyInterfaceWindow" id="dash_privacy_interface_window">
-    <property name="width_request">800</property>
-    <property name="height_request">600</property>
+    <property name="width_request">736</property>
+    <property name="height_request">574</property>
     <property name="can_focus">False</property>
     <property name="halign">center</property>
+    <property name="type">popup</property>
     <property name="title" translatable="yes" comments="Window title ">Dash Privacy Interface</property>
     <property name="resizable">False</property>
-    <property name="window_position">center-on-parent</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-always</property>
     <property name="default_width">600</property>
     <property name="default_height">800</property>
     <property name="icon">../media/dash-privacy-interface.svg</property>

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-21 19:28:48 +0000
+++ debian/changelog	2012-10-22 21:06:21 +0000
@@ -1,3 +1,26 @@
+dash-privacy-interface (12.10.2ubuntu1) quantal; urgency=low
+
+  [ cm-t arudy ]
+  * Legal notice in french
+  * This window is suposed to be launched on the first user login
+  * Link should be clickable #1068993
+
+  [ cm-t ]
+
+ -- cm-t arudy <[e-mail]>  Mon, 22 Oct 2012 22:34:29 +0200
+
+dash-privacy-interface (12.10.2) quantal; urgency=low
+
+  * Merge
+
+ -- cm-t arudy <[e-mail]>  Mon, 22 Oct 2012 22:34:28 +0200
+
+dash-privacy-interface (12.10.1-public1) quantal; urgency=low
+
+  * New release.
+
+ -- cm-t arudy <[e-mail]>  Mon, 22 Oct 2012 22:20:03 +0200
+
 dash-privacy-interface (12.10.1) precise; urgency=low
 
   * Initial release.

=== modified file 'debian/copyright'
--- debian/copyright	2012-10-21 19:01:43 +0000
+++ debian/copyright	2012-10-22 21:06:21 +0000
@@ -4,7 +4,6 @@
 Source: https://launchpad.net/dash-privacy-interface
 
 Files: *
-Copyright: (C)
 Copyright: (C) 
 Copyright: (C) </property><property name="can_focus">False</property>
 License: GPL-3

=== modified file 'po/dash-privacy-interface.pot'
--- po/dash-privacy-interface.pot	2012-10-21 19:28:48 +0000
+++ po/dash-privacy-interface.pot	2012-10-22 21:06:21 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-21 21:25+0200\n"
+"POT-Creation-Date: 2012-10-22 22:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"

=== modified file 'setup.py'
--- setup.py	2012-10-21 19:28:48 +0000
+++ setup.py	2012-10-22 21:06:21 +0000
@@ -1,22 +1,22 @@
 #!/usr/bin/env python
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
-# Copyright (C)
-# ubuntu-fr <LoCo Team>
+# Copyright (C) 
+# ubuntu-fr <LoCo Team> 
 # kanor <Romain DUBREIL> <[e-mail]>
 # cm-t <Rudy ANDRÉ> <[e-mail]>
 # olive <Olivier FRAYSSE> <[e-mail]>
 # quesh <Frédéric MANDE> <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
+# This program is free software: you can redistribute it and/or modify it 
+# under the terms of the GNU General Public License version 3, as published 
 # by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# 
+# This program is distributed in the hope that it will be useful, but 
+# WITHOUT ANY WARRANTY; without even the implied warranties of 
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
 # PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
+# 
+# You should have received a copy of the GNU General Public License along 
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
@@ -146,7 +146,7 @@
 
 DistUtilsExtra.auto.setup(
     name='dash-privacy-interface',
-    version='12.10.1',
+    version='12.10.2',
     license='GPL-3',
     author='cm-t arudy',
     author_email='[e-mail]',