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

Merge from default branch

Browse Source
This commit is contained in:
ffsup2
2010-09-24 22:49:15 +02:00
parent 18d6799cbe
commit dc2350cee8
145 changed files with 23287 additions and 17316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rtgui/preferences.cc
View File

@@ -269,7 +269,7 @@ Gtk::Widget* Preferences::getProcParamsPanel () {
std::vector<Glib::ustring> pnames;
if (options.multiUser)
parseDir (Options::cacheBaseDir + "/" + options.profilePath, pnames, paramFileExtension);
parseDir (Options::rtdir + "/" + options.profilePath, pnames, paramFileExtension);
parseDir (argv0 + "/" + options.profilePath, pnames, paramFileExtension);
for (int i=0; i<pnames.size(); i++) {
rprofiles->append_text (pnames[i]);
@@ -324,8 +324,11 @@ Gtk::Widget* Preferences::getGeneralPanel () {
std::vector<Glib::ustring> langs;
parseDir (argv0 + "/languages", langs, "");
for (int i=0; i<langs.size(); i++)
languages->append_text (langs[i]);
for (int i=0; i<langs.size(); i++) {
if ("default" != langs[i] && "README" != langs[i] && "LICENSE" != langs[i]) {
languages->append_text (langs[i]);
}
}
Gtk::Label* langw = new Gtk::Label (Glib::ustring("(") + M("PREFERENCES_APPLNEXTSTARTUP") + ")");
hblang->pack_start (*langlab, Gtk::PACK_SHRINK, 4);