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

See #3446: the theme filenames now includes a code for version handling.

Browse Source 
The theme filename must use a template, that will be explained with this
example:

mytheme-GTK3-20_22.css

Everything before -GTK3... is the theme (short) name, the [-GTK3-] is a
mandatory part, 20 is the included version where support begins and 22
is the included version where the support ends. One of this two version
parameters can be ommited (but not both of course), which make RT
understand "is compatible from all version up to xx" (e.g.
mytheme-GTK3-_22.css) or "is compatible from version yy and above" (e.g.
mytheme-GTK3-20_.css)

The RawTherapee-GTK3-_19.css comes 'as is' from the gtk3 branch and has
still to be tuned.
This commit is contained in:
Hombre
2016-11-20 02:22:03 +01:00
parent 0ebac85970
commit 55759c04e3
5 changed files with 551 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rtgui/main.cc
View File

@@ -56,7 +56,6 @@ Glib::ustring creditsPath;
Glib::ustring licensePath;
Glib::ustring argv1;
bool simpleEditor;
Glib::RefPtr<Gtk::CssProvider> cssForced;
Glib::RefPtr<Gtk::CssProvider> cssRT;
//Glib::Threads::Thread* mainThread;
@@ -313,7 +312,13 @@ int main(int argc, char **argv)
Glib::ustring filename = Glib::build_filename(argv0, "themes", options.theme + ".css");
if (!Glib::file_test(filename, Glib::FILE_TEST_EXISTS)) {
options.theme = "RawTherapee";
options.theme = "RawTherapee-GTK";
// We're not testing GTK_MAJOR_VERSION == 3 here, since this branch requires Gtk3 only
if (GTK_MINOR_VERSION < 20) {
options.theme = options.theme + "3-_19";
} else {
options.theme = options.theme + "3-20_";
}
filename = Glib::build_filename(argv0, "themes", options.theme + ".css");
}
cssRT = Gtk::CssProvider::create();

90
rtgui/preferences.cc
View File

@@ -41,6 +41,8 @@ Preferences::Preferences (RTWindow *rtwindow)
, parent (rtwindow)
, splash (nullptr)
{
regex = Glib::Regex::create("^(.+)-GTK3-(\\d{1,2})?_(\\d{1,2})?\\.css$", Glib::RegexCompileFlags::REGEX_CASELESS);
moptions.copyFrom (&options);
/*
@@ -100,6 +102,19 @@ Preferences::~Preferences ()
options.preferencesHeight = get_height();
}
int Preferences::getThemeRowNumber(Glib::ustring& longThemeFName)
{
if (regex->match(longThemeFName + ".css", matchInfo)) {
for (size_t i=0 ; i<themeFNames.size(); ++i) {
if (themeFNames.at(i).longFName == longThemeFName) {
return (int)i;
}
}
}
return -1;
}
Gtk::Widget* Preferences::getBatchProcPanel ()
{
@@ -893,11 +908,10 @@ Gtk::Widget* Preferences::getGeneralPanel ()
setExpandAlignProperties(theme, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
theme->set_active (0);
std::vector<Glib::ustring> themes;
parseDir (argv0 + "/themes", themes, ".css");
parseThemeDir (Glib::build_filename(argv0, "themes"));
for (size_t i = 0; i < themes.size(); i++) {
theme->append (themes[i]);
for (size_t i = 0; i < themeFNames.size(); i++) {
theme->append (themeFNames.at(i).shortFName);
}
themeGrid->attach_next_to(*themelab, Gtk::POS_LEFT, 1, 1);
@@ -1337,6 +1351,59 @@ void Preferences::parseDir (Glib::ustring dirname, std::vector<Glib::ustring>& i
delete dir;
}
void Preferences::parseThemeDir (Glib::ustring dirname)
{
if (dirname.empty()) {
return;
}
// process directory
Glib::Dir* dir = nullptr;
try {
dir = new Glib::Dir (dirname);
} catch (const Glib::Error& e) {
return;
}
for (Glib::DirIterator i = dir->begin(); i != dir->end(); ++i) {
Glib::ustring fname = Glib::build_filename(dirname, *i);
Glib::ustring sname = *i;
bool keepIt = false;
// ignore directories and filter out unsupported theme
if (regex->match(sname, matchInfo) && !Glib::file_test (fname, Glib::FILE_TEST_IS_DIR) && sname.size() >= 4) {
Glib::ustring fname2 = matchInfo.fetch(1);
Glib::ustring minMinor = matchInfo.fetch(2);
Glib::ustring maxMinor = matchInfo.fetch(3);
if (!minMinor.empty()) {
guint64 minMinorVal = g_ascii_strtoll(minMinor.c_str(), 0, 0);
if ((guint64)GTK_MINOR_VERSION >= minMinorVal) {
keepIt = true;
}
}
if (!maxMinor.empty()) {
guint64 maxMinorVal = g_ascii_strtoll(maxMinor.c_str(), 0, 0);
if ((guint64)GTK_MINOR_VERSION <= maxMinorVal) {
keepIt = true;
}
}
if (keepIt) {
themeFNames.push_back(ThemeFilename(matchInfo.fetch(1), sname.substr(0, sname.size() - 4)));
}
}
}
std::sort(themeFNames.begin(), themeFNames.end(), [] (const ThemeFilename& firstDir, const ThemeFilename& secondDir)
{
return firstDir.longFName < secondDir.longFName;
});
delete dir;
}
void Preferences::storePreferences ()
{
@@ -1369,7 +1436,7 @@ void Preferences::storePreferences ()
moptions.shadowThreshold = (int)shThresh->get_value ();
moptions.language = languages->get_active_text ();
moptions.languageAutoDetect = ckbLangAutoDetect->get_active ();
moptions.theme = theme->get_active_text ();
moptions.theme = themeFNames.at(theme->get_active_row_number ()).longFName;
Gdk::RGBA cropCol = butCropCol->get_rgba();
moptions.cutOverlayBrush[0] = cropCol.get_red();
@@ -1585,7 +1652,8 @@ void Preferences::fillPreferences ()
ckbHistogramWorking->set_active (moptions.rtSettings.HistogramWorking);
languages->set_active_text (moptions.language);
ckbLangAutoDetect->set_active (moptions.languageAutoDetect);
theme->set_active_text (moptions.theme);
int themeNbr = getThemeRowNumber(moptions.theme);
theme->set_active (themeNbr==-1 ? 0 : themeNbr);
Gdk::RGBA cropCol;
cropCol.set_rgba(moptions.cutOverlayBrush[0], moptions.cutOverlayBrush[1], moptions.cutOverlayBrush[2]);
@@ -1783,7 +1851,7 @@ void Preferences::okPressed ()
void Preferences::cancelPressed ()
{
// set the initial theme back
if (theme->get_active_text() != options.theme) {
if (themeFNames.at(theme->get_active_row_number ()).longFName != options.theme) {
RTImage::setPaths(options);
RTImage::updateImages();
switchThemeTo(options.theme);
@@ -1830,10 +1898,10 @@ void Preferences::aboutPressed ()
void Preferences::themeChanged ()
{
moptions.theme = theme->get_active_text ();
moptions.theme = themeFNames.at(theme->get_active_row_number ()).longFName;
RTImage::setPaths(moptions);
RTImage::updateImages();
switchThemeTo(theme->get_active_text ());
switchThemeTo(moptions.theme);
}
void Preferences::forRAWComboChanged ()
@@ -1961,10 +2029,12 @@ void Preferences::restoreValue()
void Preferences::switchThemeTo(Glib::ustring newTheme)
{
Glib::ustring filename(argv0 + "/themes/" + newTheme + ".css");
Glib::ustring filename(Glib::build_filename(argv0, "themes", newTheme + ".css"));
if (!css) {
css = Gtk::CssProvider::create();
Glib::RefPtr<Gdk::Screen> screen = Gdk::Screen::get_default();
Gtk::StyleContext::add_provider_for_screen(screen, css, GTK_STYLE_PROVIDER_PRIORITY_USER);
}
try {

19
rtgui/preferences.h
View File

@@ -60,11 +60,21 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener
add(addsetid);
}
};
class ThemeFilename
{
public:
Glib::ustring shortFName;
Glib::ustring longFName;
ThemeFilename (Glib::ustring sfname, Glib::ustring lfname) : shortFName(sfname), longFName(lfname) {}
};
Glib::RefPtr<Gtk::TreeStore> behModel;
BehavColumns behavColumns;
protected:
std::vector<ThemeFilename> themeFNames;
Glib::RefPtr<Glib::Regex> regex;
Glib::MatchInfo matchInfo;
Splash* splash;
ProfileStoreComboBox* rprofiles;
Gtk::TreeIter currRawRow; // :)
@@ -198,6 +208,7 @@ protected:
void fillPreferences ();
void storePreferences ();
void parseDir (Glib::ustring dirname, std::vector<Glib::ustring>& items, Glib::ustring ext);
void parseThemeDir (Glib::ustring dirname);
void updateDFinfos ();
void updateFFinfos ();
void workflowUpdate();
@@ -210,6 +221,8 @@ protected:
void switchThemeTo (Glib::ustring newTheme);
bool splashClosed(GdkEventAny* event);
int getThemeRowNumber(Glib::ustring& longThemeFName);
void appendBehavList (Gtk::TreeModel::iterator& parent, Glib::ustring label, int id, bool set);
Gtk::Widget* getProcParamsPanel ();