Changeset 7e4bcbf2dcc7a231b622bca6a9eff970dbdb2f01

Timestamp:

01/06/07 23:52:54 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

02f4d24f066bb6163d7e9b6151e181809f89e59e

Children:

b2d3d8e4b4d1e6c62e91c812410f4aa345690d3c

git-committer:

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

Message:

[project @ Removed empty paned from window]

Original author: Armin Burgmeier <armin@…>
Date: 2005-11-12 13:20:15+00:00

Files:

• inc/window.hpp (modified) (1 diff)
• src/window.cpp (modified) (8 diffs)

inc/window.hpp

@@ -128 +128 @@
         // GUI
         Gtk::VBox m_mainbox;
-
         Gtk::VPaned m_mainpaned;
-        Gtk::HPaned m_subpaned;
 
         Gtk::Frame m_frame_chat;
-        Gtk::Frame m_frame_list;
         Gtk::Frame m_frame_text;
 
         Header m_header;
+        UserList m_userlist;
 
         Folder m_folder;
-        UserList m_userlist;
         Chat m_chat;
         StatusBar m_statusbar;

src/window.cpp

@@ -56 +56 @@
 #endif
    m_header(),
+   m_userlist(*this, m_header),
    m_folder(m_header, m_preferences),
-   m_userlist(*this, m_header),
    m_statusbar(m_header, m_folder)
 {
@@ -93 +93 @@
         m_header.action_view_preferences->signal_activate().connect(
                 sigc::mem_fun(*this, &Window::on_view_preferences) );
-        /*m_header.view_language_event().connect(
-                sigc::mem_fun(*this, &Window::on_view_language) );*/
 
         m_header.action_help_about->signal_activate().connect(
@@ -116 +114 @@
 
         m_frame_chat.set_shadow_type(Gtk::SHADOW_IN);
-        m_frame_list.set_shadow_type(Gtk::SHADOW_IN);
         m_frame_text.set_shadow_type(Gtk::SHADOW_IN);
 
         m_frame_chat.add(m_chat);
-        //m_frame_list.add(m_userlist);
         m_frame_text.add(m_folder);
 
-        m_subpaned.pack1(m_frame_text, true, false);
-        m_subpaned.pack2(m_frame_list, true, false);
-
         m_mainpaned.set_border_width(10);
-        m_mainpaned.pack1(m_subpaned, true, false);
+        m_mainpaned.pack1(m_frame_text, true, false);
         m_mainpaned.pack2(m_frame_chat, true, false);
 
@@ -173 +166 @@
         // Initialize paned sizes. This cannot be done in the constructor
         // because the widget's sizes are not known.
-        int submin = m_subpaned.property_min_position();
-        int submax = m_subpaned.property_max_position();
         int mainmin = m_mainpaned.property_min_position();
         int mainmax = m_mainpaned.property_max_position();
 
-        m_subpaned.set_position(submin + (submax - submin) * 4 / 5);
         m_mainpaned.set_position(mainmin + (mainmax - mainmin) * 3 / 4);
 }
@@ -198 +188 @@
         m_buffer->document_remove_event().connect(
                 sigc::mem_fun(*this, &Window::on_obby_document_remove) );
-
-        /*m_buffer->message_event().connect(
-                sigc::mem_fun(*this, &Window::on_obby_chat) );
-        m_buffer->server_message_event().connect(
-                sigc::mem_fun(*this, &Window::on_obby_server_chat) );*/
 
         // Accept drag and drop of files into the gobby window
@@ -774 +759 @@
 }
 
-#if 0
-void Gobby::Window::on_chat(const Glib::ustring& message)
-{
-        // Send chat message via obby
-        m_buffer->send_message(message);
-}
-#endif
-
 /* Drag and Drop */
 void Gobby::Window::on_drag_data_received(
@@ -825 +802 @@
 }
 
-#if 0
-void Gobby::Window::on_obby_chat(const obby::user& user,
-                                 const Glib::ustring& message)
-{
-        // Got chat message
-        m_chat.obby_message(user, message);
-}
-
-void Gobby::Window::on_obby_server_chat(const Glib::ustring& message)
-{
-        // Got server chat message
-        m_chat.obby_server_message(message);
-}
-#endif
-
 void Gobby::Window::on_obby_user_join(const obby::user& user)
 {
@@ -899 +861 @@
                 m_local_file_path.clear();
         }
-
-#if 0
-        doc->get_document().signal_drag_data_received().connect(
-                sigc::mem_fun(*this, &Window::on_drag_data_received) );
-#endif
 }