Changeset 1662ea7cb97e74c04650ddda1130c2ea7a4d07ce

Timestamp:

06/01/07 23:58:02 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

0c6e731fde2f0fa4c225215371d356fed6d6f6f3

Children:

c006fa359f7823874cf7a814cb87823276535eae

git-committer:

Philipp Kern <phil@0x539.de> / 2007-01-06T22:58:02Z+0000

Message:

[project @ Disable OK button in password dialog when passwords do not match]

Original author: Armin Burgmeier <armin@…>
Date: 2006-03-07 18:03:45+00:00

Files:

• inc/passworddialog.hpp (modified) (1 diff)
• src/passworddialog.cpp (modified) (2 diffs)

inc/passworddialog.hpp

@@ -39 +39 @@
         Glib::ustring get_password() const;
 protected:
-        virtual void on_response(int response_id);
+        void on_password_changed();
 
         bool m_request;

src/passworddialog.cpp

@@ -64 +64 @@
                 m_ent_conf_password.hide();
         }
+        else
+        {
+                m_ent_password.signal_changed().connect(
+                        sigc::mem_fun(
+                                *this,
+                                &PasswordDialog::on_password_changed
+                        )
+                );
+
+                m_ent_conf_password.signal_changed().connect(
+                        sigc::mem_fun(
+                                *this,
+                                &PasswordDialog::on_password_changed
+                        )
+                );
+        }
+
+        set_response_sensitive(Gtk::RESPONSE_OK, false);
         
         set_resizable(false);
@@ -89 +107 @@
 }
 
-void Gobby::PasswordDialog::on_response(int response_id)
+void Gobby::PasswordDialog::on_password_changed()
 {
-        if(response_id == Gtk::RESPONSE_OK && !m_request)
-        {
-                if(m_ent_conf_password.get_text() != m_ent_password.get_text() )
-                {
-                        Gtk::MessageDialog dlg(
-                                *this,
-                                _("Passwords do not match"),
-                                false,
-                                Gtk::MESSAGE_ERROR,
-                                Gtk::BUTTONS_OK,
-                                true
-                        );
-
-                        dlg.run();
-                        return;
-                }
-        }
-
-        Gtk::Dialog::on_response(response_id);
+        if(m_ent_password.get_text().empty() )
+                set_response_sensitive(Gtk::RESPONSE_OK, false);
+        else if(m_ent_password.get_text() != m_ent_conf_password.get_text() )
+                set_response_sensitive(Gtk::RESPONSE_OK, false);
+        else
+                set_response_sensitive(Gtk::RESPONSE_OK, true);
 }
-