Re: [Tails-dev] [review'n'merge:1.2.1] bugfix/7678-Tails-Installer-crashes-on-upgrade
> Now you have one :) > Don't hesitate pinging tails-sysad...@boum.org in this kind of > situations. We're not perfect, and sometimes stuff is forgotten. Ok cool, no problem :) ___ Tails-dev mailing list Tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to tails-dev-unsubscr...@boum.org.
Re: [Tails-dev] [review'n'merge 1.1.1] Tails Installer should not run update_system_partition_properties on MBR partitions
Hi, > Can't we instead use the "PartitionTableScheme" property of the > parent device? This would seem more straightforward to me: > http://udisks.freedesktop.org/docs/1.0.5/Device.html#Device:PartitionTableScheme yes, but actually was easier with PartitionScheme of the same device :) Attached the fix. Cheers, KuronoFrom e6683d8867ad60e45c40bed6623f22941e1b0d2f Mon Sep 17 00:00:00 2001 From: Tails developers Date: Tue, 26 Aug 2014 19:36:37 +0200 Subject: [PATCH] Fix to Tails Installer should not run update_system_partition_properties on MBR partitions. --- liveusb/creator.py | 12 liveusb/gui.py | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/liveusb/creator.py b/liveusb/creator.py index ad9a0ab..20981d6 100755 --- a/liveusb/creator.py +++ b/liveusb/creator.py @@ -895,6 +895,18 @@ class LinuxLiveUSBCreator(LiveUSBCreator): # do it (as of Wheezy). self._set_partition_flags(self.drive['parent'], 1, SYSTEM_PARTITION_FLAGS) +def is_partition_GPT(self): + +# Check if the partition scheme is GPT +udi = self.drive['udi'] +dev_obj = self.bus.get_object("org.freedesktop.UDisks", udi) +properties = dbus.Interface(dev_obj, "org.freedesktop.DBus.Properties") +partition_scheme = str(properties.Get(udi, 'PartitionScheme')) +if partition_scheme == 'gpt': +return True +else: +return False + def switch_drive_to_system_partition(self): self._full_drive = self._drive append = False diff --git a/liveusb/gui.py b/liveusb/gui.py index d2f89f8..4b89f03 100755 --- a/liveusb/gui.py +++ b/liveusb/gui.py @@ -239,7 +239,7 @@ class LiveUSBThread(QtCore.QThread): self.live.update_configs() self.live.reset_mbr() -if not self.parent.opts.partition: +if not self.parent.opts.partition and self.live.is_partition_GPT(): self.live.update_system_partition_properties() self.live.install_bootloader() # self.live.bootable_partition() -- 1.8.3.2 ___ Tails-dev mailing list Tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to tails-dev-unsubscr...@boum.org.
[Tails-dev] [review'n'merge 1.1.1] Tails Installer should not run update_system_partition_properties on MBR partitions.
Hello, Since I don't have yet a repository for liveusb-creator, I'm sending this single patch. Ticket: https://labs.riseup.net/code/issues/7716. Cheers, kurono From 4475ee91f4534a96cb774733d8cc791e03a36cf9 Mon Sep 17 00:00:00 2001 From: Tails developers Date: Thu, 7 Aug 2014 23:53:08 +0200 Subject: [PATCH] Tails Installer should not run update_system_partition_properties on MBR partitions --- liveusb/creator.py | 13 + liveusb/gui.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/liveusb/creator.py b/liveusb/creator.py index ad9a0ab..19605f0 100755 --- a/liveusb/creator.py +++ b/liveusb/creator.py @@ -895,6 +895,19 @@ class LinuxLiveUSBCreator(LiveUSBCreator): # do it (as of Wheezy). self._set_partition_flags(self.drive['parent'], 1, SYSTEM_PARTITION_FLAGS) +def is_partition_GPT(self): + +# Check if the partition type is a valid GUID, +# if so it is a GPT. +udi = self.drive['udi'] +dev_obj = self.bus.get_object("org.freedesktop.UDisks", udi) +properties = dbus.Interface(dev_obj, "org.freedesktop.DBus.Properties") +partition_type = str(properties.Get(udi, 'PartitionType')) +if re.match( r'^[0-9A-F]{8}(-[0-9A-F]{4}){3}-[0-9A-F]{12}$', partition_type): +return True +else: +return False + def switch_drive_to_system_partition(self): self._full_drive = self._drive append = False diff --git a/liveusb/gui.py b/liveusb/gui.py index d2f89f8..4b89f03 100755 --- a/liveusb/gui.py +++ b/liveusb/gui.py @@ -239,7 +239,7 @@ class LiveUSBThread(QtCore.QThread): self.live.update_configs() self.live.reset_mbr() -if not self.parent.opts.partition: +if not self.parent.opts.partition and self.live.is_partition_GPT(): self.live.update_system_partition_properties() self.live.install_bootloader() # self.live.bootable_partition() -- 1.8.3.2 ___ Tails-dev mailing list Tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to tails-dev-unsubscr...@boum.org.
Re: [Tails-dev] FIx Bug #7344 Double-clicking on an entry in the language or keyboard layout lists is not enough
Hi, > However, I fail to understand the need of these changes: > -builder.connect_signals(self.dialog) > +builder.connect_signals(self) I made this change because in the current way (self.dialog) you obtain an error: "handler cb_langdialog_button_press not found", > -if isinstance(data, Gtk.Dialog): > -data.response(True) > +self.dialog.response(True) > - why do you drop the check for a dialog? now, when the handler receives the data, it is empty (None), so the validation is always false. > - why do you use self instead of data (use of data is advised in > callbacks as far as I know)? I think that self.dialog should be > replaced by data.dialog. Here it is the same as before if you use data.anything, then you have an error. Maybe there is a better way, but I failed to find how to do it in gtk3. Cheers, Kurono. ___ Tails-dev mailing list Tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to tails-dev-unsubscr...@boum.org.
[Tails-dev] FIx Bug #7344 Double-clicking on an entry in the language or keyboard layout lists is not enough
Hello, I attached a patch for https://labs.riseup.net/code/issues/7344, "Bug #7344 Double-clicking on an entry in the language or keyboard layout lists is not enough". I also could try with this: https://labs.riseup.net/code/issues/5387 cheers, KuronoFrom 02444dae1b626c03d435551176f0baea18ada43a Mon Sep 17 00:00:00 2001 From: kurono Date: Mon, 2 Jun 2014 22:00:17 +0200 Subject: [PATCH] Fix to Bug #7344: Double-clicking on an entry in the language or keyboard layout lists is not enough --- tailsgreeter/langpanel.py | 12 +--- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tailsgreeter/langpanel.py b/tailsgreeter/langpanel.py index df0eea7..b1cbfc9 100644 --- a/tailsgreeter/langpanel.py +++ b/tailsgreeter/langpanel.py @@ -38,7 +38,7 @@ class LangDialog(TranslatableWindow): self.dialog = builder.get_object("languages_dialog") self.treeview = builder.get_object("languages_treeview") self.liststore = builder.get_object("languages_liststore") -builder.connect_signals(self.dialog) +builder.connect_signals(self) tvcolumn = Gtk.TreeViewColumn(_("Language")) self.treeview.append_column(tvcolumn) @@ -51,15 +51,13 @@ class LangDialog(TranslatableWindow): def cb_langdialog_key_press(self, widget, event, data=None): """Handle key press in langdialog""" if event.keyval in [ Gdk.KEY_Return, Gdk.KEY_KP_Enter ]: -if isinstance(data, Gtk.Dialog): -data.response(True) +self.dialog.response(True) def cb_langdialog_button_press(self, widget, event, data=None): """Handle mouse click in langdialog""" -if (event.type == Gdk._2BUTTON_PRESS or -event.type == Gdk._3BUTTON_PRESS): -if isinstance(data, Gtk.Dialog): -data.response(True) +if (event.type == Gdk.EventType._2BUTTON_PRESS or +event.type == Gdk.EventType._3BUTTON_PRESS): +self.dialog.response(True) class LangPanel(TranslatableWindow): """Display language and layout selection panel""" -- 1.8.3.2 ___ Tails-dev mailing list Tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to tails-dev-unsubscr...@boum.org.
[Tails-dev] Broken link in documentation
Hi, there is a broken link in the documentation, here: https://tails.boum.org/contribute/design/ "This document is heavily based on preliminary work that was done as part of -> Incognito 2008.1-r1 Documentation. <- The Bibliography section has pointers to other inspiration and reference sources." Cheers, Kurono ___ Tails-dev mailing list Tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to tails-dev-unsubscr...@boum.org.
Re: [Tails-dev] #5594: tails-greeter: better administration password UI
oh yes you are right, ok drop it all. cheers. From: Tails-dev [tails-dev-boun...@boum.org] on behalf of anonym [ano...@riseup.net] Sent: 14 May 2014 13:01 To: The Tails public development discussion list Subject: Re: [Tails-dev] #5594: tails-greeter: better administration password UI 14/05/14 11:00, Andres Gomez Ramirez wrote: > But the patch is compound of two parts: one for obligatory password > and other that checks for admin password matching. I think this last > part could be keep. Sorry, but I don't get it. I've looked as best I can on the patch, and the only other thing it does is to renaming the old "warning" stuff to "warning_match", to be more consistent with the new "warning_empty". No new functionality as far as I can see. Am I mistaken? Cheers! ___ Tails-dev mailing list Tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to tails-dev-unsubscr...@boum.org. ___ Tails-dev mailing list Tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to tails-dev-unsubscr...@boum.org.
Re: [Tails-dev] #5594: tails-greeter: better administration password UI
Hi, oh I see, the part that asks for an obligatory password is not desirable, I got it. But the patch is compound of two parts: one for obligatory password and other that checks for admin password matching. I think this last part could be keep. Cheers. From: Tails-dev [tails-dev-boun...@boum.org] on behalf of intrigeri [intrig...@boum.org] Sent: 13 May 2014 11:53 To: The Tails public development discussion list Subject: Re: [Tails-dev] #5594: tails-greeter: better administration password UI anonym wrote (13 May 2014 09:45:43 GMT) : > Given that the semantics of the fields are pretty different in the > Greeter compared to in t-p-s, please provide a detailed description of > how you think the Greeter should be changed in case you still think it's > desirable. I'll do this when I'm back, around May 24. So, I've dropped the 1.1 milestone from the ticket, reassigned to me, and marked as needing more info. ___ Tails-dev mailing list Tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to tails-dev-unsubscr...@boum.org. ___ Tails-dev mailing list Tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to tails-dev-unsubscr...@boum.org.
[Tails-dev] Fix for Bug #5673 - Wheezy: way too small fonts in Tails Installer
Hello, Attached I send a patch for "Bug #5673 - Wheezy: way too small fonts in Tails Installer" https://labs.riseup.net/code/issues/5673. Cheers, KuronoFrom 23375e0d5d08554e2800fa71f0e8b2f6fb4b5258 Mon Sep 17 00:00:00 2001 From: kurono Date: Thu, 24 Apr 2014 23:37:31 +0200 Subject: [PATCH] Bug #5673 - Wheezy: way too small fonts in Tails Installer --- liveusb/dialog.py | 12 ++-- liveusb/launcher_ui.py |8 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/liveusb/dialog.py b/liveusb/dialog.py index f1ee5e8..d5137ac 100644 --- a/liveusb/dialog.py +++ b/liveusb/dialog.py @@ -64,7 +64,7 @@ class Ui_Dialog(object): self.sourceFileGroupBox.setMinimumSize(QtCore.QSize(161, 51)) self.sourceFileGroupBox.setBaseSize(QtCore.QSize(161, 51)) font = QtGui.QFont() -font.setPointSize(8) +font.setPointSize(11) self.sourceFileGroupBox.setFont(font) self.sourceFileGroupBox.setObjectName(_fromUtf8("sourceFileGroupBox")) self.isoBttn = QtGui.QPushButton(self.sourceFileGroupBox) @@ -76,7 +76,7 @@ class Ui_Dialog(object): self.orLabel.setBaseSize(QtCore.QSize(23, 24)) font = QtGui.QFont() font.setFamily(_fromUtf8("Verdana")) -font.setPointSize(10) +font.setPointSize(12) font.setBold(True) font.setWeight(75) self.orLabel.setFont(font) @@ -87,7 +87,7 @@ class Ui_Dialog(object): self.downloadGroupBox.setMinimumSize(QtCore.QSize(201, 51)) self.downloadGroupBox.setBaseSize(QtCore.QSize(201, 51)) font = QtGui.QFont() -font.setPointSize(8) +font.setPointSize(11) self.downloadGroupBox.setFont(font) self.downloadGroupBox.setObjectName(_fromUtf8("downloadGroupBox")) self.downloadCombo = QtGui.QComboBox(self.downloadGroupBox) @@ -102,7 +102,7 @@ class Ui_Dialog(object): self.targetGroupBox.setMinimumSize(QtCore.QSize(191, 51)) self.targetGroupBox.setBaseSize(QtCore.QSize(191, 51)) font = QtGui.QFont() -font.setPointSize(8) +font.setPointSize(11) self.targetGroupBox.setFont(font) self.targetGroupBox.setObjectName(_fromUtf8("targetGroupBox")) self.driveBox = QtGui.QComboBox(self.targetGroupBox) @@ -116,7 +116,7 @@ class Ui_Dialog(object): self.overlayTitle.setMinimumSize(QtCore.QSize(0, 0)) self.overlayTitle.setBaseSize(QtCore.QSize(201, 51)) font = QtGui.QFont() -font.setPointSize(8) +font.setPointSize(11) self.overlayTitle.setFont(font) self.overlayTitle.setObjectName(_fromUtf8("overlayTitle")) self.overlaySlider = QtGui.QSlider(self.overlayTitle) @@ -136,7 +136,7 @@ class Ui_Dialog(object): self.textEdit.setMinimumSize(QtCore.QSize(401, 111)) self.textEdit.setBaseSize(QtCore.QSize(401, 111)) font = QtGui.QFont() -font.setPointSize(8) +font.setPointSize(11) self.textEdit.setFont(font) self.textEdit.setReadOnly(True) self.textEdit.setObjectName(_fromUtf8("textEdit")) diff --git a/liveusb/launcher_ui.py b/liveusb/launcher_ui.py index a411fc3..ff2a977 100644 --- a/liveusb/launcher_ui.py +++ b/liveusb/launcher_ui.py @@ -157,11 +157,11 @@ class Ui_Dialog(object): def retranslateUi(self, Dialog): Dialog.setWindowTitle(translate_and_brand('%(distribution)s Installer')) self.cloneInstallButton.setText(translate_and_brand('Clone\n&&\nInstall')) -self.cloneInstallLabel.setText(translate_and_brand('http://www.w3.org/TR/REC-html40/strict.dtd";>\n\np, li { white-space: pre-wrap; }\n\nCopy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.')) +self.cloneInstallLabel.setText(translate_and_brand('http://www.w3.org/TR/REC-html40/strict.dtd";>\n\np, li { white-space: pre-wrap; }\n\nCopy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.')) self.cloneUpgradeButton.setText(translate_and_brand('Clone\n&&\nUpgrade')) -self.cloneUpgradeLabel.setText(translate_and_brand('http://www.w3.org/TR/REC-html40/strict.dtd";>\n\np, li { white-space: pre-wrap; }\n\nCopy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.')) +self.cloneUpgradeLabel.setText(translate_and_brand('http://www.w3.org/TR/REC-html40/strict.dtd";>\n\np, li { white-space: pre-wrap; }\n\nCopy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.')) self.upgradeFromIsoButton.setText(translate_and_brand('Upgrade from ISO')) -self.upgradeFromIsoLabel.setText(translate_and_brand('http://www.w3.org/TR/REC-html40/strict.dtd";>\n\np, li { white-space: pre-wrap; }\n\nUpgrade an already installed Tails device from a new ISO image.')) -self.helpLabel.setText(translate_and_bran
[Tails-dev] [PATCH] Feature #7009: Make the Greeter's help window resolution-aware
Hello, I'm sending a patch for Feature #7009: Make the Greeter's help window resolution-aware, https://labs.riseup.net/code/issues/7009. Cheers, KuronoFrom 279fc82a315d5bbd8124e115a032406745c7c736 Mon Sep 17 00:00:00 2001 From: kurono Date: Tue, 8 Apr 2014 22:27:58 +0200 Subject: [PATCH] Feature #7009: Make the Greeter's help window resolution-aware --- glade/helpwindow.glade |2 +- tailsgreeter/helpwindow.py |1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/glade/helpwindow.glade b/glade/helpwindow.glade index 0303001..b616c32 100644 --- a/glade/helpwindow.glade +++ b/glade/helpwindow.glade @@ -61,7 +61,7 @@ -False +True True 1 diff --git a/tailsgreeter/helpwindow.py b/tailsgreeter/helpwindow.py index b5b7c0e..8c48237 100644 --- a/tailsgreeter/helpwindow.py +++ b/tailsgreeter/helpwindow.py @@ -51,6 +51,7 @@ class HelpWindow(TranslatableWindow): self.html_help.load_uri(uri) self.help_container.add_child(builder, self.html_help, None) self.html_help.show() +self.window.resize(self.window.get_size()[0], self.window.get_screen().get_height()) self.window.run() def close(self, *args): -- 1.7.9.5 ___ Tails-dev mailing list Tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to tails-dev-unsubscr...@boum.org.
Re: [Tails-dev] Help needed/wished for 1.1 (Wheezy) tasks
Hi, > * Unusable documentation window in the Greeter > https://labs.riseup.net/code/issues/6901 > @alan, @anonym, @WinterFairy, @Andres: anyone? > I've updated the ticket with a (hopefully helpful) hint. > Still, a proper fix should probably introduce some "smart" (let's say, > "resolution-aware") resizing code similar to what was recently done for > the options window. But I digress... filed as #7009. Yes it works indeed :), so I'll take care of https://labs.riseup.net/code/issues/7009 if you don't mind. Cheers. ___ Tails-dev mailing list Tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to tails-dev-unsubscr...@boum.org.
Re: [Tails-dev] #5594: tails-greeter: better administration password UI
Hi, > Do you think you could rebase your patch on top of the "wheezy" branch > of the greeter, and test it in an (experimental) Wheezy-based ISO? > You can download such an ISO on > http://nightly.tails.boum.org/build_Tails_ISO_feature-wheezy/ yes, done. Cheers, kuronoFrom d5461b9a5f9d49895c631f8116370b0ed4cae656 Mon Sep 17 00:00:00 2001 From: kurono Date: Sun, 30 Mar 2014 19:17:25 +0200 Subject: [PATCH] Fix for 5594: tails-greeter: better administration password UI --- glade/optionswindow.glade | 47 ++--- tailsgreeter/optionswindow.py | 18 ++-- 2 files changed, 55 insertions(+), 10 deletions(-) diff --git a/glade/optionswindow.glade b/glade/optionswindow.glade index 8725fb8..27f9771 100644 --- a/glade/optionswindow.glade +++ b/glade/optionswindow.glade @@ -219,12 +219,12 @@ Otherwise it will be disabled for better security. - + True False 6 - + True False gtk-dialog-warning @@ -237,7 +237,48 @@ Otherwise it will be disabled for better security. - + +True +False +0 +10 +10 +Password must not be empty +True + + +True +True +1 + + + + +True +True +3 + + + + +True +False +6 + + +True +False +gtk-dialog-warning +1 + + +False +False +0 + + + + True False 0 diff --git a/tailsgreeter/optionswindow.py b/tailsgreeter/optionswindow.py index af60d53..6bb1af5 100644 --- a/tailsgreeter/optionswindow.py +++ b/tailsgreeter/optionswindow.py @@ -38,8 +38,8 @@ class OptionsWindow(TranslatableWindow): builder.connect_signals(self) self.entry_password = builder.get_object("password_entry") self.entry_password2 = builder.get_object("password_entry2") -self.warning_label = builder.get_object("warning_label") -self.warning_area = builder.get_object("warning_area") +self.warning_area_empty = builder.get_object("warning_area_empty") +self.warning_area_match = builder.get_object("warning_area_match") self.camouflage_checkbox = builder.get_object("camouflage_checkbox") self.macspoof_checkbox = builder.get_object("macspoof_checkbox") self.macspoof_checkbox.set_active(True) @@ -54,7 +54,8 @@ class OptionsWindow(TranslatableWindow): self.entry_password2.set_visibility(False) def cb_pw_changed(*args): -self.warning_area.hide() +self.warning_area_empty.hide() +self.warning_area_match.hide() # compact the window self.window.resize(1, 1) @@ -115,10 +116,13 @@ class OptionsWindow(TranslatableWindow): """Validate the selected options""" auth_password = self.entry_password.get_text() test_password = self.entry_password2.get_text() -passwords_match = test_password == auth_password -if not passwords_match: -self.warning_area.show() -return passwords_match +
Re: [Tails-dev] #5594: tails-greeter: better administration password UI
Hi, I attached a new patch for Feature #5594 tails-greeter: better administration password UI. Sorry for the huge delay, i had some days off. Cheers. From: tails-dev [tails-dev-boun...@boum.org] on behalf of intrigeri [intrig...@boum.org] Sent: 04 March 2014 12:05 To: The Tails public development discussion list Subject: Re: [Tails-dev] #5594: tails-greeter: better administration password UI Andres Gomez Ramirez wrote (22 Feb 2014 18:10:41 GMT) : >> In the patch you use at least one untranslated string in >> >> +self.warning_label.set_markup("Password must not be >> empty.") >> >> but possibly also in >> >> +self.warning_label.set_markup("Passwords do not match.") >> >> In the latter case you actually set it to the default text for >>`warning_label` as defined in the glade file, so maybe it works. >> >> I'm no glade expert, but I think the way you'll have to go is to create >> two `warning_label`, one for each warning, and `show()`/`hide()` them >> appropriately. I'd be glad if someone more familiar with glade could >> chime in if there's a better approach. > so the idea is to add translatable string to the labels, ok. Any news on this? The feature freeze for Tails 0.23 is coming real soon now. > btw I'm having problems to access labs.riseup.net with firefox > 27.0.1, there is an error with the certificate (?): labs.riseup.net uses a commercial certificate again, so this should be fixed. Cheers, -- intrigeri | GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc | OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr.asc ___ tails-dev mailing list tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to tails-dev-unsubscr...@boum.org. From 8d6d0a20f37f463172b10f039aa60f7450ab91e2 Mon Sep 17 00:00:00 2001 From: kurono Date: Sun, 30 Mar 2014 14:57:55 +0200 Subject: [PATCH] Fix for 5594: tails-greeter: better administration password UI --- GdmGreeter/optionswindow.py | 21 +++ glade/optionswindow.glade | 47 --- 2 files changed, 57 insertions(+), 11 deletions(-) diff --git a/GdmGreeter/optionswindow.py b/GdmGreeter/optionswindow.py index 5a2459b..15eec80 100644 --- a/GdmGreeter/optionswindow.py +++ b/GdmGreeter/optionswindow.py @@ -20,7 +20,8 @@ """ -import logging, gtk, os +import logging, gtk, gettext, os +_ = gettext.gettext import GdmGreeter from GdmGreeter.language import TranslatableWindow from helpwindow import HelpWindow @@ -37,8 +38,8 @@ class OptionsWindow(TranslatableWindow): builder.connect_signals(self) self.entry_password = builder.get_object("password_entry") self.entry_password2 = builder.get_object("password_entry2") -self.warning_label = builder.get_object("warning_label") -self.warning_area = builder.get_object("warning_area") +self.warning_area_empty = builder.get_object("warning_area_empty") +self.warning_area_match = builder.get_object("warning_area_match") self.camouflage_checkbox = builder.get_object("camouflage_checkbox") self.macspoof_checkbox = builder.get_object("macspoof_checkbox") self.macspoof_checkbox.set_active(True) @@ -53,7 +54,8 @@ class OptionsWindow(TranslatableWindow): self.entry_password2.set_visibility(False) def cb_pw_changed(*args): -self.warning_area.hide() +self.warning_area_empty.hide() +self.warning_area_match.hide() # compact the window self.window.resize(1, 1) @@ -114,10 +116,13 @@ class OptionsWindow(TranslatableWindow): """Validate the selected options""" auth_password = self.entry_password.get_text() test_password = self.entry_password2.get_text() -passwords_match = test_password == auth_password -if not passwords_match: -self.warning_area.show() -return passwords_match +if len(auth_password) == 0 or len(test_password) == 0: +self.warning_area_empty.show() +return False +elif not auth_password == test_password: +self.warning_area_match.show() +return False +return True def set_options_and_login(self): """Activate the selected options if they are valid""" diff --git a/glade/optionswindow.glade b/glade/optionswindow.glade index 1632b62..a3ad0ea 100644 --- a/glade/optionswindow.glade +++ b/glade/optionswindow.glade @@ -227,12 +227,12 @@ Otherwise it
Re: [Tails-dev] Help needed/wished for 1.1 (Wheezy) tasks
Hi, Ok I'll take care of the following: > Code > > * Unusable documentation window in the Greeter > https://labs.riseup.net/code/issues/6901 > @alan, @anonym, @WinterFairy, @Andres: anyone? > * Wheezy: way too small fonts in Tails Installer > https://labs.riseup.net/code/issues/5673 > @WinterFairy, @Andres: this might be a good one for you. Cheers, ___ Tails-dev mailing list Tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to tails-dev-unsubscr...@boum.org.
Re: [Tails-dev] #5594: tails-greeter: better administration password UI
> In the patch you use at least one untranslated string in > > +self.warning_label.set_markup("Password must not be > empty.") > > but possibly also in > > +self.warning_label.set_markup("Passwords do not match.") > > In the latter case you actually set it to the default text for >`warning_label` as defined in the glade file, so maybe it works. > > I'm no glade expert, but I think the way you'll have to go is to create > two `warning_label`, one for each warning, and `show()`/`hide()` them > appropriately. I'd be glad if someone more familiar with glade could > chime in if there's a better approach. so the idea is to add translatable string to the labels, ok. btw I'm having problems to access labs.riseup.net with firefox 27.0.1, there is an error with the certificate (?): (Error code: sec_error_untrusted_issuer) Cheers, Andres ___ tails-dev mailing list tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to tails-dev-unsubscr...@boum.org.
[Tails-dev] #5594: tails-greeter: better administration password UI
Hello, I attached a patch for "#5594: tails-greeter: better administration password UI" https://labs.riseup.net/code/issues/5594 Cheers, AndresFrom 21a3920dda03d0f6048aaca5ffd07da1248e843b Mon Sep 17 00:00:00 2001 From: kurono Date: Wed, 5 Feb 2014 18:26:35 -0500 Subject: [PATCH] tails-greeter: better administration password UI --- GdmGreeter/optionswindow.py | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/GdmGreeter/optionswindow.py b/GdmGreeter/optionswindow.py index 9042cb9..f8d7633 100644 --- a/GdmGreeter/optionswindow.py +++ b/GdmGreeter/optionswindow.py @@ -62,10 +62,16 @@ class OptionsWindow(TranslatableWindow): """Validate the selected options""" auth_password = self.entry_password.get_text() test_password = self.entry_password2.get_text() -passwords_match = test_password == auth_password -if not passwords_match: + +if len(auth_password) == 0 or len(test_password) == 0: +self.warning_label.set_markup("Password must not be empty.") +self.warning_area.show() +return False +elif not auth_password == test_password: +self.warning_label.set_markup("Passwords do not match.") self.warning_area.show() -return passwords_match +return False +return True def set_options_and_login(self): """Activate the selected options if they are valid""" -- 1.7.9.5 ___ tails-dev mailing list tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev
Re: [Tails-dev] #6538: Tails Installer tries to install to too small devices [Was: Installation USB-Stick]
Ok I'll have a look of it. Also I attached a patch for "persistence: optimize window height" https://labs.riseup.net/code/issues/5458. Cheers, Andres From: tails-dev-boun...@boum.org [tails-dev-boun...@boum.org] on behalf of intrigeri [intrig...@boum.org] Sent: 26 December 2013 22:37 To: The Tails public development discussion list Subject: [Tails-dev] #6538: Tails Installer tries to install to too small devices [Was: Installation USB-Stick] intrigeri wrote (10 Sep 2013 10:17:30 GMT) : > Andreas Meyer wrote (10 Sep 2013 09:53:02 GMT) : >> I guess this is all because the stick is just 1 GB and not 2 GB. > Yes, probably. > After fiddling manually with GPT / MBR, I have sometimes seen this > error too (due to some weirdness in how GPT legacy mode works, IIRC) > even when doing "Clone & Install". > Wiping out the first MB or so of the drive has always restored things > to workable state for me. Actually, while working on the automated test suite, I've hit this issue in this scenario: Scenario: Installing Tails to a USB drive with an MBR partition table but no partitions Given a computer And I create a 2 GiB disk named "mbr" And I create a msdos label on disk "mbr" And the computer is set to boot from the Tails DVD [...] And I plug USB drive "mbr" And I "Clone & Install" Tails to USB drive "mbr" So, it seems that Tails Installer does not correctly detect when the destination device is too small to hold the system partition. The fact that the destination device already has a MBR partition table might matter, or not. Reported as #6538, added implementation hints, marked as "easy": https://labs.riseup.net/code/issues/6538 Any taker? (This looks like good stuff for e.g. Andres or WinterFairy, I guess.) Cheers! -- intrigeri | GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc | OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr.asc ___ tails-dev mailing list tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev From 6619a3f225828da50f8da31783372536846b1c86 Mon Sep 17 00:00:00 2001 From: kurono Date: Sat, 4 Jan 2014 19:16:58 +0100 Subject: [PATCH] persistence: optimize window height --- lib/Tails/Persistence/Setup.pm |5 + 1 file changed, 5 insertions(+) diff --git a/lib/Tails/Persistence/Setup.pm b/lib/Tails/Persistence/Setup.pm index 401dbe3..2641889 100644 --- a/lib/Tails/Persistence/Setup.pm +++ b/lib/Tails/Persistence/Setup.pm @@ -635,6 +635,7 @@ sub empty_main_window { sub run_current_step { my $self = shift; +my ($width, $height) = $self->main_window->get_size(); $self->debug("Running step " . $self->current_step->name); @@ -645,6 +646,10 @@ sub run_current_step { $self->main_window->show_all; $self->current_step->working(0); $self->main_window->set_visible(TRUE); + +if($self->current_step->name eq 'configure') { +$self->main_window->resize($width, $self->main_window->get_screen()->get_height()); +} } sub goto_next_step { -- 1.7.9.5 ___ tails-dev mailing list tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev
Re: [Tails-dev] Persistence: display nicer paths
Done, I attached two new patches to "Persistence: display nicer paths". Cheers, Andres From: tails-dev-boun...@boum.org [tails-dev-boun...@boum.org] on behalf of intrigeri [intrig...@boum.org] Sent: 19 December 2013 12:38 To: The Tails public development discussion list Subject: Re: [Tails-dev] Persistence: display nicer paths Hi Andres, Andres Gomez Ramirez wrote (18 Dec 2013 22:20:48 GMT) : > Attached the second version, [...] Merged, great work! Added a few fixes on top (53cd9d1, 4f3f54f), that you surely want to look at and avoid the need thereof next time (that is: first, configure Git to use color in diffs, so that trailing whitespace jumps at your eye; second, run the test suite to make sure your changes don't break it :) Released as tails-persistence-setup 1.0.2, uploaded to devel and experimental, will be part of Tails 0.23. Congrats! I know you already committed to another task (some liveusb-creator bug IIRC), but as a follow-up on this one (#5311), you might want to take care of other places where the Persistent Volume Assistant displays ugly paths, e.g. in "Tails is running from non-USB / non-SDIO device %s." and other checks. It is certainly not critical, but I assume it should be pretty easy to wrap ->boot_device with something that returns DeviceFilePresentation in: my $message = $self->encoding->decode(sprintf( gettext($check->{message}), $self->boot_device)); Time to add a boot_device_file lazy-built attribute to Tails::RunningSystem in our perl5lib, perhaps? Cheers, -- intrigeri | GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc | OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr.asc ___ tails-dev mailing list tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev From b1a669a8404d2a9dccad4de84d7711291afcf7ab Mon Sep 17 00:00:00 2001 From: kurono Date: Sun, 22 Dec 2013 13:30:22 +0100 Subject: [PATCH] persistence: display nicer paths - extend --- lib/Tails/RunningSystem.pm | 10 ++ 1 file changed, 10 insertions(+) diff --git a/lib/Tails/RunningSystem.pm b/lib/Tails/RunningSystem.pm index e7a5c93..4d6258c 100644 --- a/lib/Tails/RunningSystem.pm +++ b/lib/Tails/RunningSystem.pm @@ -63,6 +63,10 @@ has 'boot_device' => lazy_build rw Str, documentation => q{The UDI of the physical block device where Tails is installed, e.g. /org/freedesktop/UDisks/devices/sdb.}; +has 'boot_device_file' => +lazy_build rw Str, +documentation => q{The rute of the file where Tails is installed, e.g. /dev/sdb.}; + has 'system_partition' => lazy_build rw Str, documentation => q{The UDI of the partition where Tails is installed, e.g. /org/freedesktop/UDisks/devices/sdb1.}; @@ -145,6 +149,12 @@ sub _build_boot_device { return $device; } +sub _build_boot_device_file { +my $self = shift; + +$self->get_device_property($self->boot_device, 'DeviceFilePresentation'); +} + sub _build_system_partition { my $self = shift; -- 1.7.9.5 From 71feda6a517573d261bfcd9b219c53de7f2febfa Mon Sep 17 00:00:00 2001 From: kurono Date: Sun, 22 Dec 2013 13:35:49 +0100 Subject: [PATCH] persistence: display nicer paths - extend --- lib/Tails/Persistence/Setup.pm | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/Tails/Persistence/Setup.pm b/lib/Tails/Persistence/Setup.pm index bf8b394..cefb080 100644 --- a/lib/Tails/Persistence/Setup.pm +++ b/lib/Tails/Persistence/Setup.pm @@ -81,7 +81,7 @@ has 'running_system' => lazy_build ro 'Tails::RunningSystem', metaclass => 'NoGetopt', handles => [ -qw{boot_device boot_device_model boot_device_vendor boot_device_size +qw{boot_device boot_device_model boot_device_vendor boot_device_size boot_device_file started_from_device_installed_with_tails_installer} ]; @@ -439,7 +439,7 @@ sub check_sanity { if (! $res) { my $message = $self->encoding->decode(sprintf( gettext($check->{message}), -$self->boot_device)); +$self->boot_device_file)); if ($self->force && exists($check->{can_be_forced}) && $check->{can_be_forced}) { warn "$message", "... but --force is enabled, ignoring results of this sanity check."; @@ -461,7 +461,7 @@ sub check_sanity { sub run { my $self = shift; -$self->debug(sprintf("Working on device %s", $self->boot_device)); +$self->debug(sprintf("Working on device %s", $self->boot_device_file)); # Force initialization in the correct order if ($Moose::VE
[Tails-dev] Patch Two new easy liveusb-creator tasks
> OK that's another bug: if not self.live.existing_live_os, it tries to > copy a new liveos without confirmation and without removing tmp. > FTR, the two bugs discovered when testing this patch are #6437 and >#6438, that should be easily fixed by anyone who has touched > liveusb-creator's codebase before. Andres, maybe? I attached a patch for "Tails Installer sometimes installs files without confirmation" and "Installer fails to "upgrade" a partial Tails installation" (https://labs.riseup.net/code/issues/6437 and https://labs.riseup.net/code/issues/6438). Cheers, AndresFrom 5f56da95523efe8d4d1831a7631ea9bc3016c5ef Mon Sep 17 00:00:00 2001 From: kurono Date: Thu, 19 Dec 2013 23:32:19 +0100 Subject: [PATCH] Tails Installer sometimes installs files without confirmation --- liveusb/gui.py | 51 +-- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/liveusb/gui.py b/liveusb/gui.py index 3c188c5..1fd366f 100755 --- a/liveusb/gui.py +++ b/liveusb/gui.py @@ -716,33 +716,32 @@ class LiveUSBDialog(QtGui.QDialog, LiveUSBInterface): # let's go on self.confirmed = False else: -if self.live.existing_liveos(): -msg = (_("You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s device (%(device)s). " - "Any persistent volume on this device will remain unchanged. " - "Continue?") % { - 'vendor': self.live.drive['vendor'], - 'model': self.live.drive['model'], - 'device': self.live.drive['device'], - 'parent_size': _format_bytes_in_gb(self.live.drive['parent_size']) - } - ) -if self.live.existing_overlay() and self.overlaySlider.value(): -msg = msg + _("Warning: Creating a new persistent overlay " - "will delete your existing one.") -if self.show_confirmation_dialog(_("Please confirm your device selection"), msg): -# The user has confirmed that they wish to overwrite their -# existing Live OS. Here we delete it first, in order to -# accurately calculate progress. -self.delete_existing_liveos_confirmed = False -try: -self.live.delete_liveos() -except LiveUSBError, e: -self.status(e.args[0]) -#self.live.unmount_device() -self.enable_widgets(True) -return -else: +msg = (_("You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s device (%(device)s). " + "Any persistent volume on this device will remain unchanged. " + "Continue?") % { + 'vendor': self.live.drive['vendor'], + 'model': self.live.drive['model'], + 'device': self.live.drive['device'], + 'parent_size': _format_bytes_in_gb(self.live.drive['parent_size']) + } + ) +if self.live.existing_overlay() and self.overlaySlider.value(): +msg = msg + _("Warning: Creating a new persistent overlay " + "will delete your existing one.") +if self.show_confirmation_dialog(_("Please confirm your device selection"), msg): +# The user has confirmed that they wish to overwrite their +# existing Live OS. Here we delete it first, in order to +# accurately calculate progress. +self.delete_existing_liveos_confirmed = False +try: +self.live.delete_liveos() +except LiveUSBError, e: +self.status(e.args[0]) +#self.live.unmount_device() +self.enable_widgets(True) return +else: +return # Remove the log handler, because our live thread will register its own self.live.log.removeHandler(self.handler) -- 1.7.9.5 ___ tails-dev mailing list tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev
Re: [Tails-dev] Two new easy liveusb-creator tasks [Was: Please review'n'merge liveusb-creator's bugfix/dont-fail-upgrade-if-tmp-dir-exists-on-destination]
Hi, > OK that's another bug: if not self.live.existing_live_os, it tries to > copy a new liveos without confirmation and without removing tmp. > FTR, the two bugs discovered when testing this patch are #6437 and >#6438, that should be easily fixed by anyone who has touched > liveusb-creator's codebase before. Andres, maybe? Ok I'll have a look of it. Cheers, Andres ___ tails-dev mailing list tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev
Re: [Tails-dev] Persistence: display nicer paths
Hi, Attached the second version, my comments: >> +sub _build_partition_file { >> +my $self = shift; >> + >> +my $device_file = $self->get_device_property($self->device, >> 'DeviceFile'); >> +my $partition_number = >> $self->get_device_property($self->persistence_partition, >> 'PartitionNumber'); >> + >> +$device_file.$partition_number; > This naming scheme is not correct for all kinds of supported devices, > e.g. SD cards plugged into a reader wired via SDIO. See commit > 83637f4e for details. Doesn't $self->persistence_partition have > a DeviceFile property that we could use instead of manually appending > the partition number this way? If it has, let's simply use it. Else, > using the info from commit 83637f4e should be good enough. Ok in this version of tails-persistence was possible to use simply DeviceFilePresentation :) Cheers, Andres From 66e863907f7ecb4e02823d3731cc6bd53eb8c7ed Mon Sep 17 00:00:00 2001 From: kurono Date: Wed, 18 Dec 2013 23:10:04 +0100 Subject: [PATCH] persistence: display nicer paths --- lib/Tails/Persistence/Setup.pm |9 + lib/Tails/Persistence/Step/Configure.pm |4 ++-- lib/Tails/Persistence/Step/Delete.pm|5 +++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/Tails/Persistence/Setup.pm b/lib/Tails/Persistence/Setup.pm index 431e71a..1944737 100644 --- a/lib/Tails/Persistence/Setup.pm +++ b/lib/Tails/Persistence/Setup.pm @@ -102,6 +102,7 @@ has 'main_window' => has "$_" => lazy_build ro Str for (qw{override_liveos_mountpoint override_boot_device override_system_partition}); +has 'persistence_partition_device_file'=> lazy_build ro Str, metaclass => 'NoGetopt'; has 'persistence_partition_size' => lazy_build ro Int, metaclass => 'NoGetopt'; has 'persistence_is_enabled' => lazy_build ro Bool, metaclass => 'NoGetopt'; has 'persistence_is_read_write' => lazy_build ro Bool, metaclass => 'NoGetopt'; @@ -270,6 +271,12 @@ sub _build_size_of_free_space { ); } +sub _build_persistence_partition_device_file { +my $self = shift; + +$self->get_device_property($self->persistence_partition, 'DeviceFilePresentation'); +} + sub _build_persistence_partition_size { my $self = shift; @@ -695,6 +702,7 @@ sub step_object_from_name { $self->delete_persistence_partition({ @_ }) }, persistence_partition => $self->persistence_partition, +persistence_partition_device_file => $self->persistence_partition_device_file, persistence_partition_size => $self->persistence_partition_size, ); } @@ -705,6 +713,7 @@ sub step_object_from_name { }, configuration => $self->configuration, persistence_partition => $self->persistence_partition, +persistence_partition_device_file => $self->persistence_partition_device_file, persistence_partition_size => $self->persistence_partition_size, ); } diff --git a/lib/Tails/Persistence/Step/Configure.pm b/lib/Tails/Persistence/Step/Configure.pm index 9f3d4a0..e2c33cf 100644 --- a/lib/Tails/Persistence/Step/Configure.pm +++ b/lib/Tails/Persistence/Step/Configure.pm @@ -31,7 +31,7 @@ textdomain("tails-persistence-setup"); has 'configuration' => required ro 'Tails::Persistence::Configuration'; -has 'persistence_partition' => required ro Str; +has 'persistence_partition_device_file' => required ro Str; has 'persistence_partition_size' => required ro Int; has 'list_box' => lazy_build ro 'Gtk2::VBox'; @@ -66,7 +66,7 @@ sub BUILD { $self->description->set_markup($self->encoding->decode(sprintf( # TRANSLATORS: partition, size, device vendor, device model gettext(q{The selected files will be stored in the encrypted partition %s (%s), on the %s %s device.}), -$self->persistence_partition, +$self->persistence_partition_device_file, format_bytes($self->persistence_partition_size, mode => "iec"), $self->device_vendor, $self->device_model diff --git a/lib/Tails/Persistence/Step/Delete.pm b/lib/Tails/Persistence/Step/Delete.pm index 747dadd..0b5857a 100644 --- a/lib/Tails/Persistence/Step/Delete.pm +++ b/lib/Tails/Persistence/Step/Delete.pm @@ -25,10 +25,11 @@ textdomain("tails-persistence-setup"); =cut -has 'persistence_partition' => required ro Str; +has 'persistence_partition_device_file' => required ro Str; has 'persistence_partition_size' => required ro Int; has 'warning_icon' => lazy_build rw 'Gtk2::Image'; + =head1 CONSTRUCTORS =cut @@ -45,7 +46,7 @@ sub BUILD { # TRANSLATORS: partition, size, device vendor, device model $self->description->set_markup($self->encoding->decode(sprintf( gettext(q{The persistent volume %s (%s), on the %s %s device, will be deleted.}), -$self->persistence_partition, +$self->persistence_partition
[Tails-dev] Persistence: display nicer paths
Hello, >Thanks a lot! > >If you feel it's ready for QA, please email the tails-dev ML about it >(that's the preferred way to submit patches and discuss them, as not >everybody is tracking Redmine that closely). Thanks in advance :) Ok no problem, attached is the patch for "Persistence: display nicer paths" feature -> https://labs.riseup.net/code/issues/5311. Cheers Andres From 4152d1fa8838e8e5d25df82e8213f8d433d19011 Mon Sep 17 00:00:00 2001 From: kurono Date: Wed, 20 Nov 2013 22:52:34 +0100 Subject: [PATCH] persistence: display nicer paths --- lib/Tails/Persistence/Setup.pm | 15 +++ lib/Tails/Persistence/Step/Configure.pm |3 ++- lib/Tails/Persistence/Step/Delete.pm|4 ++-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/lib/Tails/Persistence/Setup.pm b/lib/Tails/Persistence/Setup.pm index 6cd3997..1106646 100644 --- a/lib/Tails/Persistence/Setup.pm +++ b/lib/Tails/Persistence/Setup.pm @@ -97,6 +97,10 @@ has 'system_partition' => lazy_build rw Str, documentation => q{The UDI of the partition where Tails is installed, e.g. /org/freedesktop/UDisks/devices/sdb1.}; +has 'partition_file' => +lazy_build rw Str, +documentation => q{The persistent partition file, e.g. /dev/sdb1.}; + has 'main_window' => lazy_build ro 'Gtk2::Window', metaclass => 'NoGetopt'; @@ -271,6 +275,15 @@ sub _build_system_partition { ); } +sub _build_partition_file { +my $self = shift; + +my $device_file = $self->get_device_property($self->device, 'DeviceFile'); +my $partition_number = $self->get_device_property($self->persistence_partition, 'PartitionNumber'); + +$device_file.$partition_number; +} + sub _build_main_window { my $self = shift; my $win = Gtk2::Window->new('toplevel'); @@ -910,6 +923,7 @@ sub step_object_from_name { }, persistence_partition => $self->persistence_partition, persistence_partition_size => $self->persistence_partition_size, +partition_file => $self->partition_file, ); } elsif ($name eq 'configure') { @@ -920,6 +934,7 @@ sub step_object_from_name { configuration => $self->configuration, persistence_partition => $self->persistence_partition, persistence_partition_size => $self->persistence_partition_size, +partition_file => $self->partition_file, ); } diff --git a/lib/Tails/Persistence/Step/Configure.pm b/lib/Tails/Persistence/Step/Configure.pm index 5d3603a..a5e0efe 100644 --- a/lib/Tails/Persistence/Step/Configure.pm +++ b/lib/Tails/Persistence/Step/Configure.pm @@ -32,6 +32,7 @@ has 'configuration' => required ro 'Tails::Persistence::Configuration'; has 'persistence_partition' => required ro Str; has 'persistence_partition_size' => required ro Int; +has 'partition_file' => required ro Str; has 'list_box' => ro 'Gtk2::VBox', builder '_build_list_box'; @@ -60,7 +61,7 @@ sub BUILD { $self->description->set_markup($self->encoding->decode(sprintf( # TRANSLATORS: partition, size, device vendor, device model gettext(q{The selected files will be stored in the encrypted partition %s (%s), on the %s %s device.}), -$self->persistence_partition, +$self->partition_file, format_bytes($self->persistence_partition_size, mode => "iec"), $self->device_vendor, $self->device_model diff --git a/lib/Tails/Persistence/Step/Delete.pm b/lib/Tails/Persistence/Step/Delete.pm index 40c72cf..81989e3 100644 --- a/lib/Tails/Persistence/Step/Delete.pm +++ b/lib/Tails/Persistence/Step/Delete.pm @@ -27,7 +27,7 @@ textdomain("tails-persistence-setup"); has 'persistence_partition' => required ro Str; has 'persistence_partition_size' => required ro Int; - +has 'partition_file' => required ro Str; =head1 CONSTRUCTORS @@ -45,7 +45,7 @@ sub BUILD { # TRANSLATORS: partition, size, device vendor, device model $self->description->set_markup($self->encoding->decode(sprintf( gettext(q{The persistent volume %s (%s), on the %s %s device, will be deleted.}), -$self->persistence_partition, +$self->partition_file, format_bytes($self->persistence_partition_size, mode => "iec"), $self->device_vendor, $self->device_model -- 1.7.9.5 ___ tails-dev mailing list tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev
Re: [Tails-dev] Fix: persistence: clearer warning at delete step
>Much better! However, I think the icon should be left-aligned with the >title and the rest of the text, instead of protruding in the >left-margin. Do you think you can fix this? > >Long term wise, best would even be to fully follow the HIG regarding >alert windows [1], but IMHO this can be kept for a later iteration, >once the addition of the icon is merged. Besides, the way t-p-s is >implemented doesn't make it very easy: among all steps (create, >>configure, delete), only deletion should be an alert window, but in >practice they share the same basic window. So well, just adding the >relevant icon in the right place will be good enough for now, and >a very useful improvement :) > >I also see a regression in the last version of the patch: the icon >stays displayed even in the "Finished" screen. I doubt it was >intended, and it doesn't look too good. Likely it should be hidden in >some callback, perhaps in the operation_finished one. Ok! Here it goes the next iteration :) cheers, Andres From f3c9ac691b212ba19567cebfff51bdc4bf39c76c Mon Sep 17 00:00:00 2001 From: kurono Date: Tue, 12 Nov 2013 23:25:14 +0100 Subject: [PATCH] persistence: clearer warning at delete step --- lib/Tails/Persistence/Step/Delete.pm | 17 +++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/Tails/Persistence/Step/Delete.pm b/lib/Tails/Persistence/Step/Delete.pm index 1a7cfd5..b23fe65 100644 --- a/lib/Tails/Persistence/Step/Delete.pm +++ b/lib/Tails/Persistence/Step/Delete.pm @@ -27,7 +27,7 @@ textdomain("tails-persistence-setup"); has 'persistence_partition' => required ro Str; has 'persistence_partition_size' => required ro Int; - +has 'image_alert'=> lazy_build rw 'Gtk2::Image'; =head1 CONSTRUCTORS @@ -54,13 +54,25 @@ sub BUILD { $self->go_button->set_sensitive(TRUE); } +sub _build_image_alert { +my $self = shift; + +my $image = Gtk2::Image->new_from_stock("gtk-dialog-warning", "GTK_ICON_SIZE_DIALOG"); + +return $image; +} + sub _build_main_box { my $self = shift; my $box = Gtk2::VBox->new(); +my $hbox = Gtk2::HBox->new(); $box->set_spacing(6); + $box->pack_start($self->title, FALSE, FALSE, 0); -$box->pack_start($self->subtitle, FALSE, FALSE, 0); +$hbox->pack_start($self->image_alert, FALSE, FALSE, 10); +$hbox->pack_start($self->subtitle, FALSE, FALSE, 0); +$box->pack_start($hbox, FALSE, FALSE, 0); $box->pack_start($self->description, FALSE, FALSE, 0); $box->pack_start($self->status_area, FALSE, FALSE, 0); @@ -76,6 +88,7 @@ sub _build_main_box { sub operation_finished { my $self = shift; +$self->image_alert->hide(); # FIXME: handle errors say STDERR "done."; -- 1.7.9.5 ___ tails-dev mailing list tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev
Re: [Tails-dev] Fix to #5917 tails-greeter password field : Warn when caps-lock in ON
> Apparently it's done with a secondary icon, and our Glade reads: > > False > Perhaps it's related? I thought that, I tried with a working test case outside of greeter, a simple password field in Glade. Then i copied the exact same parameters to greeter's glade (Removing False), but still it didn't work. Also changed the GTK version but the behavior was the same. Cheers, Andres ___ tails-dev mailing list tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev
Re: [Tails-dev] Fix: persistence: clearer warning at delete step
>I've quickly tried it, and it works fine *but* the placement of the >icon (centered, alone on top of the window) looks quite weird to me. >Andres, would you please have a look at what the GNOME HIG says (if >you like formal specs), or more easily, just copy what >`zenity --warning' does (it's likely that it just applies the specs)? Oh, you are right, I have fixed it according to GNOME HIG :) > Oh, BTW: if you want more privs on Redmine, so that e.g. you could > have marked the relevant ticket as ready for QA, and assign it to the > current RM (me), just tell me what's your login there. ok great, my user is kurono. Cheers, Andres From 9b061467b7485187639cc62f2a926eb368c613d8 Mon Sep 17 00:00:00 2001 From: kurono Date: Sun, 10 Nov 2013 21:00:45 +0100 Subject: [PATCH] persistence: clearer warning at delete step --- lib/Tails/Persistence/Step/Delete.pm |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/Tails/Persistence/Step/Delete.pm b/lib/Tails/Persistence/Step/Delete.pm index 1a7cfd5..a3cee87 100644 --- a/lib/Tails/Persistence/Step/Delete.pm +++ b/lib/Tails/Persistence/Step/Delete.pm @@ -58,9 +58,14 @@ sub _build_main_box { my $self = shift; my $box = Gtk2::VBox->new(); +my $hbox = Gtk2::HBox->new(); +my $image = Gtk2::Image->new_from_stock("gtk-dialog-warning", "GTK_ICON_SIZE_DIALOG"); $box->set_spacing(6); + $box->pack_start($self->title, FALSE, FALSE, 0); -$box->pack_start($self->subtitle, FALSE, FALSE, 0); +$hbox->pack_start($image, FALSE, FALSE, 0); +$hbox->pack_start($self->subtitle, FALSE, FALSE, 0); +$box->pack_start($hbox, FALSE, FALSE, 0); $box->pack_start($self->description, FALSE, FALSE, 0); $box->pack_start($self->status_area, FALSE, FALSE, 0); -- 1.7.9.5 ___ tails-dev mailing list tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev
[Tails-dev] Fix: persistence: clearer warning at delete step
Hi, Meanwhile I get how to deal with feature #5917, I send a patch for the feature #5888 "persistence: clearer warning at delete step" https://labs.riseup.net/code/issues/5888 and I'll take a look of https://labs.riseup.net/code/issues/5311. Cheers, AndresFrom ce7b1451052f86f340fb5ca42a297bc1eba8e060 Mon Sep 17 00:00:00 2001 From: kurono Date: Sun, 10 Nov 2013 00:15:35 +0100 Subject: [PATCH] persistence: clearer warning at delete step --- lib/Tails/Persistence/Step/Delete.pm |2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/Tails/Persistence/Step/Delete.pm b/lib/Tails/Persistence/Step/Delete.pm index 1a7cfd5..5ddfa4e 100644 --- a/lib/Tails/Persistence/Step/Delete.pm +++ b/lib/Tails/Persistence/Step/Delete.pm @@ -58,7 +58,9 @@ sub _build_main_box { my $self = shift; my $box = Gtk2::VBox->new(); +my $image = Gtk2::Image->new_from_stock("gtk-dialog-warning", "GTK_ICON_SIZE_DIALOG"); $box->set_spacing(6); +$box->pack_start($image, FALSE, FALSE, 0); $box->pack_start($self->title, FALSE, FALSE, 0); $box->pack_start($self->subtitle, FALSE, FALSE, 0); $box->pack_start($self->description, FALSE, FALSE, 0); -- 1.7.9.5 ___ tails-dev mailing list tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev
[Tails-dev] tails-greeter: reset passphrase on failure
Hi, I was taking a look of this bug "tails-greeter: reset passphrase on failure" https://labs.riseup.net/code/issues/5904, but I think it is already solved in the greeter, or there is something missing? Cheers, Andres ___ tails-dev mailing list tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev
Re: [Tails-dev] Fix to #5917 tails-greeter password field : Warn when caps-lock in ON
Sorry for the delay, I tried with a minimal test case, and caps locks key was detected in all cases. Maybe it has to be with the way greeter uses gtk+ library. On the other hand, according to this: https://developer.gnome.org/gtk2/2.24/GtkEntry.html#GtkEntry--caps-lock-warning caps lock warning should be activated by default in Gtk entries, which is not happening in greeter for some reason. Is there another component in tails using the same library, where caps lock warning is already working? Cheers. From: tails-dev-boun...@boum.org [tails-dev-boun...@boum.org] on behalf of intrigeri [intrig...@boum.org] Sent: 03 November 2013 15:27 To: The Tails public development discussion list Subject: Re: [Tails-dev] Fix to #5917 tails-greeter password field :Warn when caps-lock in ON intrigeri wrote (13 Oct 2013 09:37:46 GMT) : > Andres Gomez Ramirez wrote (10 Oct 2013 09:57:43 GMT) : >> It's just that the key event for caps lock (when it is on) is >> not detected or activated at all. If you try with any other key it works. > How about trying to reproduce this in a minimal test case, > independently from the greeter code? Ping? I'm curious if this is a bug in one of the underlying libraries, in how we're using them, or in some other part of the greeter. Cheers, -- intrigeri | GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc | OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr.asc ___ tails-dev mailing list tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev ___ tails-dev mailing list tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev
Re: [Tails-dev] Fix to #5917 tails-greeter password field : Warn when caps-lock in ON
Hi intrigeri, > If that were the case, then indeed the piece of code that hides the > caps lock warning would never be run. > Also, please make sure your commits don't add space errors. > Git commit warns you about this. yes I was adding tabs and spaces in indentation, but i doesn't affect the expected behavior of the code. It's just that the key event for caps lock (when it is on) is not detected or activated at all. If you try with any other key it works. Cheers, Andres ___ tails-dev mailing list tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev
[Tails-dev] Fix to #5917 tails-greeter password field : Warn when caps-lock in ON
Hi, I created a patch for feature #5917 (tails-greeter password field : Warn when caps-lock in ON). I had a problem when caps lock key was on. I press the key again and it doesn't generate a key event, so the warning message does not hide until i press another key; don't know if this is GTK normal behavior or specific to my keyboard or virtualbox. Could please somebody check that? kind regards, kurono. From 3f5fd5c90e1ef2cfe0873bd2e6f282487cc36242 Mon Sep 17 00:00:00 2001 From: kurono Date: Sat, 5 Oct 2013 23:32:21 +0200 Subject: [PATCH 3/3] tails-greeter password field : Warn when caps-lock in ON --- GdmGreeter/optionswindow.py |8 GdmGreeter/persistencewindow.py |7 +++ glade/optionswindow.glade | 41 + glade/persistencewindow.glade | 43 ++- 4 files changed, 98 insertions(+), 1 deletion(-) diff --git a/GdmGreeter/optionswindow.py b/GdmGreeter/optionswindow.py index 9042cb9..cd8fa40 100644 --- a/GdmGreeter/optionswindow.py +++ b/GdmGreeter/optionswindow.py @@ -38,12 +38,14 @@ class OptionsWindow(TranslatableWindow): self.entry_password2 = builder.get_object("password_entry2") self.warning_label = builder.get_object("warning_label") self.warning_area = builder.get_object("warning_area") + self.caps_lock_warning_area = builder.get_object("caps_lock_warning_area") self.camouflage_checkbox = builder.get_object("camouflage_checkbox") TranslatableWindow.__init__(self, builder.get_object("options_dialog")) self.window.set_visible(False) self.warning_area.hide() + self.caps_lock_warning_area.hide() self.entry_password.set_visibility(False) self.entry_password2.set_visibility(False) @@ -86,6 +88,12 @@ class OptionsWindow(TranslatableWindow): self.entry_password2.grab_focus() else: self.set_options_and_login() +elif event.keyval == gtk.keysyms.Caps_Lock: + if event.state & gtk.gdk.LOCK_MASK: + self.caps_lock_warning_area.show() + elif not (event.state & gtk.gdk.LOCK_MASK): + self.caps_lock_warning_area.hide() + def delete_event_cb(self, widget, event=None): """Ignore delete event (Esc)""" diff --git a/GdmGreeter/persistencewindow.py b/GdmGreeter/persistencewindow.py index 657544f..7df7a2a 100644 --- a/GdmGreeter/persistencewindow.py +++ b/GdmGreeter/persistencewindow.py @@ -53,6 +53,7 @@ class PersistenceWindow(TranslatableWindow): self.readonly_checkbutton = builder.get_object("readonly_checkbutton") self.warning_label = builder.get_object("warning_label") self.warning_area = builder.get_object("warning_area") +self.caps_lock_warning_area = builder.get_object("caps_lock_warning_area") self.warning_image = builder.get_object("warning_area") # self.spinner = builder.get_object("spinner") self.checked_img_moreoptions_yes = builder.get_object("moreoptions_yes_checked_img") @@ -61,6 +62,7 @@ class PersistenceWindow(TranslatableWindow): self.checked_img_persistence_no = builder.get_object("persistence_no_checked_img") self.warning_area.hide() +self.caps_lock_warning_area.hide() # FIXME: list_containers may raise exceptions. Deal with that. self.containers = [ @@ -189,6 +191,11 @@ class PersistenceWindow(TranslatableWindow): if event: if event.keyval in [ gtk.keysyms.Return, gtk.keysyms.KP_Enter ]: self.go() +elif event.keyval == gtk.keysyms.Caps_Lock: + if event.state & gtk.gdk.LOCK_MASK: + self.caps_lock_warning_area.show() + elif not (event.state & gtk.gdk.LOCK_MASK): + self.caps_lock_warning_area.hide() def delete_event_cb(self, widget, event=None): """Ignore delete event (Esc)""" diff --git a/glade/optionswindow.glade b/glade/optionswindow.glade index e0bedaa..30054a6 100644 --- a/glade/optionswindow.glade +++ b/glade/optionswindow.glade @@ -184,6 +184,47 @@ Otherwise it will be disabled for better security. 2 + + +True +False +6 + + +True +False +gtk-info +1 + + +False +False +0 + + + + +True +False +0 +10 +10 +Caps lock is on +True + +
Re: [Tails-dev] Fix in tails-greeter
> It only works if you restart the gdm3 service from a text console >(tty1, etc. => CTRL-ALT-F1). If you run `service gdm3 restart' from X, >the stop action kills X, and then the Terminal, and then the start >action is not run. > Can you retry this way? >IMHO the easiest to test such patches during initial development is >often to add a patch to config/chroot_local-patches/ -- this nicely >works around the requirement to learn git-buildpackage, pbuilder & >friends :) Of course this only works for programs written in >interpreted languages, which happens to be the case for all our custom >programs shipped as .deb's. ok thanks, great explanation! I've attached two new patches for greeter persistence and admin password mismatch. CheersFrom 497237607b1600a065f532791f41849fa14fd311 Mon Sep 17 00:00:00 2001 From: kurono Date: Sun, 8 Sep 2013 23:19:51 +0200 Subject: [PATCH] Display a warning icon on greeter admin password mismatch --- glade/optionswindow.glade |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glade/optionswindow.glade b/glade/optionswindow.glade index 9733f7c..e0bedaa 100644 --- a/glade/optionswindow.glade +++ b/glade/optionswindow.glade @@ -193,7 +193,7 @@ Otherwise it will be disabled for better security. True False -gtk-info +gtk-dialog-warning 1 -- 1.7.9.5 From cd8aa8f6493922a462831442f4e86f8e57168b18 Mon Sep 17 00:00:00 2001 From: kurono Date: Sun, 8 Sep 2013 23:14:46 +0200 Subject: [PATCH] Display a warning icon on persistence unlocking failure (Closes: #5332) --- glade/persistencewindow.glade |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glade/persistencewindow.glade b/glade/persistencewindow.glade index f4d8487..0b6f25f 100644 --- a/glade/persistencewindow.glade +++ b/glade/persistencewindow.glade @@ -300,7 +300,7 @@ True False -gtk-info +gtk-dialog-warning 1 -- 1.7.9.5 ___ tails-dev mailing list tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev
Re: [Tails-dev] Fix in tails-greeter
Hi, >I have two remarks about it: > >1. The commit message could be clearer than "Feature #5332". > I suggest instead something like: > "Display a warning icon on persistence unlocking failure (Closes: #5332)" ok. > 2. I did not manage to confirm that this patch was working (boot > Tails, apply patch, restart gdm3 service, enter wrong persistence > passphrase). > > Once we're done with #5332, I just realized that we have the very same > problem in the greeter, with the administrator password, in the more > options dialog. I guess the same solution will be easy to apply there. mm so I misunderstood the requirement. I guess my fix was to the second bug you mention (related to greeter) and not to persistence :) I have not been able to test both bugs (as you mention boot Tails, apply patch, restart gdm3 service, enter wrong persistence pass phrase), restarting gdm3 does not work to me, It does not show me again the greeter or persistence initial menu. I know how to test tails changes by creating an image (https://tails.boum.org/contribute/build/), but I'm confused about changes in software from different repositories (like greeter and persistence menu). Cheers ___ tails-dev mailing list tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev
Re: [Tails-dev] Fix in tails-greeter
Hi, yes I'm following the list, cc is not necessary. From: intrigeri [intrig...@boum.org] Sent: 04 September 2013 10:50 To: Andres Gomez Ramirez Cc: tails-dev@boum.org Subject: Re: [Tails-dev] Fix in tails-greeter intrigeri wrote (04 Sep 2013 08:34:18 GMT) : > Welcome aboard! ... oh, I forgot: do you read tails-dev, or should we Cc: you? ___ tails-dev mailing list tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev
[Tails-dev] Fix in tails-greeter
Hi, I just want to start contributing to Tails, so I selected an easy task: https://labs.riseup.net/code/issues/5332 I have attached a patch for this. cheers, kurono From cb204e5019823fcefca2d3191dc8ebacc3e64d96 Mon Sep 17 00:00:00 2001 From: kurono Date: Wed, 4 Sep 2013 00:13:10 +0200 Subject: [PATCH] Feature #5332 --- glade/persistencewindow.glade |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glade/persistencewindow.glade b/glade/persistencewindow.glade index f4d8487..278ea7d 100644 --- a/glade/persistencewindow.glade +++ b/glade/persistencewindow.glade @@ -300,7 +300,7 @@ True False -gtk-info +gtk-warning 1 -- 1.7.9.5 ___ tails-dev mailing list tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev