Changeset 37d1c6c8b8138f6437b874300b99621b33b455a3

Timestamp:

01/06/07 23:40:41 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

8b539409d5a028ca07bf8e7f23329ad9731d79f4

Children:

b09b4b0883e0286cc03cc927822c658879604fc4

git-committer:

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

Message:

[project @ User authentication stuff]

Original author: Armin Burgmeier <armin@…>
Date: 2005-07-17 13:17:52+00:00

Files:

• inc/header.hpp (modified) (4 diffs)
• inc/window.hpp (modified) (2 diffs)
• src/chat.cpp (modified) (1 diff)
• src/header.cpp (modified) (9 diffs)
• src/window.cpp (modified) (6 diffs)

inc/header.hpp

@@ -56 +56 @@
         typedef sigc::signal<void> signal_document_save_type;
         typedef sigc::signal<void> signal_document_close_type;
+        typedef sigc::signal<void> signal_user_set_password_type;
         typedef sigc::signal<void> signal_document_word_wrap_type;
 #ifdef WITH_GTKSOURCEVIEW
@@ -84 +85 @@
         signal_document_save_type document_save_event() const;
         signal_document_close_type document_close_event() const;
+        signal_user_set_password_type user_set_password_event() const;
         signal_document_word_wrap_type document_word_wrap_event() const;
 #ifdef WITH_GTKSOURCEVIEW
@@ -108 +110 @@
         void on_app_document_save();
         void on_app_document_close();
+        void on_app_user_set_password();
         void on_app_document_word_wrap();
 #ifdef WITH_GTKSOURCEVIEW
@@ -150 +153 @@
         signal_document_save_type m_signal_document_save;
         signal_document_close_type m_signal_document_close;
+        signal_user_set_password_type m_signal_user_set_password;
         signal_document_word_wrap_type m_signal_document_word_wrap;
 #ifdef WITH_GTKSOURCEVIEW

inc/window.hpp

@@ -59 +59 @@
         void on_document_close();
 
+        void on_user_set_password();
+
         void on_document_word_wrap();
 #ifdef WITH_GTKSOURCEVIEW
@@ -75 +77 @@
         void on_obby_login_failed(obby::login::error error);
         bool on_obby_global_password(std::string& password);
+        bool on_obby_user_password(std::string& password);
         void on_obby_close();
         void on_obby_sync();

src/chat.cpp

@@ -120 +120 @@
         // Highlight the message if the user's nickname is found in it,
         // but not if the message is coming from the user itself.
-        if( (user != self) &&
+        if( (&user != &self) &&
             (message.find(self.get_name() ) != Glib::ustring::npos) )
                 colour = "darkred";

src/header.cpp

@@ -22 +22 @@
 #include <obby/format_string.hpp>
 #include <obby/local_buffer.hpp>
+#include <obby/client_buffer.hpp>
 
 #include "features.hpp"
@@ -44 +45 @@
                 "      <menuitem action=\"CloseDocument\" />"
                 "    </menu>"
+                "    <menu action=\"MenuUser\">"
+                "      <menuitem action=\"UserSetPassword\" />"
+                "    </menu>"
                 "    <menu action=\"MenuView\">"
                 "      <menuitem action=\"ViewWordWrap\" />"
@@ -241 +245 @@
                         *this,
                         &Header::on_app_document_close
+                )
+        );
+
+        // User menu
+        m_group_app->add(Gtk::Action::create("MenuUser", _("User")) );
+
+        // Set password
+        m_group_app->add(
+                Gtk::Action::create(
+                        "UserSetPassword",
+                        Gtk::Stock::DIALOG_AUTHENTICATION,
+                        _("Set password"),
+                        _("Sets a password for this user")
+                ),
+                sigc::mem_fun(
+                        *this,
+                        &Header::on_app_user_set_password
                 )
         );
@@ -395 +416 @@
         m_group_app->get_action("CloseDocument")->set_sensitive(false);
         m_group_app->get_action("QuitSession")->set_sensitive(false);
-#ifdef WITH_GTKSOURCEVIEW
+
+        m_group_app->get_action("MenuUser")->set_sensitive(false);
         m_group_app->get_action("MenuView")->set_sensitive(false);
-#endif
 
         // Connect to folder's signals
@@ -422 +443 @@
         m_group_app->get_action("SaveDocument")->set_sensitive(false);
         m_group_app->get_action("CloseDocument")->set_sensitive(false);
-#ifdef WITH_GTKSOURCEVIEW
         m_group_app->get_action("MenuView")->set_sensitive(false);
-#endif
 }
 
@@ -467 +486 @@
 {
         return m_signal_document_close;
+}
+
+Gobby::Header::signal_user_set_password_type
+Gobby::Header::user_set_password_event() const
+{
+        return m_signal_user_set_password;
 }
 
@@ -512 +537 @@
         m_group_app->get_action("OpenDocument")->set_sensitive(true);
 
+        // Enable password button if we are client
+        m_group_app->get_action("MenuUser")->set_sensitive(true);
+        m_group_app->get_action("UserSetPassword")->set_sensitive(
+                dynamic_cast<obby::client_buffer*>(&buf) != NULL);
+
         // Document actions will be activated from the insert_document event
         m_group_app->get_action("SaveDocument")->set_sensitive(false);
@@ -526 +556 @@
         m_group_app->get_action("JoinSession")->set_sensitive(true);
         m_group_app->get_action("QuitSession")->set_sensitive(false);
+
+        // Disable user buttons
+        m_group_app->get_action("MenuUser")->set_sensitive(false);
 
         // Disable document buttons
@@ -601 +634 @@
 {
         m_signal_document_close.emit();
+}
+
+void Gobby::Header::on_app_user_set_password()
+{
+        m_signal_user_set_password.emit();
 }
 

src/window.cpp

@@ -27 +27 @@
 #include <gtkmm/stock.h>
 
+#include <obby/format_string.hpp>
 #include <obby/client_buffer.hpp>
 #include <obby/host_buffer.hpp>
@@ -64 +65 @@
                 sigc::mem_fun(*this, &Window::on_document_close) );
 
+        m_header.user_set_password_event().connect(
+                sigc::mem_fun(*this, &Window::on_user_set_password) );
+
         m_header.document_word_wrap_event().connect(
                 sigc::mem_fun(*this, &Window::on_document_word_wrap) );
@@ -229 +233 @@
                 buffer->global_password_event().connect(
                         sigc::mem_fun(*this, &Window::on_obby_global_password));
+                buffer->user_password_event().connect(
+                        sigc::mem_fun(*this, &Window::on_obby_user_password) );
                 buffer->close_event().connect(
                         sigc::mem_fun(*this, &Window::on_obby_close) );
@@ -234 +240 @@
                         sigc::mem_fun(*this, &Window::on_obby_sync) );
 
-                /* TODO: Connect to on_global_password to prompt for password */
                 /* TODO: Add password entry widget in join dialog */
                 /* TODO: Add password entry widget in host dialog */
@@ -426 +431 @@
 }
 
+void Gobby::Window::on_user_set_password()
+{
+        // TODO: Password dialog with second entry field to confirm password
+        EntryDialog dlg(
+                *this,
+                _("Set user password"),
+                _("Enter new password")
+        );
+
+        dlg.get_entry().set_visibility(false);
+
+        if(dlg.run() == Gtk::RESPONSE_OK)
+        {
+                dynamic_cast<obby::client_buffer*>(m_buffer)->set_password(
+                        dlg.get_text() );
+        }
+}
+
 void Gobby::Window::on_document_word_wrap()
 {
@@ -499 +522 @@
                 _("Password required"),
                 _("Enter session password")
+        );
+
+        // Disable view of typed characters (password input)
+        dlg.get_entry().set_visibility(false);
+        if(dlg.run() == Gtk::RESPONSE_OK)
+        {
+                // Use given text as password
+                password = dlg.get_text();
+                return true;
+        }
+        else
+        {
+                // Close connection otherwise
+                on_session_quit();
+                return false;
+        }
+}
+
+bool Gobby::Window::on_obby_user_password(std::string& password)
+{
+        obby::format_string str(_("Enter user password for user %0") );
+        str << m_buffer->get_name();
+
+        // Prompt for password
+        EntryDialog dlg(
+                *this,
+                _("Password required"),
+                str.str()
         );