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

Fixed theme selection

Browse Source
This commit is contained in:
Beep6581
2016-03-07 18:49:09 +01:00
parent a563427d59
commit 0ce06b691f
2 changed files with 1 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rtgui/main.cc
View File

@@ -16,12 +16,6 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>. * along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/ */
// generated 2004/6/3 19:15:32 CEST by gabor@darkstar.(none)
// using glademm V2.5.0
//
// newer (non customized) versions of this file go to raw.cc_new
// This file is for your program, I won't touch it again!
#ifdef __GNUC__ #ifdef __GNUC__
#if defined(__FAST_MATH__) #if defined(__FAST_MATH__)
@@ -62,7 +56,6 @@ Glib::ustring creditsPath;
Glib::ustring licensePath; Glib::ustring licensePath;
Glib::ustring argv1; Glib::ustring argv1;
bool simpleEditor; bool simpleEditor;
Glib::RefPtr<Gtk::CssProvider> cssBase;
Glib::RefPtr<Gtk::CssProvider> cssForced; Glib::RefPtr<Gtk::CssProvider> cssForced;
Glib::RefPtr<Gtk::CssProvider> cssRT; Glib::RefPtr<Gtk::CssProvider> cssRT;
//Glib::Threads::Thread* mainThread; //Glib::Threads::Thread* mainThread;
@@ -124,11 +117,6 @@ static void myGdkLockLeave()
* -3 if at least one required procparam file was not found */ * -3 if at least one required procparam file was not found */
int processLineParams( int argc, char **argv ); int processLineParams( int argc, char **argv );
/*
*
* M A I N
*
*/
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
@@ -321,15 +309,9 @@ int main(int argc, char **argv)
Gtk::Settings::get_for_screen(screen)->property_gtk_theme_name() = "Adwaita"; Gtk::Settings::get_for_screen(screen)->property_gtk_theme_name() = "Adwaita";
Gtk::Settings::get_for_screen(screen)->property_gtk_application_prefer_dark_theme() = true; Gtk::Settings::get_for_screen(screen)->property_gtk_application_prefer_dark_theme() = true;
Glib::ustring filename = argv0 + "/themes/RawTherapee.css"; Glib::ustring filename = Glib::build_filename(argv0 + "/themes/", options.theme + ".css");
cssRT = Gtk::CssProvider::create(); cssRT = Gtk::CssProvider::create();
/* TODO
* Make theme selection work again. All themes should be applied below here,
* in other words after the base Adwaita Dark theme has been applied. This
* makes for smaller custom theme files.
*/
try { try {
cssRT->load_from_path (filename); cssRT->load_from_path (filename);
Gtk::StyleContext::add_provider_for_screen(screen, cssRT, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); Gtk::StyleContext::add_provider_for_screen(screen, cssRT, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);

13
rtgui/preferences.cc
View File

@@ -2014,19 +2014,6 @@ void Preferences::switchThemeTo(Glib::ustring newTheme)
printf("Error: Can't load css file \"%s\"\n", filename.c_str()); printf("Error: Can't load css file \"%s\"\n", filename.c_str());
loaded = false; loaded = false;
} }
// TODO remove rtcommon
if (!loaded && options.theme != "rtcommon") {
try {
printf("Trying with \"rtcommon.css\"\n");
filename = argv0 + "/themes/rtcommon.css";
css->load_from_path (filename);
} catch (Glib::Error &err) {
printf("Error: Can't load css file \"rtcommon.css\"\nMessage: %s\n", err.what().c_str());
} catch (...) {
printf("Error: Can't load css file \"%s\"\n", filename.c_str());
}
}
} }
void Preferences::workflowUpdate () void Preferences::workflowUpdate ()