Merge and cleanup of GSoC C++-ification project.

[inkscape.git] / src / widgets / sp-color-icc-selector.cpp

diff --git a/src/widgets/sp-color-icc-selector.cpp b/src/widgets/sp-color-icc-selector.cpp
index 17324967ecb642bb35d38e2d81e88e2fed086f56..12467041c4f4fb7189a8190d91378d3f5c4d2944 100644 (file)
--- a/src/widgets/sp-color-icc-selector.cpp
+++ b/src/widgets/sp-color-icc-selector.cpp
@@ -217,12 +217,12 @@ void getThings( DWORD space, gchar const**& namers, gchar const**& tippies, guin
         //
         {"_Y", "C_b", "C_r", "", "", ""},
         {"_Y", "_x", "y", "", "", ""},
-        {_("_R"), _("_G"), _("_B"), "", "", ""},
-        {_("_G"), "", "", "", "", ""},
-        {_("_H"), _("_S"), "_V", "", "", ""},
-        {_("_H"), _("_L"), _("_S"), "", "", ""},
-        {_("_C"), _("_M"), _("_Y"), _("_K"), "", ""},
-        {_("_C"), _("_M"), _("_Y"), "", "", ""},
+        {_("_R:"), _("_G:"), _("_B:"), "", "", ""},
+        {_("_G:"), "", "", "", "", ""},
+        {_("_H:"), _("_S:"), "_V:", "", "", ""},
+        {_("_H:"), _("_L:"), _("_S:"), "", "", ""},
+        {_("_C:"), _("_M:"), _("_Y:"), _("_K:"), "", ""},
+        {_("_C:"), _("_M:"), _("_Y:"), "", "", ""},
     };
 
     static gchar const *tips[][6] = {
@@ -377,7 +377,7 @@ void ColorICCSelector::init()
     }
 
     /* Label */
-    _label = gtk_label_new_with_mnemonic (_("_A"));
+    _label = gtk_label_new_with_mnemonic (_("_A:"));
     gtk_misc_set_alignment (GTK_MISC (_label), 1.0, 0.5);
     gtk_widget_show (_label);
     gtk_table_attach (GTK_TABLE (t), _label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, XPAD, YPAD);
@@ -581,7 +581,7 @@ void ColorICCSelector::_profilesChanged( std::string const & name )
     gtk_combo_box_set_active( combo, 0 );
 
     int index = 1;
-    const GSList *current = SP_ACTIVE_DOCUMENT->get_resource_list( "iccprofile" );
+    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList( "iccprofile" );
     while ( current ) {
         SPObject* obj = SP_OBJECT(current->data);
         Inkscape::ColorProfile* prof = reinterpret_cast<Inkscape::ColorProfile*>(obj);
@@ -933,4 +933,4 @@ void ColorICCSelector::_sliderChanged( SPColorSlider */*slider*/, SPColorICCSele
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :