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

[Kanor]

[lp:dash-privacy-interface]

7. By rdubreil <email address hidden> on 2012-10-21

This window is suposed to be launched on the first user login

8. By rdubreil <email address hidden> on 2012-10-21

Legal notice in french

9. By rdubreil <email address hidden> on 2012-10-22

Merge

=== removed file 'bin/dash-privacy-interfacec'
Binary files bin/dash-privacy-interfacec	2012-10-20 07:41:01 +0000 and bin/dash-privacy-interfacec	1970-01-01 00:00:00 +0000 differ
=== removed directory 'build'
=== removed directory 'build/share'
=== removed directory 'build/share/applications'
=== removed file 'build/share/applications/dash-privacy-interface.desktop'
--- build/share/applications/dash-privacy-interface.desktop	2012-10-20 07:54:32 +0000
+++ build/share/applications/dash-privacy-interface.desktop	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Dash Privacy Interface
-Comment=DashPrivacyInterface application
-Categories=GNOME;Utility;
-Exec=dash-privacy-interface
-Icon=dash-privacy-interface
-Terminal=false
-Type=Application

=== modified file 'dash_privacy_interface/DashPrivacyInterfaceWindow.py'
--- dash_privacy_interface/DashPrivacyInterfaceWindow.py	2012-10-20 07:41:01 +0000
+++ dash_privacy_interface/DashPrivacyInterfaceWindow.py	2012-10-22 16:50:24 +0000
@@ -1,44 +1,53 @@
 # -*- 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
 
 from locale import gettext as _
+import locale
 import os
 from gi.repository import Gio, Gtk # pylint: disable=E0611
 import logging
 logger = logging.getLogger('dash_privacy_interface')
 
 from dash_privacy_interface_lib import Window
-from dash_privacy_interface.AboutDashPrivacyInterfaceDialog import AboutDashPrivacyInterfaceDialog
-from dash_privacy_interface.PreferencesDashPrivacyInterfaceDialog import PreferencesDashPrivacyInterfaceDialog
 
 # See dash_privacy_interface_lib.Window.py for more details about how this class works
 class DashPrivacyInterfaceWindow(Window):
     __gtype_name__ = "DashPrivacyInterfaceWindow"
-    
+
     def finish_initializing(self, builder): # pylint: disable=E1002
         """Set up the main window"""
         super(DashPrivacyInterfaceWindow, self).finish_initializing(builder)
-
-        #self.AboutDialog = AboutDashPrivacyInterfaceDialog
-        #self.PreferencesDialog = PreferencesDashPrivacyInterfaceDialog
+        #Add url to read legal notice with local language
+        btn_label = builder.get_object("lbl_do_later_descrp")
+        text_label = btn_label.get_label()
+        language = locale.getdefaultlocale()[0].split('_')[0]
+        lien = "/usr/share/unity/6/searchingthedashlegalnotice%s.html"
+        lien_locale = lien % ( "_%s" % language)
+        if os.path.exists(lien_locale) and language != 'en':
+            lien = lien_locale
+        else:
+            lien = lien % ""
+        lien = "file:" + lien
+        text_label = text_label % {'url': lien}
+        btn_label.set_label(text_label)
 
         # Code for other initialization actions should be added here.
         settings = Gtk.Settings.get_default()
@@ -61,16 +70,12 @@
         self.quit_after_choice()
 
     def quit_after_choice(self):
-        self.set_has_been_displayed()
-        self.disable_auto_start()        
+        self.disable_auto_start()
         Gtk.main_quit()
-    
-    def set_has_been_displayed(self):
-        cookiFile = os.path.expanduser("~/config/.dash-privacy-interface/screen_seen")
-        if os.path.exists(cookiFile):
-            with open(cookiFile, 'w') as f:
-                f.write(_("The file was created after the current user has manualy chosen his dash privacy search result setting (online and local or local only). \n  For more information: https://launchpad.net/dash-privacy-interface "))
+
 
     def disable_auto_start(self):
-        return
-    
+        desktopFile = os.path.expanduser("~/.config/autostart/dash-privacy-interface.desktop")
+        if os.path.exists(desktopFile):
+            os.remove(desktopFile)
+

=== added file 'data/dash-privacy-interface.desktop'
--- data/dash-privacy-interface.desktop	1970-01-01 00:00:00 +0000
+++ data/dash-privacy-interface.desktop	2012-10-22 16:50:24 +0000
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Dash Privacy Interface
+Comment=DashPrivacyInterface application
+Categories=GNOME;Utility;
+Exec=dash-privacy-interface
+Icon=dash-privacy-interface
+Terminal=false
+Type=Application

=== added directory 'data/legalnotice'
=== added file 'data/legalnotice/searchingthedashlegalnotice_fr.html'
--- data/legalnotice/searchingthedashlegalnotice_fr.html	1970-01-01 00:00:00 +0000
+++ data/legalnotice/searchingthedashlegalnotice_fr.html	2012-10-22 16:50:24 +0000
@@ -0,0 +1,67 @@
+<html><head><title>Recherche dans le tableau de bord, mentions légales.</title>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<style type="text/css">
+body {font-family:Ubuntu; font-size:9pt;padding:50pt}
+h1{font-size:11pt;font-weight:bold;text-align:center;padding:10pt}
+h2{font-size:11pt;font-weight:bold;}
+</style>
+</head>
+<body>
+<h1>Recherche dans le tableau de bord - Mentions légales<br>Traduction non-officielle datée du 20 octobre 2012</h1>
+<p><a href="file:///usr/share/unity/6/searchingthedashlegalnotice.html">Consultez la version originale (en anglais).</a></p>
+
+<p>Cette fonction de recherche est fournie par la société Canonical 
+Group Limited (Canonical). Cette notice légale s'applique à la fonction 
+de recherche et inclue les
+<a href="http://www.canonical.com/legal">mentions légales</a> et la politique de respect de la vie privée, de Canonical.</p>
+
+<h2>Collecte et usage des données</h2>
+<p>Quand vous entrez une recherche dans le dash, Ubuntu cherchera sur votre ordinateur et enregistrera cette recherche localement.</p>
+
+<p>À moins que vous ayez désactivé cette option, (voir la section 
+«&nbsp;Recherche en ligne&nbsp;» ci-dessous), nous enverrons aussi vos 
+frappes de clavier en tant que recherches à productsearch.ubuntu.com et à
+ des tiers sélectionnés afin de pouvoir compléter vos recherches par des
+ résultats de recherches en ligne de tierces parties telles que : 
+Facebook, Twitter, BBC et Amazon. Canonical et ces tiers sélectionnés 
+collecteront vos recherches et les utiliseront pour vous fournir des 
+résultats de recherche durant votre utilisation d'Ubuntu.</p>
+<p>En effectuant des recherches dans le tableau de bord, vous acceptez :</p>
+
+<ul>
+<li>la collecte et l'utilisation de vos recherches et de votre adresse IP de cette façon, et</li>
+<li>le stockage de vos recherches et adresses IP par Canonical et ces tierces parties (si applicable).</li>
+</ul>
+
+<p>Canonical n'utilisera ces recherches et adresses IP qu'en accord avec ces mentions légales et 
+<a href="http://www.ubuntu.com/aboutus/privacypolicy">notre politique de respect de la vie privée</a>. Veuillez consulter <a href="http://www.ubuntu.com/aboutus/privacypolicy">notre politique de respect de la vie privée</a>
+ pour toute information complémentaire sur la façon dont Canonical 
+protège vos informations personelles. Pour toute information sur la 
+manière dont les parties tierces peuvent utiliser vos informations, 
+veuillez consulter leurs politiques de respect de la vie privée.</p>
+
+<h2>Recherche en ligne</h2>
+<p>Vous pouvez restreindre votre tableau de bord de telle sorte que nous
+ n'envoyions pas les recherches à des tiers et que vous ne receviez pas 
+de résultat de recherche en ligne. Pour ce faire, allez dans le panneau 
+de configuration «&nbsp;vie privée&nbsp;» et désactivez «&nbsp;Inclure 
+les résultats de la recherche en ligne&nbsp;». Le panneau de 
+configuration «&nbsp;vie privée&nbsp;» peut être trouvé dans les 
+paramètres système ou via une recherche dans le tableau de bord. Pour 
+une liste actualisée des parties tierces sélectionnées veuillez 
+consulter 
+<a href="http://www.ubuntu.com/privacypolicy/thirdparties">www.ubuntu.com/privacypolicy/thirdparties</a>.</p>
+
+<h2>Modifications</h2>
+<p>Même si les changements seront probablement mineurs, Canonical peut 
+modifier ces mentions légales de temps à autres et à la seule discrétion
+ de Canonical. Veuillez consulter régulièrement cette page pour tout 
+changement dans les mentions légales, il nous est impossible de vous en 
+avertir directement.</p>
+
+<h2>Comment nous contacter</h2>
+<p>Veuillez soumettre toute question ou commentaire à propos de la 
+recherche dans le tableau de bord ou de ces mentions légales, en nous 
+contactant à l'adresse suivante : </p><address>Canonical Group Ltd, 5th Floor, Blue Fin Building, 110  Southwark Street, London, England, SE1  0SU.</address><p></p>
+
+</body></html>
\ No newline at end of file

=== modified file 'data/ui/DashPrivacyInterfaceWindow.ui'
--- data/ui/DashPrivacyInterfaceWindow.ui	2012-10-20 07:41:01 +0000
+++ data/ui/DashPrivacyInterfaceWindow.ui	2012-10-22 16:50:24 +0000
@@ -195,7 +195,8 @@
             <property name="xpad">27</property>
             <property name="ypad">5</property>
             <property name="label" translatable="yes" comments="This field explain that you can change this setting later + legal notice">You can go back on your choice at any time, in the private life menu in the system settings.
-Learn more about this function and browse the legal notice.</property>
+                Learn more about this function and browse &lt;a href="%(url)s"&gt;the legal notice&lt;/a&gt;.</property>
+            <property name="use_markup">True</property>
             <property name="justify">fill</property>
             <property name="wrap">True</property>
             <property name="ellipsize">start</property>

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-20 08:03:08 +0000
+++ debian/changelog	2012-10-22 16:50:24 +0000
@@ -1,101 +1,5 @@
-dash-privacy-interface (12.10.1) quantal; urgency=low
-
-  * translation added
-
- -- cm-t arudy <[e-mail]>  Sat, 20 Oct 2012 10:03:05 +0200
-
-dash-privacy-interface (12.10) quantal; urgency=low
-
-  * New release.
-
- -- cm-t arudy <[e-mail]>  Sat, 20 Oct 2012 09:41:05 +0200
-
-dash-privacy-interface (0.1-public17) quantal; urgency=low
-
-  * New release.
-
- -- cm-t arudy <[e-mail]>  Sat, 20 Oct 2012 09:37:26 +0200
-
-dash-privacy-interface (0.1-public16) quantal; urgency=low
-
-  * New release.
-
- -- cm-t arudy <[e-mail]>  Sat, 20 Oct 2012 09:15:13 +0200
-
-dash-privacy-interface (0.1-public15) quantal; urgency=low
-
-  * New release.
-
- -- cm-t arudy <[e-mail]>  Sat, 20 Oct 2012 09:08:30 +0200
-
-dash-privacy-interface (0.1-public14) quantal; urgency=low
-
-  * New release.
-
- -- cm-t arudy <[e-mail]>  Sat, 20 Oct 2012 09:02:33 +0200
-
-dash-privacy-interface (0.1-public13) quantal; urgency=low
-
-  * New release.
-
- -- cm-t arudy <[e-mail]>  Sat, 20 Oct 2012 08:57:51 +0200
-
-dash-privacy-interface (0.1-public12) quantal; urgency=low
-
-  * New release.
-
- -- cm-t arudy <[e-mail]>  Sat, 20 Oct 2012 08:54:18 +0200
-
-dash-privacy-interface (0.1-public11) quantal; urgency=low
-
-  * New release.
-
- -- cm-t arudy <[e-mail]>  Sat, 20 Oct 2012 08:51:30 +0200
-
-dash-privacy-interface (0.1-public10) quantal; urgency=low
-
-  * New release.
-
- -- cm-t arudy <[e-mail]>  Sat, 20 Oct 2012 08:49:04 +0200
-
-dash-privacy-interface (0.1-public9) quantal; urgency=low
-
-  * New release.
-
- -- cm-t arudy <[e-mail]>  Sat, 20 Oct 2012 08:47:47 +0200
-
-dash-privacy-interface (0.1-public8) quantal; urgency=low
-
-  * New release.
-
- -- cm-t arudy <[e-mail]>  Sat, 20 Oct 2012 08:45:06 +0200
-
-dash-privacy-interface (0.1-public7) quantal; urgency=low
-
-  * New release.
-
- -- cm-t arudy <[e-mail]>  Sat, 20 Oct 2012 08:38:50 +0200
-
-dash-privacy-interface (0.1-public6) quantal; urgency=low
-
-  * New release.
-
- -- cm-t arudy <[e-mail]>  Sat, 20 Oct 2012 08:36:49 +0200
-
-dash-privacy-interface (0.1-public5) quantal; urgency=low
-
-  * New release.
-
- -- cm-t arudy <[e-mail]>  Sat, 20 Oct 2012 08:34:39 +0200
-
-dash-privacy-interface (0.1-public4) quantal; urgency=low
-
-  * New release.
-
- -- cm-t arudy <[e-mail]>  Sat, 20 Oct 2012 08:33:06 +0200
-
-dash-privacy-interface (0.1-public3) quantal; urgency=low
+dash-privacy-interface (12.10.1) precise; urgency=low
 
   * Initial release.
 
- -- cm-t arudy <[e-mail]>  Sat, 20 Oct 2012 08:31:23 +0200
+ -- Tyrus <tyrus@tyrus-carthage>  Sun, 21 Oct 2012 21:25:06 +0200

=== modified file 'debian/copyright'
--- debian/copyright	2012-10-20 07:41:10 +0000
+++ debian/copyright	2012-10-22 16:50:24 +0000
@@ -4,6 +4,7 @@
 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-20 07:54:32 +0000
+++ po/dash-privacy-interface.pot	2012-10-22 16:50:24 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-20 09:52+0200\n"
+"POT-Creation-Date: 2012-10-21 21:25+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"
@@ -17,13 +17,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../dash_privacy_interface/DashPrivacyInterfaceWindow.py:72
-msgid ""
-"The file was created after the current user has manualy chosen his dash "
-"privacy search result setting (online and local or local only). \n"
-"  For more information: https://launchpad.net/dash-privacy-interface "
-msgstr ""
-
 #. Code for other initialization actions should be added here.
 #. Window title
 #: ../data/ui/DashPrivacyInterfaceWindow.ui.h:2
@@ -63,11 +56,13 @@
 msgstr ""
 
 #. This field explain that you can change this setting later + legal notice
-#: ../data/ui/DashPrivacyInterfaceWindow.ui.h:15
+#: ../data/ui/DashPrivacyInterfaceWindow.ui.h:16
+#, no-c-format
 msgid ""
 "You can go back on your choice at any time, in the private life menu in the "
 "system settings.\n"
-"Learn more about this function and browse the legal notice."
+"                Learn more about this function and browse <a href=\"%(url)s"
+"\">the legal notice</a>."
 msgstr ""
 
 #: ../data/ui/PreferencesDashPrivacyInterfaceDialog.ui.h:1

=== modified file 'setup.py'
--- setup.py	2012-10-20 08:03:02 +0000
+++ setup.py	2012-10-22 16:50:24 +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
 
@@ -24,6 +24,7 @@
 
 import os
 import sys
+import glob
 
 try:
     import DistUtilsExtra.auto
@@ -134,10 +135,14 @@
         update_desktop_file(desktop_file, target_pkgdata, target_scripts)
         compile_schemas(self.root, target_data)
 
-        
+
 ##################################################################################
 ###################### YOU SHOULD MODIFY ONLY WHAT IS BELOW ######################
 ##################################################################################
+#List translate legal notice
+l_file_legal_notice = glob.glob(os.path.join(
+            os.path.dirname(os.path.abspath(__file__)),
+            "data/legalnotice/*.html"))
 
 DistUtilsExtra.auto.setup(
     name='dash-privacy-interface',
@@ -148,6 +153,10 @@
     #description='UI for managing …',
     #long_description='Here a longer description',
     url='https://launchpad.net/dash-privacy-interface',
-    cmdclass={'install': InstallAndUpdateDataDirectory}
+    cmdclass={'install': InstallAndUpdateDataDirectory},
+    data_files=[("/etc/skel/.config/autostart/",
+                  ["data/dash-privacy-interface.desktop"]),
+                ("/usr/share/unity/6/",
+                  l_file_legal_notice)]
     )