Changeset d451ded122128ae7642f03735ebc062afc1b7e9d

Timestamp:

10/24/09 16:58:54 (4 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

100e34cbc1b89eb7b0aa267f90358ed8f0b7d84d

Children:

44f4113f1630461cc00e8ad6aae3d5720fa585e5

git-committer:

Armin Burgmeier <armin@arbur.net> / 2009-10-24T16:58:54Z+0200

Message:

Show user color indicator in user list

2009-10-24 Armin Burgmeier <armin@…>

• icons/hicolor/scalable/status/user-color-indicator.svg: Removed blur, so that rsvg renders it correctly.

• icons/hicolor/scalable/Makefile.am:
• icons/hicolor/48x48/Makefile.am:
• icons/hicolor/48x48/status/Makefile.am:
• icons/hicolor/scalable/status/Makefile.am:
• configure.ac: Added the new item to the build system.

• code/util/color.hpp:
• code/util/color.cpp: Added public rgb_to_hsv() and hsv_to_rgb() functions.

• code/core/iconmanager.hpp:
• code/core/iconmanager.cpp: Added a stock item for the user color indicator.

• code/core/userlist.cpp: Show the user color indicator for the user color instead of a boring monochromatic square.

Files:

• ChangeLog (modified) (1 diff)
• code/core/iconmanager.cpp (modified) (2 diffs)
• code/core/iconmanager.hpp (modified) (2 diffs)
• code/core/userlist.cpp (modified) (5 diffs)
• code/util/color.cpp (modified) (3 diffs)
• code/util/color.hpp (modified) (1 diff)
• configure.ac (modified) (1 diff)
• icons/hicolor/48x48/Makefile.am (modified) (1 diff)
• icons/hicolor/48x48/status/Makefile.am (added)
• icons/hicolor/scalable/Makefile.am (modified) (1 diff)
• icons/hicolor/scalable/status/Makefile.am (added)
• icons/hicolor/scalable/status/user-color-indicator.svg (modified) (3 diffs)

ChangeLog

@@ +1 @@
+2009-10-24  Armin Burgmeier  <armin@arbur.net>
+
+        * icons/hicolor/scalable/status/user-color-indicator.svg: Removed
+        blur, so that rsvg renders it correctly.
+
+        * icons/hicolor/scalable/Makefile.am:
+        * icons/hicolor/48x48/Makefile.am:
+        * icons/hicolor/48x48/status/Makefile.am:
+        * icons/hicolor/scalable/status/Makefile.am:
+        * configure.ac: Added the new item to the build system.
+
+        * code/util/color.hpp:
+        * code/util/color.cpp: Added public rgb_to_hsv() and hsv_to_rgb()
+        functions.
+
+        * code/core/iconmanager.hpp:
+        * code/core/iconmanager.cpp: Added a stock item for the user color
+        indicator.
+
+        * code/core/userlist.cpp: Show the user color indicator for the user
+        color instead of a boring monochromatic square.
+
 2009-10-24  Benjamin Herr  <ben@0x539.de>
 

code/core/iconmanager.cpp

@@ -26 +26 @@
 Gtk::StockID Gobby::IconManager::STOCK_DOCLIST("gobby-document-list");
 Gtk::StockID Gobby::IconManager::STOCK_SAVE_ALL("gobby-save-all");
+Gtk::StockID Gobby::IconManager::STOCK_USER_COLOR_INDICATOR(
+        "gobby-user-color-indicator");
 
 // TODO: The save-all icon does not match the save icon for toolbar
@@ -48 +50 @@
         Gtk::StockItem save_all_item(STOCK_SAVE_ALL, _("Save All"));
 
+        Gtk::IconSource user_color_indicator_source;
+        user_color_indicator_source.set_icon_name("user-color-indicator");
+        m_is_user_color_indicator.add_source(user_color_indicator_source);
+        Gtk::StockItem user_color_indicator_item(STOCK_USER_COLOR_INDICATOR,
+                                                 _("User Color Indicator"));
+        m_icon_factory->add(STOCK_USER_COLOR_INDICATOR,
+                            m_is_user_color_indicator);
+
         m_icon_factory->add_default();
 }

code/core/iconmanager.hpp

@@ -33 +33 @@
                 static Gtk::StockID STOCK_DOCLIST;
                 static Gtk::StockID STOCK_SAVE_ALL;
+                static Gtk::StockID STOCK_USER_COLOR_INDICATOR;
 
                 IconManager();
@@ -40 +41 @@
                 Gtk::IconSet m_is_doclist;
                 Gtk::IconSet m_is_save_all;
+                Gtk::IconSet m_is_user_color_indicator;
 
                 Glib::RefPtr<Gtk::IconFactory> m_icon_factory;

code/core/userlist.cpp

@@ -18 +18 @@
 
 #include "core/userlist.hpp"
+#include "core/iconmanager.hpp"
 
 #include "util/i18n.hpp"
@@ -37 +38 @@
         }
 
-        void draw_pixel(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf, int x, int y,
-                        const Gdk::Color& color)
-        {
-                guint8* pixels = pixbuf->get_pixels();
-                guint8* pixel = pixels + y * pixbuf->get_rowstride() +
-                                         x * pixbuf->get_n_channels();
-                *pixel++ = (color.get_red() >> 8);
-                *pixel++ = (color.get_green() >> 8);
-                *pixel++ = (color.get_blue() >> 8);
-        }
-
-        void draw_vline(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf, int x,
-                        int y1, int y2, const Gdk::Color& color)
-        {
-                for(int y = y1; y < y2; ++ y)
-                        draw_pixel(pixbuf, x, y, color);
-        }
-
-        void draw_hline(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf, int x1,
-                        int x2, int y, const Gdk::Color& color)
-        {
-                for(int x = x1; x < x2; ++ x)
-                        draw_pixel(pixbuf, x, y, color);
-        }
-
-        void draw_rectangle(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf, int x1,
-                            int y1, int x2, int y2, const Gdk::Color& color)
-        {
-                for(int y = y1; y < y2; ++ y)
-                        for(int x = x1; x < x2; ++ x)
-                                draw_pixel(pixbuf, x, y, color);
-        }
-
-        Glib::RefPtr<Gdk::Pixbuf> generate_user_color_pixbuf(gdouble hue)
-        {
-                // TODO: Play around with hue, saturation and value to get
-                // a cool effect instead of a monochromatic icon.
-                Gdk::Color color = Gobby::hue_to_gdk_color(hue, 0.35, 1.0);
-                Gdk::Color black("#000000");
-
-                int width, height;
-                Gtk::IconSize::lookup(Gtk::ICON_SIZE_MENU, width, height);
-
-                Glib::RefPtr<Gdk::Pixbuf> pixbuf(
-                        Gdk::Pixbuf::create(
-                                Gdk::COLORSPACE_RGB, false, 8,
-                                width, height));
-
-                draw_hline(pixbuf, 0, width, 0, black);
-                draw_hline(pixbuf, 0, width, height - 1, black);
-                draw_vline(pixbuf, 0, 1, height - 1, black);
-                draw_vline(pixbuf, width-1, 1, height - 1, black);
-                draw_rectangle(pixbuf, 1, 1, width - 1, height - 1, color);
+        Glib::RefPtr<Gdk::Pixbuf> generate_user_color_pixbuf(Gtk::Widget& w,
+                                                             gdouble hue)
+        {
+                Glib::RefPtr<Gdk::Pixbuf> pixbuf = w.render_icon(
+                        Gobby::IconManager::STOCK_USER_COLOR_INDICATOR,
+                        Gtk::ICON_SIZE_MENU);
+
+                // pixbuf is shared, though we want to mess with it here
+                pixbuf = pixbuf->copy();
+
+                for(unsigned int y = 0; y < pixbuf->get_height(); ++y)
+                {
+                        for(unsigned int x = 0; x < pixbuf->get_width(); ++x)
+                        {
+                                guint8* pixels = pixbuf->get_pixels();
+                                guint8* pixel =
+                                        pixels + y * pixbuf->get_rowstride() +
+                                                 x * pixbuf->get_n_channels();
+
+                                double r = pixel[0]/255.0;
+                                double g = pixel[1]/255.0;
+                                double b = pixel[2]/255.0;
+
+                                Gobby::rgb_to_hsv(r,g,b);
+                                r = hue;
+                                Gobby::hsv_to_rgb(r,g,b);
+
+                                pixel[0] =
+                                        static_cast<guint8>(r * 255.0 + 0.5);
+                                pixel[1] =
+                                        static_cast<guint8>(g * 255.0 + 0.5);
+                                pixel[2] =
+                                        static_cast<guint8>(b * 255.0 + 0.5);
+                        }
+                }
 
                 return pixbuf;
@@ -266 +249 @@
         g_assert(find_user_iter(user) == m_store->children().end());
 
-        Glib::RefPtr<Gdk::Pixbuf> color_pixbuf =
-                generate_user_color_pixbuf(inf_text_user_get_hue(user));
+        Glib::RefPtr<Gdk::Pixbuf> color_pixbuf = generate_user_color_pixbuf(
+                *this, inf_text_user_get_hue(user));
 
         Gtk::TreeIter iter = m_store->append();
@@ -285 +268 @@
         g_assert(iter != m_store->children().end());
 
-        (*iter)[m_columns.color] =
-                generate_user_color_pixbuf(inf_text_user_get_hue(user));
+        (*iter)[m_columns.color] = generate_user_color_pixbuf(
+                *this, inf_text_user_get_hue(user));
 }
 
@@ -313 +296 @@
         return children.end();
 }
-

code/util/color.cpp

@@ -162 +162 @@
 namespace Gobby
 {
+        double hsv_to_rgb(double& rh, double &gs, double &gv)
+        {
+                ::hsv_to_rgb(&rh, &gs, &gv);
+        }
+
+        double rgb_to_hsv(double &rh, double &gs, double &gv)
+        {
+                ::rgb_to_hsv(&rh, &gs, &gv);
+        }
+
         double hue_from_gdk_color(const Gdk::Color& color)
         {
@@ -168 +178 @@
                 double b = color.get_blue() / 65535.0;
 
-                rgb_to_hsv(&r, &g, &b);
+                ::rgb_to_hsv(&r, &g, &b);
                 return r;
         }
@@ -175 +185 @@
                                     double value)
         {
-                hsv_to_rgb(&hue, &saturation, &value);
+                ::hsv_to_rgb(&hue, &saturation, &value);
                 Gdk::Color color;
                 color.set_red(static_cast<gushort>(hue * 65535.0));

code/util/color.hpp

@@ -24 +24 @@
 namespace Gobby
 {
+        double hsv_to_rgb(double& rh, double &gs, double &gv);
+        double rgb_to_hsv(double &rh, double &gs, double &gv);
+
         double hue_from_gdk_color(const Gdk::Color& color);
 

configure.ac

@@ -108 +108 @@
           icons/hicolor/48x48/apps/Makefile
           icons/hicolor/48x48/actions/Makefile
+          icons/hicolor/48x48/status/Makefile
         icons/hicolor/scalable/Makefile
           icons/hicolor/scalable/apps/Makefile
           icons/hicolor/scalable/actions/Makefile
+          icons/hicolor/scalable/status/Makefile
       icons/HighContrastLargePrint/Makefile
         icons/HighContrastLargePrint/48x48/Makefile

icons/hicolor/48x48/Makefile.am

@@ -1 @@
-SUBDIRS = apps actions
+SUBDIRS = apps actions status

icons/hicolor/scalable/Makefile.am

@@ -1 @@
-SUBDIRS = apps actions
+SUBDIRS = apps actions status

icons/hicolor/scalable/status/user-color-indicator.svg

@@ -136 +136 @@
        fy="23.794725"
        r="6.65625" />
-    <filter
-       inkscape:collect="always"
-       id="filter3737">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.064470153"
-         id="feGaussianBlur3739" />
-    </filter>
   </defs>
   <sodipodi:namedview
@@ -156 +148 @@
      inkscape:pageshadow="2"
      inkscape:zoom="8"
-     inkscape:cx="17.162175"
+     inkscape:cx="-4.400325"
      inkscape:cy="18.546187"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="821"
-     inkscape:window-height="809"
-     inkscape:window-x="792"
-     inkscape:window-y="155" />
+     inkscape:window-width="1280"
+     inkscape:window-height="725"
+     inkscape:window-x="0"
+     inkscape:window-y="25" />
   <metadata
      id="metadata7">
@@ -206 +198 @@
       <path
          sodipodi:type="arc"
-         style="fill:url(#linearGradient3707);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter3737)"
+         style="fill:url(#linearGradient3707);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;"
          id="path6538"
          sodipodi:cx="10.1875"