Changeset 8343ef5b25d88a8435bcc3c904c1653f928f3950

Timestamp:

01/06/07 23:39:09 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

29715c255541ab3aa8d8f67699d73b3d998e4f3d

Children:

01f86001264bebde561c59a71d8fd87b39120b6a

git-committer:

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

Message:

[project @ Using obby::format_string instead of std::stringstream]

Original author: Armin Burgmeier <armin@…>
Date: 2005-06-14 17:44:41+00:00

Files:

• po/POTFILES.in (modified) (1 diff)
• src/buffer_wrapper.cpp (modified) (2 diffs)
• src/chat.cpp (modified) (2 diffs)
• src/document.cpp (modified) (2 diffs)
• src/header.cpp (modified) (4 diffs)
• src/statusbar.cpp (modified) (4 diffs)

po/POTFILES.in

@@ -9 +9 @@
 src/statusbar.cpp
 src/buffer_wrapper.cpp
-
+src/document.cpp

src/buffer_wrapper.cpp

@@ -20 +20 @@
 #include <obby/client_user_table.hpp>
 #include <obby/host_user_table.hpp>
+#include <obby/format_string.hpp>
 #include "common.hpp"
 #include "buffer_wrapper.hpp"
@@ -171 +172 @@
         {
                 // Should not happen...
-                throw Error(
-                        Error::PEER_NOT_FOUND,
-                        _("Peer ") + peer.get_name() + _("(")
-                        + peer.get_address().get_name() +
-                        _(") not found in peer list")
-                );
+                obby::format_string str(
+                        _("Peer %0 (%1) not found in peer list") );
+                str << peer.get_name() << peer.get_address().get_name();
+                throw Error(Error::PEER_NOT_FOUND, str.str() );
         }
 

src/chat.cpp

@@ -18 +18 @@
 
 #include <gtkmm/stock.h>
+#include <obby/format_string.hpp>
 #include "common.hpp"
 #include "chat.hpp"
@@ -76 +77 @@
 void Gobby::Chat::obby_user_join(obby::user& user)
 {
-        m_log_chat.log(user.get_name() + " has joined", "blue");
+        obby::format_string str(_("%0 has joined") );
+        str << user.get_name();
+        m_log_chat.log(str.str(), "blue");
 }
 
 void Gobby::Chat::obby_user_part(obby::user& user)
 {
-        m_log_chat.log(user.get_name() + " has left", "blue");
+        obby::format_string str(_("%0 has left") );
+        str << user.get_name();
+        m_log_chat.log(str.str(), "blue");
 }
 

src/document.cpp

@@ -18 +18 @@
 
 #include <iostream>
+#include <obby/format_string.hpp>
 #include <obby/user_table.hpp>
 #include <obby/client_document.hpp>
@@ -598 +599 @@
 #endif
 
-        buf->set_text(_(
-                "You are not subscribed to the document \"") +
-                        m_doc.get_title() + _("\".\n\nTo view changes that "
-                "others make or to edit the document yourself, you have to "
-                "subscribe to this document. Use the following button to "
-                "perform this.\n\n")
-        );
-
+        // Build text
+        obby::format_string str(_(
+                "You are not subscribed to the document \"%0\".\n\n"
+                "To view changes that others make or to edit the document "
+                "yourself, you have to subscribe to this document. Use the "
+                "following button to perform this.\n\n"
+        ) );
+        str << m_doc.get_title();
+
+        // Set it
+        buf->set_text(str.str() );
+
+        // Add child anchor for the button
         Glib::RefPtr<Gtk::TextChildAnchor> anchor =
                 buf->create_child_anchor(buf->end() );

src/header.cpp

@@ -20 +20 @@
 #include <gtkmm/toggleaction.h>
 #include <gtkmm/radioaction.h>
+#include <obby/format_string.hpp>
 #include <obby/local_buffer.hpp>
 
@@ -275 +276 @@
                         m_lang_group,
                         "ViewLanguageNone",
-                        "None",
-                        "Unselects the current language"
+                        _("None"),
+                        _("Unselects the current language")
                 ),
                 sigc::bind(
@@ -295 +296 @@
                 Glib::ustring language_xml_name = language->get_name();
 
+                // Build description string
+                obby::format_string str(_("Selects %0 as language") );
+                str << language->get_name();
+
                 // Add language to action group
                 remove_entities(language_xml_name);
@@ -302 +307 @@
                                 "ViewLanguage" + language_xml_name, 
                                 language->get_name(),
-                                _("Selects ") + language->get_name() +
-                                        _(" as language")
+                                str.str()
                         ),
                         sigc::bind(

src/statusbar.cpp

@@ -18 +18 @@
 
 #include <sstream>
+#include <obby/format_string.hpp>
 #include <obby/local_buffer.hpp>
 #include "common.hpp"
@@ -61 +62 @@
         // Selected language
         if(document.get_language() )
-                m_language.set_text(
-                        _("Selected language: ") +
-                        document.get_language()->get_name()
-                );
+        {
+                obby::format_string str(_("Selected language: %0") );
+                str << document.get_language()->get_name();
+                m_language.set_text(str.str() );
+        }
         else
+        {
                 m_language.set_text(_("No language selected") );
+        }
 }
 #endif
@@ -72 +76 @@
 void Gobby::StatusBar::update_sync(Document& document)
 {
-        unsigned int unsynced_count = document.get_unsynced_changes_count();
-        std::stringstream sync_str;
-        sync_str << unsynced_count << _(" unsynced change(s)");
-        m_sync.set_text(sync_str.str() );
+        // TODO: ngettext
+        obby::format_string str(_("%0 pending change(s)") );
+        str << document.get_unsynced_changes_count();
+        m_sync.set_text(str.str() );
 }
 
 void Gobby::StatusBar::update_revision(Document& document)
 {
-        std::stringstream rev_str;
-        rev_str << _("Revision: ") << document.get_revision();
-        m_revision.set_text(rev_str.str() );
+        obby::format_string str(_("Revision: %0") );
+        str << document.get_revision();
+        m_revision.set_text(str.str() );
 }
 
@@ -89 +93 @@
         unsigned int row, col;
         document.get_cursor_position(row, col);
-        ++ row; ++ col;
 
-        std::stringstream pos_str;
-        pos_str << _("Line: ") << row << _(" Column: ") << col;
-        m_position.set_text(pos_str.str() );
+        obby::format_string str("Line: %0 Column: %1");
+        str << (row + 1) << (col + 1);
+        m_position.set_text(str.str() );
 }