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

Browse Source
This commit is contained in:
ghorvath
2010-04-16 10:29:18 +00:00
parent 71b74bbfd2
commit 68c4f03a59
205 changed files with 7112 additions and 15069 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
rtgui/rtwindow.cc
View File

@@ -1,21 +1,21 @@
/*
* This file is part of RawTherapee.
*
* Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
*
* RawTherapee is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* RawTherapee is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
/*
* This file is part of RawTherapee.
*
* Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
*
* RawTherapee is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* RawTherapee is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
#include <rtwindow.h>
#include <options.h>
#include <preferences.h>
@@ -25,13 +25,18 @@ RTWindow::RTWindow () {
cacheMgr.init ();
try {
set_default_icon_from_file (argv0+"/images/logoicon16.png");
}
catch (Glib::FileError) {}
#ifdef GLIBMM_EXCEPTIONS_ENABLED
try { set_default_icon_from_file (argv0+"/images/logoicon16.png");
} catch(Glib::Exception& ex) { printf ("%s\n", ex.what().c_str()); }
#else
{ std::auto_ptr<Glib::Error> error;
set_default_icon_from_file (argv0+"/images/logoicon16.png", error);
}
#endif //GLIBMM_EXCEPTIONS_ENABLED
set_title("Raw Therapee "+versionString);
property_allow_shrink() = true;
set_size_request (1000,600);
set_size_request (options.windowWidth, options.windowHeight);
// maximize ();
set_modal(false);
set_resizable(true);
@@ -117,7 +122,7 @@ void RTWindow::addEditorPanel (EditorPanel* ep) {
style->set_ythickness (0);
closeb->modify_style (style);
closeb->signal_clicked().connect( sigc::bind (sigc::mem_fun(*this, &RTWindow::remEditorPanel) , ep));
closeb->signal_clicked().connect( sigc::bind (sigc::mem_fun(*this, &RTWindow::remEditorPanel) , ep));
hb->pack_end (*closeb);
hb->set_spacing (2);
hb->show_all ();
@@ -195,6 +200,7 @@ bool RTWindow::on_delete_event(GdkEventAny* event) {
fileBrowser->close ();
cacheMgr.closeCache ();
options.lastScale = editorPanel->zoomBar->getScale ();
options.lastCropSize = editorPanel->zoomBar->getCropSize ();
if (options.showFilePanelState==0 || options.showFilePanelState==2)
@@ -211,6 +217,10 @@ bool RTWindow::on_delete_event(GdkEventAny* event) {
options.fbArrangement = fileBrowser->getFileCatalog()->getArrangement ();
options.firstRun = false;
*/
options.windowWidth = get_width();
options.windowHeight = get_height();
Options::save ();
hide();
return true;