From c2bc2acec073b92f62d6992bff3a6cffcd78f8a4 Mon Sep 17 00:00:00 2001 From: Ivan C Date: Sat, 14 Oct 2017 17:05:38 -0700 Subject: [PATCH 1/3] enble pressing enter key to log in in login view and to log in agin in the login failure view. --- views/.formlogin.py.swp | Bin 0 -> 12288 bytes views/formlogin.py | 4 ++-- views/formloginfailure.py | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 views/.formlogin.py.swp diff --git a/views/.formlogin.py.swp b/views/.formlogin.py.swp new file mode 100644 index 0000000000000000000000000000000000000000..7a79d2220dfa0af0ab6db5ee00c54eb1f61b4bcd GIT binary patch literal 12288 zcmeHNO>f*p7@mLxgfs;eAvka_%OT!qvmZebQG|n(wvkp!(Tb*(%EhwRR{4ycz)JwX3ny8^=R~x)^>()VM83|(_6@rZ$ygQ6( zBGblo9?(YUU+;UeGm?FtG)@^kOB*2qA*4 z7I*|a1U>;C03NUjJOezrO2`ku_rT}C8E_kD0at-_;K@26KLQVd_kj)IY2fh{!~l@$-ay1$+p+1MCB9!0)Ssd?9Hd84k-Hk zTxV3Xx)Hu0F&;lA-E>B#4C?!vH8ZNTxp3uNn(lv{oqH^b5p3v%q zO?ujipn6ZRz!v<>*@jy@8pes!Dt=1`UgB(*wdi1|ijhjZ3>^n7CbOWVHVf@JYUKGe zx=6P*lY}NO)}5t>KHTApGC(dUJS$SQE*LpG5SV5jU(04aXMMKoqUJvRjOoF&zbk~0=~AVeM8Zw9Ln3uVy{OL z8v27imwXXtPFTk{c|<9je*k(%Nwt--9Wpq!!Qx)y@L((4LN?s>qak&7cI!PBZj|A= zmaIkCr#z;r6_xFs=6S2xoXtMxNhTv|SF&T(IY;komN3b@h8f+fAXo|yPD(Rqae--D{H7cz*Wc%v*qQ5O?PjCm9L@FZ1n=F zyPDy;)02_a++3d}fn9m~Jt~JH*~c!>PAuK8x{8IW_zLYtSi0q_%T_t4Ug-Bpr+rks rNA$v}S^9Q-k`1dDVKJ`avQH!Cr}fZR@1a&Px|t0fpRfd*z5MiVzbKPu literal 0 HcmV?d00001 diff --git a/views/formlogin.py b/views/formlogin.py index a766f6c..31fe73d 100644 --- a/views/formlogin.py +++ b/views/formlogin.py @@ -6,6 +6,7 @@ class FormLogin(Form): def __init__(self, master): + master.bind("", self._on_buttonlogin_clicked) Form.__init__(self, master) self._initialize(master) self._initialize_view(master) @@ -31,7 +32,6 @@ def _initialize_view(self, master): self.buttonlogin = Button(master, text="Login", command=self._on_buttonlogin_clicked) - self.fblogo.grid(row=0, column=0, rowspan=2, pady=5) self.labelid.grid(row=0, column=1) self.labelpass.grid(row=1, column=1) @@ -39,7 +39,7 @@ def _initialize_view(self, master): self.entrypass.grid(row=1, column=2) self.buttonlogin.grid(row=2, column=1, columnspan=2) - def _on_buttonlogin_clicked(self): + def _on_buttonlogin_clicked(self, event=None): username = self.username.get() password = self.password.get() try: diff --git a/views/formloginfailure.py b/views/formloginfailure.py index cf74a72..0020e8f 100644 --- a/views/formloginfailure.py +++ b/views/formloginfailure.py @@ -5,6 +5,7 @@ class FormLoginFailure(Form): def __init__(self, master): + master.bind("", self._on_loginagainbutton_clicked) Form.__init__(self, master) self._initialize(master) self._initialize_view(master) @@ -22,7 +23,7 @@ def _initialize_view(self, master): text="Login Again", command=self._on_loginagainbutton_clicked) self.loginagainbutton.pack() - def _on_loginagainbutton_clicked(self): + def _on_loginagainbutton_clicked(self, event=None): self.close() from formlogin import FormLogin FormLogin(Tk()) From fc00aa4ea3bbd56c831859e5820206ea0e684c61 Mon Sep 17 00:00:00 2001 From: Ivan C Date: Sat, 14 Oct 2017 21:38:43 -0700 Subject: [PATCH 2/3] deleted .swp file and moved lines to _initialize_view method. --- views/.formlogin.py.swp | Bin 12288 -> 0 bytes views/formlogin.py | 6 +++--- views/formloginfailure.py | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 views/.formlogin.py.swp diff --git a/views/.formlogin.py.swp b/views/.formlogin.py.swp deleted file mode 100644 index 7a79d2220dfa0af0ab6db5ee00c54eb1f61b4bcd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeHNO>f*p7@mLxgfs;eAvka_%OT!qvmZebQG|n(wvkp!(Tb*(%EhwRR{4ycz)JwX3ny8^=R~x)^>()VM83|(_6@rZ$ygQ6( zBGblo9?(YUU+;UeGm?FtG)@^kOB*2qA*4 z7I*|a1U>;C03NUjJOezrO2`ku_rT}C8E_kD0at-_;K@26KLQVd_kj)IY2fh{!~l@$-ay1$+p+1MCB9!0)Ssd?9Hd84k-Hk zTxV3Xx)Hu0F&;lA-E>B#4C?!vH8ZNTxp3uNn(lv{oqH^b5p3v%q zO?ujipn6ZRz!v<>*@jy@8pes!Dt=1`UgB(*wdi1|ijhjZ3>^n7CbOWVHVf@JYUKGe zx=6P*lY}NO)}5t>KHTApGC(dUJS$SQE*LpG5SV5jU(04aXMMKoqUJvRjOoF&zbk~0=~AVeM8Zw9Ln3uVy{OL z8v27imwXXtPFTk{c|<9je*k(%Nwt--9Wpq!!Qx)y@L((4LN?s>qak&7cI!PBZj|A= zmaIkCr#z;r6_xFs=6S2xoXtMxNhTv|SF&T(IY;komN3b@h8f+fAXo|yPD(Rqae--D{H7cz*Wc%v*qQ5O?PjCm9L@FZ1n=F zyPDy;)02_a++3d}fn9m~Jt~JH*~c!>PAuK8x{8IW_zLYtSi0q_%T_t4Ug-Bpr+rks rNA$v}S^9Q-k`1dDVKJ`avQH!Cr}fZR@1a&Px|t0fpRfd*z5MiVzbKPu diff --git a/views/formlogin.py b/views/formlogin.py index 31fe73d..600e73d 100644 --- a/views/formlogin.py +++ b/views/formlogin.py @@ -5,14 +5,14 @@ class FormLogin(Form): - def __init__(self, master): - master.bind("", self._on_buttonlogin_clicked) + def __init__(self, master): Form.__init__(self, master) self._initialize(master) self._initialize_view(master) def _initialize(self, master): - self.username = StringVar() + master.bind("", self._on_buttonlogin_clicked) + self.username = StringVar() self.password = StringVar() self.friend = StringVar() self.message = StringVar() diff --git a/views/formloginfailure.py b/views/formloginfailure.py index 0020e8f..5058346 100644 --- a/views/formloginfailure.py +++ b/views/formloginfailure.py @@ -5,13 +5,12 @@ class FormLoginFailure(Form): def __init__(self, master): - master.bind("", self._on_loginagainbutton_clicked) Form.__init__(self, master) self._initialize(master) self._initialize_view(master) - def _initialize(self, master): - pass + def _initialize(self, master): + master.bind("", self._on_loginagainbutton_clicked) def _initialize_view(self, master): self.master.title("Login Error") From f3bff1d59fc5c62aa1f2d8b2c9b42bbc70ee5a79 Mon Sep 17 00:00:00 2001 From: Ivan C Date: Sat, 14 Oct 2017 22:12:53 -0700 Subject: [PATCH 3/3] changed master.bind() to self.master.bind() --- views/formlogin.py | 2 +- views/formloginfailure.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/views/formlogin.py b/views/formlogin.py index 600e73d..a5d9c76 100644 --- a/views/formlogin.py +++ b/views/formlogin.py @@ -11,7 +11,6 @@ def __init__(self, master): self._initialize_view(master) def _initialize(self, master): - master.bind("", self._on_buttonlogin_clicked) self.username = StringVar() self.password = StringVar() self.friend = StringVar() @@ -20,6 +19,7 @@ def _initialize(self, master): def _initialize_view(self, master): self.master.title("fbChat") self.master.geometry("250x100") + self.master.bind("", self._on_buttonlogin_clicked) fbphoto = PhotoImage(file='img/FB-f-Logo_blue_58.gif') self.fblogo = Label(master, image=fbphoto) self.fblogo.image = fbphoto diff --git a/views/formloginfailure.py b/views/formloginfailure.py index 5058346..adbd368 100644 --- a/views/formloginfailure.py +++ b/views/formloginfailure.py @@ -10,10 +10,11 @@ def __init__(self, master): self._initialize_view(master) def _initialize(self, master): - master.bind("", self._on_loginagainbutton_clicked) + pass def _initialize_view(self, master): self.master.title("Login Error") + self.master.bind("", self._on_loginagainbutton_clicked) self.err_text_widget = Text(master, bg='#3b5998', fg='#ffffff', height=5, width=40, font=("TkDefaultFont", "12")) self.err_text_widget.insert(INSERT, "Invalid loginID/Password combination!\nPlease try again!") self.err_text_widget.pack()