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

Added command line options

Browse Source
This commit is contained in:
ffsup2
2010-12-29 17:22:18 +01:00
parent 1c3739b628
commit 15b0860bbb
6 changed files with 391 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/imageio.cc
View File

@@ -871,7 +871,8 @@ void png_flush(png_structp png_ptr) {
int ImageIO::load (Glib::ustring fname) { int ImageIO::load (Glib::ustring fname) {
int lastdot = fname.find_last_of ('.'); int lastdot = fname.find_last_of ('.');
if( Glib::ustring::npos == lastdot )
return IMIO_FILETYPENOTSUPPORTED;
if (!fname.casefold().compare (lastdot, 4, ".png")) if (!fname.casefold().compare (lastdot, 4, ".png"))
return loadPNG (fname); return loadPNG (fname);
else if (!fname.casefold().compare (lastdot, 4, ".jpg")) else if (!fname.casefold().compare (lastdot, 4, ".jpg"))
@@ -884,7 +885,8 @@ int ImageIO::load (Glib::ustring fname) {
int ImageIO::save (Glib::ustring fname) { int ImageIO::save (Glib::ustring fname) {
int lastdot = fname.find_last_of ('.'); int lastdot = fname.find_last_of ('.');
if( Glib::ustring::npos == lastdot )
return IMIO_FILETYPENOTSUPPORTED;
if (!fname.casefold().compare (lastdot, 4, ".png")) if (!fname.casefold().compare (lastdot, 4, ".png"))
return savePNG (fname); return savePNG (fname);
else if (!fname.casefold().compare (lastdot, 4, ".jpg")) else if (!fname.casefold().compare (lastdot, 4, ".jpg"))

3
rtgui/editorpanel.cc
View File

@@ -161,7 +161,8 @@ EditorPanel::EditorPanel (FilePanel* filePanel) : beforePreviewHandler(NULL), be
sendtogimp->set_tooltip_markup(M("MAIN_BUTTON_SENDTOEDITOR_TOOLTIP")); sendtogimp->set_tooltip_markup(M("MAIN_BUTTON_SENDTOEDITOR_TOOLTIP"));
iops->pack_start (*saveimgas, Gtk::PACK_SHRINK); iops->pack_start (*saveimgas, Gtk::PACK_SHRINK);
iops->pack_start (*queueimg, Gtk::PACK_SHRINK); if(!simpleEditor)
iops->pack_start (*queueimg, Gtk::PACK_SHRINK);
iops->pack_start (*sendtogimp, Gtk::PACK_SHRINK); iops->pack_start (*sendtogimp, Gtk::PACK_SHRINK);
// Status box // Status box

2
rtgui/filepanel.cc
View File

@@ -131,7 +131,7 @@ void FilePanel::init () {
dirBrowser->fillDirTree (); dirBrowser->fillDirTree ();
placesBrowser->refreshPlacesList (); placesBrowser->refreshPlacesList ();
if (argv1!="") if (argv1!="" && safe_file_test (argv1, Glib::FILE_TEST_IS_DIR))
dirBrowser->open (argv1); dirBrowser->open (argv1);
else { else {
if (options.startupDir==STARTUPDIR_HOME) if (options.startupDir==STARTUPDIR_HOME)

277
rtgui/main.cc
View File

@@ -43,18 +43,24 @@
extern Options options; extern Options options;
//#ifdef WIN32
//#include <windows.h> // included for WinMain
//#endif
// stores path to data files // stores path to data files
Glib::ustring argv0; Glib::ustring argv0;
Glib::ustring argv1; Glib::ustring argv1;
bool simpleEditor;
/* Process line command options
* Returns
* 0 if process in batch has executed
* 1 to start GUI (with a dir or file option)
* 2 to start GUI because no files found
* -1 if there is an error in parameters
* -2 if an error occurred during processing */
int processLineParams( int argc, char **argv );
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
std::string argv0_, argv1_; std::string argv0_;
#ifdef WIN32 #ifdef WIN32
char exname[512]; char exname[512];
@@ -81,18 +87,12 @@ int main(int argc, char **argv)
#endif #endif
if (argc>1)
argv1_ = argv[1];
else
argv1_ = "";
#ifdef GLIBMM_EXCEPTIONS_ENABLED #ifdef GLIBMM_EXCEPTIONS_ENABLED
argv0 = Glib::filename_to_utf8 (argv0_); argv0 = Glib::filename_to_utf8 (argv0_);
argv1 = Glib::filename_to_utf8 (argv1_);
#else #else
std::auto_ptr<Glib::Error> error; std::auto_ptr<Glib::Error> error;
argv0 = Glib::filename_to_utf8 (argv0_, error); argv0 = Glib::filename_to_utf8 (argv0_, error);
argv1 = Glib::filename_to_utf8 (argv1_, error);
#endif //GLIBMM_EXCEPTIONS_ENABLED #endif //GLIBMM_EXCEPTIONS_ENABLED
Glib::thread_init(); Glib::thread_init();
@@ -101,13 +101,23 @@ int main(int argc, char **argv)
Options::load (); Options::load ();
if (argc>1){
int ret = processLineParams( argc, argv);
if( ret <= 0 )
return ret;
}
#ifndef _WIN32 #ifndef _WIN32
// Move the old path to the new one if the new does not exist // Move the old path to the new one if the new does not exist
if (safe_file_test(Glib::build_filename(options.rtdir,"cache"), Glib::FILE_TEST_IS_DIR) && !safe_file_test(options.cacheBaseDir, Glib::FILE_TEST_IS_DIR)) if (safe_file_test(Glib::build_filename(options.rtdir,"cache"), Glib::FILE_TEST_IS_DIR) && !safe_file_test(options.cacheBaseDir, Glib::FILE_TEST_IS_DIR))
safe_g_rename(Glib::build_filename(options.rtdir,"cache"), options.cacheBaseDir); safe_g_rename(Glib::build_filename(options.rtdir,"cache"), options.cacheBaseDir);
#endif #endif
// Gtk::RC::add_default_file (argv0+"/themes/"+options.theme); simpleEditor=false;
if( !argv1.empty() )
if( Glib::file_test(argv1, Glib::FILE_TEST_EXISTS) && !Glib::file_test(argv1, Glib::FILE_TEST_IS_DIR))
simpleEditor = true;
if (!options.useSystemTheme) if (!options.useSystemTheme)
{ {
std::vector<std::string> rcfiles; std::vector<std::string> rcfiles;
@@ -118,7 +128,7 @@ int main(int argc, char **argv)
Gtk::RC::set_default_files (rcfiles); Gtk::RC::set_default_files (rcfiles);
} }
Gtk::Main m(&argc, &argv); Gtk::Main m(&argc, &argv);
// MainWindow *MainWindow = new class MainWindow();
RTWindow *rtWindow = new class RTWindow(); RTWindow *rtWindow = new class RTWindow();
gdk_threads_enter (); gdk_threads_enter ();
m.run(*rtWindow); m.run(*rtWindow);
@@ -128,5 +138,246 @@ int main(int argc, char **argv)
} }
int processLineParams( int argc, char **argv )
{
std::vector<Glib::ustring> inputFiles;
Glib::ustring outputPath;
Glib::ustring processingParams;
bool isDirectory=false;
bool outputDirectory=false;
bool overwriteFiles=false;
bool sideProcParams=false;
bool copyParamsFile=false;
bool useDefaultIfAbsent=true;
int compression=100;
int bits=-1;
std::string outputType;
unsigned errors=0;
for( int iArg=1; iArg<argc; iArg++){
if( argv[iArg][0]=='-' ){
switch( argv[iArg][1]){
case 'O':
copyParamsFile = true;
case 'o': // outputfile or dir
if( iArg+1 <argc ){
iArg++;
outputPath = Glib::filename_to_utf8 (argv[iArg]);
if( safe_file_test (outputPath, Glib::FILE_TEST_IS_DIR))
outputDirectory=true;
}
break;
case 'p': // processing parameters for all inputs
if( iArg+1 <argc ){
iArg++;
processingParams = Glib::filename_to_utf8 ( argv[iArg] );
}
break;
case 'S':
useDefaultIfAbsent=false;
case 's': // Processing params next to file (.pp3 appended)
sideProcParams = true;
break;
case 'Y':
overwriteFiles =true;
break;
case 'j':
outputType = "jpg";
sscanf(&argv[iArg][2],"%d",&compression);
break;
case 't':
outputType = "tif";
compression = ((argv[iArg][2]!='1')?0:1);
break;
case 'n':
outputType = "png";
compression = -1;
break;
case 'c': // MUST be last option
while( iArg+1 <argc ){
iArg++;
if( !safe_file_test( argv[iArg], Glib::FILE_TEST_EXISTS )){
std::cerr << argv[iArg] << " doesn't exist."<< std::endl;
continue;
}
if( safe_file_test( argv[iArg], Glib::FILE_TEST_IS_DIR )){
isDirectory = true;
std::vector<Glib::ustring> names;
Glib::RefPtr<Gio::File> dir = Gio::File::create_for_path ( argv[iArg] );
safe_build_file_list (dir, names, argv[iArg] );
for(size_t iFile=0; iFile< names.size(); iFile++ ){
if( !safe_file_test( names[iFile] , Glib::FILE_TEST_IS_DIR)){
// skip files without extension and pp3 files
Glib::ustring s(names[iFile]);
Glib::ustring::size_type ext= s.find_last_of('.');
if( Glib::ustring::npos == ext )
continue;
if( ! s.substr(ext).compare( paramFileExtension ))
continue;
inputFiles.push_back( names[iFile] );
}
}
}else{
inputFiles.push_back( Glib::filename_to_utf8 (argv[iArg]) );
}
}
break;
case 'h':
case '?':
default:
std::cerr << "Usage:"<< std::endl;
std::cerr << Glib::path_get_basename(argv[0]) << " [<selected dir>] : start RT GUI browser inside dir."<< std::endl;
std::cerr << Glib::path_get_basename(argv[0]) << " <file> : start GUI editor with file."<< std::endl;
std::cerr << Glib::path_get_basename(argv[0]) << " -c <inputDir>|<file list> : convert files in batch with default parameters."<< std::endl<< std::endl;
std::cerr << "Other options used with -c (that must be last option) "<< std::endl;
std::cerr << Glib::path_get_basename(argv[0]) <<" [-o <output> | -O <output>] [-s | -S | -p <file>] [-j[1-100]|-t|-n] -Y -c <input>"<< std::endl;
std::cerr << " -o <outputFile>|<outputDir> : select output directory."<< std::endl;
std::cerr << " -O <outputFile>|<outputDir> : select output dir and copy pp3 file into it"<< std::endl;
std::cerr << " -s : select parameters to be pp3 file next to input file (with same name)"<< std::endl;
std::cerr << " ex: for IMG001.NEF there should be IMG001.NEF.pp3 in the same dir" << std::endl;
std::cerr << " if absent use default" << std::endl;
std::cerr << " -S : like -s but skip if pp3 file not found." << std::endl;
std::cerr << " -p <file.pp3> : specify pp3 file to be used for all conversions."<< std::endl;
std::cerr << " -j[compression] : specify output to be jpeg.(default)"<< std::endl;
std::cerr << " -t : specify output to be tif."<< std::endl;
std::cerr << " -n : specify output to be png."<< std::endl;
std::cerr << " -Y : overwrite output if present."<< std::endl;
return -1;
}
}else{
argv1 = Glib::filename_to_utf8 ( argv[iArg] );
if( outputDirectory ){
options.savePathFolder = outputPath;
options.saveUsePathTemplate = false;
}
if (outputType == "jpg") {
options.saveFormat.format = outputType;
options.saveFormat.jpegQuality = compression;
} else if (outputType == "tif") {
options.saveFormat.format = outputType;
} else if (outputType == "png") {
options.saveFormat.format = outputType;
}
break;
}
}
if( !argv1.empty() )
return 1;
if( !inputFiles.size() )
return 2;
rtengine::procparams::ProcParams params,paramsRaw,paramsImg, *currentParams;
if( !sideProcParams ){
if( processingParams.length()>0 )
params.load ( processingParams );
else{
paramsRaw.load(options.profilePath+"/"+options.defProfRaw+paramFileExtension);
paramsImg.load(options.profilePath+"/"+options.defProfImg+paramFileExtension);
}
}
for( size_t iFile=0; iFile< inputFiles.size(); iFile++){
Glib::ustring inputFile = inputFiles[iFile];
std::cout << "Processing: " << inputFile << std::endl;
rtengine::InitialImage* ii=NULL;
rtengine::ProcessingJob* job =NULL;
int errorCode;
bool isRaw=false;
Glib::ustring outputFile;
if( outputType.empty() )
outputType = "jpg";
if( outputPath.empty() ){
Glib::ustring s = inputFile;
Glib::ustring::size_type ext= s.find_last_of('.');
outputFile = s.substr(0,ext)+ "." + outputType;
}else if( outputDirectory ){
Glib::ustring s = Glib::path_get_basename( inputFile );
Glib::ustring::size_type ext= s.find_last_of('.');
outputFile = outputPath + "/" + s.substr(0,ext) + "." + outputType;
}else{
Glib::ustring s = outputPath;
Glib::ustring::size_type ext= s.find_last_of('.');
outputFile = s.substr(0,ext) + "." + outputType;
}
if( inputFile == outputFile){
std::cerr << "Cannot overwrite:" << inputFile << std::endl;
continue;
}
if( !overwriteFiles && safe_file_test( outputFile , Glib::FILE_TEST_EXISTS ) ){
std::cerr << outputFile <<" already exists: use -Y option to overwrite:" << std::endl;
continue;
}
// Load the image
ii = rtengine::InitialImage::load ( inputFile, true, &errorCode, NULL );
if (ii)
isRaw=true;
else
ii = rtengine::InitialImage::load ( inputFile , false, &errorCode, NULL );
if (!ii) {
errors++;
std::cerr << "Error loading file:"<< inputFile << std::endl;
continue;
}
if( sideProcParams ){
Glib::ustring sideProcessingParams = inputFile + paramFileExtension;
if( !safe_file_test( sideProcessingParams, Glib::FILE_TEST_EXISTS ) || params.load ( sideProcessingParams )){
if( useDefaultIfAbsent ){
currentParams = isRaw? &paramsRaw: &paramsImg;
}else{
delete ii;
errors++;
std::cerr << "Error loading processing params:"<< sideProcessingParams << std::endl;
continue;
}
}else
currentParams = &params;
}else if( processingParams.length()>0 ){
currentParams = &params;
}else if(isRaw ){
currentParams = &paramsRaw;
}else{
currentParams = &paramsImg;
}
job = rtengine::ProcessingJob::create (ii, *currentParams);
if( !job ){
errors++;
std::cerr << "Error creating processing for:"<< inputFile << std::endl;
ii->decreaseRef();
continue;
}
// Process image
rtengine::IImage16* resultImage = rtengine::processImage (job, errorCode, NULL);
if( !resultImage ){
errors++;
std::cerr << "Error processing:"<< inputFile << std::endl;
rtengine::ProcessingJob::destroy( job );
continue;
}
// save image to disk
if( outputType=="jpg" )
errorCode = resultImage->saveAsJPEG( outputFile, compression );
else if( outputType=="tif" )
errorCode = resultImage->saveAsTIFF( outputFile, bits, compression==0 );
else if( outputType=="png" )
errorCode = resultImage->saveAsPNG( outputFile,compression, bits );
else
errorCode = resultImage->saveToFile (outputFile);
if(errorCode){
errors++;
std::cerr << "Error saving to:"<< outputFile << std::endl;
}else{
if( copyParamsFile ){
Glib::ustring outputProcessingParams = outputFile + paramFileExtension;
currentParams->save( outputProcessingParams );
}
}
ii->decreaseRef();
resultImage->free();
}
return errors>0?-2:0;
}

1
rtgui/options.h
View File

@@ -156,6 +156,7 @@ class Options {
extern Options options; extern Options options;
extern Glib::ustring argv0; extern Glib::ustring argv0;
extern Glib::ustring argv1; extern Glib::ustring argv1;
extern bool simpleEditor;
extern Glib::ustring versionString; extern Glib::ustring versionString;
extern Glib::ustring paramFileExtension; extern Glib::ustring paramFileExtension;

216
rtgui/rtwindow.cc
View File

@@ -22,9 +22,12 @@
#include <cursormanager.h> #include <cursormanager.h>
RTWindow::RTWindow () { RTWindow::RTWindow ()
:fpanel(NULL)
epanel=NULL; // to prevent eventing errors ,epanel(NULL)
,bpanel(NULL)
,mainNB(NULL)
{
cacheMgr->init (); cacheMgr->init ();
@@ -49,105 +52,122 @@ RTWindow::RTWindow () {
property_destroy_with_parent().set_value(false); property_destroy_with_parent().set_value(false);
signal_window_state_event().connect( sigc::mem_fun(*this, &RTWindow::on_window_state_event) ); signal_window_state_event().connect( sigc::mem_fun(*this, &RTWindow::on_window_state_event) );
mainNB = Gtk::manage (new Gtk::Notebook ()); if(simpleEditor)
mainNB->set_scrollable (true); {
mainNB->signal_switch_page().connect_notify( sigc::mem_fun(*this, &RTWindow::on_mainNB_switch_page) ); epanel = new EditorPanel (NULL);
epanel->setParent (this);
add (*epanel);
show_all ();
fpanel = new FilePanel (); CacheManager* cm = CacheManager::getInstance();
fpanel->setParent (this); Thumbnail* thm= cm->getEntry( argv1 );
if(thm){
int error;
rtengine::InitialImage *ii= rtengine::InitialImage::load(argv1,thm->getType() == FT_Raw,&error,NULL);
epanel->open( thm, ii );
}
}else{
mainNB = Gtk::manage (new Gtk::Notebook ());
mainNB->set_scrollable (true);
mainNB->signal_switch_page().connect_notify( sigc::mem_fun(*this, &RTWindow::on_mainNB_switch_page) );
// decorate tab fpanel = new FilePanel ();
if (options.mainNBVertical) { fpanel->setParent (this);
mainNB->set_tab_pos (Gtk::POS_LEFT);
Gtk::VBox* vbf = Gtk::manage (new Gtk::VBox ()); // decorate tab
vbf->pack_start (*Gtk::manage (new Gtk::Image (Gtk::Stock::DIRECTORY, Gtk::ICON_SIZE_MENU))); if (options.mainNBVertical) {
Gtk::Label* l=new Gtk::Label (Glib::ustring(" ") + M("MAIN_FRAME_FILEBROWSER")); mainNB->set_tab_pos (Gtk::POS_LEFT);
l->set_angle (90);
vbf->pack_start (*l); Gtk::VBox* vbf = Gtk::manage (new Gtk::VBox ());
vbf->set_spacing (2); vbf->pack_start (*Gtk::manage (new Gtk::Image (Gtk::Stock::DIRECTORY, Gtk::ICON_SIZE_MENU)));
vbf->show_all (); Gtk::Label* l=new Gtk::Label (Glib::ustring(" ") + M("MAIN_FRAME_FILEBROWSER"));
mainNB->append_page (*fpanel, *vbf); l->set_angle (90);
} else { vbf->pack_start (*l);
Gtk::HBox* hbf = Gtk::manage (new Gtk::HBox ()); vbf->set_spacing (2);
hbf->pack_start (*Gtk::manage (new Gtk::Image (Gtk::Stock::DIRECTORY, Gtk::ICON_SIZE_MENU))); vbf->show_all ();
hbf->pack_start (*Gtk::manage (new Gtk::Label (M("MAIN_FRAME_FILEBROWSER")))); mainNB->append_page (*fpanel, *vbf);
hbf->set_spacing (2); } else {
hbf->show_all (); Gtk::HBox* hbf = Gtk::manage (new Gtk::HBox ());
mainNB->append_page (*fpanel, *hbf); hbf->pack_start (*Gtk::manage (new Gtk::Image (Gtk::Stock::DIRECTORY, Gtk::ICON_SIZE_MENU)));
hbf->pack_start (*Gtk::manage (new Gtk::Label (M("MAIN_FRAME_FILEBROWSER"))));
hbf->set_spacing (2);
hbf->show_all ();
mainNB->append_page (*fpanel, *hbf);
}
bpanel = new BatchQueuePanel ();
bpanel->setParent (this);
// decorate tab, the label is unimportant since its updated in batchqueuepanel anyway
Gtk::Label* lbq = new Gtk::Label (M("MAIN_FRAME_BATCHQUEUE"));
mainNB->append_page (*bpanel, *lbq);
// epanel is only for single tab mode
epanel = new EditorPanel (fpanel);
epanel->setParent (this);
// decorate tab
if (options.mainNBVertical) {
Gtk::VBox* vbe = Gtk::manage (new Gtk::VBox ());
vbe->pack_start (*Gtk::manage (new Gtk::Image (argv0+"/images/logoicon16.png")));
Gtk::Label* l=new Gtk::Label( Glib::ustring(" ") + M("MAIN_FRAME_EDITOR") );
//l->set_markup(Glib::ustring("<b>Editor</b>")); Bold difficult to read
l->set_angle (90);
vbe->pack_start (*l);
vbe->set_spacing (2);
vbe->show_all ();
mainNB->append_page (*epanel, *vbe);
} else {
Gtk::HBox* hbe = Gtk::manage (new Gtk::HBox ());
hbe->pack_start (*Gtk::manage (new Gtk::Image (argv0+"/images/logoicon16.png")));
hbe->pack_start (*Gtk::manage (new Gtk::Label(M("MAIN_FRAME_EDITOR"))));
hbe->set_spacing (2);
hbe->show_all ();
mainNB->append_page (*epanel, *hbe);
}
mainNB->set_current_page (mainNB->page_num (*fpanel));
signal_key_press_event().connect( sigc::mem_fun(*this, &RTWindow::keyPressed) );
Gtk::VBox* mainBox = Gtk::manage (new Gtk::VBox ());
mainBox->pack_start (*mainNB);
Gtk::HBox* bottomBox = Gtk::manage (new Gtk::HBox ());
mainBox->pack_start (*bottomBox, Gtk::PACK_SHRINK, 1);
// filling bottom box
Gtk::LinkButton* rtWeb = Gtk::manage (new Gtk::LinkButton ("http://rawtherapee.com"));
Gtk::Button* preferences = Gtk::manage (new Gtk::Button (M("MAIN_BUTTON_PREFERENCES")+"..."));
preferences->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-preferences"), Gtk::ICON_SIZE_BUTTON)));
preferences->signal_clicked().connect( sigc::mem_fun(*this, &RTWindow::showPreferences) );
is_fullscreen = false;
btn_fullscreen = Gtk::manage( new Gtk::Button(M("MAIN_BUTTON_FULLSCREEN")));
btn_fullscreen->signal_clicked().connect( sigc::mem_fun(*this, &RTWindow::toggle_fullscreen) );
bottomBox->pack_start (*preferences, Gtk::PACK_SHRINK, 0);
bottomBox->pack_end (*btn_fullscreen, Gtk::PACK_SHRINK, 4);
bottomBox->pack_start (*rtWeb, Gtk::PACK_SHRINK, 4);
bottomBox->pack_start (prLabel );
prLabel.set_alignment(Gtk::ALIGN_RIGHT);
bottomBox->pack_start (prProgBar, Gtk::PACK_SHRINK, 4);
pldBridge = new PLDBridge(&prLabel,&prProgBar);
Glib::RefPtr<Gtk::RcStyle> style = Gtk::RcStyle::create ();
style->set_xthickness (0);
style->set_ythickness (0);
rtWeb->modify_style (style);
add (*mainBox);
show_all ();
} }
if (!isSingleTabMode()&& !simpleEditor) epanel->hide_all();
bpanel = new BatchQueuePanel ();
bpanel->setParent (this);
// decorate tab, the label is unimportant since its updated in batchqueuepanel anyway
Gtk::Label* lbq = new Gtk::Label (M("MAIN_FRAME_BATCHQUEUE"));
mainNB->append_page (*bpanel, *lbq);
// epanel is only for single tab mode
epanel = new EditorPanel (fpanel);
epanel->setParent (this);
// decorate tab
if (options.mainNBVertical) {
Gtk::VBox* vbe = Gtk::manage (new Gtk::VBox ());
vbe->pack_start (*Gtk::manage (new Gtk::Image (argv0+"/images/logoicon16.png")));
Gtk::Label* l=new Gtk::Label( Glib::ustring(" ") + M("MAIN_FRAME_EDITOR") );
//l->set_markup(Glib::ustring("<b>Editor</b>")); Bold difficult to read
l->set_angle (90);
vbe->pack_start (*l);
vbe->set_spacing (2);
vbe->show_all ();
mainNB->append_page (*epanel, *vbe);
} else {
Gtk::HBox* hbe = Gtk::manage (new Gtk::HBox ());
hbe->pack_start (*Gtk::manage (new Gtk::Image (argv0+"/images/logoicon16.png")));
hbe->pack_start (*Gtk::manage (new Gtk::Label(M("MAIN_FRAME_EDITOR"))));
hbe->set_spacing (2);
hbe->show_all ();
mainNB->append_page (*epanel, *hbe);
}
mainNB->set_current_page (mainNB->page_num (*fpanel));
signal_key_press_event().connect( sigc::mem_fun(*this, &RTWindow::keyPressed) );
Gtk::VBox* mainBox = Gtk::manage (new Gtk::VBox ());
mainBox->pack_start (*mainNB);
Gtk::HBox* bottomBox = Gtk::manage (new Gtk::HBox ());
mainBox->pack_start (*bottomBox, Gtk::PACK_SHRINK, 1);
// filling bottom box
Gtk::LinkButton* rtWeb = Gtk::manage (new Gtk::LinkButton ("http://rawtherapee.com"));
Gtk::Button* preferences = Gtk::manage (new Gtk::Button (M("MAIN_BUTTON_PREFERENCES")+"..."));
preferences->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-preferences"), Gtk::ICON_SIZE_BUTTON)));
preferences->signal_clicked().connect( sigc::mem_fun(*this, &RTWindow::showPreferences) );
is_fullscreen = false;
btn_fullscreen = Gtk::manage( new Gtk::Button(M("MAIN_BUTTON_FULLSCREEN")));
btn_fullscreen->signal_clicked().connect( sigc::mem_fun(*this, &RTWindow::toggle_fullscreen) );
bottomBox->pack_start (*preferences, Gtk::PACK_SHRINK, 0);
bottomBox->pack_end (*btn_fullscreen, Gtk::PACK_SHRINK, 4);
bottomBox->pack_start (*rtWeb, Gtk::PACK_SHRINK, 4);
bottomBox->pack_start (prLabel );
prLabel.set_alignment(Gtk::ALIGN_RIGHT);
bottomBox->pack_start (prProgBar, Gtk::PACK_SHRINK, 4);
pldBridge = new PLDBridge(&prLabel,&prProgBar);
Glib::RefPtr<Gtk::RcStyle> style = Gtk::RcStyle::create ();
style->set_xthickness (0);
style->set_ythickness (0);
rtWeb->modify_style (style);
add (*mainBox);
show_all ();
if (!isSingleTabMode()) epanel->hide_all();
} }
void RTWindow::on_realize () { void RTWindow::on_realize () {
Gtk::Window::on_realize (); Gtk::Window::on_realize ();
fpanel->setAspect(); if( fpanel )
fpanel->setAspect();
cursorManager.init (get_window()); cursorManager.init (get_window());
} }
@@ -275,11 +295,13 @@ void RTWindow::addBatchQueueJobs (std::vector<BatchQueueEntry*> &entries) {
bool RTWindow::on_delete_event(GdkEventAny* event) { bool RTWindow::on_delete_event(GdkEventAny* event) {
if( fpanel )
fpanel->saveOptions ();
if( bpanel )
bpanel->saveOptions ();
fpanel->saveOptions (); if (isSingleTabMode() || simpleEditor)
bpanel->saveOptions (); epanel->saveProfile();
if (isSingleTabMode()) epanel->saveProfile();
cacheMgr->closeCache (); // also makes cleanup if too large cacheMgr->closeCache (); // also makes cleanup if too large