liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding rawtherapee-cli.exe, '-q' (quick start mode) added

Browse Source 
Standard rawtherapee.exe now has almost no command line options left.
Use '-h' to see options for each executables.
This commit is contained in:
Hombre
2017-02-13 23:38:05 +01:00
parent 7b4d51238d
commit a04b3eefba
27 changed files with 436 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
rtgui/rtimage.cc
View File

@@ -23,51 +23,13 @@
#include <iostream>
#include "options.h"
#include "../rtengine/icons.h"
namespace
{
std::vector<Glib::ustring> imagePaths;
std::map<Glib::ustring, Glib::RefPtr<Gdk::Pixbuf>> pixbufCache;
bool loadIconSet(const Glib::ustring& iconSet)
{
try {
Glib::KeyFile keyFile;
keyFile.load_from_file (iconSet);
auto iconSetDir = keyFile.get_string ("General", "Iconset");
if (!iconSetDir.empty ()) {
imagePaths.push_back (Glib::build_filename (argv0, "images", iconSetDir, "actions"));
imagePaths.push_back (Glib::build_filename (argv0, "images", iconSetDir));
imagePaths.push_back (Glib::build_filename (argv0, "images", iconSetDir, "devices"));
imagePaths.push_back (Glib::build_filename (argv0, "images", iconSetDir, "places"));
}
iconSetDir = keyFile.get_string ("General", "FallbackIconset");
if (!iconSetDir.empty ()) {
imagePaths.push_back (Glib::build_filename (argv0, "images", iconSetDir, "actions"));
imagePaths.push_back (Glib::build_filename (argv0, "images", iconSetDir));
imagePaths.push_back (Glib::build_filename (argv0, "images", iconSetDir, "devices"));
imagePaths.push_back (Glib::build_filename (argv0, "images", iconSetDir, "places"));
}
return true;
} catch (const Glib::Exception& exception) {
if (options.rtSettings.verbose) {
std::cerr << "Failed to load icon set \"" << iconSet << "\": " << exception.what() << std::endl;
}
return false;
}
}
}
RTImage::RTImage (const Glib::ustring& fileName, const Glib::ustring& rtlFileName) : Gtk::Image()
@@ -90,7 +52,7 @@ void RTImage::changeImage (const Glib::ustring& imageName)
auto iterator = pixbufCache.find (imageName);
if (iterator == pixbufCache.end ()) {
const auto imagePath = findIconAbsolutePath (imageName);
const auto imagePath = rtengine::findIconAbsolutePath (imageName);
const auto pixbuf = Gdk::Pixbuf::create_from_file (imagePath);
iterator = pixbufCache.emplace (imageName, pixbuf).first;
@@ -102,70 +64,18 @@ void RTImage::changeImage (const Glib::ustring& imageName)
void RTImage::updateImages()
{
for (auto& entry : pixbufCache) {
const auto imagePath = findIconAbsolutePath (entry.first);
const auto imagePath = rtengine::findIconAbsolutePath (entry.first);
entry.second = Gdk::Pixbuf::create_from_file (imagePath);
}
}
Glib::ustring RTImage::findIconAbsolutePath (const Glib::ustring& iconName)
{
try {
for (const auto& imagePath : imagePaths) {
const auto iconPath = Glib::build_filename(imagePath, iconName);
if (Glib::file_test(iconPath, Glib::FILE_TEST_IS_REGULAR)) {
return iconPath;
}
}
} catch(const Glib::Exception&) {}
if (options.rtSettings.verbose) {
std::cerr << "Icon \"" << iconName << "\" could not be found!" << std::endl;
}
return Glib::ustring();
}
void RTImage::setPaths (const Options& options)
{
// TODO: Forcing the Dark theme, so reading the icon set files is useless for now...
/*Glib::ustring iconSet;
// Either use the system icon set or the one specified in the options.
if (options.useSystemTheme) {
iconSet = Glib::build_filename (argv0, "themes", "system.iconset");
} else {
iconSet = Glib::build_filename (argv0, "themes", options.theme + ".iconset");
}
imagePaths.clear ();
if (!loadIconSet (iconSet)) {
// If the preferred icon set is unavailable, fall back to the default icon set.
loadIconSet (Glib::build_filename (argv0, "themes", "Default.iconset"));
}*/
imagePaths.clear ();
imagePaths.push_back (Glib::build_filename(argv0, "images", "Dark"));
imagePaths.push_back (Glib::build_filename(argv0, "images", "Dark", "actions"));
imagePaths.push_back (Glib::build_filename(argv0, "images", "Dark", "devices"));
imagePaths.push_back (Glib::build_filename(argv0, "images", "Dark", "places"));
// The images folder is the second fallback solution.
imagePaths.push_back (Glib::build_filename(argv0, "images"));
}
Glib::RefPtr<Gdk::Pixbuf> RTImage::createFromFile (const Glib::ustring& fileName)
{
Glib::RefPtr<Gdk::Pixbuf> pixbuf;
try {
const auto filePath = findIconAbsolutePath (fileName);
const auto filePath = rtengine::findIconAbsolutePath (fileName);
if (!filePath.empty ()) {
pixbuf = Gdk::Pixbuf::create_from_file (filePath);
@@ -188,7 +98,7 @@ Cairo::RefPtr<Cairo::ImageSurface> RTImage::createFromPng (const Glib::ustring&
try {
const auto filePath = findIconAbsolutePath (fileName);
const auto filePath = rtengine::findIconAbsolutePath (fileName);
if (!filePath.empty()) {
surface = Cairo::ImageSurface::create_from_png (Glib::locale_from_utf8 (filePath));