Changeset debf4abb25a94c2355deabff93cc6d1398ac7278

Timestamp:

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

Author:

Philipp Kern <phil@…>

Parents:

8975b6e0f22d55b275ae4beeab91bec67a2d5bbb

Children:

50fd8625a91817104b85ce1f4f61945dd3a73274

git-committer:

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

Message:

[project @ Replaced DefaultDialog? by Gtk::Dialog::set_default_response [fixes #117]]

Original author: Armin Burgmeier <armin@…>
Date: 2006-03-17 18:25:42+00:00

Files:

• Makefile.am (modified) (2 diffs)
• inc/defaultdialog.hpp (deleted)
• inc/entrydialog.hpp (modified) (1 diff)
• inc/hostdialog.hpp (modified) (2 diffs)
• inc/joindialog.hpp (modified) (2 diffs)
• inc/joinprogressdialog.hpp (modified) (1 diff)
• inc/passworddialog.hpp (modified) (3 diffs)
• src/buffer_def.cpp (modified) (1 diff)
• src/defaultdialog.cpp (deleted)
• src/document.cpp (modified) (1 diff)
• src/docwindow.cpp (modified) (1 diff)
• src/entrydialog.cpp (modified) (3 diffs)
• src/fileentry.cpp (modified) (3 diffs)
• src/hostdialog.cpp (modified) (3 diffs)
• src/joindialog.cpp (modified) (3 diffs)
• src/joinprogressdialog.cpp (modified) (9 diffs)
• src/passworddialog.cpp (modified) (4 diffs)
• src/window.cpp (modified) (1 diff)

Makefile.am

@@ -24 +24 @@
 noinst_HEADERS += inc/application_state.hpp
 noinst_HEADERS += inc/encoding_selector.hpp
-noinst_HEADERS += inc/defaultdialog.hpp
 noinst_HEADERS += inc/historyentry.hpp
 noinst_HEADERS += inc/fileentry.hpp
@@ -78 +77 @@
 gobby_SOURCES += src/application_state.cpp
 gobby_SOURCES += src/encoding_selector.cpp
-gobby_SOURCES += src/defaultdialog.cpp
 gobby_SOURCES += src/historyentry.cpp
 gobby_SOURCES += src/fileentry.cpp

inc/entrydialog.hpp

@@ -22 +22 @@
 #include <gtkmm/label.h>
 #include <gtkmm/entry.h>
-#include "defaultdialog.hpp"
+#include <gtkmm/dialog.h>
 
 namespace Gobby
 {
 
-class EntryDialog : public DefaultDialog
+class EntryDialog: public Gtk::Dialog
 {
 public:

inc/hostdialog.hpp

@@ -25 +25 @@
 #include <gtkmm/entry.h>
 #include <gtkmm/colorbutton.h>
-#include "defaultdialog.hpp"
 #include "colorsel.hpp"
 #include "config.hpp"
@@ -33 +32 @@
 {
 
-class HostDialog : public DefaultDialog
+class HostDialog: public Gtk::Dialog
 {
 public:

inc/joindialog.hpp

@@ -25 +25 @@
 #include <gtkmm/entry.h>
 #include <gtkmm/colorbutton.h>
-#include "defaultdialog.hpp"
 #include "config.hpp"
 #include "features.hpp"
@@ -42 +41 @@
 {
 
-class JoinDialog : public DefaultDialog
+class JoinDialog: public Gtk::Dialog
 {
 public:
 #ifdef WITH_HOWL
-        class Columns : public Gtk::TreeModel::ColumnRecord
+        class Columns: public Gtk::TreeModel::ColumnRecord
         {
         public:

inc/joinprogressdialog.hpp

@@ -46 +46 @@
         typedef ClientBuffer::connection_settings connection_settings;
 
-        class Prompt: public DefaultDialog
+        class Prompt: public Gtk::Dialog
         {
-        public:
+        protected:
                 Prompt(Gtk::Window& parent,
                        const Glib::ustring& title,
                        const Glib::ustring& info,
-                       Gtk::Widget& widget,
                        const Gtk::StockID& icon);
-        protected:
+
+                void set_custom_widget(Widget& widget);
+
                 Gtk::Table m_table;
                 Gtk::Label m_info;
                 Gtk::Image m_icon;
+        };
+
+        class NamePrompt: public Prompt
+        {
+        public:
+                NamePrompt(Gtk::Window& parent,
+                           const Glib::ustring& initial_name);
+
+                Glib::ustring get_name() const;
+        protected:
+                void on_change();
+
+                const Glib::ustring m_initial_name;
+
+                Gtk::HBox m_box;
+                Gtk::Label m_label;
+                Gtk::Entry m_entry;
+        };
+
+        class ColorPrompt: public Prompt
+        {
+        public:
+                ColorPrompt(Gtk::Window& parent,
+                            const Gdk::Color& initial_color);
+
+                Gdk::Color get_color() const;
+        protected:
+                Gtk::ColorButton m_button;
+        };
+
+        class SessionPasswordPrompt: public Prompt
+        {
+        public:
+                SessionPasswordPrompt(Gtk::Window& parent);
+
+                Glib::ustring get_password() const;
+        protected:
+                void on_change();
+
+                Gtk::HBox m_box;
+                Gtk::Label m_label;
+                Gtk::Entry m_entry;
+        };
+
+        class UserPasswordPrompt: public Prompt
+        {
+        public:
+                UserPasswordPrompt(Gtk::Window& parent,
+                                   const Glib::ustring& initial_name);
+
+                Glib::ustring get_name() const;
+                Glib::ustring get_password() const;
+        protected:
+                void on_change();
+
+                const Glib::ustring m_initial_name;
+
+                Gtk::Table m_table;
+                Gtk::Label m_lbl_name;
+                Gtk::Label m_lbl_password;
+                Gtk::Entry m_ent_name;
+                Gtk::Entry m_ent_password;
         };
 

inc/passworddialog.hpp

@@ -20 +20 @@
 #define _GOBBY_PASSWORDDIALOG_HPP_
 
-#include "defaultdialog.hpp"
 #include <gtkmm/table.h>
 #include <gtkmm/label.h>
@@ -29 +28 @@
 {
 
-class PasswordDialog : public DefaultDialog
+class PasswordDialog: public Gtk::Dialog
 {
 public:
-        PasswordDialog(Gtk::Window& parent, const Glib::ustring& title,
-                       bool request);
-        ~PasswordDialog();
+        PasswordDialog(Gtk::Window& parent, const Glib::ustring& title);
 
         void set_info(const Glib::ustring& info);
@@ -40 +37 @@
 protected:
         void on_password_changed();
-
-        bool m_request;
 
         Gtk::Table m_table;

src/buffer_def.cpp

@@ -34 +34 @@
 bool Gobby::is_subscribable(const LocalDocumentInfo& info)
 {
-        // Gobby only allow subscriptions to UTF-8 encoded documents
+        // Gobby only allows subscriptions to UTF-8 encoded documents
         for(std::size_t n = 0; n < utf8_repr_count; ++ n)
                 if(info.get_encoding() == utf8_reprs[n])

src/document.cpp

@@ -242 +242 @@
         );
 
+        // TODO: This belongs to document
+        m_buffer->begin_not_undoable_action();
+
         // TODO: Connect to user table's signal handler - as soon as it
         // has some...

src/docwindow.cpp

@@ -57 +57 @@
         m_view.set_buffer(buf);
 
-        // TODO: This belongs to document
-        buf->begin_not_undoable_action();
-
         // Set source language by filename
         buf->set_highlight(false);

src/entrydialog.cpp

@@ -23 +23 @@
 Gobby::EntryDialog::EntryDialog(Gtk::Window& parent,
                                 const Glib::ustring& title,
-                                const Glib::ustring& label)
- : DefaultDialog(title, parent, true, true),
-   m_label(label),
-   m_box(false, 5),
-   m_check_valid_entry(false)
+                                const Glib::ustring& label):
+        Gtk::Dialog(title, parent, true, true), m_label(label), m_box(false, 5),
+        m_check_valid_entry(false)
 {
+        m_entry.set_activates_default(true);
+
         m_box.pack_start(m_label);
         m_box.pack_start(m_entry);
@@ -35 +35 @@
         get_vbox()->pack_start(m_box);
 
-        set_default_response(Gtk::RESPONSE_OK);
+        m_entry.signal_changed().connect(
+                sigc::mem_fun(*this, &EntryDialog::on_entry_changed)
+        );
 
         add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
         add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
-
-        m_entry.signal_changed().connect(
-                sigc::mem_fun(*this, &EntryDialog::on_entry_changed) );
+        set_default_response(Gtk::RESPONSE_OK);
 
         show_all();
@@ -86 +86 @@
         set_response_sensitive(Gtk::RESPONSE_OK, !disable);
 }
-

src/fileentry.cpp

@@ -21 +21 @@
 
 Gobby::FileEntry::FileEntry(const Glib::ustring& title):
-        Gtk::HBox(), m_dialog(title), m_btn_browse(Gtk::Stock::OPEN)
+        Gtk::HBox(), m_btn_browse(Gtk::Stock::OPEN), m_dialog(title)
 {
         init();
@@ -27 +27 @@
 
 Gobby::FileEntry::FileEntry(Gtk::Window& parent, const Glib::ustring& title):
-        Gtk::HBox(), m_dialog(parent, title), m_btn_browse(Gtk::Stock::OPEN)
+        Gtk::HBox(), m_btn_browse(Gtk::Stock::OPEN), m_dialog(parent, title)
 {
         init();
@@ -38 +38 @@
 
         m_btn_browse.signal_clicked().connect(
-                sigc::mem_fun(*this, &FileEntry::on_browse) );
+                sigc::mem_fun(*this, &FileEntry::on_browse)
+        );
 
         pack_start(m_ent_file, Gtk::PACK_EXPAND_WIDGET);
         pack_start(m_btn_browse, Gtk::PACK_SHRINK);
+
+        m_ent_file.set_activates_default(true);
 
         set_spacing(5);

src/hostdialog.cpp

@@ -22 +22 @@
 
 Gobby::HostDialog::HostDialog(Gtk::Window& parent, Config& config):
-        DefaultDialog(_("Create obby session"), parent, true, true),
+        Gtk::Dialog(_("Create obby session"), parent, true, true),
         m_config(config),
         m_table(4, 2),
@@ -51 +51 @@
         m_ent_name.set_text(name);
         m_btn_color.set_color(color);
+
+        sigc::slot<void> response(
+                sigc::bind(
+                        sigc::mem_fun(*this, &Gtk::Dialog::response),
+                        Gtk::RESPONSE_OK
+                )
+        );
+
+        m_ent_port.set_activates_default(true);
+        m_ent_name.set_activates_default(true);
+        m_ent_password.set_activates_default(true);
 
         m_table.attach(m_lbl_port, 0, 1, 0, 1,
@@ -93 +104 @@
         add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
         Gtk::Button* host_btn = add_button(_("_Host"), Gtk::RESPONSE_OK);
+
         Gtk::Image* img = Gtk::manage(
                 new Gtk::Image(Gtk::Stock::NETWORK, Gtk::ICON_SIZE_BUTTON)
-                );
+        );
+
         host_btn->set_image(*img);
+
+        set_default_response(Gtk::RESPONSE_OK);
 
         show_all();

src/joindialog.cpp

@@ -32 +32 @@
 
 #ifndef WITH_HOWL
-Gobby::JoinDialog::JoinDialog(Gtk::Window& parent, Gobby::Config& config)
+Gobby::JoinDialog::JoinDialog(Gtk::Window& parent, Gobby::Config& config):
 #else
 Gobby::JoinDialog::JoinDialog(Gtk::Window& parent, Gobby::Config& config,
-                              obby::zeroconf* zeroconf)
-#endif
- : DefaultDialog(_("Join obby session"), parent, true, true),
+                              obby::zeroconf* zeroconf):
+#endif
+        Gtk::Dialog(_("Join obby session"), parent, true, true),
    m_config(config),
    m_table(4, 2),
@@ -71 +71 @@
         m_ent_name.set_text(name);
         m_btn_color.set_color(color);
+
+        m_ent_host.set_activates_default(true);
+        m_ent_port.set_activates_default(true);
+        m_ent_name.set_activates_default(true);
 
         m_table.attach(m_lbl_host, 0, 1, 0, 1,
@@ -124 +128 @@
         add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
         add_button(Gtk::Stock::CONNECT, Gtk::RESPONSE_OK);
+        set_default_response(Gtk::RESPONSE_OK);
 
         show_all();

src/joinprogressdialog.cpp

@@ -21 +21 @@
 #include <obby/format_string.hpp>
 #include "common.hpp"
-#include "defaultdialog.hpp"
 #include "colorsel.hpp"
 #include "passworddialog.hpp"
@@ -27 +26 @@
 #include "joinprogressdialog.hpp"
 
-namespace {
-        // TODO: How to use std::logical_and and such?
-        bool logical_and(bool lhs, bool rhs) { return lhs && rhs; }
-        bool logical_or(bool lhs, bool rhs) { return lhs || rhs; }
-        bool logical_not(bool arg) { return !arg; }
-
-        typedef bool(*compare_ustring_func)(
-                const Glib::ustring&,
-                const Glib::ustring&
-        );
+namespace
+{
+        Glib::ustring make_user_password_info(const Glib::ustring& username)
+        {
+                obby::format_string str(
+                        Gobby::_(
+                                "User password for user '%0%' required. You "
+                                "may either choose another user name, type "
+                                "in your user password or cancel the "
+                                "connection."
+                        )
+                );
+
+                str << username.raw();
+                return str.str();
+        }
 
         obby::colour gdk_to_obby(const Gdk::Color& color)
@@ -60 +65 @@
                                           const Glib::ustring& title,
                                           const Glib::ustring& info,
-                                          Gtk::Widget& widget,
                                           const Gtk::StockID& icon):
-        DefaultDialog(title, parent, true, true), m_table(2, 2), m_info(info),
+        Gtk::Dialog(title, parent, true, true), m_table(2, 2), m_info(info),
         m_icon(icon, Gtk::ICON_SIZE_DIALOG)
 {
@@ -68 +72 @@
 
         m_table.attach(m_icon, 0, 1, 0, 2, Gtk::SHRINK, Gtk::SHRINK);
-        m_table.attach(m_info, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK);
-        m_table.attach(widget, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK);
+        m_table.attach(
+                m_info,
+                1, 2, 0, 1,
+                Gtk::EXPAND | Gtk::FILL,
+                Gtk::SHRINK
+        );
+
         m_table.set_spacings(10);
 
@@ -79 +88 @@
         add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
 
+        set_default_response(Gtk::RESPONSE_OK);
         set_border_width(10);
-
         set_resizable(false);
+}
+
+void Gobby::JoinProgressDialog::Prompt::set_custom_widget(Widget& widget)
+{
+        m_table.attach(
+                widget,
+                1, 2, 1, 2,
+                Gtk::EXPAND | Gtk::FILL,
+                Gtk::SHRINK
+        );
+}
+
+Gobby::JoinProgressDialog::NamePrompt::
+        NamePrompt(Gtk::Window& parent,
+                   const Glib::ustring& initial_name):
+        Prompt(
+                parent,
+                obby::login::errstring(net6::login::ERROR_NAME_IN_USE),
+                _("Name is already in use. You may choose another name or "
+                  "cancel the connection."),
+                Gtk::Stock::DIALOG_QUESTION
+        ),
+        m_initial_name(initial_name),
+        m_label(_("New name:") )
+{
+        m_entry.signal_changed().connect(
+                sigc::mem_fun(*this, &NamePrompt::on_change)
+        );
+
+        m_entry.set_text(m_initial_name);
+        m_entry.set_activates_default(true);
+
+        m_box.pack_start(m_label, Gtk::PACK_SHRINK);
+        m_box.pack_start(m_entry, Gtk::PACK_EXPAND_WIDGET);
+        m_box.set_spacing(10);
+
+        m_box.show_all();
+        set_custom_widget(m_box);
+
+        m_entry.grab_focus();
+}
+
+Glib::ustring Gobby::JoinProgressDialog::NamePrompt::get_name() const
+{
+        return m_entry.get_text();
+}
+
+void Gobby::JoinProgressDialog::NamePrompt::on_change()
+{
+        const Glib::ustring name = m_entry.get_text();
+
+        set_response_sensitive(
+                Gtk::RESPONSE_OK,
+                name != m_initial_name && !name.empty()
+        );
+}
+
+Gobby::JoinProgressDialog::ColorPrompt::
+        ColorPrompt(Gtk::Window& parent,
+                    const Gdk::Color& initial_color):
+        Prompt(
+                parent,
+                obby::login::errstring(obby::login::ERROR_COLOUR_IN_USE),
+                _("Colour is already in use. You may choose another colour or "
+                  "cancel the connection."),
+                Gtk::Stock::DIALOG_QUESTION
+        )
+{
+        m_button.set_color(initial_color);
+        m_button.show_all();
+
+        set_custom_widget(m_button);
+        m_button.grab_focus();
+}
+
+Gdk::Color Gobby::JoinProgressDialog::ColorPrompt::get_color() const
+{
+        return m_button.get_color();
+}
+
+Gobby::JoinProgressDialog::SessionPasswordPrompt::
+        SessionPasswordPrompt(Gtk::Window& parent):
+        Prompt(
+                parent,
+                obby::login::errstring(
+                        obby::login::ERROR_WRONG_GLOBAL_PASSWORD
+                ),
+                _("Session password required. You have to type in the "
+                  "password to be able to join the obby session."),
+                Gtk::Stock::DIALOG_AUTHENTICATION
+        ),
+        m_label(_("Session password:") )
+{
+        m_entry.signal_changed().connect(
+                sigc::mem_fun(*this, &SessionPasswordPrompt::on_change)
+        );
+
+        m_entry.set_activates_default(true);
+        m_entry.set_visibility(false);
+
+        m_box.pack_start(m_label, Gtk::PACK_SHRINK);
+        m_box.pack_start(m_entry, Gtk::PACK_EXPAND_WIDGET);
+        m_box.set_spacing(10);
+
+        m_box.show_all();
+        set_custom_widget(m_box);
+        set_response_sensitive(Gtk::RESPONSE_OK, false);
+
+        m_entry.grab_focus();
+}
+
+Glib::ustring Gobby::JoinProgressDialog::SessionPasswordPrompt::
+        get_password() const
+{
+        return m_entry.get_text();
+}
+
+void Gobby::JoinProgressDialog::SessionPasswordPrompt::on_change()
+{
+        set_response_sensitive(Gtk::RESPONSE_OK, !m_entry.get_text().empty() );
+}
+
+Gobby::JoinProgressDialog::UserPasswordPrompt::
+        UserPasswordPrompt(Gtk::Window& parent,
+                           const Glib::ustring& initial_name):
+        Prompt(
+                parent,
+                obby::login::errstring(obby::login::ERROR_WRONG_USER_PASSWORD),
+                make_user_password_info(initial_name),
+                Gtk::Stock::DIALOG_AUTHENTICATION
+        ),
+        m_initial_name(initial_name), m_table(2, 2),
+        m_lbl_name(_("New name:"), Gtk::ALIGN_RIGHT),
+        m_lbl_password(_("User password:"), Gtk::ALIGN_RIGHT)
+{
+        m_ent_name.set_text(m_initial_name);
+        m_ent_password.set_visibility(false);
+
+        m_ent_name.set_activates_default(true);
+        m_ent_password.set_activates_default(true);
+
+        m_ent_name.signal_changed().connect(
+                sigc::mem_fun(*this, &UserPasswordPrompt::on_change)
+        );
+
+        m_ent_password.signal_changed().connect(
+                sigc::mem_fun(*this, &UserPasswordPrompt::on_change)
+        );
+
+        m_table.attach(
+                m_lbl_name,
+                0, 1, 0, 1,
+                Gtk::SHRINK, Gtk::SHRINK
+        );
+
+        m_table.attach(
+                m_lbl_password,
+                0, 1, 1, 2,
+                Gtk::SHRINK, Gtk::SHRINK
+        );
+
+        m_table.attach(
+                m_ent_name,
+                1, 2, 0, 1,
+                Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK
+        );
+
+        m_table.attach(
+                m_ent_password,
+                1, 2, 1, 2,
+                Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK
+        );
+
+        m_table.set_spacings(5);
+
+        set_response_sensitive(Gtk::RESPONSE_OK, false);
+        m_ent_password.grab_focus();
+
+        m_table.show_all();
+        set_custom_widget(m_table);
+
+        m_ent_password.grab_focus();
+}
+
+Glib::ustring Gobby::JoinProgressDialog::UserPasswordPrompt::get_name() const
+{
+        return m_ent_name.get_text();
+}
+
+Glib::ustring Gobby::JoinProgressDialog::UserPasswordPrompt::
+        get_password() const
+{
+        return m_ent_password.get_text();
+}
+
+void Gobby::JoinProgressDialog::UserPasswordPrompt::on_change()
+{
+        const Glib::ustring name = m_ent_name.get_name();
+        const Glib::ustring password = m_ent_password.get_name();
+
+        set_response_sensitive(
+                Gtk::RESPONSE_OK,
+                !name.empty() && (name != m_initial_name || !password.empty())
+        );
 }
 
@@ -257 +470 @@
 bool Gobby::JoinProgressDialog::on_prompt_name(connection_settings& settings)
 {
-        Gtk::HBox box;
-        Gtk::Label label(_("New name:") );
-        Gtk::Entry entry;
-        entry.set_text(m_username);
-
-        box.pack_start(label, Gtk::PACK_SHRINK);
-        box.pack_start(entry, Gtk::PACK_EXPAND_WIDGET);
-        box.set_spacing(10);
-
-        Prompt prompt(
-                *this,
-                obby::login::errstring(net6::login::ERROR_NAME_IN_USE),
-                _("Name is already in use. You may choose another name or "
-                  "cancel the connection."),
-                box,
-                Gtk::Stock::DIALOG_QUESTION
-        );
-
-        prompt.set_response_sensitive(Gtk::RESPONSE_OK, false);
-
-        // We are using the logical_or and logical_not functions defined above,
-        // but the standard library provides functors like std::logical_or, but
-        // how to use these?
-        sigc::slot<void> changed_slot(
-                sigc::compose(
-                        sigc::bind<0>(
-                                sigc::mem_fun(
-                                        prompt,
-                                        &DefaultDialog::set_response_sensitive
-                                ),
-                                Gtk::RESPONSE_OK
-                        ),
-                        sigc::compose(
-                                sigc::ptr_fun(&logical_and),
-                                sigc::compose(
-                                        sigc::bind(
-                                                sigc::ptr_fun(static_cast<
-                                                        compare_ustring_func
-                                                >(&Glib::operator!=) ),
-                                                sigc::ref(m_username)
-                                        ),
-                                        sigc::mem_fun(
-                                                entry,
-                                                &Gtk::Entry::get_text
-                                        )
-                                ),
-                                sigc::compose(
-                                        sigc::ptr_fun(&logical_not),
-                                        sigc::compose(
-                                                &Glib::ustring::empty,
-                                                sigc::mem_fun(
-                                                        entry,
-                                                        &Gtk::Entry::get_text
-                                                )
-                                        )
-                                )
-                        )
-                )
-        );
-
-        entry.signal_changed().connect(changed_slot);
+        NamePrompt prompt(*this, m_username);
+
         if(prompt.run() == Gtk::RESPONSE_OK)
         {
-                settings.name = entry.get_text();
+                settings.name = prompt.get_name();
                 m_username = settings.name;
                 return true;
@@ -333 +487 @@
 bool Gobby::JoinProgressDialog::on_prompt_colour(connection_settings& settings)
 {
-        ColorButton btn;
-        btn.set_color(m_color);
-
-        Prompt prompt(
-                *this,
-                obby::login::errstring(obby::login::ERROR_COLOUR_IN_USE),
-                _("Colour is already in use. You may choose another colour or "
-                  "cancel the connection."),
-                btn,
-                Gtk::Stock::DIALOG_QUESTION
-        );
-
+        ColorPrompt prompt(*this, m_color);
         if(prompt.run() == Gtk::RESPONSE_OK)
         {
-                settings.colour = gdk_to_obby(btn.get_color() );
-                m_color = btn.get_color();
+                settings.colour = gdk_to_obby(prompt.get_color() );
+                m_color = prompt.get_color();
                 return true;
         }
@@ -361 +504 @@
         on_prompt_global_password(connection_settings& settings)
 {
-        Gtk::HBox box;
-        Gtk::Label label(_("Session password:") );
-        Gtk::Entry entry;
-        entry.set_visibility(false);
-
-        box.pack_start(label, Gtk::PACK_SHRINK);
-        box.pack_start(entry, Gtk::PACK_EXPAND_WIDGET);
-        box.set_spacing(10);
-
-        Prompt prompt(
-                *this,
-                obby::login::errstring(
-                        obby::login::ERROR_WRONG_GLOBAL_PASSWORD
-                ),
-                _("Session password required. You have to type in the "
-                  "password to be able to join the obby session."),
-                box,
-                Gtk::Stock::DIALOG_AUTHENTICATION
-        );
-
-        // Do not allow OK if the entry is empty
-        prompt.set_response_sensitive(Gtk::RESPONSE_OK, false);
-        entry.signal_changed().connect(
-                sigc::compose(
-                        sigc::bind<0>(
-                                sigc::mem_fun(
-                                        prompt,
-                                        &DefaultDialog::set_response_sensitive
-                                ),
-                                Gtk::RESPONSE_OK
-                        ),
-                        sigc::compose(
-                                sigc::ptr_fun(&logical_not),
-                                sigc::compose(
-                                        &Glib::ustring::empty,
-                                        sigc::mem_fun(
-                                                entry,
-                                                &Gtk::Entry::get_text
-                                        )
-                                )
-                        )
-                )
-        );
-
+        SessionPasswordPrompt prompt(*this);
         if(prompt.run() == Gtk::RESPONSE_OK)
         {
-                settings.global_password = entry.get_text();
+                settings.global_password = prompt.get_password();
                 return true;
         }
@@ -420 +520 @@
         on_prompt_user_password(connection_settings& settings)
 {
-        Gtk::Table table;
-        Gtk::Label lbl_name(_("New name:"), Gtk::ALIGN_RIGHT);
-        Gtk::Label lbl_password(_("User password:"), Gtk::ALIGN_RIGHT);
-        Gtk::Entry ent_name;
-        Gtk::Entry ent_password;
-        ent_name.set_text(m_username);
-        ent_password.set_visibility(false);
-
-        table.attach(lbl_name, 0, 1, 0, 1,
-                Gtk::SHRINK, Gtk::SHRINK);
-        table.attach(lbl_password, 0, 1, 1, 2,
-                Gtk::SHRINK, Gtk::SHRINK);
-        table.attach(ent_name, 1, 2, 0, 1,
-                Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK);
-        table.attach(ent_password, 1, 2, 1, 2,
-                Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK);
-        table.set_spacings(5);
-
-        obby::format_string str(
-                _("User password for user '%0%' required. You may either "
-                  "choose another user name, type in your user password or "
-                  "cancel the connection.")
-        );
-
-        str << m_username;
-        Prompt prompt(
-                *this,
-                obby::login::errstring(obby::login::ERROR_WRONG_USER_PASSWORD),
-                str.str(),
-                table,
-                Gtk::Stock::DIALOG_AUTHENTICATION
-        );
-
-        prompt.set_response_sensitive(Gtk::RESPONSE_OK, false);
-        ent_password.grab_focus();
-
-        sigc::slot<void> changed_slot(
-                sigc::compose(
-                        sigc::bind<0>(
-                                sigc::mem_fun(
-                                        prompt,
-                                        &DefaultDialog::set_response_sensitive
-                                ),
-                                Gtk::RESPONSE_OK
-                        ),
-                        sigc::compose(
-                                sigc::ptr_fun(&logical_and),
-                                sigc::compose(
-                                        sigc::ptr_fun(&logical_not),
-                                        sigc::compose(
-                                                &Glib::ustring::empty,
-                                                sigc::mem_fun(
-                                                        ent_name,
-                                                        &Gtk::Entry::
-                                                                get_text
-                                                )
-                                        )
-                                ),
-                                sigc::compose(
-                                        sigc::ptr_fun(&logical_or),
-                                        sigc::compose(
-                                                sigc::bind(
-                                                        sigc::ptr_fun(static_cast<
-                                                                compare_ustring_func
-                                                        >(&Glib::operator!=) ),
-                                                        sigc::ref(m_username)
-                                                ),
-                                                sigc::mem_fun(
-                                                        ent_name,
-                                                        &Gtk::Entry::get_text
-                                                )
-                                        ),
-                                        sigc::compose(
-                                                sigc::ptr_fun(&logical_not),
-                                                sigc::compose(
-                                                        &Glib::ustring::empty,
-                                                        sigc::mem_fun(
-                                                                ent_password,
-                                                                &Gtk::Entry::
-                                                                        get_text
-                                                        )
-                                                )
-                                        )
-                                )
-                        )
-                )
-        );
-
-        ent_name.signal_changed().connect(changed_slot);
-        ent_password.signal_changed().connect(changed_slot);
-
+        UserPasswordPrompt prompt(*this, m_username);
         if(prompt.run() == Gtk::RESPONSE_OK)
         {
-                m_username = ent_name.get_text();
-                settings.name = ent_name.get_text();
-                settings.user_password = ent_password.get_text();
+                m_username = prompt.get_name();
+                settings.name = prompt.get_name();
+                settings.user_password = prompt.get_password();
                 return true;
         }

src/passworddialog.cpp

@@ -23 +23 @@
 
 Gobby::PasswordDialog::PasswordDialog(Gtk::Window& parent,
-                                      const Glib::ustring& title,
-                                      bool request)
- : DefaultDialog(title, parent, true, true), m_request(request),
-   m_table(3, 3),
-   m_icon(Gtk::Stock::DIALOG_AUTHENTICATION, Gtk::ICON_SIZE_DIALOG),
-   m_lbl_password("Password:", Gtk::ALIGN_RIGHT),
-   m_lbl_conf_password("Confirm password:", Gtk::ALIGN_RIGHT)
+                                      const Glib::ustring& title):
+        Gtk::Dialog(title, parent, true, true), m_table(3, 3),
+        m_icon(Gtk::Stock::DIALOG_AUTHENTICATION, Gtk::ICON_SIZE_DIALOG),
+        m_lbl_password("Password:", Gtk::ALIGN_RIGHT),
+        m_lbl_conf_password("Confirm password:", Gtk::ALIGN_RIGHT)
 {
         m_ent_password.set_visibility(false);
         m_ent_conf_password.set_visibility(false);
         m_info.set_line_wrap(true);
+
+        m_ent_password.set_activates_default(true);
+        m_ent_conf_password.set_activates_default(true);
 
         m_table.set_spacings(5);
@@ -52 +53 @@
         add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
         add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
+        set_default_response(Gtk::RESPONSE_OK);
 
         show_all();
@@ -58 +60 @@
         m_info.hide();
 
-        // Hide confirm password fields if a password is requested
-        if(request)
-        {
-                m_lbl_conf_password.hide();
-                m_ent_conf_password.hide();
-        }
-        else
-        {
-                m_ent_password.signal_changed().connect(
-                        sigc::mem_fun(
-                                *this,
-                                &PasswordDialog::on_password_changed
-                        )
-                );
+        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
-                        )
-                );
-        }
+        m_ent_conf_password.signal_changed().connect(
+                sigc::mem_fun(*this, &PasswordDialog::on_password_changed)
+        );
 
         set_response_sensitive(Gtk::RESPONSE_OK, false);
@@ -85 +72 @@
         set_resizable(false);
         set_border_width(10);
-}
-
-Gobby::PasswordDialog::~PasswordDialog()
-{
 }
 

src/window.cpp

@@ -903 +903 @@
 {
         // Build password dialog with info
-        PasswordDialog dlg(*this, _("Set user password"), false);
+        PasswordDialog dlg(*this, _("Set user password") );
         dlg.set_info(_(
                 "Set a user password for your user account. When you try to "