Changeset 3e869acf2eb279fefaba15768ca18932c148968c

Timestamp:

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

Author:

Philipp Kern <phil@…>

Parents:

83656f5e55cda4f7a31f2911e7c2e36ebb87e0b3

Children:

24041fba2be0714c5821951abe3c0ab8fa76a094

git-committer:

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

Message:

[project @ Win32 Drag+Drop support [fixes #71]]

Original author: Armin Burgmeier <armin@…>
Date: 2005-11-17 12:52:24+00:00

Files:

• inc/dragdrop.hpp (added)
• inc/window.hpp (modified) (6 diffs)
• src/dragdrop.cpp (added)
• src/window.cpp (modified) (3 diffs)

inc/window.hpp

@@ -23 +23 @@
 #include <gtkmm/paned.h>
 #include <gtkmm/frame.h>
+#include <gtkmm/messagedialog.h>
 #include <obby/local_buffer.hpp>
+#include "features.hpp"
 #include "icon.hpp"
 #include "config.hpp"
@@ -34 +36 @@
 #include "chat.hpp"
 #include "statusbar.hpp"
-#include "features.hpp"
+#include "dragdrop.hpp"
 #ifdef WITH_HOWL
 #include <obby/zeroconf.hpp>
@@ -48 +50 @@
         ~Window();
 
+        /** Offers a pointer to the currently visible document. If the user
+         * is not subscribed to a document, NULL is returned.
+         */
         Document* get_current_document();
+
+        /** Opens a document containing the content of a file mounted on the
+         * local filesystem.
+         */
+        void open_local_file(const Glib::ustring& file);
+
+        /** Saves an existing document to the given path.
+         */
+        void save_local_file(Document& doc, const Glib::ustring& file);
 protected:
         // Gtk::Window overrides
@@ -90 +104 @@
         void on_quit();
 
-        // Drag and drop
-        virtual void on_drag_data_received(
-                const Glib::RefPtr<Gdk::DragContext>& context,
-                int x, int y, const Gtk::SelectionData& data,
-                guint info, guint time
-        );
-
         // Obby signal handlers
         void on_obby_close();
@@ -110 +117 @@
         void apply_preferences();
         void update_title_bar();
-        void open_local_file(const Glib::ustring& file);
-        void save_local_file(Document& doc, const Glib::ustring& file);
         void close_document(DocWindow& doc);
         void display_error(const Glib::ustring& message,
@@ -142 +147 @@
         StatusBar m_statusbar;
 
+        /** Drag+Drop handler
+         */
+        std::auto_ptr<DragDrop> m_dnd;
+
         // obby
         std::auto_ptr<obby::local_buffer> m_buffer;

src/window.cpp

@@ -273 +273 @@
 
         // Accept drag and drop of files into the gobby window
-        std::list<Gtk::TargetEntry> targets;
-        targets.push_back(Gtk::TargetEntry("text/uri-list") );
-        drag_dest_set(targets);
+        m_dnd.reset(new DragDrop(*this) );
 
         m_header.group_session->set_sensitive(true);
@@ -334 +332 @@
 void Gobby::Window::obby_end()
 {
-        // No drag and drop anymore
-        drag_dest_unset();
-
         // Nothing to do if no buffer is open
         if(!m_buffer.get() ) return;
+
+        // Remove DND handler
+        m_dnd.reset(NULL);
 
         // Tell GUI components that the session ended
@@ -917 +915 @@
 }
 
-/* Drag and Drop */
-void Gobby::Window::on_drag_data_received(
-        const Glib::RefPtr<Gdk::DragContext>& context,
-        int x, int y, const Gtk::SelectionData& data,
-        guint info, guint time
-)
-{
-        // We only accept uri-lists as new files to open
-        if(data.get_target() == "text/uri-list")
-        {
-                // Get files by dragdata
-                std::vector<std::string> files = data.get_uris();
-                //std::unique(files.begin(), files.end() );
-
-                // Open all of them
-                for(std::vector<std::string>::iterator iter = files.begin();
-                    iter != files.end();
-                    ++ iter)
-                {
-                        try
-                        {
-                                // Convert URI to filename
-                                open_local_file(
-                                        Glib::filename_from_uri(*iter) );
-                        }
-                        catch(Glib::ConvertError& e)
-                        {
-                                // Show any errors while converting a file
-                                display_error(e.what() );
-                        }
-                }
-        }
-
-        // Call base function
-        Gtk::Window::on_drag_data_received(context, x, y, data, info, time);
-}
-
 void Gobby::Window::on_obby_close()
 {