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

put right panel stuff back get closer to merging into trunk

Browse Source
This commit is contained in:
Andrey Skvortsov
2010-09-30 20:54:07 -07:00
parent 19c716852b
commit d6d6d6ae23
2 changed files with 53 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/editorpanel.cc
View File

@@ -352,11 +352,6 @@ void EditorPanel::close () {
delete previewHandler; delete previewHandler;
previewHandler= NULL; previewHandler= NULL;
// delete beforePreviewHandler;
// beforePreviewHandler = NULL;
// delete iarea->imageArea->mainCropWindow;
// iarea->imageArea->mainCropWindow = NULL;
rtengine::StagedImageProcessor::destroy (ipc); rtengine::StagedImageProcessor::destroy (ipc);
ipc = NULL; ipc = NULL;
@@ -369,7 +364,6 @@ void EditorPanel::close () {
openThm->removeThumbnailListener (this); openThm->removeThumbnailListener (this);
openThm->decreaseRef (); openThm->decreaseRef ();
} }
} }

55
rtgui/filepanel.cc
View File

@@ -49,13 +49,27 @@ FilePanel::FilePanel () : parent(NULL) {
placespaned->pack2 (*obox, true, true); placespaned->pack2 (*obox, true, true);
dirpaned->pack1 (*placespaned, true, true); dirpaned->pack1 (*placespaned, true, true);
tpc = new BatchToolPanelCoordinator (this);
tpc = new BatchToolPanelCoordinator (this);
fileCatalog = new FileCatalog (tpc->coarse, tpc->getToolBar()); fileCatalog = new FileCatalog (tpc->coarse, tpc->getToolBar());
dirpaned->pack2 (*fileCatalog, true, true); dirpaned->pack2 (*fileCatalog, true, true);
placesBrowser->setDirBrowserRemoteInterface (dirBrowser);
recentBrowser->setDirBrowserRemoteInterface (dirBrowser);
dirBrowser->addDirSelectionListener (fileCatalog); dirBrowser->addDirSelectionListener (fileCatalog);
dirBrowser->addDirSelectionListener (recentBrowser);
dirBrowser->addDirSelectionListener (placesBrowser);
fileCatalog->setFileSelectionListener (this); fileCatalog->setFileSelectionListener (this);
fileCatalog->setFileSelectionChangeListener (tpc);
rightBox = new Gtk::HBox ();
rightNotebook = new Gtk::Notebook ();
Gtk::VBox* taggingBox = new Gtk::VBox ();
history = new History (false);
tpc->addPParamsChangeListener (history);
history->setProfileChangeListener (tpc);
Gtk::ScrolledWindow* sFilterPanel = new Gtk::ScrolledWindow(); Gtk::ScrolledWindow* sFilterPanel = new Gtk::ScrolledWindow();
filterPanel = new FilterPanel (); filterPanel = new FilterPanel ();
sFilterPanel->add (*filterPanel); sFilterPanel->add (*filterPanel);
@@ -64,13 +78,35 @@ FilePanel::FilePanel () : parent(NULL) {
fileCatalog->setFilterPanel (filterPanel); fileCatalog->setFilterPanel (filterPanel);
fileCatalog->setImageAreaToolListener (tpc); fileCatalog->setImageAreaToolListener (tpc);
//------------------
placesBrowser->setDirBrowserRemoteInterface (dirBrowser); rightNotebook->set_tab_pos (Gtk::POS_LEFT);
recentBrowser->setDirBrowserRemoteInterface (dirBrowser);
dirBrowser->addDirSelectionListener (recentBrowser); Gtk::Label* devLab = new Gtk::Label (M("MAIN_TAB_DEVELOP"));
dirBrowser->addDirSelectionListener (placesBrowser); devLab->set_angle (90);
Gtk::Label* filtLab = new Gtk::Label (M("MAIN_TAB_FILTER"));
filtLab->set_angle (90);
Gtk::Label* tagLab = new Gtk::Label (M("MAIN_TAB_TAGGING"));
tagLab->set_angle (90);
Gtk::VPaned* tpcPaned = new Gtk::VPaned ();
tpcPaned->pack1 (*tpc->toolPanelNotebook, true, true);
tpcPaned->pack2 (*history, true, true);
rightNotebook->append_page (*tpcPaned, *devLab);
rightNotebook->append_page (*sFilterPanel, *filtLab);
rightNotebook->append_page (*taggingBox, *tagLab);
rightBox->pack_start (*rightNotebook);
pack1(*dirpaned, true, true); pack1(*dirpaned, true, true);
pack2(*rightBox, true, true);
//set_position(options.browserToolPanelWidth);////Hombre's change which screws up OSX build
fileCatalog->setFileSelectionChangeListener (tpc);
fileCatalog->setFileSelectionListener (this);
g_idle_add (fbinit, this); g_idle_add (fbinit, this);
show_all (); show_all ();
@@ -99,7 +135,7 @@ bool FilePanel::fileSelected (Thumbnail* thm) {
return false; return false;
// try to open the file // try to open the file
// fileCatalog->setEnabled (false); // fileCatalog->setEnabled (false);
if (isloading) if (isloading)
return false; return false;
@@ -131,6 +167,9 @@ void FilePanel::saveOptions () {
options.dirBrowserWidth = dirpaned->get_position (); options.dirBrowserWidth = dirpaned->get_position ();
options.dirBrowserHeight = placespaned->get_position (); options.dirBrowserHeight = placespaned->get_position ();
if (options.startupDir==STARTUPDIR_LAST && fileCatalog->lastSelectedDir ()!="")
options.startupPath = fileCatalog->lastSelectedDir ();
fileCatalog->closeDir ();
} }
void FilePanel::open (const Glib::ustring& d) { void FilePanel::open (const Glib::ustring& d) {
@@ -151,7 +190,7 @@ bool FilePanel::addBatchQueueJob (BatchQueueEntry* bqe) {
void FilePanel::optionsChanged () { void FilePanel::optionsChanged () {
tpc->optionsChanged (); tpc->optionsChanged ();
// fileCatalog->refreshAll (); fileCatalog->refreshAll ();
} }
bool FilePanel::handleShortcutKey (GdkEventKey* event) { bool FilePanel::handleShortcutKey (GdkEventKey* event) {