Changeset ecfdae11289287fec91513ba406f03d044dc56d9

Timestamp:

09/21/10 21:42:01 (3 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

4a12852956b8c9d65420066459277f873f6247ee

Children:

428f3277c6c01ec69d678024f9073fd42c839e46

git-committer:

Armin Burgmeier <armin@arbur.net> / 2010-09-21T21:42:01Z+0200

Message:

Add a "Disconnect from Server" option to the context menu (#542)

2010-09-21 Armin Burgmeier <armin@…>

• code/commands/browser-context-commands.hpp:
• code/commands/browser-context-commands.cpp: Add a "Disconnect from Server" option to the context menu (#542).

Files:

• ChangeLog (modified) (1 diff)
• code/commands/browser-context-commands.cpp (modified) (3 diffs)
• code/commands/browser-context-commands.hpp (modified) (1 diff)

ChangeLog

@@ +1 @@
+2010-09-21  Armin Burgmeier  <armin@arbur.net>
+
+        * code/commands/browser-context-commands.hpp:
+        * code/commands/browser-context-commands.cpp: Add a "Disconnect from
+        Server" option to the context menu (#542).
+
 2010-09-21  Armin Burgmeier  <armin@arbur.net>
 

code/commands/browser-context-commands.cpp

@@ -90 +90 @@
                         *this, &BrowserContextCommands::on_menu_deactivate));
 
+                // Add "Disconnect" menu option if the connection
+                // item has been clicked at
+                if(is_toplevel)
+                {
+                        Gtk::ImageMenuItem* disconnect_item = Gtk::manage(
+                                new Gtk::ImageMenuItem(_("_Disconnect from Server"), true));
+                        disconnect_item->set_image(*Gtk::manage(new Gtk::Image(
+                                Gtk::Stock::DISCONNECT, Gtk::ICON_SIZE_MENU)));
+                        disconnect_item->signal_activate().connect(sigc::bind(
+                                sigc::mem_fun(*this,
+                                        &BrowserContextCommands::on_disconnect),
+                                browser));
+                        disconnect_item->show();
+                        menu->append(*disconnect_item);
+
+                        // Separator
+                        Gtk::SeparatorMenuItem* sep_item =
+                                Gtk::manage(new Gtk::SeparatorMenuItem);
+                        sep_item->show();
+                        menu->append(*sep_item);
+                }
+
                 // Create Document
                 Gtk::ImageMenuItem* new_document_item = Gtk::manage(
@@ -127 +149 @@
 
                 Gtk::ImageMenuItem* new_directory_item = Gtk::manage(
-                        new Gtk::ImageMenuItem(_("Create Directory..."),
+                        new Gtk::ImageMenuItem(_("Create Di_rectory..."),
                                                true));
                 new_directory_item->set_image(*new_directory_image);
@@ -184 +206 @@
 }
 
+void Gobby::BrowserContextCommands::on_disconnect(InfcBrowser* browser)
+{
+        InfXmlConnection* connection = infc_browser_get_connection(browser);
+        InfXmlConnectionStatus status;
+        g_object_get(G_OBJECT(connection), "status", &status, NULL);
+
+        if(status != INF_XML_CONNECTION_CLOSED &&
+           status != INF_XML_CONNECTION_CLOSING)
+        {
+                inf_xml_connection_close(connection);
+        }
+}
+
 void Gobby::BrowserContextCommands::on_new(InfcBrowser* browser,
                                            InfcBrowserIter iter,

code/commands/browser-context-commands.hpp

@@ -58 +58 @@
 
         // Context commands
+        void on_disconnect(InfcBrowser* browser);
+
         void on_new(InfcBrowser* browser, InfcBrowserIter iter,
                     bool directory);