Changeset ded2b4e54b49492e039d814453f12549e56ad518

Timestamp:

10/25/09 14:24:51 (4 years ago)

Author:

Benjamin Herr <ben@…>

git-author:

Benjamin Herr <ben@0x539.de> / 2009-01-16T17:38:22Z+0100

Parents:

80d0eeda014ec64671fb9da68e646348a9165ded

Children:

7cfad2e713662f0eeea22b5c5d19c6a9596c4413

git-committer:

Benjamin Herr <ben@0x539.de> / 2009-10-25T14:24:51Z+0100

Message:

htmlexport: fixed bug with non-ascii chars, changed colour handling

Files:

• code/commands/file-commands.cpp (modified) (6 diffs)

code/commands/file-commands.cpp

@@ -222 +222 @@
 }
 
+#include <iomanip>
+
 #include <ctime>
+#include <cstring>
 
 #include <gtkmm/textbuffer.h>
@@ -265 +268 @@
                 // split text by newlines so we can insert line number elements
                 gchar* text = gtk_text_iter_get_text(&begin, &next);
-                try{
-                        gchar* last_pos = text;
-                        for (gchar* i = text; *i; ++i) {
+                try {
+                        gchar const* last_pos = text;
+                        for (gchar const* i = text; *i; ++i) {
                                 if (*i != '\n')
                                         continue;
@@ -273 +276 @@
                                 ++line_counter;
 
-                                gchar* next_pos = i;
+                                gchar const* next_pos = i;
                                 ++next_pos;
-                                last_node->add_child_text(Glib::ustring(last_pos, next_pos - last_pos));
+                                last_node->add_child_text(Glib::ustring(last_pos, next_pos));
                                 last_pos = next_pos;
 
@@ -351 +354 @@
         char session_info[] = "<placeholder for session info and path>";
 
-        // TODO: do some more magic to make localising this easier
-        node->add_child_text(_("Document generated by "));
+        // %1 is information about the document's location, session name,
+        // %2 is current date as formatted by %c,
+        // %3 is a link to the gobby site
+        char const* translated = _("Document generated from %1 at %2 by %3");
+        char const* p = std::strstr(translated, "%3");
+        g_assert(p);
+        node->add_child_text(
+                Glib::ustring::compose(Glib::ustring(translated, p), session_info, time_str));
+
         xmlpp::Element* link = node->add_child("a");
         link->set_attribute("href", "http://gobby.0x539.de/");
         link->add_child_text(PACKAGE_STRING);
-        node->add_child_text(
-                Glib::ustring::compose(_(" %1 from %2 at %3"),
-                PACKAGE_STRING, session_info, time_str));
+
+        if (*p != 0)
+                node->add_child_text(
+                  Glib::ustring::compose(p+2 , session_info, time_str));
 }
 
@@ -370 +381 @@
                 guint id = inf_user_get_id(INF_USER(*i));
                 gdouble hue = inf_text_user_get_hue(*i);
-                gdouble r, g, b;
-                // TODO: use Gdk::Color c; c.set_hsv(...) if we are not depending on 2.14
-                gtk_hsv_to_rgb(hue, 0.35, 1.0, &r, &g, &b);
-                unsigned int rgb =
-                         ((static_cast<unsigned int>(r * 0xff) << 16)
-                        | (static_cast<unsigned int>(g * 0xff) << 8)
-                        | (static_cast<unsigned int>(b * 0xff))) & 0xffffff;
+                if (hue == 1)
+                        hue = 0;
+
+                Gdk::Color c;
+                c.set_hsv(360.0 * hue, 0.35, 1.0);
                 gchar const* name = inf_user_get_name(INF_USER(*i));
                 // TODO: figure out if we can get "written by <name>" tooltips easily
-                std::ostringstream ss;
-                ss
-                        << ".user_" << id << " {\n"
-                        << "  background-color:       #" << std::hex << rgb << ";\n"
-                        << "}\n";
-
-                css->add_child_text(ss.str());
+                unsigned int rgb =
+                          ((c.get_red()   & 0xff00) << 8)
+                        |  (c.get_green() & 0xff00)
+                        | ((c.get_blue()  & 0xff00) >> 8);
+
+                css->add_child_text(Glib::ustring::compose(
+                        ".user_%1 {\n"
+                        "  background-color:       #%2;\n"
+                        "}\n",
+                        id,
+                        Glib::ustring::format(std::hex,
+                                              std::setw(6),
+                                              std::setfill(L'0'), rgb)));
                 xmlpp::Element* item = list->add_child("li");
                 item->set_attribute("class", Glib::ustring::compose("user_%1", id));
@@ -426 +441 @@
         style->set_attribute("type", "text/css");
         add_user_colours(style, user_list, users);
+        if (!user_list->cobj()->children) {
+                body->remove_child(h2);
+                body->remove_child(user_list);
+        }
 
         style->add_child_text(