Merge intelligent-remove-entry by thad-fisch

This commit is contained in:
Sean Davis 2014-04-01 06:22:17 -04:00
commit 6461a48463
2 changed files with 20 additions and 12 deletions

View File

@ -175,9 +175,11 @@ class MugshotWindow(Window):
self.image_menu = builder.get_object('image_menu')
self.image_menu.attach_to_widget(self.image_button, detach_cb)
self.image_from_camera = builder.get_object('image_from_camera')
image_from_stock = builder.get_object('image_from_stock')
image_from_stock.set_visible(os.path.exists(faces_dir) and
self.image_from_stock = builder.get_object('image_from_stock')
self.image_from_stock.set_visible(os.path.exists(faces_dir) and
len(os.listdir(faces_dir)) > 0)
self.menuitem1 = builder.get_object('menuitem1')
self.image_remove = builder.get_object('image_remove')
# Entry widgets (chfn)
self.first_name_entry = builder.get_object('first_name')
@ -279,8 +281,14 @@ class MugshotWindow(Window):
pixbuf = GdkPixbuf.Pixbuf.new_from_file(filename)
scaled = pixbuf.scale_simple(128, 128, GdkPixbuf.InterpType.HYPER)
self.user_image.set_from_pixbuf(scaled)
# Show "Remove" menu item.
self.menuitem1.set_visible(True)
self.image_remove.set_visible(True)
else:
self.user_image.set_from_icon_name('avatar-default', 128)
# Hide "Remove" menu item.
self.menuitem1.set_visible(False)
self.image_remove.set_visible(False)
def filter_numbers(self, entry, *args):
"""Allow only numbers and + in phone entry fields."""

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-03-29 11:56-0400\n"
"POT-Creation-Date: 2014-04-01 06:18-0400\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"
@ -61,7 +61,7 @@ msgstr ""
msgid "Browse…"
msgstr ""
#: ../data/ui/MugshotWindow.ui.h:9 ../mugshot/MugshotWindow.py:499
#: ../data/ui/MugshotWindow.ui.h:9 ../mugshot/MugshotWindow.py:507
msgid "Mugshot"
msgstr ""
@ -131,37 +131,37 @@ msgid "Retry"
msgstr ""
#. Password was incorrect, complain.
#: ../mugshot/MugshotWindow.py:298
#: ../mugshot/MugshotWindow.py:306
msgid "Authentication Failed"
msgstr ""
#: ../mugshot/MugshotWindow.py:299
#: ../mugshot/MugshotWindow.py:307
msgid "User details were not updated."
msgstr ""
#: ../mugshot/MugshotWindow.py:429
#: ../mugshot/MugshotWindow.py:437
msgid "Update Pidgin buddy icon?"
msgstr ""
#: ../mugshot/MugshotWindow.py:430
#: ../mugshot/MugshotWindow.py:438
msgid "Would you also like to update your Pidgin buddy icon?"
msgstr ""
#: ../mugshot/MugshotWindow.py:500
#: ../mugshot/MugshotWindow.py:508
msgid "Enter your password to change user details."
msgstr ""
#: ../mugshot/MugshotWindow.py:502
#: ../mugshot/MugshotWindow.py:510
msgid ""
"This is a security measure to prevent unwanted updates\n"
"to your personal information."
msgstr ""
#: ../mugshot/MugshotWindow.py:649
#: ../mugshot/MugshotWindow.py:657
msgid "Update LibreOffice user details?"
msgstr ""
#: ../mugshot/MugshotWindow.py:650
#: ../mugshot/MugshotWindow.py:658
msgid "Would you also like to update your user details in LibreOffice?"
msgstr ""