Changeset 534b092abe789eaa49f7f356b43bd77538c62ef9

Timestamp:

10/10/08 23:59:47 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

cdda99c0276d6c08523acc389ac0c13818ce9e9a

Children:

6cb2a945e0d4db91d47be1384bba73331dc6f8c2

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-10-10T23:59:47Z+0200

Message:

Use the display name as document title for files opened via the filechooser

2008-10-10 Armin Burgmeier <armin@…>

• code/core/filechooser.cpp: Allow selecting non-local files in Gobby's filechooser.

• code/commands/file-commands.cpp:
• code/commands/browser-context-commands.cpp: Query the display name when opening a file, to use as document title. FileChooser::get_filename() does not work for non-local files.

Files:

• ChangeLog (modified) (1 diff)
• TODO (modified) (1 diff)
• code/commands/browser-context-commands.cpp (modified) (2 diffs)
• code/commands/file-commands.cpp (modified) (3 diffs)
• code/core/filechooser.cpp (modified) (1 diff)

ChangeLog

@@ +1 @@
+2008-10-10  Armin Burgmeier  <armin@arbur.net>
+
+        * code/core/filechooser.cpp: Allow selecting non-local files in
+        Gobby's filechooser.
+
+        * code/commands/file-commands.cpp:
+        * code/commands/browser-context-commands.cpp: Query the display name
+        when opening a file, to use as document title.
+        FileChooser::get_filename() does not work for non-local files.
+
 2008-10-09  Armin Burgmeier  <armin@arbur.net>
 

TODO

@@ -9 +9 @@
  - Add base preferences class with Preferences::Option definition to util/,
    inherit in core/, move ClosableFrame to util/
+ - Show in tab and userlist when others are typing, using an icon
+ - Typing sounds (libcanberra?)
 
 These things need to be implemented in infinote, but again would be nice

code/commands/browser-context-commands.cpp

@@ -22 +22 @@
 #include <gtkmm/icontheme.h>
 #include <gtkmm/stock.h>
+#include <giomm/file.h>
 
 Gobby::BrowserContextCommands::BrowserContextCommands(Gtk::Window& parent,
@@ -269 +270 @@
         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, Glib::path_get_basename(
-                                m_file_dialog->get_filename()),
+                        browser, &iter, info->get_display_name(),
                         m_preferences, m_file_dialog->get_uri(), NULL);
         }

code/commands/file-commands.cpp

@@ -21 +21 @@
 
 #include <gtkmm/stock.h>
+#include <giomm/file.h>
 
 namespace
@@ -94 +95 @@
                 void on_file_response(int response_id)
                 {
+                        const gchar* const ATTR_DISPLAY_NAME =
+                                G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME;
+
                         if(response_id == Gtk::RESPONSE_ACCEPT)
                         {
@@ -107 +111 @@
                                 // TODO: Handle multiple selection
                                 m_open_uri = m_file_dialog.get_uri();
+                                // TODO: Query the display name
+                                // asynchronously, and use a default as long
+                                // as the query is running.
+                                Glib::RefPtr<Gio::File> file =
+                                        Gio::File::create_for_uri(m_open_uri);
+                                Glib::RefPtr<Gio::FileInfo> info =
+                                        file->query_info(ATTR_DISPLAY_NAME);
+
                                 dialog.set_document_name(
-                                        Glib::path_get_basename(
-                                                m_file_dialog.
-                                                        get_filename()));
+                                        info->get_display_name());
 
                                 m_file_dialog.hide();

code/core/filechooser.cpp

@@ -45 +45 @@
         }
 
+        set_local_only(false);
         set_current_folder_uri(m_chooser.get_current_folder_uri());
 }