Changeset 326c7d29bd07f56e8a97a4ba00be40c7035f0dcf

Timestamp:

11/08/09 00:45:56 (4 years ago)

Author:

Armin Burgmeier <armin@…>

git-author:

Gabríel A. Pétursson <gabrielp@simnet.is> / 2009-11-08T00:45:56Z+0100

Parents:

1c0f9eaecee4addf07208e81f777f28e409cbfe7

Children:

91395eca1c2b5080c28f69b5efc2381d5977e555

git-committer:

Armin Burgmeier <armin@arbur.net> / 2009-11-08T00:45:56Z+0100

Message:

Added the ability to upload multiple files simultaneously

2009-11-07 Gabríel A. Pétursson <gabrielp@…>

• code/commands/browser-context-commands.cpp:
• code/commands/file-tasks/task-open-file.hpp:
• code/commands/file-tasks/task-open-file.cpp: Added the ability to upload multiple files simultaneously.

Signed-off-by: Armin Burgmeier <armin@…>

Files:

• ChangeLog (modified) (1 diff)
• code/commands/browser-context-commands.cpp (modified) (2 diffs)
• code/commands/file-tasks/task-open-file.cpp (modified) (2 diffs)
• code/commands/file-tasks/task-open-file.hpp (modified) (2 diffs)

ChangeLog

@@ +1 @@
+2009-11-07  Gabríel A. Pétursson  <gabrielp@simnet.is>
+
+        * code/commands/browser-context-commands.cpp:
+        * code/commands/file-tasks/task-open-file.hpp:
+        * code/commands/file-tasks/task-open-file.cpp: Added the ability to
+        upload multiple files simultaneously.
+
 2009-11-07  Armin Burgmeier  <armin@arbur.net>
 

code/commands/browser-context-commands.cpp

@@ -215 +215 @@
                 browser, iter));
 
+        m_file_dialog->set_select_multiple(true);
         m_file_dialog->present();
 }
@@ -266 +267 @@
         if(response_id == Gtk::RESPONSE_ACCEPT)
         {
-                Glib::RefPtr<Gio::File> file =
-                        Gio::File::create_for_uri(m_file_dialog->get_uri());
-
-                // TODO: Do this asynchronously:
-                Glib::RefPtr<Gio::FileInfo> info = file->query_info(
-                        G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME);
-                m_operations.create_document(
-                        browser, &iter, info->get_display_name(),
-                        m_preferences, m_file_dialog->get_uri(), NULL);
+                Glib::SListHandle<Glib::ustring> uris = m_file_dialog->get_uris();
+
+                for(Glib::SListHandle<Glib::ustring>::iterator i = uris.begin(); i != uris.end(); ++i)
+                {
+                        Glib::RefPtr<Gio::File> file =
+                                Gio::File::create_for_uri(*i);
+
+                        // TODO: Do this asynchronously:
+                        Glib::RefPtr<Gio::FileInfo> info = file->query_info(
+                                G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME);
+                        m_operations.create_document(
+                                browser, &iter, info->get_display_name(),
+                                m_preferences, *i, NULL);
+                }
         }
 

code/commands/file-tasks/task-open-file.cpp

@@ -25 +25 @@
                 Gtk::FILE_CHOOSER_ACTION_OPEN)
 {
+        m_file_dialog.set_select_multiple(true);
 }
 
@@ -40 +41 @@
         {
                 m_file_dialog.hide();
-                // TODO: Handle multiple selection
-                Glib::ustring uri = m_file_dialog.get_uri();
-                Glib::RefPtr<Gio::File> file =
-                        Gio::File::create_for_uri(uri);
-
-                m_open_task.reset(new TaskOpen(m_file_commands, file));
-                m_open_task->signal_finished().connect(
-                        sigc::mem_fun(*this, &TaskOpenFile::finish));
-                m_open_task->run();
+                Glib::SListHandle<Glib::ustring> uris = m_file_dialog.get_uris();
+                
+                g_assert(uris.size() >= 1);
+                
+                if (uris.size() == 1)
+                {
+                        Glib::RefPtr<Gio::File> file = Gio::File::create_for_uri(*uris.begin());
+                        m_open_task.reset(new TaskOpen(m_file_commands, file));
+                        m_open_task->signal_finished().connect(
+                                sigc::mem_fun(*this, &TaskOpenFile::finish));
+                        m_open_task->run();
+                }
+                else
+                {
+                        TaskOpenMultiple *task = new TaskOpenMultiple(m_file_commands);
+                        
+                        for(Glib::SListHandle<Glib::ustring>::iterator i = uris.begin(); i != uris.end(); ++i)
+                                task->add_file(*i);
+                        
+                        m_open_taskm.reset(task);
+                        m_open_taskm->signal_finished().connect(
+                                sigc::mem_fun(*this, &TaskOpenFile::finish));
+                        m_open_taskm->run();
+                }
         }
         else

code/commands/file-tasks/task-open-file.hpp

@@ -22 +22 @@
 #include "commands/file-commands.hpp"
 #include "commands/file-tasks/task-open.hpp"
+#include "commands/file-tasks/task-open-multiple.hpp"
 
 namespace Gobby
@@ -38 +39 @@
         FileChooser::Dialog m_file_dialog;
         std::auto_ptr<TaskOpen> m_open_task;
+        std::auto_ptr<TaskOpenMultiple> m_open_taskm;
 };