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

Merge from default. Hope I did it right...

Browse Source
This commit is contained in:
Emil Martinec
2012-03-08 20:27:30 -06:00
parent 380728e1f0
commit f47b4b5bb0
262 changed files with 41736 additions and 37104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtgui/preferences.cc
View File

@@ -33,6 +33,8 @@ extern Glib::ustring argv0;
Preferences::Preferences (RTWindow *rtwindow):parent(rtwindow) {
splash = NULL;
set_title (M("MAIN_BUTTON_PREFERENCES"));
moptions.copyFrom (&options);
@@ -1296,9 +1298,9 @@ void Preferences::selectStartupDir () {
void Preferences::aboutPressed () {
Splash* splash = new Splash ();
splash = new Splash (*this);
splash->set_transient_for (*this);
splash->set_modal (true);
splash->signal_delete_event().connect( sigc::mem_fun(*this, &Preferences::splashClosed) );
splash->show ();
}
@@ -1478,3 +1480,9 @@ void Preferences::updateFFinfos()
Glib::ustring s = Glib::ustring::compose("%1: %2 %3, %4 %5", M("PREFERENCES_FLATFIELDFOUND"), t1, M("PREFERENCES_FLATFIELDSHOTS"), t2, M("PREFERENCES_FLATFIELDTEMPLATES"));
ffLabel->set_text(s);
}
bool Preferences::splashClosed(GdkEventAny* event) {
delete splash;
splash = NULL;
return true;
}