Changeset 500d2c5f67fab64860d81d7e78f352ed5f5a5ba6

Timestamp:

04/15/07 16:24:49 (6 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

f2e79fb7e99e21e1ae673f2d2d310e1ba1c77fb5

Children:

d694de594c7d4e794d7eb7c2a43fc1fd29e714c4

git-committer:

Armin Burgmeier <armin@0x539.de> / 2007-04-15T14:24:49Z+0000

Message:

2007-04-15 Armin Burgmeier <armin@…>

• src/joindialog.cpp: Don't allow selection in the error case, use a single column for both icon and text. Make the dialog resizable.

Files:

• ChangeLog (modified) (1 diff)
• src/joindialog.cpp (modified) (6 diffs)

ChangeLog

@@ +1 @@
+2007-04-15  Armin Burgmeier  <armin@0x539.de>
+
+        * src/joindialog.cpp: Don't allow selection in the error case, use a
+        single column for both icon and text. Make the dialog resizable.
+
 2007-04-15  Philipp Kern <phil@0x539.de>
 

src/joindialog.cpp

@@ -19 +19 @@
 #include <gtkmm/stock.h>
 #include <gtkmm/enums.h>
+#include <gtkmm/alignment.h>
 #include <iostream>
 #include "common.hpp"
@@ -111 +112 @@
         m_table.set_spacings(5);
         m_vbox.set_spacing(5);
-        m_vbox.pack_start(m_table);
+        m_vbox.pack_start(m_table, Gtk::PACK_SHRINK);
 
 #ifdef WITH_ZEROCONF
@@ -129 +130 @@
                         sigc::mem_fun(*this, &JoinDialog::on_leave) );
 
-                m_vbox.pack_start(m_ep_discover);
+                Gtk::Alignment* alignment = new Gtk::Alignment(0.5, 0.0);
+                alignment->add(m_ep_discover);
+                m_vbox.pack_start(*alignment, Gtk::PACK_EXPAND_WIDGET);
         }
 #endif
@@ -141 +144 @@
         show_all();
         set_border_width(10);
-        set_resizable(false);
+        set_resizable(true);
 }
 
@@ -276 +279 @@
                         m_session_view.append_column(_("Host"), m_session_cols.host);
                         m_session_view.append_column(_("Port"), m_session_cols.port);
+
+                        // Enable selection
+                        m_session_view.get_selection()->set_mode(Gtk::SELECTION_SINGLE);
                 } catch(std::runtime_error& e) {
                         std::cerr << "Discovery failed: " << e.what() << std::endl;
@@ -290 +296 @@
 
                         // append them
-                        m_session_view.append_column("", *stop);
-                        m_session_view.append_column(_("Failure"), *failure);
+                        Gtk::TreeViewColumn* column = Gtk::manage(
+                                new Gtk::TreeViewColumn(_("Failure")));
+
+                        column->pack_start(*stop, false);
+                        column->pack_start(*failure, true);
+                        column->set_spacing(8);
+                        m_session_view.append_column(*column);
+
+                        // Disable selection
+                        m_session_view.get_selection()->set_mode(Gtk::SELECTION_NONE);
 
                         // create a dummy row for the renderer to be displayed