Changeset 5e4f71dcc0a6c1d008fd8d95df86fbd05299e55b

Timestamp:

01/07/07 00:04:51 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

dfc8e830fe2821fcb4775fb6d78b5654e733a8ff

Children:

960ea8f1a0fe6c93f64551b52589fe8585e7fd5e

git-committer:

Philipp Kern <phil@0x539.de> / 2007-01-06T23:04:51Z+0000

Message:

[project @ Load pixmaps from pixmaps/ if not found in PIXMAPS_DIR]

Original author: Armin Burgmeier <armin@…>
Date: 2006-08-21 20:41:33+00:00

Files:

• src/icon.cpp (modified) (3 diffs)

src/icon.cpp

@@ -1 @@
-/* GdkPixbuf RGBA C-Source image dump */
+/* IconZZzzzzzzzzz */
 
 #include <glib/gtypes.h>
@@ -6 +6 @@
 #include "icon.hpp"
 
+#ifdef _WIN32
+# include <windows.h>
+#endif
+
+namespace
+{
+        Glib::RefPtr<Gdk::Pixbuf> load_pixbuf(const char* dir, const char* file)
+        {
+                try
+                {
+                        return Gdk::Pixbuf::create_from_file(
+                                Glib::build_filename(dir, file)
+                        );
+                }
+                catch(Glib::FileError& e)
+                {
+                        /* Not installed */
+#ifdef _WIN32
+                        TCHAR path[MAX_PATH];
+                        if(!GetModuleFileName(NULL, path, MAX_PATH))
+                                throw e;
+
+                        return Gdk::Pixbuf::create_from_file(
+                                Glib::build_filename(
+                                        Glib::build_filename(
+                                                Glib::path_get_dirname(path),
+                                                "pixmaps"
+                                        ),
+                                        file
+                                )
+                        );
+#else
+                        return Gdk::Pixbuf::create_from_file(
+                                Glib::build_filename("pixmaps", file)
+                        );
+#endif
+                }
+        }
+}
+
 Gtk::StockID Gobby::IconManager::STOCK_USERLIST("gobby-userlist");
 Gtk::StockID Gobby::IconManager::STOCK_DOCLIST("gobby-doclist");
@@ -11 +51 @@
 
 Gobby::IconManager::IconManager():
-        gobby(Gdk::Pixbuf::create_from_file(APPICON_DIR"/gobby.png") ),
-        userlist(Gdk::Pixbuf::create_from_file(PIXMAPS_DIR"/userlist.png") ),
-        doclist(Gdk::Pixbuf::create_from_file(PIXMAPS_DIR"/doclist.png") ),
-        chat(Gdk::Pixbuf::create_from_file(PIXMAPS_DIR"/chat.png") ),
+        gobby(load_pixbuf(APPICON_DIR, "gobby.png") ),
+        userlist(load_pixbuf(PIXMAPS_DIR, "userlist.png") ),
+        doclist(load_pixbuf(PIXMAPS_DIR, "doclist.png") ),
+        chat(load_pixbuf(PIXMAPS_DIR, "chat.png") ),
         m_is_userlist(userlist),
         m_is_doclist(doclist),