update to trunk

(bzr r13708.1.39)

7 files changed, 52 insertions, 40 deletions

diff --git a/src/ui/widget/color-entry.h b/src/ui/widget/color-entry.h
index edabe1980..08537f26d 100644
--- a/src/ui/widget/color-entry.h
+++ b/src/ui/widget/color-entry.h
@@ -9,7 +9,7 @@
  */
 
 #ifndef SEEN_COLOR_ENTRY_H
-#define SEEN_COLOR_ENTRY_H_
+#define SEEN_COLOR_ENTRY_H
 
 #include <gtkmm/entry.h>
 #include "ui/selected-color.h"
diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp
index 1c31ae33a..2fe4a0704 100644
--- a/src/ui/widget/color-icc-selector.cpp
+++ b/src/ui/widget/color-icc-selector.cpp
@@ -676,9 +676,9 @@ void ColorICCSelectorImpl::_profilesChanged(std::string const &name)
     gtk_combo_box_set_active(combo, 0);
 
     int index = 1;
-    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList("iccprofile");
-    while (current) {
-        SPObject *obj = SP_OBJECT(current->data);
+    std::set<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList("iccprofile");
+    for (std::set<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
+        SPObject *obj = *it;
         Inkscape::ColorProfile *prof = reinterpret_cast<Inkscape::ColorProfile *>(obj);
 
         gtk_list_store_append(store, &iter);
@@ -690,7 +690,6 @@ void ColorICCSelectorImpl::_profilesChanged(std::string const &name)
         }
 
         index++;
-        current = g_slist_next(current);
     }
 
     g_signal_handler_unblock(G_OBJECT(_profileSel), _profChangedID);
diff --git a/src/ui/widget/font-variants.cpp b/src/ui/widget/font-variants.cpp
index 5d1e40971..62598dead 100644
--- a/src/ui/widget/font-variants.cpp
+++ b/src/ui/widget/font-variants.cpp
@@ -35,41 +35,41 @@ namespace Widget {
 
   FontVariants::FontVariants () :
     Gtk::VBox (),
-    _ligatures_frame          ( Glib::ustring(_("Ligatures"    )) ),
-    _ligatures_common         ( Glib::ustring(_("Common"       )) ),
-    _ligatures_discretionary  ( Glib::ustring(_("Discretionary")) ),
-    _ligatures_historical     ( Glib::ustring(_("Historical"   )) ),
-    _ligatures_contextual     ( Glib::ustring(_("Contextual"   )) ),
-
-    _position_frame           ( Glib::ustring(_("Position"     )) ),
-    _position_normal          ( Glib::ustring(_("Normal"       )) ),
-    _position_sub             ( Glib::ustring(_("Subscript"    )) ),
-    _position_super           ( Glib::ustring(_("Superscript"  )) ),
-
-    _caps_frame               ( Glib::ustring(_("Capitals"     )) ),
-    _caps_normal              ( Glib::ustring(_("Normal"       )) ),
-    _caps_small               ( Glib::ustring(_("Small"        )) ),
-    _caps_all_small           ( Glib::ustring(_("All small"    )) ),
-    _caps_petite              ( Glib::ustring(_("Petite"       )) ),
-    _caps_all_petite          ( Glib::ustring(_("All petite"   )) ),
-    _caps_unicase             ( Glib::ustring(_("Unicase"      )) ),
-    _caps_titling             ( Glib::ustring(_("Titling"      )) ),
-
-    _numeric_frame            ( Glib::ustring(_("Numeric"      )) ),
-    _numeric_lining           ( Glib::ustring(_("Lining"       )) ),
-    _numeric_old_style        ( Glib::ustring(_("Old Style"    )) ),
-    _numeric_default_style    ( Glib::ustring(_("Default Style")) ),
-    _numeric_proportional     ( Glib::ustring(_("Proportional" )) ),
-    _numeric_tabular          ( Glib::ustring(_("Tabular"      )) ),
-    _numeric_default_width    ( Glib::ustring(_("Default Width")) ),
-    _numeric_diagonal         ( Glib::ustring(_("Diagonal"     )) ),
-    _numeric_stacked          ( Glib::ustring(_("Stacked"      )) ),
-    _numeric_default_fractions( Glib::ustring(_("Default Fractions")) ),
-    _numeric_ordinal          ( Glib::ustring(_("Ordinal"      )) ),
-    _numeric_slashed_zero     ( Glib::ustring(_("Slashed Zero" )) ),
-
-    _feature_frame            ( Glib::ustring(_("Feature Settings")) ),
-    _feature_label            ( Glib::ustring(_("Selection has different Feature Settings!")) ),
+    _ligatures_frame          ( Glib::ustring(C_("Font variant", "Ligatures"    )) ),
+    _ligatures_common         ( Glib::ustring(C_("Font variant", "Common"       )) ),
+    _ligatures_discretionary  ( Glib::ustring(C_("Font variant", "Discretionary")) ),
+    _ligatures_historical     ( Glib::ustring(C_("Font variant", "Historical"   )) ),
+    _ligatures_contextual     ( Glib::ustring(C_("Font variant", "Contextual"   )) ),
+
+    _position_frame           ( Glib::ustring(C_("Font variant", "Position"     )) ),
+    _position_normal          ( Glib::ustring(C_("Font variant", "Normal"       )) ),
+    _position_sub             ( Glib::ustring(C_("Font variant", "Subscript"    )) ),
+    _position_super           ( Glib::ustring(C_("Font variant", "Superscript"  )) ),
+
+    _caps_frame               ( Glib::ustring(C_("Font variant", "Capitals"     )) ),
+    _caps_normal              ( Glib::ustring(C_("Font variant", "Normal"       )) ),
+    _caps_small               ( Glib::ustring(C_("Font variant", "Small"        )) ),
+    _caps_all_small           ( Glib::ustring(C_("Font variant", "All small"    )) ),
+    _caps_petite              ( Glib::ustring(C_("Font variant", "Petite"       )) ),
+    _caps_all_petite          ( Glib::ustring(C_("Font variant", "All petite"   )) ),
+    _caps_unicase             ( Glib::ustring(C_("Font variant", "Unicase"      )) ),
+    _caps_titling             ( Glib::ustring(C_("Font variant", "Titling"      )) ),
+
+    _numeric_frame            ( Glib::ustring(C_("Font variant", "Numeric"      )) ),
+    _numeric_lining           ( Glib::ustring(C_("Font variant", "Lining"       )) ),
+    _numeric_old_style        ( Glib::ustring(C_("Font variant", "Old Style"    )) ),
+    _numeric_default_style    ( Glib::ustring(C_("Font variant", "Default Style")) ),
+    _numeric_proportional     ( Glib::ustring(C_("Font variant", "Proportional" )) ),
+    _numeric_tabular          ( Glib::ustring(C_("Font variant", "Tabular"      )) ),
+    _numeric_default_width    ( Glib::ustring(C_("Font variant", "Default Width")) ),
+    _numeric_diagonal         ( Glib::ustring(C_("Font variant", "Diagonal"     )) ),
+    _numeric_stacked          ( Glib::ustring(C_("Font variant", "Stacked"      )) ),
+    _numeric_default_fractions( Glib::ustring(C_("Font variant", "Default Fractions")) ),
+    _numeric_ordinal          ( Glib::ustring(C_("Font variant", "Ordinal"      )) ),
+    _numeric_slashed_zero     ( Glib::ustring(C_("Font variant", "Slashed Zero" )) ),
+
+    _feature_frame            ( Glib::ustring(C_("Font variant", "Feature Settings")) ),
+    _feature_label            ( Glib::ustring(C_("Font variant", "Selection has different Feature Settings!")) ),
     
     _ligatures_changed( false ),
     _position_changed( false ),
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index 72597e4d9..e906762e3 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -205,6 +205,7 @@ void PrefCheckButton::init(Glib::ustring const &label, Glib::ustring const &pref
 
 void PrefCheckButton::on_toggled()
 {
+    this->changed_signal.emit(this->get_active());
     if (this->get_visible()) //only take action if the user toggled it
     {
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
diff --git a/src/ui/widget/preferences-widget.h b/src/ui/widget/preferences-widget.h
index 8b75b8368..1d2d77699 100644
--- a/src/ui/widget/preferences-widget.h
+++ b/src/ui/widget/preferences-widget.h
@@ -59,6 +59,7 @@ class PrefCheckButton : public Gtk::CheckButton
 public:
     void init(Glib::ustring const &label, Glib::ustring const &prefs_path,
               bool default_value);
+    sigc::signal<void, bool> changed_signal;
 protected:
     Glib::ustring _prefs_path;
     void on_toggled();
diff --git a/src/ui/widget/unit-tracker.cpp b/src/ui/widget/unit-tracker.cpp
index c6318db25..a1501c229 100644
--- a/src/ui/widget/unit-tracker.cpp
+++ b/src/ui/widget/unit-tracker.cpp
@@ -12,6 +12,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "style-internal.h"
 #include "unit-tracker.h"
 #include "widgets/ege-select-one-action.h"
 
@@ -121,6 +122,15 @@ void UnitTracker::addUnit(Inkscape::Util::Unit const *u)
     gtk_list_store_set(_store, &iter, COLUMN_STRING, u ? u->abbr.c_str() : "NULL", -1);
 }
 
+void UnitTracker::prependUnit(Inkscape::Util::Unit const *u)
+{
+    GtkTreeIter iter;
+    gtk_list_store_prepend(_store, &iter);
+    gtk_list_store_set(_store, &iter, COLUMN_STRING, u ? u->abbr.c_str() : "NULL", -1);
+    /* Re-shuffle our default selection here (_active gets out of sync) */
+    setActiveUnit(_activeUnit);
+}
+
 void UnitTracker::setFullVal(GtkAdjustment *adj, gdouble val)
 {
     _priorValues[adj] = val;
diff --git a/src/ui/widget/unit-tracker.h b/src/ui/widget/unit-tracker.h
index 06245930e..0fe5bda80 100644
--- a/src/ui/widget/unit-tracker.h
+++ b/src/ui/widget/unit-tracker.h
@@ -42,6 +42,7 @@ public:
     Inkscape::Util::Unit const * getActiveUnit() const;
 
     void addUnit(Inkscape::Util::Unit const *u);
+    void prependUnit(Inkscape::Util::Unit const *u);
     void addAdjustment(GtkAdjustment *adj);
     void setFullVal(GtkAdjustment *adj, gdouble val);