fix settings window display, scan qr code

This commit is contained in:
Bilal Elmoussaoui 2016-06-21 20:42:29 +02:00
parent c157d3751e
commit db97c80ceb
5 changed files with 21 additions and 22 deletions

View file

@ -37,7 +37,6 @@ class Application(Gtk.Application):
alive = True
locked = False
settings_window = None
settings_action = None
def __init__(self):
@ -167,11 +166,9 @@ class Application(Gtk.Application):
"""
Shows settings window
"""
if not self.settings_window:
self.settings_window = SettingsWindow(self.win)
self.settings_window.show_window()
else:
self.settings_window.present()
settings_window = SettingsWindow(self.win)
settings_window.show_window()
settings_window.present()
def on_quit(self, *args):
"""

View file

@ -49,7 +49,7 @@ class QRReader:
remove image file for security reasons
"""
if path.isfile(self.filename):
remove(filename)
remove(self.filename)
logging.debug("QR code image was removed for security reasons")
def is_valid(self):

View file

@ -272,7 +272,7 @@ class AccountRow(Thread, Gtk.ListBoxRow):
"""
Remove an account
"""
message = _("Do you really want to remove this account?")
message = _('Do you really want to remove "%s"?' % self.get_name())
confirmation = ConfirmationMessage(self.window, message)
confirmation.show()
if confirmation.get_confirmation():

View file

@ -20,6 +20,7 @@
from gi import require_version
require_version("Gtk", "3.0")
from gi.repository import Gtk, Gio
from TwoFactorAuth.utils import is_gnome
import logging
from gettext import gettext as _

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-06-21 04:45+0200\n"
"POT-Creation-Date: 2016-06-21 20:42+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -88,38 +88,38 @@ msgid ""
"later</a> for details."
msgstr ""
#: TwoFactorAuth/widgets/headerbar.py:63
#: TwoFactorAuth/widgets/headerbar.py:64
msgid "Remove selected accounts"
msgstr ""
#: TwoFactorAuth/widgets/headerbar.py:70
#: TwoFactorAuth/widgets/headerbar.py:71
#: TwoFactorAuth/widgets/add_account.py:49
#: TwoFactorAuth/widgets/add_account.py:64
msgid "Add a new account"
msgstr ""
#: TwoFactorAuth/widgets/headerbar.py:77
#: TwoFactorAuth/widgets/headerbar.py:78
msgid "Lock the Application"
msgstr ""
#: TwoFactorAuth/widgets/headerbar.py:93
#: TwoFactorAuth/widgets/headerbar.py:94
msgid "Selection mode"
msgstr ""
#: TwoFactorAuth/widgets/headerbar.py:100
#: TwoFactorAuth/widgets/headerbar.py:101
#: TwoFactorAuth/widgets/applications_list.py:98
msgid "Search"
msgstr ""
#: TwoFactorAuth/widgets/headerbar.py:104
#: TwoFactorAuth/widgets/headerbar.py:105
#: TwoFactorAuth/widgets/add_account.py:69
#: TwoFactorAuth/widgets/change_password.py:162
#: TwoFactorAuth/widgets/applications_list.py:90
msgid "Cancel"
msgstr ""
#: TwoFactorAuth/widgets/headerbar.py:116 TwoFactorAuth/widgets/settings.py:43
#: TwoFactorAuth/application.py:79
#: TwoFactorAuth/widgets/headerbar.py:117 TwoFactorAuth/widgets/settings.py:43
#: TwoFactorAuth/application.py:78
msgid "Settings"
msgstr ""
@ -202,7 +202,8 @@ msgid "Couldn't generate the secret code"
msgstr ""
#: TwoFactorAuth/widgets/account_row.py:275
msgid "Do you really want to remove this account?"
#, python-format
msgid "Do you really want to remove \"%s\"?"
msgstr ""
#: TwoFactorAuth/widgets/settings.py:71
@ -225,18 +226,18 @@ msgstr ""
msgid "Secret code generation time (s) :"
msgstr ""
#: TwoFactorAuth/application.py:47
#: TwoFactorAuth/application.py:46
msgid "TwoFactorAuth"
msgstr ""
#: TwoFactorAuth/application.py:87
#: TwoFactorAuth/application.py:86
msgid "Shortcuts"
msgstr ""
#: TwoFactorAuth/application.py:89
#: TwoFactorAuth/application.py:88
msgid "About"
msgstr ""
#: TwoFactorAuth/application.py:90
#: TwoFactorAuth/application.py:89
msgid "Quit"
msgstr ""