diff --git a/c_gui/CasaMain.cs b/c_gui/CasaMain.cs index c5dc3116..5966d2e3 100644 --- a/c_gui/CasaMain.cs +++ b/c_gui/CasaMain.cs @@ -51,7 +51,8 @@ public class CasaMain dialogLoginContinue, dialogConfirmRefresh, dialogSingleInstance, - dialogLoginReprompt; + dialogLoginReprompt, + dialogShortPassword; [Glade.Widget] Gtk.Entry entryMasterPassword1, @@ -298,50 +299,56 @@ public class CasaMain if( true == entryMasterPassword4.Visible ) { - if(entryMasterPassword3.Text != "" && (entryMasterPassword3.Text == entryMasterPassword4.Text) && entryMasterPassword3.Text.Length >= 8) + if( entryMasterPassword3.Text.Length < 8 ) + { + Glade.XML gxmlTemp = new Glade.XML (Common.GladeFile, "dialogShortPassword", null); + gxmlTemp.Autoconnect (this); + + } + else if(entryMasterPassword3.Text != "" && (entryMasterPassword3.Text == entryMasterPassword4.Text) && entryMasterPassword3.Text.Length >= 8) { miCASA.SetMasterPassword(0, entryMasterPassword3.Text); MiCasaRequestReply.Send(MiCasaRequestReply.VERB_UNLOCK_STORE, entryMasterPassword3.Text); dialogLogin.Destroy(); InitializeGUI(); - } - else - { - entryMasterPassword3.Text=""; - entryMasterPassword4.Text=""; - entryMasterPassword3.HasFocus=true; - } } else { - if( 0 == miCASA.SetMasterPassword(0, entryMasterPassword3.Text) ) - { - MiCasaRequestReply.Send(MiCasaRequestReply.VERB_UNLOCK_STORE, entryMasterPassword3.Text); + entryMasterPassword3.Text=""; + entryMasterPassword4.Text=""; + entryMasterPassword3.HasFocus=true; + } + } + else + { + if( 0 == miCASA.SetMasterPassword(0, entryMasterPassword3.Text) ) + { + MiCasaRequestReply.Send(MiCasaRequestReply.VERB_UNLOCK_STORE, entryMasterPassword3.Text); dialogLogin.Destroy(); InitializeGUI(); + } + else + { + Logger.DbgLog("GUI:CasaMain.okbuttonLogin_clicked() - MasterPassword verification failed."); + //dialogLogin.Destroy(); + //LoginContinue("Master Password verfication failed", "The store will not be persistent"); + loginPromptCount--; + dialogLogin.Hide(); + + if( loginPromptCount > 0 ) + { + dialogLogin.Show(); + entryMasterPassword3.Text=""; } else - { - Logger.DbgLog("GUI:CasaMain.okbuttonLogin_clicked() - MasterPassword verification failed."); - //dialogLogin.Destroy(); - //LoginContinue("Master Password verfication failed", "The store will not be persistent"); - loginPromptCount--; - dialogLogin.Hide(); - - if( loginPromptCount > 0 ) - { - dialogLogin.Show(); - entryMasterPassword3.Text=""; - } - else - { - Glade.XML gxmlTemp = new Glade.XML (Common.GladeFile, "dialogLoginReprompt", null); + { + Glade.XML gxmlTemp = new Glade.XML (Common.GladeFile, "dialogLoginReprompt", null); gxmlTemp.Autoconnect (this); - } - } + } } + } - Logger.DbgLog("GUI:CasaMain.okbuttonLogin_clicked() - END"); + Logger.DbgLog("GUI:CasaMain.okbuttonLogin_clicked() - END"); } internal void on_buttonRetryRepropmt_clicked(object obj, EventArgs args) @@ -352,6 +359,14 @@ public class CasaMain loginPromptCount = 3; } + internal void on_buttonRetryShortPassword_clicked(object obj, EventArgs args) + { + dialogShortPassword.Destroy(); + entryMasterPassword3.Text = ""; + entryMasterPassword4.Text = ""; + entryMasterPassword3.HasFocus = true; + } + internal void on_buttonCloseReprompt_clicked(object obj, EventArgs args) { dialogLoginReprompt.Destroy(); diff --git a/c_gui/images/casa-1.5.glade b/c_gui/images/casa-1.5.glade index 228321ba..42dedff1 100644 --- a/c_gui/images/casa-1.5.glade +++ b/c_gui/images/casa-1.5.glade @@ -740,9 +740,9 @@ True - miCASA + <b>miCASA</b> False - False + True GTK_JUSTIFY_LEFT False False @@ -877,7 +877,7 @@ True - Firefox + <b>Firefox</b> False True GTK_JUSTIFY_LEFT @@ -1015,7 +1015,7 @@ True - Mozilla + <b>Mozilla</b> False True GTK_JUSTIFY_LEFT @@ -1153,7 +1153,7 @@ True - KDE Wallet + <b>KDE Wallet</b> False True GTK_JUSTIFY_LEFT @@ -1291,9 +1291,9 @@ True - GNOME Keyring + <b>GNOME Keyring</b> False - False + True GTK_JUSTIFY_LEFT False False @@ -4774,7 +4774,7 @@ CSL Manojna</b> True CASA Master Password Authentication GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER_ON_PARENT + GTK_WIN_POS_CENTER_ALWAYS True False True @@ -5919,8 +5919,8 @@ instance is already running.</b> True WARNING GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER_ALWAYS - False + GTK_WIN_POS_CENTER_ON_PARENT + True False True CASAicons.ico @@ -6141,4 +6141,214 @@ by cilcking the Close button. + + True + WARNING + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + True + False + True + CASAicons.ico + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + + + + True + False + 0 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + True + True + GTK_RELIEF_NORMAL + True + -5 + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-redo + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + _Retry + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + + + 0 + False + True + GTK_PACK_END + + + + + + True + False + 0 + + + + True + False + 0 + + + + True + gtk-dialog-warning + 6 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + True + + + + + 4 + True + True + + + + + + True + False + 0 + + + + True + <b>Master Password is too short.</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 5 + False + False + + + + + + True + The Master Password should be atleast eight characters in length. + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 0 + 0 + + + 4 + False + False + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + diff --git a/c_gui/images/firefox-logo.png b/c_gui/images/firefox-logo.png index 909ac2f9..fbc09507 100644 Binary files a/c_gui/images/firefox-logo.png and b/c_gui/images/firefox-logo.png differ diff --git a/c_gui/images/keyring-logo.png b/c_gui/images/keyring-logo.png index 15c4b1ea..e2f8dc13 100644 Binary files a/c_gui/images/keyring-logo.png and b/c_gui/images/keyring-logo.png differ diff --git a/c_gui/images/kwallet-logo.png b/c_gui/images/kwallet-logo.png index 8ebc39df..168661f9 100644 Binary files a/c_gui/images/kwallet-logo.png and b/c_gui/images/kwallet-logo.png differ diff --git a/c_gui/images/mozilla-logo.png b/c_gui/images/mozilla-logo.png index df3149e9..baec4548 100644 Binary files a/c_gui/images/mozilla-logo.png and b/c_gui/images/mozilla-logo.png differ