[Pkg-privacy-commits] [tails-installer] 59/70: Completely get rid of the splash screen.

Ulrike Uhlig ulrike at moszumanska.debian.org
Mon Nov 20 14:55:04 UTC 2017


This is an automated email from the git hooks/post-receive script.

ulrike pushed a commit to annotated tag tails-installer_4.20
in repository tails-installer.

commit c8e050ba29351e683e88ed7d7d1f1e808206a9de
Author: anonym <anonym at riseup.net>
Date:   Tue Sep 19 15:23:09 2017 +0200

    Completely get rid of the splash screen.
---
 .gitignore                            |   1 -
 MANIFEST.in                           |   3 -
 data/tails-installer-launcher.desktop |  13 -
 data/tails-installer-launcher.ui      | 580 ----------------------------------
 data/tails-installer.desktop          |   9 +-
 po/POTFILES.in                        |   3 -
 setup.py                              |   8 +-
 tails-installer-launcher              |  36 ---
 tails-installer-launcher.1.markdown   |  22 --
 tails_installer/launcher.py           |  53 ----
 10 files changed, 9 insertions(+), 719 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0169b41..91f6a8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@ build/
 dist/
 MANIFEST
 data/tails-installer.ui.h
-data/tails-installer-launcher.ui.h
 .*.swp
 /po/*.mo
 /po/*.mo~
diff --git a/MANIFEST.in b/MANIFEST.in
index 0704629..2a780b7 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,16 +2,13 @@ include README.txt
 include Makefile
 include LICENSE.txt
 include tails-installer
-include tails-installer-launcher
 include setup.py
 include tails_installer/__init__.py
 include tails_installer/creator.py
 include tails_installer/dialog.py
 include tails_installer/gui.py
-include tails_installer/launcher.py
 include tails_installer/releases.py
 include data/tails-installer.ui
-include data/tails-installer-launcher.ui
 include data/tails-installer.desktop
 include data/tails-tails_installer-header.png
 include data/tails-installer.svg
diff --git a/data/tails-installer-launcher.desktop b/data/tails-installer-launcher.desktop
deleted file mode 100644
index b8a3f81..0000000
--- a/data/tails-installer-launcher.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Tails Installer
-Name[fr]=Programme d'installation de Tails
-Name[sv]=Tails installerare
-Comment=Install, clone, upgrade Tails
-Comment[fr]=Installer, cloner, mettre à jour Tails
-Comment[sv]=Installera, klona, uppgradera Tails
-Icon=tails-installer.svg
-Exec=tails-installer-launcher
-Terminal=false
-Categories=System;Tails;
-Keywords=Tails;Install;Upgrade;Update;Copy;Clone;Installer;USB;Installation;Anonymity;Tor;Anonymous;SD;Amnesic;Amnesia;
diff --git a/data/tails-installer-launcher.ui b/data/tails-installer-launcher.ui
deleted file mode 100644
index 09d3ec4..0000000
--- a/data/tails-installer-launcher.ui
+++ /dev/null
@@ -1,580 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3
-
-Copyright (C) 2015 Tails Developers
-
-This file is part of tails-installer.
-
-tails-installer is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-tails-installer is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY 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 with tails-installer.  If not, see <http://www.gnu.org/licenses/>.
-
--->
-<interface domain="tails-installer">
-  <requires lib="gtk+" version="3.0"/>
-  <!-- interface-license-type gplv3 -->
-  <!-- interface-name tails-installer -->
-  <!-- interface-copyright 2015 Tails Developers -->
-  <object class="GtkBox" id="box_launcher">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="halign">center</property>
-    <property name="valign">start</property>
-    <property name="margin_left">18</property>
-    <property name="margin_right">18</property>
-    <property name="margin_top">18</property>
-    <property name="margin_bottom">18</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkBox" id="box_standalone">
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">6</property>
-        <child>
-          <object class="GtkLabel" id="label_intro">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_bottom">12</property>
-            <property name="xalign">0</property>
-            <property name="yalign">0</property>
-            <property name="label" translatable="yes">To run Tails Installer you need an ISO image which can be downloaded from the Tails website: <a href="https://tails.boum.org/download/">https://tails.boum.org/download/</a></property>
-            <property name="use_markup">True</property>
-            <property name="justify">center</property>
-            <property name="wrap">True</property>
-            <property name="width_chars">15</property>
-            <property name="max_width_chars">15</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="button_install">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <signal name="clicked" handler="on_install_iso" swapped="no"/>
-            <child>
-              <object class="GtkBox" id="box_install">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="resize_mode">queue</property>
-                <property name="spacing">12</property>
-                <child>
-                  <object class="GtkLabel" id="label_install_title">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Install</property>
-                    <property name="justify">fill</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkGrid" id="grid_install">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="column_spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="label_install_tr">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">• Install Tails on a new USB stick.</property>
-                        <property name="width_chars">50</property>
-                        <property name="max_width_chars">50</property>
-                        <property name="wrap">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_install_br">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">• The USB stick that you install on is formatted and all data is lost.</property>
-                        <property name="width_chars">50</property>
-                        <property name="max_width_chars">50</property>
-                        <property name="wrap">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="button_upgrade">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <signal name="clicked" handler="on_upgrade_iso" swapped="no"/>
-            <child>
-              <object class="GtkBox" id="box_upgrade">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="resize_mode">queue</property>
-                <property name="spacing">12</property>
-                <child>
-                  <object class="GtkLabel" id="label_upgrade_title">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Upgrade</property>
-                    <property name="justify">fill</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkGrid" id="grid_upgrade">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="column_spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="label_upgrade_tr">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">• Upgrade a Tails USB stick to the version of an ISO image.</property>
-                        <property name="width_chars">50</property>
-                        <property name="max_width_chars">50</property>
-                        <property name="wrap">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_upgrade_br">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">• The encrypted persistent storage of the Tails USB stick that you upgrade is preserved.</property>
-                        <property name="width_chars">50</property>
-                        <property name="max_width_chars">50</property>
-                        <property name="wrap">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_help1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="margin_top">6</property>
-            <property name="label" translatable="yes">Need help? Read the <a href="https://tails.boum.org/doc/first_steps/installation/">documentation</a></property>
-            <property name="use_markup">True</property>
-            <property name="width_chars">50</property>
-            <property name="max_width_chars">50</property>
-            <property name="lines">0</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox" id="box_tails">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">6</property>
-        <child>
-          <object class="GtkButton" id="button_clone_install">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <signal name="clicked" handler="on_clone_install" swapped="no"/>
-            <child>
-              <object class="GtkBox" id="box_clone_install">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="resize_mode">queue</property>
-                <property name="spacing">12</property>
-                <child>
-                  <object class="GtkLabel" id="label_clone_install_title">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Install by cloning</property>
-                    <property name="justify">center</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkGrid" id="grid_installbycloning">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="column_spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="label_install_by_cloning_description1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0</property>
-                        <property name="label" translatable="yes">• Install Tails on another USB stick by copying the Tails system that you are currently using.</property>
-                        <property name="width_chars">50</property>
-                        <property name="max_width_chars">50</property>
-                        <property name="wrap">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_install_by_cloning_description2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0</property>
-                        <property name="label" translatable="yes">• The USB stick that you install on is formatted and all data is lost.</property>
-                        <property name="width_chars">50</property>
-                        <property name="max_width_chars">50</property>
-                        <property name="wrap">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_install_by_cloning_description3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0</property>
-                        <property name="label" translatable="yes">• The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</property>
-                        <property name="width_chars">50</property>
-                        <property name="max_width_chars">50</property>
-                        <property name="wrap">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="button_clone_upgrade">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <signal name="clicked" handler="on_clone_upgrade" swapped="no"/>
-            <child>
-              <object class="GtkBox" id="box_clone_upgrade">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="resize_mode">queue</property>
-                <property name="spacing">12</property>
-                <child>
-                  <object class="GtkLabel" id="label_clone_upgrade_title">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Upgrade by cloning</property>
-                    <property name="justify">center</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkGrid" id="grid1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="column_spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="label_upgrade_by_cloning1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0</property>
-                        <property name="label" translatable="yes">• Upgrade another Tails USB stick to the same version of Tails that you are currently using.</property>
-                        <property name="width_chars">50</property>
-                        <property name="max_width_chars">50</property>
-                        <property name="wrap">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_upgrade_by_cloning2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0</property>
-                        <property name="label" translatable="yes">• The encrypted persistent storage of the Tails USB stick that you upgrade is preserved.</property>
-                        <property name="width_chars">50</property>
-                        <property name="max_width_chars">50</property>
-                        <property name="wrap">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_upgrade_by_cloning3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0</property>
-                        <property name="label" translatable="yes">• The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</property>
-                        <property name="width_chars">50</property>
-                        <property name="max_width_chars">50</property>
-                        <property name="wrap">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="button_upgrade_iso">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <signal name="clicked" handler="on_upgrade_iso" swapped="no"/>
-            <child>
-              <object class="GtkBox" id="box_upgrade_iso">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="resize_mode">queue</property>
-                <property name="spacing">12</property>
-                <child>
-                  <object class="GtkLabel" id="label_upgrade_iso_title">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Upgrade from ISO</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkGrid" id="grid_upgrade_iso">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="column_spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="label_upgradefromiso1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0</property>
-                        <property name="label" translatable="yes">• Upgrade another Tails USB stick to the version of an ISO image.</property>
-                        <property name="use_markup">True</property>
-                        <property name="width_chars">50</property>
-                        <property name="max_width_chars">50</property>
-                        <property name="wrap">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_upgradefromiso2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0</property>
-                        <property name="label" translatable="yes">• The encrypted persistent storage of the Tails USB stick that you upgrade is preserved.</property>
-                        <property name="width_chars">50</property>
-                        <property name="max_width_chars">50</property>
-                        <property name="wrap">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_upgradefromiso3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0</property>
-                        <property name="label" translatable="yes">• The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</property>
-                        <property name="width_chars">50</property>
-                        <property name="max_width_chars">50</property>
-                        <property name="wrap">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_help">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_top">6</property>
-            <property name="label" translatable="yes">Need help? Read the <a href="file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html">documentation</a></property>
-            <property name="use_markup">True</property>
-            <property name="width_chars">50</property>
-            <property name="max_width_chars">50</property>
-            <property name="lines">0</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkSizeGroup" id="sizegroup_standalone_buttons">
-    <widgets>
-      <widget name="label_install_title"/>
-      <widget name="label_upgrade_title"/>
-    </widgets>
-  </object>
-  <object class="GtkSizeGroup" id="sizegroup_tails_buttons">
-    <widgets>
-      <widget name="label_clone_install_title"/>
-      <widget name="label_clone_upgrade_title"/>
-      <widget name="label_upgrade_iso_title"/>
-    </widgets>
-  </object>
-</interface>
diff --git a/data/tails-installer.desktop b/data/tails-installer.desktop
index 7d7fd2c..7fb87d5 100644
--- a/data/tails-installer.desktop
+++ b/data/tails-installer.desktop
@@ -1,8 +1,13 @@
 [Desktop Entry]
 Type=Application
 Name=Tails Installer
-Comment=Write operating system images to a USB device
+Name[fr]=Programme d'installation de Tails
+Name[sv]=Tails installerare
+Comment=Install, clone, upgrade Tails
+Comment[fr]=Installer, cloner, mettre à jour Tails
+Comment[sv]=Installera, klona, uppgradera Tails
 Icon=tails-installer.svg
 Exec=tails-installer
 Terminal=false
-Categories=System;
+Categories=System;Tails;
+Keywords=Tails;Install;Upgrade;Update;Copy;Clone;Installer;USB;Installation;Anonymity;Tor;Anonymous;SD;Amnesic;Amnesia;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 65534f7..34ba1a5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,12 +2,9 @@
 tails_installer/__init__.py
 tails_installer/creator.py
 tails_installer/gui.py
-tails_installer/launcher.py
 tails_installer/source.py
 tails_installer/utils.py
 
 data/tails-installer.ui.h
-data/tails-installer-launcher.ui.h
 
 tails-installer
-tails-installer-launcher
diff --git a/setup.py b/setup.py
index 6ae8a0a..5f0422c 100755
--- a/setup.py
+++ b/setup.py
@@ -97,9 +97,6 @@ else:
             subprocess.call (["intltool-extract",
                               "--type=gettext/glade",
                               "data/tails-installer.ui"])
-            subprocess.call (["intltool-extract",
-                              "--type=gettext/glade",
-                              "data/tails-installer-launcher.ui"])
 
     build_extra.build_extra.sub_commands.insert(0, ("build_gtkbuilderi18n", None))
 
@@ -107,7 +104,7 @@ else:
         name = 'tails-installer',
         version = VERSION,
         packages = ['tails_installer'],
-        scripts = ['tails-installer', 'tails-installer-launcher'],
+        scripts = ['tails-installer'],
         license = 'GNU General Public License (GPL)',
         url = 'https://tails.boum.org/contribute/release_process/tails-installer/',
         description = 'This tool installs a LiveCD ISO on to a USB stick',
@@ -116,11 +113,10 @@ else:
         maintainer = 'Tails developers',
         maintainer_email = 'tails at boum.org',
         data_files = [("/usr/share/applications",
-                       [ "data/tails-installer-launcher.desktop" ]),
+                       [ "data/tails-installer.desktop" ]),
                       ("/usr/share/appdata", ["data/tails-installer.appdata.xml"]),
                       ("/usr/share/pixmaps",["data/tails-installer.svg"]),
                       ("/usr/share/tails-installer", ["data/tails-installer.ui",
-                                                      "data/tails-installer-launcher.ui",
                                                       "data/tails-liveusb-header.png"])],
         cmdclass = {
             "build" : build_extra.build_extra,
diff --git a/tails-installer-launcher b/tails-installer-launcher
deleted file mode 100755
index 9deb011..0000000
--- a/tails-installer-launcher
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/python -tt
-# coding: utf-8
-#
-# Copyright © 2012-2015, Tails developers <tails at boum.org>
-#
-# This copyrighted material is made available to anyone wishing to use, modify,
-# copy, or redistribute it subject to the terms and conditions of the GNU
-# General Public License v.2.  This program is distributed in the hope that it
-# will be useful, but WITHOUT ANY WARRANTY expressed or implied, including the
-# implied warranties of MERCHANTABILITY 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 with this program; if
-# not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-# Floor, Boston, MA 02110-1301, USA.
-
-import gi
-import sys
-
-gi.require_version('Gtk', '3.0')
-from gi.repository import Gtk
-
-from tails_installer.launcher import TailsInstallerLauncherWindow
-
-def main():
-    try:
-        if len(sys.argv) > 1:
-            args = sys.argv[1:]
-        else:
-            args = []
-        TailsInstallerLauncherWindow(args)
-        Gtk.main()
-    except KeyboardInterrupt:
-        pass
-
-if __name__ == '__main__':
-    main()
diff --git a/tails-installer-launcher.1.markdown b/tails-installer-launcher.1.markdown
deleted file mode 100644
index b8b3df6..0000000
--- a/tails-installer-launcher.1.markdown
+++ /dev/null
@@ -1,22 +0,0 @@
-% tails-installer-LAUNCHER(1) tails-installer-launcher user manual
-% This manual page was written by u <u at 451f.org>
-% July 22nd, 2015
-
-NAME
-====
-
-tails-installer-launcher - launches Tails Installer
-
-SYNOPSIS
-========
-
-	tails-installer-launcher
-
-DESCRIPTION
-===========
-
-tails-installer-launcher is a graphical frontend that hides the
-complexity of running tails-installer with the right set of options.
-It lets the user choose among a limited number of installation and
-upgrade options; only the options that make sense in the current
-runtime context are made available.
diff --git a/tails_installer/launcher.py b/tails_installer/launcher.py
deleted file mode 100644
index e56525f..0000000
--- a/tails_installer/launcher.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright © 2012-2015, Tails developers <tails at boum.org>
-
-"""
-A unified launcher for the most common Tails Installer usecases
-"""
-
-import os
-
-from gi.repository import Gtk
-
-from tails_installer import _
-from tails_installer.utils import _get_datadir, is_running_from_tails
-
-class TailsInstallerLauncherWindow(Gtk.ApplicationWindow):
-    """ Our main dialog class """
-
-    def __init__(self, args):
-        Gtk.ApplicationWindow.__init__(self)
-
-        self.args = args
-        if os.getenv('DEBUG', 0):
-            self.args = self.args + ['--verbose']
-
-        self.connect('delete-event', Gtk.main_quit)
-        builder = Gtk.Builder.new_from_file(
-                os.path.join(_get_datadir(), 'tails-installer-launcher.ui'))
-        builder.connect_signals(self)
-        self.add(builder.get_object('box_launcher'))
-        self.set_title(_("Tails Installer"))
-
-        if not is_running_from_tails():
-            builder.get_object('box_tails').set_visible(False)
-            builder.get_object('box_standalone').set_visible(True)
-
-        self.show()
-
-    def run_tails_installer(self, args):
-        args = ['tails-installer'] + args + self.args
-        os.execvp('tails-installer', args)
-
-    def on_clone_install(self, widget, data=None):
-        self.run_tails_installer([ '-u', '-n', '--clone', '-P', '-m', '-x' ])
-
-    def on_clone_upgrade(self, widget, data=None):
-        self.run_tails_installer([ '-u', '-n', '-x', '--clone' ])
-
-    def on_upgrade_iso(self, widget, data=None):
-        self.run_tails_installer([ '-u', '-n', '-x' ])
-
-    def on_install_iso(self, widget, data=None):
-        self.run_tails_installer([ '-u', '-n', '-P', '-m', '-x' ])

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git



More information about the Pkg-privacy-commits mailing list