Merge lp:~fader/gvoice-notifier/nicer-credentials-ui into lp:~matt-mossholder/gvoice-notifier/trunk

[Ronald McCollam]

I replaced the multiple popups asking for the email address, password, and check interval with a single dialog asking for all three as this seems like a slightly nicer experience to me. This involved replacing the flexible getText() function with a single function I called getCredentials().

I also simplified the interval selection. While it was quite powerful, it was also difficult to enter. I'm not sure what the use case is for someone wanting to check Google Voice only every 45 days, 16 hours, and 3 minutes. Thus I have simplified the string to a single spinbutton specifying the time interval in minutes.

Thanks for writing this notifier... I use it all the time and it's incredibly helpful to me!

[inverser (resrevni)]

Hi Ronald thank you for your work. It looks great.

I was wondering if you could help with a credential issue I am having. I am unable to log in using any of my Google Voice accounts. I get hit with "Could not log in with provided credentials" at every attempt.

I am absolutely sure that I am using the correct password. I log into Gmail/Voice every day. I'd really, really appreciate it. gvoice-notifier would be such a great addition to my desktop. Cheers.

Unmerged revisions

24. By Ronald McCollam on 2010-07-03

Better message on dialog, remove superfluous print statements

23. By Ronald McCollam on 2010-07-03

Replaced multi-dialog configuration UI with a single dialog

22. By Ken VanDine on 2010-06-10

releasing version 0.0.0+r23

21. By Ken VanDine on 2010-06-10

Initial package.

20. By Ken VanDine on 2010-06-10

added initial packaging

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2010-07-03 22:14:24 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+merge = True

=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2010-07-03 22:14:24 +0000
@@ -0,0 +1,5 @@
+gvoice-notifier (0.0.0+r23) maverick; urgency=low
+
+  * Initial package.
+
+ -- Ken VanDine <[e-mail]>  Thu, 10 Jun 2010 12:40:03 -0400

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2010-07-03 22:14:24 +0000
@@ -0,0 +1,1 @@
+6

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2010-07-03 22:14:24 +0000
@@ -0,0 +1,27 @@
+Source: gvoice-notifier
+Section: python
+Priority: extra
+Build-Depends: cdbs (>= 0.4.43),
+ debhelper (>= 6),
+ python,
+ python-support (>= 0.6.4),
+ python-distutils-extra (>= 2.10)
+Maintainer: Ken VanDine <[e-mail]>
+Standards-Version: 3.8.4
+XS-Python-Version: current
+
+Package: gvoice-notifier
+Architecture: all
+XB-Python-Version: ${python:Versions}
+Depends: ${misc:Depends},
+ ${python:Depends}${misc:Depends},
+ ${python:Depends},
+ python-indicate,
+ python-gconf,
+ python-notify,
+ python-gobject,
+ python-distutils-extra,
+ python-gtk2,
+ python-gnomekeyring
+Description: Google Voice Notifier
+ Google Voice Notifier, utilizing the messaging indicator.

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2010-07-03 22:14:24 +0000
@@ -0,0 +1,33 @@
+This package was debianized by Ken VanDine <[e-mail]> on
+Thu, 10 Jun 2010 11:54:27 -0400
+
+It was downloaded from <http://launchpad.net/gvoice-notifier>
+
+Upstream Author:
+
+    Matt Mossholder < [e-mail]>
+
+Copyright:
+
+    Copyright (C) 2010 Matt Mossholder < [e-mail]>
+
+License:
+
+    This program 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.
+
+    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-3'.
+
+The Debian packaging is (C) 2010, Ken VanDine <[e-mail]> and
+is licensed under the GPLv3, see `/usr/share/common-licenses/GPL-3'.

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2010-07-03 22:14:24 +0000
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+DEB_PYTHON_SYSTEM := pysupport
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/langpack.mk

=== modified file 'po/gvoice-notifier.pot'
--- po/gvoice-notifier.pot	2010-06-11 16:55:02 +0000
+++ po/gvoice-notifier.pot	2010-07-03 22:14:24 +0000
@@ -8,7 +8,11 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< TREE
 "POT-Creation-Date: 2010-06-11 12:54-0400\n"
+=======
+"POT-Creation-Date: 2010-07-03 17:59-0400\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -16,6 +20,7 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+<<<<<<< TREE
 #: ../src/gvoice-notifier:52
 msgid "Please enter your username:"
 msgstr ""
@@ -29,22 +34,25 @@
 msgstr ""
 
 #: ../src/gvoice-notifier:102
+=======
+#: ../src/gvoice-notifier:113
+>>>>>>> MERGE-SOURCE
 msgid "Could not log in with provided credentials"
 msgstr ""
 
-#: ../src/gvoice-notifier:103
+#: ../src/gvoice-notifier:114
 msgid "You have a new message."
 msgstr ""
 
-#: ../src/gvoice-notifier:104 ../data/gvoice-notifier.desktop.in.h:2
+#: ../src/gvoice-notifier:115 ../data/gvoice-notifier.desktop.in.h:2
 msgid "Google Voice Notifier"
 msgstr ""
 
-#: ../src/gvoice-notifier:122
+#: ../src/gvoice-notifier:133
 msgid "SMS"
 msgstr ""
 
-#: ../src/gvoice-notifier:123
+#: ../src/gvoice-notifier:134
 msgid "Voicemail"
 msgstr ""
 

=== modified file 'src/gvoice-notifier'
--- src/gvoice-notifier	2010-06-11 16:55:02 +0000
+++ src/gvoice-notifier	2010-07-03 22:14:24 +0000
@@ -48,6 +48,7 @@
 def responseToDialog(entry, dialog, response):
 	dialog.response(response)
 
+<<<<<<< TREE
 def getText(name, description, hidden=False):
 	_email 		= _("Please enter your username:")
 	_password 	= _("Please enter your password:")
@@ -70,6 +71,41 @@
 	text = entry.get_text()
 	dialog.destroy()
 	return text
+=======
+def getCredentials():
+    dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_QUESTION, gtk.BUTTONS_OK, None)
+    email = gtk.Entry()
+    password = gtk.Entry()
+    password.set_visibility(False)
+    adjustment = gtk.Adjustment(value=5, lower=0, upper=10080, step_incr=1, page_incr=5, page_size=0)
+    interval = gtk.SpinButton(adjustment, 1)
+    email.connect("activate", responseToDialog, dialog, gtk.RESPONSE_OK)
+    password.connect("activate", responseToDialog, dialog, gtk.RESPONSE_OK)
+    interval.connect("activate", responseToDialog, dialog, gtk.RESPONSE_OK)
+    
+    minutesHbox = gtk.HBox()
+    minutesHbox.pack_start(interval)
+    minutesHbox.pack_end(gtk.Label("minutes"), False, 5, 5)
+    
+    containerTable = gtk.Table(3, 2, False)
+    containerTable.attach(gtk.Label("Email:"), 0, 1, 0, 1)
+    containerTable.attach(email, 1, 2, 0, 1)
+    containerTable.attach(gtk.Label("Password:"), 0, 1, 1, 2)
+    containerTable.attach(password, 1, 2, 1, 2)
+    containerTable.attach(gtk.Label("Check every"), 0, 1, 2, 3)
+    containerTable.attach(minutesHbox, 1, 2, 2, 3)
+    
+    dialog.set_title("Configure your Google Voice connection")
+    dialog.format_secondary_markup("Please provide your credentials and how often you'd like to check for new messages:")
+    dialog.vbox.pack_end(containerTable, True, True, 0)
+    dialog.show_all()
+    dialog.run()
+    userEmail = email.get_text()
+    userPassword = password.get_text()
+    userInterval = interval.get_value()
+    dialog.destroy()
+    return userEmail, userPassword, userInterval
+>>>>>>> MERGE-SOURCE
 
 class Message(indicate.Indicator):
 	def __init__(self, msgtype, sender, time , hash, timestamp):
@@ -312,6 +348,7 @@
 		else:
 			USERNAME, PASSWORD, CHECK_TIME = gkey.getInfo()
 	except:
+<<<<<<< TREE
 		USERNAME = getText("email", "")
 		PASSWORD = getText("password", "", True)
 		CHECK_TIME = getText("interval", "").strip()
@@ -328,6 +365,13 @@
 						CHECK_TIME = CHECK_TIME[CHECK_TIME.find(char)+1:]
 		CHECK_TIME = i
 		print "Done"
+=======
+		USERNAME, PASSWORD, interval = getCredentials()
+		
+		# The setup dialog asks for minutes, but we need seconds
+		CHECK_TIME = int(interval * 60)
+		
+>>>>>>> MERGE-SOURCE
 		gkey.setInfo(USERNAME, PASSWORD, CHECK_TIME)
 	
 	x = Notifier(USERNAME, PASSWORD, CHECK_TIME)