Changeset fe534f331f514bb65fb6f20f00cee4a7c22266fc

Timestamp:

01/06/07 23:57:46 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

3ccecb19e9700eb868504cd7b5927768be794791

Children:

1ae339e56a5d9161629369b17d26f17500ad317e

git-committer:

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

Message:

[project @ Added encoding selection in file chooser]

Original author: Armin Burgmeier <armin@…>
Date: 2006-03-05 18:59:22+00:00

Files:

• Makefile.am (modified) (2 diffs)
• inc/encoding.hpp (modified) (1 diff)
• inc/encoding_selector.hpp (added)
• inc/window.hpp (modified) (2 diffs)
• po/POTFILES.in (modified) (1 diff)
• src/dragdrop.cpp (modified) (3 diffs)
• src/encoding.cpp (modified) (3 diffs)
• src/encoding_selector.cpp (added)
• src/window.cpp (modified) (12 diffs)

Makefile.am

@@ -23 +23 @@
 noinst_HEADERS += inc/mimemap.hpp
 noinst_HEADERS += inc/regex.hpp
+noinst_HEADERS += inc/encoding_selector.hpp
 noinst_HEADERS += inc/defaultdialog.hpp
 noinst_HEADERS += inc/historyentry.hpp
@@ -76 +77 @@
 gobby_SOURCES += src/mimemap.cpp
 gobby_SOURCES += src/regex.cpp
+gobby_SOURCES += src/encoding_selector.cpp
 gobby_SOURCES += src/defaultdialog.cpp
 gobby_SOURCES += src/historyentry.cpp

inc/encoding.hpp

@@ -26 +26 @@
 {
 
-class Encoding
+namespace Encoding
 {
-public:
-        enum Charset {
-                UTF_7,
-                UTF_8,
-                UTF_16,
-                ISO_8859_1,
-                ISO_8859_15,
-                UCS_2,
-                UCS_4
-        };
 
-        Encoding(const Glib::ustring& name, Charset charset);
-        Encoding(const Encoding& other);
-        ~Encoding();
+const std::vector<std::string>& get_encodings();
+Glib::ustring convert_to_utf8(const std::string& str,
+                              std::string& encoding);
 
-        Encoding& operator=(const Encoding& other);
-
-        const Glib::ustring& get_name() const;
-        Charset get_charset() const;
-
-        Glib::ustring convert_to_utf8(const std::string& str);
-protected:
-        Glib::ustring m_name;
-        Charset m_charset;
-};
-
-Glib::ustring convert_to_utf8(const std::string& str);
+}
 
 }
 
 #endif // _GOBBY_ENCODING_HPP_
-

inc/window.hpp

@@ -60 +60 @@
          * local filesystem.
          */
-        void open_local_file(const Glib::ustring& file);
+        void open_local_file(const Glib::ustring& file,
+                             const std::string& encoding);
 
         /** Saves an existing document to the given path.
          */
-        void save_local_file(DocWindow& doc, const Glib::ustring& file);
+        void save_local_file(DocWindow& doc,
+                             const Glib::ustring& file,
+                             const std::string& encoding);
 protected:
         // Gtk::Window overrides
@@ -131 +134 @@
         // Paths
         std::string m_last_path;
+        std::string m_prev_session;
+
         std::string m_local_file_path;
-        std::string m_prev_session;
+        std::string m_local_encoding;
 
         // GUI

po/POTFILES.in

@@ -1 +1 @@
 # source files
 
-src/io/buffer_wrapper.cpp
 src/icon.cpp
 src/encoding.cpp
+src/encoding_selector.cpp
 src/header.cpp
 src/statusbar.cpp

src/dragdrop.cpp

@@ -25 +25 @@
 #endif
 
+#include "encoding_selector.hpp"
 #include "dragdrop.hpp"
 #include "window.hpp"
@@ -177 +178 @@
                         DragQueryFileA(drop, i, buf, size + 1);
 
-                        m_window.open_local_file(buf);
+                        m_window.open_local_file(
+                                buf,
+                                Gobby::EncodingSelector::AUTO_DETECT
+                        );
+
                         delete[] buf;
                 }
@@ -235 +240 @@
                         }
 
-                        window.open_local_file(filename);
+                        window.open_local_file(
+                                filename,
+                                Gobby::EncodingSelector::AUTO_DETECT
+                        );
                 }
         }

src/encoding.cpp

@@ -17 +17 @@
  */
 
+#include <cstdlib>
 #include "common.hpp"
 #include "encoding.hpp"
@@ -22 +23 @@
 namespace
 {
-        // Available encodings
-        Gobby::Encoding encodings[] = {
-                Gobby::Encoding("UTF-8", Gobby::Encoding::UTF_8),
-                Gobby::Encoding("ISO_8859-1", Gobby::Encoding::ISO_8859_1),
-                Gobby::Encoding("ISO_8859-15", Gobby::Encoding::ISO_8859_15),
-                Gobby::Encoding("UTF-7", Gobby::Encoding::UTF_7),
-                Gobby::Encoding("UTF-16", Gobby::Encoding::UTF_16),
-                Gobby::Encoding("UCS-2", Gobby::Encoding::UCS_2),
-                Gobby::Encoding("UCS-4", Gobby::Encoding::UCS_4)
-        };
 
-        // Amount of encodings we have
-        unsigned int encoding_count = sizeof(encodings) / sizeof(encodings[0]);
-}
-
-Gobby::Encoding::Encoding(const Glib::ustring& name, Charset charset)
- : m_name(name), m_charset(charset)
+Glib::ustring convert_to_utf8(const std::string& str, const std::string& from)
 {
-}
-
-Gobby::Encoding::Encoding(const Encoding& other)
- : m_name(other.m_name), m_charset(other.m_charset)
-{
-}
-
-Gobby::Encoding::~Encoding()
-{
-}
-
-Gobby::Encoding& Gobby::Encoding::operator=(const Encoding& other)
-{
-        m_name = other.m_name;
-        m_charset = other.m_charset;
-        return *this;
-}
-
-const Glib::ustring& Gobby::Encoding::get_name() const
-{
-        return m_name;
-}
-
-Gobby::Encoding::Charset Gobby::Encoding::get_charset() const
-{
-        return m_charset;
-}
-
-Glib::ustring Gobby::Encoding::convert_to_utf8(const std::string& str)
-{
-        Glib::ustring utf8 = Glib::convert(str, "UTF-8", m_name);
+        Glib::ustring utf8 = Glib::convert(str, "UTF-8", from);
         if(!utf8.validate() )
         {
@@ -78 +34 @@
                 );
         }
+
         return utf8;
 }
 
-Glib::ustring Gobby::convert_to_utf8(const std::string& str)
+}
+
+const std::vector<std::string>& Gobby::Encoding::get_encodings()
+{
+        static const std::string encodings[] = {
+                "UTF-8",
+                "ISO-8859-1",
+                "ISO-8859-15",
+                "UTF-7",
+                "UTF-16",
+                "UCS-2",
+                "UCS-4"
+        };
+
+        static const std::size_t encoding_count =
+                sizeof(encodings) / sizeof(encodings[0]);
+
+        static std::vector<std::string> encoding_vec(
+                encodings,
+                encodings + encoding_count
+        );
+
+        return encoding_vec;
+}
+
+Glib::ustring Gobby::Encoding::convert_to_utf8(const std::string& str,
+                                               std::string& encoding)
 {
         if(g_utf8_validate(str.c_str(), str.length(), NULL) == TRUE)
+        {
+                encoding = "UTF-8";
                 return str;
+        }
 
-        // Ignore UTF-8 encoding we currently checked
-        for(unsigned int i = 1; i < encoding_count; ++ i)
+        typedef std::vector<std::string> encoding_list_type;
+        const encoding_list_type& encodings = get_encodings();
+
+        for(encoding_list_type::const_iterator iter = encodings.begin();
+            iter != encodings.end();
+            ++ iter)
         {
+                // Ignore UTF-8 encoding we currently checked
+                if(*iter == "UTF-8") continue;
+
                 try
                 {
-                        return encodings[i].convert_to_utf8(str);
+                        encoding = *iter;
+                        return ::convert_to_utf8(str, *iter);
                 }
                 catch(Glib::ConvertError& e)

src/window.cpp

@@ -35 +35 @@
 #include "common.hpp"
 #include "encoding.hpp"
+#include "encoding_selector.hpp"
 #include "docwindow.hpp"
 #include "passworddialog.hpp"
@@ -604 +605 @@
                 // " " is newly created, so we do not need a path
                 if(m_local_file_path != " ")
+                {
                         window.set_path(m_local_file_path);
-
-                // Crear local path
+                        // TODO: Set document's encoding to m_local_encoding
+                        // in document settings
+                }
+
+                // Clear local path
                 m_local_file_path.clear();
         }
@@ -661 +666 @@
 {
         // Create FileChooser
-        Gtk::FileChooserDialog dlg(*this, _("Open new document"));
+        EncodingFileChooserDialog dlg(
+                *this,
+                _("Open new document"),
+                Gtk::FILE_CHOOSER_ACTION_OPEN
+        );
+
+        dlg.get_selector().set_encoding(EncodingSelector::AUTO_DETECT);
 
         // Use the last used path for this dialog, if we have any
@@ -684 +695 @@
                     iter != list.end();
                     ++ iter)
-                        open_local_file(*iter);
+                {
+                        open_local_file(
+                                *iter,
+                                dlg.get_selector().get_encoding()
+                        );
+                }
         }
 }
@@ -703 +719 @@
         if(!doc->get_path().empty() )
                 // Yes, so save the document there
-                save_local_file(*doc, doc->get_path() );
+                // TODO: Lookup document's encoding
+                save_local_file(*doc, doc->get_path(), "UTF-8");
         else
                 // Open save as dialog otherwise
@@ -722 +739 @@
 
         // Setup dialog
-        Gtk::FileChooserDialog dlg(*this, _("Save current document"),
-                Gtk::FILE_CHOOSER_ACTION_SAVE);
+        EncodingFileChooserDialog dlg(
+                *this,
+                _("Save current document"),
+                Gtk::FILE_CHOOSER_ACTION_SAVE
+        );
+
+        // TODO: Preselect document's encoding
+        dlg.get_selector().set_encoding("UTF-8");
 
 #ifdef GTKMM_GEQ_28
@@ -753 +776 @@
                 m_last_path = dlg.get_current_folder();
                 // Save document
-                save_local_file(*doc, dlg.get_filename() );
+                save_local_file(
+                        *doc,
+                        dlg.get_filename(),
+                        dlg.get_selector().get_encoding()
+                );
         }
 }
@@ -1078 +1105 @@
 }
 
-void Gobby::Window::open_local_file(const Glib::ustring& file)
+void Gobby::Window::open_local_file(const Glib::ustring& file,
+                                    const std::string& encoding)
 {
         try
@@ -1084 +1112 @@
                 // Set local file path for the document_insert callback
                 m_local_file_path = file;
-
-                std::string content(
-                        convert_to_utf8(Glib::file_get_contents(file)) );
-                convert2unix(content);
+                m_local_encoding = encoding;
+
+                std::string utf8_content;
+                if(encoding == EncodingSelector::AUTO_DETECT)
+                {
+                        std::string detected_encoding;
+
+                        utf8_content = Encoding::convert_to_utf8(
+                                        Glib::file_get_contents(file),
+                                        detected_encoding
+                        );
+
+                        m_local_encoding = detected_encoding;
+                }
+                else
+                {
+                        utf8_content = Glib::convert(
+                                Glib::file_get_contents(file),
+                                "UTF-8",
+                                encoding
+                        );
+                }
+
+                convert2unix(utf8_content);
 
                 m_buffer->document_create(
-                        Glib::path_get_basename(file), "UTF-8", content
+                        Glib::path_get_basename(file), "UTF-8", utf8_content
                 );
         }
@@ -1100 +1148 @@
 }
 
-void Gobby::Window::save_local_file(DocWindow& doc, const Glib::ustring& file)
+void Gobby::Window::save_local_file(DocWindow& doc,
+                                    const Glib::ustring& file,
+                                    const std::string& encoding)
 {
         // Open stream to file
@@ -1117 +1167 @@
 
                 // Save content into file
-                stream << doc.get_content().raw();
+                std::string conv_content = doc.get_content().raw();
+                if(encoding != "UTF-8")
+                {
+                        conv_content = Glib::convert(
+                                conv_content,
+                                encoding,
+                                "UTF-8"
+                        );
+                }
+
+                stream << conv_content;
                 stream.close();
 
@@ -1126 +1186 @@
                 // Unset modifified flag
                 doc.get_document().get_buffer()->set_modified(false);
+        }
+        catch(Glib::ConvertError& e)
+        {
+                display_error(e.what() );
         }
         catch(std::exception& e)