Fixes AppImage build

- RawTherapee app icon should be installed in hicolor theme provided in AppImage package
- Fix wrong searching path for SVG/PNG images in rtscalable.h
This commit is contained in:
Pandagrapher
2023-09-12 11:59:43 +02:00
parent 735958fc0d
commit e255a77fcd
13 changed files with 63 additions and 48 deletions

View File

@@ -24,9 +24,10 @@
#include <librsvg/rsvg.h>
#include "../rtengine/settings.h"
#include "config.h"
#include "guiutils.h"
extern Glib::ustring argv0;
// Default static parameter values
double RTScalable::dpi = 96.;
int RTScalable::scale = 1;
@@ -118,7 +119,7 @@ Cairo::RefPtr<Cairo::ImageSurface> RTScalable::loadSurfaceFromPNG(const Glib::us
path = fname;
} else {
// Look for PNG file in "images" folder
Glib::ustring imagesFolder = Glib::build_filename(DATA_SEARCH_PATH, "images");
Glib::ustring imagesFolder = Glib::build_filename(argv0, "images");
path = Glib::build_filename(imagesFolder, fname);
}
@@ -145,7 +146,7 @@ Cairo::RefPtr<Cairo::ImageSurface> RTScalable::loadSurfaceFromSVG(const Glib::us
path = fname;
} else {
// Look for SVG file in "images" folder
Glib::ustring imagesFolder = Glib::build_filename(DATA_SEARCH_PATH, "images");
Glib::ustring imagesFolder = Glib::build_filename(argv0, "images");
path = Glib::build_filename(imagesFolder, fname);
}