Changeset 732c22f27b65ef45c0c1b5142b735804990451ec

Timestamp:

11/09/09 16:36:58 (4 years ago)

Author:

Benjamin Herr <ben@…>

git-author:

Benjamin Herr <ben@0x539.de> / 2009-11-09T14:24:00Z+0100

Parents:

74e640926423470402269ebe48f3082b89e6cba9

Children:

2a1e37c2ebaa4d166360a8bed2b730ac8cdc8203

git-committer:

Benjamin Herr <ben@0x539.de> / 2009-11-09T16:36:58Z+0100

Message:

minor refactoring to status bar message change

2009-11-09 Benjamin Herr <ben@…>

• code/core/statusbar.cpp:
• code/core/statusbar.hpp: Minor refactoring to below's minor refactoring. Made more stuff a detail of StatusBar::Message.

Files:

• ChangeLog (modified) (1 diff)
• code/core/statusbar.cpp (modified) (5 diffs)
• code/core/statusbar.hpp (modified) (1 diff)

ChangeLog

@@ +1 @@
+2009-11-09  Benjamin Herr  <ben@0x539.de>
+
+        * code/core/statusbar.cpp:
+        * code/core/statusbar.hpp: Minor refactoring to the status bar message
+        change. Also made more stuff a detail of StatusBar::Message.
+
 2009-11-08  Armin Burgmeier  <armin@arbur.net>
 

code/core/statusbar.cpp

@@ -34 +34 @@
                 case Gobby::StatusBar::ERROR:
                         return Gtk::Stock::DIALOG_ERROR;
-                default:        
+                default:
                         g_assert_not_reached();
                 }
@@ -43 +43 @@
 {
 public:
-        Message(Gtk::Widget* widget):
-                m_widget(widget) {}
-        ~Message() { m_conn.disconnect(); }
-
-        void set_timeout_connection(sigc::connection timeout_conn)
-        {
-                m_conn = timeout_conn;
+        Message(Gtk::Widget* widget,
+                const Glib::ustring& simple,
+                const Glib::ustring& detail):
+                m_widget(widget), m_simple_desc(simple), m_detail_desc(detail)
+        {
+        }
+
+        void show_dialog() const
+        {
+                Gtk::MessageDialog dialog(
+                        m_simple_desc,
+                        false,
+                        Gtk::MESSAGE_ERROR,
+                        Gtk::BUTTONS_OK,
+                        false);
+
+                dialog.set_secondary_text(m_detail_desc, true);
+                dialog.run();
         }
 
         Gtk::Widget* widget() const { return m_widget; }
-        
+
+protected:
+        Gtk::Widget* m_widget;
         Glib::ustring m_simple_desc;
         Glib::ustring m_detail_desc;
-protected:
-        Gtk::Widget* m_widget;
-        sigc::connection m_conn;
 };
 
@@ -88 +98 @@
 
 Gobby::StatusBar::MessageHandle
-Gobby::StatusBar::add_message(MessageType type,
+Gobby::StatusBar::add_message(Gobby::StatusBar::MessageType type,
                               const Glib::ustring& message,
                               const Glib::ustring& dialog_message)
 {
-        if (m_list.size() >= 12)
+        if(m_list.size() >= 12)
                 Gobby::StatusBar::remove_message(m_list.begin());
 
@@ -112 +122 @@
                              "shadow-type", &shadow_type, NULL);
         Gtk::Frame* frame = Gtk::manage(new Gtk::Frame);
-        Gtk::EventBox *eventbox = Gtk::manage(new Gtk::EventBox);
-
-        frame->set_shadow_type(static_cast<Gtk::ShadowType>(shadow_type));
-        frame->add(*eventbox);
-        eventbox->add(*bar);
-        bar->show();
-
-        pack_start(*frame, Gtk::PACK_EXPAND_WIDGET);
-        reorder_child(*frame, 0);
-
-        m_list.push_back(new Message(frame));
+
+        m_list.push_back(new Message(frame, message, dialog_message));
         Gobby::StatusBar::MessageHandle iter(--m_list.end());
-        (*iter)->m_simple_desc = message;
-        (*iter)->m_detail_desc = dialog_message;
-
-        eventbox->signal_button_press_event().connect(
-                sigc::bind_return(
-                        sigc::bind(
+
+        if(dialog_message.empty())
+        {
+                frame->add(*bar);
+        }
+        else
+        {
+                Gtk::EventBox *eventbox = Gtk::manage(new Gtk::EventBox);
+                frame->add(*eventbox);
+                eventbox->add(*bar);
+                eventbox->signal_button_press_event().connect(
+                        sigc::bind_return(sigc::bind(
                                 sigc::mem_fun(
                                         *this,
                                         &StatusBar::on_message_clicked),
-                                iter),
-                        false));
-
-        eventbox->show();
+                                iter), false));
+
+                eventbox->show();
+        }
+
+        frame->set_shadow_type(static_cast<Gtk::ShadowType>(shadow_type));
+        bar->show();
+
+        pack_start(*frame, Gtk::PACK_EXPAND_WIDGET);
+        reorder_child(*frame, 0);
+
         frame->show();
 
@@ -168 +182 @@
 
 void Gobby::StatusBar::on_message_clicked(GdkEventButton* button,
-                                          const MessageHandle& handler)
-{
-        const Glib::ustring& simple = (*handler)->m_simple_desc;
-        const Glib::ustring& detail = (*handler)->m_detail_desc;
-
-        if(!detail.empty())
-        {
-                if (button->button == 1)
-                {
-                        Gtk::MessageDialog *dialog = new Gtk::MessageDialog(
-                                simple,
-                                false,
-                                Gtk::MESSAGE_ERROR,
-                                Gtk::BUTTONS_CLOSE,
-                                false
-                        );
-
-                        dialog->set_secondary_text(detail, false);
-                        dialog->run();
-
-                        delete dialog;
-                }
-
-                remove_message(handler);
-        }
+                                          const MessageHandle& handle)
+{
+        if(button->button == 1)
+                (*handle)->show_dialog();
+
+        remove_message(handle);
 }
 

code/core/statusbar.hpp

@@ -85 +85 @@
 
         void on_message_clicked(GdkEventButton* button,
-                                const MessageHandle& message);
+                                const MessageHandle& handle);
 
         void on_document_removed(SessionView& view);
         void on_document_changed(SessionView* view);
         void on_view_changed();
-        
+
         void on_mark_set(GtkTextMark* mark);
         void on_changed();