GNOME.org
 

[niepce] gtk: All the icons are in GResource

commit 56e61160a9d28e7f7f8300f93cd3a79efb369b1f
Author: Hubert Figuière <hub figuiere net>
Date:   Thu Dec 26 20:31:54 2019 -0500

    gtk: All the icons are in GResource

 configure.ac                                       |  1 -
 data/Makefile.am                                   | 25 ++++++-
 data/icons/Makefile.am                             | 13 ----
 ...data.xml.in => org.gnome.Niepce.appdata.xml.in} |  0
 ...epce.desktop.in => org.gnome.Niepce.desktop.in} |  0
 src/fwk/toolkit/application.cpp                    |  1 +
 src/fwk/toolkit/widgets/ratinglabel.cpp            | 76 ++++++++++------------
 src/fwk/toolkit/widgets/ratinglabel.hpp            | 17 ++---
 src/niepce/Makefile.am                             | 16 +++++
 src/niepce/gresource.xml                           | 21 ++++++
 src/niepce/modules/darkroom/darkroommodule.cpp     |  4 +-
 src/niepce/modules/darkroom/imagecanvas.cpp        | 19 ++----
 src/niepce/ui/librarycellrenderer.cpp              | 48 +++++++-------
 src/niepce/ui/librarycellrenderer.hpp              | 18 ++---
 14 files changed, 142 insertions(+), 117 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8a61872..50eda33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,7 +152,6 @@ doc/Doxyfile
 doc/Makefile
 doc/doxygen/Makefile
 data/Makefile
-data/icons/Makefile
 data/themes/Makefile
 third_party/Makefile
 src/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index fd5befe..0933405 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,6 @@
-SUBDIRS = icons themes
+SUBDIRS = themes
 
-desktop_in_files = niepce.desktop.in
+desktop_in_files = org.gnome.Niepce.desktop.in
 desktop_files    = $(desktop_in_files:.desktop.in=.desktop)
 
 %.desktop: %.desktop.in
@@ -10,16 +10,35 @@ desktopdir   = $(datadir)/applications
 desktop_DATA = $(desktop_files)
 
 appdatadir = $(datarootdir)/appdata
-appdata_in_files = niepce.appdata.xml.in
+appdata_in_files = org.gnome.Niepce.appdata.xml.in
 appdata_files = $(appdata_in_files:.xml.in=.xml)
 appdata_DATA  = $(appdata_files)
 
 %.appdata.xml: %.appdata.xml.in
        $(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
+pixmap_files = icons/niepce-jpg-fmt.png \
+       icons/niepce-raw-fmt.png \
+       icons/niepce-rawjpeg-fmt.png \
+       icons/niepce-tiff-fmt.png \
+       icons/niepce-png-fmt.png \
+       icons/niepce-img-fmt.png \
+       icons/niepce-unknown-fmt.png \
+       icons/niepce-video-fmt.png \
+       icons/niepce-set-star.png \
+       icons/niepce-unset-star.png \
+       icons/niepce-flag-pick.png \
+       icons/niepce-flag-reject.png \
+       icons/niepce-transform-rotate.png \
+       icons/niepce-image-generic.png \
+       icons/niepce-image-missing.png \
+       icons/niepce-missing.png \
+       $(null)
+
 EXTRA_DIST = \
         $(desktop_in_files) \
        $(appdata_in_files) \
+       $(pixmap_files) \
        $(null)
 
 
diff --git a/data/niepce.appdata.xml.in b/data/org.gnome.Niepce.appdata.xml.in
similarity index 100%
rename from data/niepce.appdata.xml.in
rename to data/org.gnome.Niepce.appdata.xml.in
diff --git a/data/niepce.desktop.in b/data/org.gnome.Niepce.desktop.in
similarity index 100%
rename from data/niepce.desktop.in
rename to data/org.gnome.Niepce.desktop.in
diff --git a/src/fwk/toolkit/application.cpp b/src/fwk/toolkit/application.cpp
index 9a52f1d..d931a35 100644
--- a/src/fwk/toolkit/application.cpp
+++ b/src/fwk/toolkit/application.cpp
@@ -46,6 +46,7 @@ Application::Application(int & argc, char** &argv, const char* app_id,
     }
     m_gtkapp->signal_startup().connect(
         sigc::mem_fun(*this, &Application::on_startup));
+    getIconTheme()->add_resource_path("/org/gnome/Niepce");
 }
 
 
diff --git a/src/fwk/toolkit/widgets/ratinglabel.cpp b/src/fwk/toolkit/widgets/ratinglabel.cpp
index 8d73a39..26dfea1 100644
--- a/src/fwk/toolkit/widgets/ratinglabel.cpp
+++ b/src/fwk/toolkit/widgets/ratinglabel.cpp
@@ -1,7 +1,7 @@
 /*
  * niepce - fwk/toolkit/widgets/ratinglabel.cpp
  *
- * Copyright (C) 2011 Hubert Figuiere
+ * Copyright (C) 2011-2019 Hubert Figuière
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,64 +20,58 @@
 
 #include <cmath>
 
+#include <gdkmm/general.h>
+
 #include "fwk/base/debug.hpp"
 #include "ratinglabel.hpp"
 
-
 namespace fwk {
 
-#ifndef DATADIR
-#error DATADIR is not defined
-#endif
-
-
-
-const Cairo::RefPtr<Cairo::ImageSurface> & RatingLabel::get_star()
+const Glib::RefPtr<Gdk::Pixbuf> & RatingLabel::get_star()
 {
-  static Cairo::RefPtr<Cairo::ImageSurface>  s_star;
+  static Glib::RefPtr<Gdk::Pixbuf> s_star;
   if(!s_star) {
-    s_star = Cairo::ImageSurface::create_from_png(
-                  std::string(DATADIR"/niepce/pixmaps/niepce-set-star.png"));
+    s_star = Gdk::Pixbuf::create_from_resource(
+                  "/org/gnome/Niepce/pixmaps/niepce-set-star.png");
   }
   return s_star;
 }
 
-const Cairo::RefPtr<Cairo::ImageSurface> & RatingLabel::get_unstar()
+const Glib::RefPtr<Gdk::Pixbuf> & RatingLabel::get_unstar()
 {
-  static Cairo::RefPtr<Cairo::ImageSurface> s_unstar;
+  static Glib::RefPtr<Gdk::Pixbuf> s_unstar;
   if(!s_unstar) {
-    s_unstar = Cairo::ImageSurface::create_from_png(
-            std::string(DATADIR"/niepce/pixmaps/niepce-unset-star.png"));
+    s_unstar = Gdk::Pixbuf::create_from_resource(
+            "/org/gnome/Niepce/pixmaps/niepce-unset-star.png");
   }
   return s_unstar;
 }
 
 
-void RatingLabel::draw_rating(const Cairo::RefPtr<Cairo::Context> & cr, 
+void RatingLabel::draw_rating(const Cairo::RefPtr<Cairo::Context> & cr,
                              int32_t rating,
-                             const Cairo::RefPtr<Cairo::ImageSurface> & star,
-                             const Cairo::RefPtr<Cairo::ImageSurface> & unstar,
+                             const Glib::RefPtr<Gdk::Pixbuf> & star,
+                             const Glib::RefPtr<Gdk::Pixbuf> & unstar,
                              double x, double y)
 {
-    if(!star || !unstar) {
-        return;
-    }
-    if(rating == -1) {
-        rating = 0;
-    }
-    int w = star->get_width();
-    int h = star->get_height();
-    y -= h;
-    for(int32_t i = 1; i <= 5; i++) {
-        if(i <= rating) {
-            cr->set_source(star, x, y);
-        }
-        else {
-            cr->set_source(unstar, x, y);
-        }
-        cr->paint();
-        x += w;
+  if (!star || !unstar) {
+    return;
+  }
+  if (rating == -1) {
+    rating = 0;
+  }
+  int w = star->get_width();
+  int h = star->get_height();
+  y -= h;
+  for (int32_t i = 1; i <= 5; i++) {
+    if (i <= rating) {
+      Gdk::Cairo::set_source_pixbuf(cr, star, x, y);
+    } else {
+      Gdk::Cairo::set_source_pixbuf(cr, unstar, x, y);
     }
+    cr->paint();
+    x += w;
+  }
 }
 
 
@@ -93,7 +87,7 @@ int RatingLabel::rating_value_from_hit_x(double x)
   return round(x / width);
 }
 
-  RatingLabel::RatingLabel(int rating, bool editable)
+RatingLabel::RatingLabel(int rating, bool editable)
   : Gtk::DrawingArea()
   , m_rating(rating)
   , m_is_editable(editable)
@@ -151,19 +145,19 @@ bool RatingLabel::on_button_press_event (GdkEventButton* e)
 
 void RatingLabel::get_preferred_width_vfunc (int& minimum_width, int& natural_width) const
 {
-  const Cairo::RefPtr<Cairo::ImageSurface> & star = get_star();
+  const Glib::RefPtr<Gdk::Pixbuf> & star = get_star();
   minimum_width = natural_width = star->get_width() * 5;
 }
 
 void RatingLabel::get_preferred_height_vfunc (int& minimum_height, int& natural_height) const
 {
-  const Cairo::RefPtr<Cairo::ImageSurface> & star = get_star();
+  const Glib::RefPtr<Gdk::Pixbuf> & star = get_star();
   minimum_height = natural_height = star->get_height();
 }
 
 bool RatingLabel::on_draw(const Cairo::RefPtr< Cairo::Context > &cr)
 {
-  const Cairo::RefPtr<Cairo::ImageSurface> & star = get_star();
+  const Glib::RefPtr<Gdk::Pixbuf> & star = get_star();
   double x, y;
   x = 0;
   y = star->get_height();
diff --git a/src/fwk/toolkit/widgets/ratinglabel.hpp b/src/fwk/toolkit/widgets/ratinglabel.hpp
index ba7196d..dbf4615 100644
--- a/src/fwk/toolkit/widgets/ratinglabel.hpp
+++ b/src/fwk/toolkit/widgets/ratinglabel.hpp
@@ -1,7 +1,7 @@
 /*
  * niepce - fwk/toolkit/widgets/ratinglabel.hpp
  *
- * Copyright (C) 2011 Hubert Figuiere
+ * Copyright (C) 2011-2019 Hubert Figuière
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,8 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __FWK_TOOLKIT_RATINGLABEL_HPP__
-#define __FWK_TOOLKIT_RATINGLABEL_HPP__
+#pragma once
 
 #include <gtkmm/drawingarea.h>
 #include <cairomm/surface.h>
@@ -37,15 +36,15 @@ public:
   void set_editable(bool);
 
   void set_rating(int rating);
-  static const Cairo::RefPtr<Cairo::ImageSurface> & get_star();
-  static const Cairo::RefPtr<Cairo::ImageSurface> & get_unstar();
+  static const Glib::RefPtr<Gdk::Pixbuf> & get_star();
+  static const Glib::RefPtr<Gdk::Pixbuf> & get_unstar();
 
   // draw the rating at x and y in the context.
   // this can be called by anybody who wants to print these
-  static void draw_rating(const Cairo::RefPtr<Cairo::Context> & cr, 
+  static void draw_rating(const Cairo::RefPtr<Cairo::Context> & cr,
                          int32_t rating,
-                         const Cairo::RefPtr<Cairo::ImageSurface> & star,
-                         const Cairo::RefPtr<Cairo::ImageSurface> & unstar,
+                         const Glib::RefPtr<Gdk::Pixbuf> & star,
+                         const Glib::RefPtr<Gdk::Pixbuf> & unstar,
                          double x, double y);
   static void get_geometry(double & w, double & h);
   static int rating_value_from_hit_x(double x);
@@ -66,5 +65,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/src/niepce/Makefile.am b/src/niepce/Makefile.am
index ea5f7c3..90a476a 100644
--- a/src/niepce/Makefile.am
+++ b/src/niepce/Makefile.am
@@ -31,8 +31,24 @@ niepce_LDADD = \
        -ldl \
        $(NULL)
 
+## Resources compilation
+npc-resources.c: gresource.xml
+       $(AM_V_GEN) glib-compile-resources \
+                --sourcedir=$(top_srcdir) --target=$@ \
+                --generate-source --c-name npc $(srcdir)/gresource.xml
+
+npc-resources.h: gresource.xml
+       $(AM_V_GEN) glib-compile-resources                                  \
+                --sourcedir=$(top_srcdir) --target=$@ \
+               --generate-header --c-name npc $(srcdir)/gresource.xml
+
+BUILT_SOURCES = \
+        npc-resources.c \
+        npc-resources.h
 
 niepce_SOURCES = \
        notificationcenter.hpp notificationcenter.cpp \
         notifications.hpp \
+        npc-resources.c \
+        npc-resources.h \
        main.cpp
diff --git a/src/niepce/gresource.xml b/src/niepce/gresource.xml
new file mode 100644
index 0000000..c6e1720
--- /dev/null
+++ b/src/niepce/gresource.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/Niepce">
+    <file alias="/pixmaps/niepce-set-star.png">data/icons/niepce-set-star.png</file>
+    <file alias="/pixmaps/niepce-unset-star.png">data/icons/niepce-unset-star.png</file>
+    <file alias="/pixmaps/niepce-missing.png">data/icons/niepce-missing.png</file>
+    <file alias="/pixmaps/niepce-flag-pick.png">data/icons/niepce-flag-pick.png</file>
+    <file alias="/pixmaps/niepce-flag-reject.png">data/icons/niepce-flag-reject.png</file>
+    <file alias="/pixmaps/niepce-transform-rotate.png">data/icons/niepce-transform-rotate.png</file>
+    <file alias="/pixmaps/niepce-img-fmt.png">data/icons/niepce-img-fmt.png</file>
+    <file alias="/pixmaps/niepce-raw-fmt.png">data/icons/niepce-raw-fmt.png</file>
+    <file alias="/pixmaps/niepce-jpg-fmt.png">data/icons/niepce-jpg-fmt.png</file>
+    <file alias="/pixmaps/niepce-rawjpeg-fmt.png">data/icons/niepce-rawjpeg-fmt.png</file>
+    <file alias="/pixmaps/niepce-png-fmt.png">data/icons/niepce-png-fmt.png</file>
+    <file alias="/pixmaps/niepce-tiff-fmt.png">data/icons/niepce-tiff-fmt.png</file>
+    <file alias="/pixmaps/niepce-video-fmt.png">data/icons/niepce-video-fmt.png</file>
+    <file alias="/pixmaps/niepce-unknown-fmt.png">data/icons/niepce-unknown-fmt.png</file>
+    <file alias="/pixmaps/niepce-image-generic.png">data/icons/niepce-image-generic.png</file>
+    <file alias="/pixmaps/niepce-image-missing.png">data/icons/niepce-image-missing.png</file>
+  </gresource>
+</gresources>
diff --git a/src/niepce/modules/darkroom/darkroommodule.cpp b/src/niepce/modules/darkroom/darkroommodule.cpp
index c5b91bd..06ef0bb 100644
--- a/src/niepce/modules/darkroom/darkroommodule.cpp
+++ b/src/niepce/modules/darkroom/darkroommodule.cpp
@@ -59,8 +59,8 @@ void DarkroomModule::reload_image()
     }
     else {
         // reset
-        Glib::RefPtr<Gdk::Pixbuf> p = Gdk::Pixbuf::create_from_file(
-            DATADIR"/niepce/pixmaps/niepce-image-generic.png");
+        Glib::RefPtr<Gdk::Pixbuf> p = Gdk::Pixbuf::create_from_resource(
+            "/org/gnome/Niepce/pixmaps/niepce-image-generic.png", -1, -1);
         m_image->reload(p);
     }
     m_need_reload = false;
diff --git a/src/niepce/modules/darkroom/imagecanvas.cpp b/src/niepce/modules/darkroom/imagecanvas.cpp
index db13667..f7b5cd9 100644
--- a/src/niepce/modules/darkroom/imagecanvas.cpp
+++ b/src/niepce/modules/darkroom/imagecanvas.cpp
@@ -1,7 +1,7 @@
 /*
  * niepce - darkroom/imagecanvas.cpp
  *
- * Copyright (C) 2008-2018 Hubert Figuière
+ * Copyright (C) 2008-2019 Hubert Figuière
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,18 +20,11 @@
 #include <cairomm/context.h>
 #include <gdkmm.h>
 
-
 #include "fwk/base/debug.hpp"
 #include "fwk/base/geometry.hpp"
 
 #include "imagecanvas.hpp"
 
-#include <gdkmm/general.h>
-
-#ifndef DATADIR
-#error DATADIR is not defined
-#endif
-
 namespace dr {
 
 #define IMAGE_INSET 6
@@ -101,8 +94,9 @@ Cairo::RefPtr<Cairo::ImageSurface> ImageCanvas::_get_error_placeholder()
 {
     Cairo::RefPtr<Cairo::ImageSurface> s;
     try {
-        s = Cairo::ImageSurface::create_from_png(
-                std::string(DATADIR"/niepce/pixmaps/niepce-image-generic.png"));
+        auto pixbuf = Gdk::Pixbuf::create_from_resource(
+            "/org/gnome/Niepce/pixmaps/niepce-image-generic.png", -1, -1);
+        s = Gdk::Cairo::create_surface_from_pixbuf(pixbuf, 0);
     }
     catch(...) {
     }
@@ -114,8 +108,9 @@ Cairo::RefPtr<Cairo::ImageSurface> ImageCanvas::_get_missing_placeholder()
 {
     Cairo::RefPtr<Cairo::ImageSurface> s;
     try {
-        s = Cairo::ImageSurface::create_from_png(
-                std::string(DATADIR"/niepce/pixmaps/niepce-image-missing.png"));
+        auto pixbuf = Gdk::Pixbuf::create_from_resource(
+            "/org/gnome/Niepce/pixmaps/niepce-image-missing.png", -1, -1);
+        s = Gdk::Cairo::create_surface_from_pixbuf(pixbuf, 0);
     }
     catch(...) {
     }
diff --git a/src/niepce/ui/librarycellrenderer.cpp b/src/niepce/ui/librarycellrenderer.cpp
index 8d5d992..18ee3a8 100644
--- a/src/niepce/ui/librarycellrenderer.cpp
+++ b/src/niepce/ui/librarycellrenderer.cpp
@@ -28,10 +28,6 @@
 
 #include <gdkmm/general.h>
 
-#ifndef DATADIR
-#error DATADIR is not defined
-#endif
-
 #define CELL_PADDING 4
 
 namespace ui {
@@ -54,30 +50,30 @@ LibraryCellRenderer::LibraryCellRenderer(const IModuleShell& shell)
     property_mode() = Gtk::CELL_RENDERER_MODE_ACTIVATABLE;
     try {
         m_raw_format_emblem
-            = Cairo::ImageSurface::create_from_png(
-                std::string(DATADIR"/niepce/pixmaps/niepce-raw-fmt.png"));
+            = Gdk::Pixbuf::create_from_resource(
+                "/org/gnome/Niepce/pixmaps/niepce-raw-fmt.png", -1, -1);
         m_rawjpeg_format_emblem
-            = Cairo::ImageSurface::create_from_png(
-                std::string(DATADIR"/niepce/pixmaps/niepce-rawjpeg-fmt.png"));
+            = Gdk::Pixbuf::create_from_resource(
+                "/org/gnome/Niepce/pixmaps/niepce-rawjpeg-fmt.png", -1, -1);
         m_img_format_emblem
-            = Cairo::ImageSurface::create_from_png(
-                std::string(DATADIR"/niepce/pixmaps/niepce-img-fmt.png"));
+            = Gdk::Pixbuf::create_from_resource(
+                "/org/gnome/Niepce/pixmaps/niepce-img-fmt.png", -1, -1);
         m_video_format_emblem
-            = Cairo::ImageSurface::create_from_png(
-                std::string(DATADIR"/niepce/pixmaps/niepce-video-fmt.png"));
+            = Gdk::Pixbuf::create_from_resource(
+                "/org/gnome/Niepce/pixmaps/niepce-video-fmt.png", -1, -1);
         m_unknown_format_emblem
-            = Cairo::ImageSurface::create_from_png(
-                std::string(DATADIR"/niepce/pixmaps/niepce-unknown-fmt.png"));
+            = Gdk::Pixbuf::create_from_resource(
+                "/org/gnome/Niepce/pixmaps/niepce-unknown-fmt.png", -1, -1);
 
         m_status_missing
-            = Cairo::ImageSurface::create_from_png(
-                std::string(DATADIR"/niepce/pixmaps/niepce-missing.png"));
+            = Gdk::Pixbuf::create_from_resource(
+                "/org/gnome/Niepce/pixmaps/niepce-missing.png", -1, -1);
         m_flag_reject
-            = Cairo::ImageSurface::create_from_png(
-                std::string(DATADIR"/niepce/pixmaps/niepce-flag-reject.png"));
+            = Gdk::Pixbuf::create_from_resource(
+                "/org/gnome/Niepce/pixmaps/niepce-flag-reject.png", -1, -1);
         m_flag_pick
-            = Cairo::ImageSurface::create_from_png(
-                std::string(DATADIR"/niepce/pixmaps/niepce-flag-pick.png"));
+            = Gdk::Pixbuf::create_from_resource(
+                "/org/gnome/Niepce/pixmaps/niepce-flag-pick.png", -1, -1);
     }
     catch(const std::exception & e) {
         ERR_OUT("exception while creating emblems: %s", e.what());
@@ -129,7 +125,7 @@ LibraryCellRenderer::draw_status(const Cairo::RefPtr<Cairo::Context>& cr,
     double x = r.x + CELL_PADDING;
     double y = r.y + CELL_PADDING;
 
-    cr->set_source(m_status_missing, x, y);
+    Gdk::Cairo::set_source_pixbuf(cr, m_status_missing, x, y);
     cr->paint();
 }
 
@@ -141,7 +137,7 @@ LibraryCellRenderer::draw_flag(const Cairo::RefPtr<Cairo::Context>& cr,
         return;
     }
 
-    Cairo::RefPtr<Cairo::ImageSurface> pixbuf;
+    Glib::RefPtr<Gdk::Pixbuf> pixbuf;
     if (flag_value == -1) {
         pixbuf = m_flag_reject;
     } else if(flag_value == 1) {
@@ -153,14 +149,14 @@ LibraryCellRenderer::draw_flag(const Cairo::RefPtr<Cairo::Context>& cr,
     int w = pixbuf->get_width();
     double x = r.x + r.width - CELL_PADDING - w;
     double y = r.y + CELL_PADDING;
-    cr->set_source(pixbuf, x, y);
+    Gdk::Cairo::set_source_pixbuf(cr, pixbuf, x, y);
     cr->paint();
 }
 
 namespace {
 
 int drawFormatEmblem(const Cairo::RefPtr<Cairo::Context>& cr,
-                      const Cairo::RefPtr<Cairo::ImageSurface>& emblem,
+                      const Glib::RefPtr<Gdk::Pixbuf>& emblem,
                       const GdkRectangle& r)
 {
     int left = 0;
@@ -172,7 +168,7 @@ int drawFormatEmblem(const Cairo::RefPtr<Cairo::Context>& cr,
         left = CELL_PADDING + w;
         x = r.x + r.width - left;
         y = r.y + r.height - CELL_PADDING - h;
-        cr->set_source(emblem, x, y);
+        Gdk::Cairo::set_source_pixbuf(cr, emblem, x, y);
         cr->paint();
     }
     return left;
@@ -267,7 +263,7 @@ LibraryCellRenderer::render_vfunc(const Cairo::RefPtr<Cairo::Context>& cr,
     }
 
     if (m_drawemblem) {
-        Cairo::RefPtr<Cairo::ImageSurface> emblem;
+        Glib::RefPtr<Gdk::Pixbuf> emblem;
 
         switch(engine_db_libfile_file_type(file.get())) {
         case eng::FileType::RAW:
diff --git a/src/niepce/ui/librarycellrenderer.hpp b/src/niepce/ui/librarycellrenderer.hpp
index 1925d9c..28198b6 100644
--- a/src/niepce/ui/librarycellrenderer.hpp
+++ b/src/niepce/ui/librarycellrenderer.hpp
@@ -1,7 +1,7 @@
 /*
  * niepce - ui/librarycellrenderer.h
  *
- * Copyright (C) 2008-2018 Hubert Figuiere
+ * Copyright (C) 2008-2019 Hubert Figuière
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -95,16 +95,16 @@ private:
     Glib::Property<eng::LibFilePtr>   m_libfileproperty;
     Glib::Property<eng::FileStatus> m_statusproperty;
 
-    Cairo::RefPtr<Cairo::ImageSurface>  m_raw_format_emblem;
-    Cairo::RefPtr<Cairo::ImageSurface>  m_rawjpeg_format_emblem;
-    Cairo::RefPtr<Cairo::ImageSurface>  m_img_format_emblem;
-    Cairo::RefPtr<Cairo::ImageSurface>  m_video_format_emblem;
-    Cairo::RefPtr<Cairo::ImageSurface>  m_unknown_format_emblem;
+    Glib::RefPtr<Gdk::Pixbuf>  m_raw_format_emblem;
+    Glib::RefPtr<Gdk::Pixbuf>  m_rawjpeg_format_emblem;
+    Glib::RefPtr<Gdk::Pixbuf>  m_img_format_emblem;
+    Glib::RefPtr<Gdk::Pixbuf>  m_video_format_emblem;
+    Glib::RefPtr<Gdk::Pixbuf>  m_unknown_format_emblem;
 
-    Cairo::RefPtr<Cairo::ImageSurface>  m_status_missing;
+    Glib::RefPtr<Gdk::Pixbuf>  m_status_missing;
 
-    Cairo::RefPtr<Cairo::ImageSurface>  m_flag_reject;
-    Cairo::RefPtr<Cairo::ImageSurface>  m_flag_pick;
+    Glib::RefPtr<Gdk::Pixbuf>  m_flag_reject;
+    Glib::RefPtr<Gdk::Pixbuf>  m_flag_pick;
 };
 
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]