diff --git a/helpers/DATA/ubiquity/stepPartAsk.ui b/helpers/DATA/ubiquity/stepPartAsk.ui new file mode 100644 index 0000000000000000000000000000000000000000..f37bc476e9674cadbc78f4016d5e72aa29c07d55 --- /dev/null +++ b/helpers/DATA/ubiquity/stepPartAsk.ui @@ -0,0 +1,406 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkAlignment" id="stepPartAsk"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">20</property> + <property name="left_padding">24</property> + <property name="right_padding">24</property> + <child> + <object class="GtkGrid" id="grid1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">3</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="part_ask_heading"> + <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">This computer currently has Ubuntu 11.04 on it. What would you like to do?</property> + <property name="wrap">True</property> + <property name="width_chars">45</property> + <property name="mnemonic_widget">use_device</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="left_padding">24</property> + <child> + <object class="GtkGrid" id="grid2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkLabel" id="reuse_partition_desc"> + <property name="can_focus">False</property> + <property name="margin_left">24</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes"><span size="small">Documents, music, and other personal files will be kept. Installed software will be kept where possible. System-wide settings will be cleared.</span></property> + <property name="use_markup">True</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="reuse_partition"> + <property name="label" translatable="yes">Upgrade Ubuntu to 11.10</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin_top">9</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <signal name="clicked" handler="part_ask_option_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="replace_partition_desc"> + <property name="can_focus">False</property> + <property name="margin_left">24</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes"><span size="small"><span foreground="darkred">Warning:</span> This will delete all your Ubuntu 11.04 programs, documents, photos, music, and any other files.</span></property> + <property name="use_markup">True</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="replace_partition"> + <property name="label" translatable="yes">Erase Ubuntu and reinstall</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin_top">9</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">reuse_partition</property> + <signal name="clicked" handler="part_ask_option_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="resize_use_free_desc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_left">24</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes"><span size="small">Documents, music, and other personal files will be kept. You can choose which operating system you want each time the computer starts up.</span></property> + <property name="use_markup">True</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="resize_use_free"> + <property name="label" translatable="yes">Install Ubuntu alongside Windows</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin_top">9</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <property name="group">reuse_partition</property> + <signal name="clicked" handler="part_ask_option_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="use_device_desc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_left">24</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes"><span size="small"><span foreground="darkred">Warning:</span> This will delete all of your Windows programs, documents, photos, music, and any other files.</span></property> + <property name="use_markup">True</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">7</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="use_device"> + <property name="label" translatable="yes">Replace Windows with Ubuntu</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin_top">9</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <property name="group">reuse_partition</property> + <signal name="clicked" handler="part_ask_option_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="use_crypto_desc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_left">48</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes"><span size="small">You’ll choose a security key in the next step.</span></property> + <property name="use_markup">True</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">9</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="use_crypto"> + <property name="label" translatable="yes">Encrypt the new Ubuntu installation for security</property> + <property name="active">True</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="margin_left">24</property> + <property name="receives_default">False</property> + <property name="margin_top">9</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <signal name="clicked" handler="on_crypto_lvm_toggled" swapped="no"/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">8</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="use_lvm_desc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_left">48</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes"><span size="small">This will set up Logical Volume Management. It allows taking snapshots and easier partition resizing.</span></property> + <property name="use_markup">True</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">11</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="use_lvm"> + <property name="label" translatable="yes">Use LVM with the new Ubuntu installation</property> + <property name="visible">True</property> + <property name="active">True</property> + <property name="can_focus">True</property> + <property name="margin_left">24</property> + <property name="receives_default">False</property> + <property name="margin_top">9</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <signal name="clicked" handler="on_crypto_lvm_toggled" swapped="no"/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">10</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + + <child> + <object class="GtkLabel" id="use_zfs_desc"> + <property name="visible">False</property> + <property name="can_focus">False</property> + <property name="margin_left">24</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes"><span foreground="darkred">Warning:</span> This will delete all your files on all operating systems. +This is experimental and may cause data loss. Do not use on production systems.</property> + <property name="use_markup">True</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">14</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="use_zfs"> + <property name="label" translatable="yes">EXPERIMENTAL: Erase disk and use ZFS</property> + <property name="visible">False</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin_top">9</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <property name="group">reuse_partition</property> + <signal name="clicked" handler="part_ask_option_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">13</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + + <child> + <object class="GtkLabel" id="custom_partitioning_desc"> + <property name="visible">False</property> + <property name="can_focus">False</property> + <property name="margin_left">24</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes"><span size="small">You can create or resize partitions yourself, or choose multiple partitions for Ubuntu.</span></property> + <property name="use_markup">True</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">16</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="custom_partitioning"> + <property name="label" translatable="yes">Something else</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin_top">9</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <property name="group">reuse_partition</property> + <signal name="clicked" handler="part_ask_option_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">15</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + </child> + </object> + <object class="GtkAlignment" id="stepBitlocker"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">20</property> + <property name="bottom_padding">20</property> + <property name="left_padding">20</property> + <property name="right_padding">20</property> + <child> + <object class="GtkBox" id="using_bitlocker"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="label_using_bitlocker"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="margin_top">6</property> + <property name="margin_bottom">6</property> + <property name="label" translatable="yes">This computer uses Windows BitLocker encryption. You need to turn off BitLocker in Windows before installing Trisquel. For instructions, open this page on a phone or other device: <a href="https://help.ubuntu.com/bitlocker">help.ubuntu.com/bitlocker</a></property> + <property name="use_markup">True</property> + <property name="max_width_chars">100</property> + <property name="wrap">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkImage" id="bitlocker_qrcode"> + <property name="visible">False</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="margin_top">6</property> + <property name="pixbuf">../pixmaps/qr-help-ubuntu-com-bitlocker.png</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> +</interface> diff --git a/helpers/make-ubiquity b/helpers/make-ubiquity index 4508fe3ca7acc6ed4f527c047f235bf376385d95..697f3f489cf97c93df1fbc7964384789b638751f 100644 --- a/helpers/make-ubiquity +++ b/helpers/make-ubiquity @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2011-2022 Ruben Rodriguez <ruben@trisquel.info> +# Copyright (C) 2011-2023 Ruben Rodriguez <ruben@trisquel.info> # Copyright (C) 2019 Mason Hock <mason@masonhock.com> # # This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=31 +VERSION=32 . ./config @@ -28,6 +28,10 @@ VERSION=31 # Fix some gtk labels for Orca patch -p1 < $DATA/a11y.patch +# Revert changes to advanced features page +cp $DATA/stepPartAsk.ui gui/gtk/stepPartAsk.ui +sed '/# Advanced features in new installs/,/^$/d' -i ubiquity/plugins/ubi-partman.py + # Do not try to start orca on ubiquity-dm sed 's/osextras.find_on_path.*orca.*/False: # Disabled by trisquel changes/' -i bin/ubiquity-dm @@ -220,6 +224,7 @@ replace archive.ubuntu.com/ubuntu archive.trisquel.org/trisquel . replace security.ubuntu.com/trisquel archive.trisquel.org/trisquel . replace archive.ubuntu.com archive.trisquel.org . replace security.ubuntu.com archive.trisquel.org . +replace help.ubuntu.com/bitlocker trisquel.info/en/wiki/bitlocker . #sed -i 's/apt-install/true #apt-install/' ubiquity/components/check_kernels.py sed -i 's/apt-install/true #apt-install/' scripts/check-kernels #sed -i '82s/True/False/g' gui/gtk/stepPrepare.ui