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

Make file catalog work in both main and editor panels!!!

Browse Source
This commit is contained in:
askvortsov
2010-09-30 16:10:10 -07:00
parent b6b3b17802
commit 19c716852b
4 changed files with 63 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
rtgui/editorpanel.cc
View File

@@ -187,19 +187,24 @@ EditorPanel::EditorPanel (FilePanel* filePanel) : beforePreviewHandler(NULL), be
}
ipc = NULL;
btpCoordinator = new BatchToolPanelCoordinator (filePanel);
fCatalog = new FileCatalog (btpCoordinator->coarse, btpCoordinator->getToolBar()); //, filePanel->fileCatalog->fileBrowser);
filePanel->dirBrowser->addDirSelectionListener (fCatalog);
// fCatalog->setFilterPanel (filePanel->filterPanel);
fCatalog->setImageAreaToolListener (btpCoordinator);
fCatalog->setFileSelectionListener (filePanel);
fCatalog->setFileSelectionChangeListener (btpCoordinator);
fCatalog->setEnabled(true);
// btpCoordinator = new BatchToolPanelCoordinator (filePanel);
// fCatalog = new FileCatalog (btpCoordinator->coarse, btpCoordinator->getToolBar()); //, filePanel->fileCatalog->fileBrowser);
// filePanel->dirBrowser->addDirSelectionListener (fCatalog);
// // fCatalog->setFilterPanel (filePanel->filterPanel);
// fCatalog->setImageAreaToolListener (btpCoordinator);
// fCatalog->setFileSelectionListener (filePanel);
// fCatalog->setFileSelectionChangeListener (btpCoordinator);
// fCatalog->setEnabled(true);
catalogPane = new Gtk::Paned();
Gtk::VPaned * viewpaned = Gtk::manage (new Gtk::VPaned());
viewpaned->pack1(*fCatalog, false, true);
viewpaned->pack1(*catalogPane, false, true);
viewpaned->pack2(*editbox, true, true);
fPanel = filePanel;
fCatalog = filePanel->fileCatalog;
Gtk::Frame* vbfr = Gtk::manage (new Gtk::Frame ());
vbfr->add (*viewpaned);
hpanedl->pack2(*vbfr, true, true);
@@ -274,7 +279,7 @@ EditorPanel::~EditorPanel () {
delete green;
delete leftbox;
delete vboxright;
delete catalogPane;
delete saveAsDialog;
}
@@ -976,3 +981,15 @@ void EditorPanel::histogramChanged (unsigned int* rh, unsigned int* gh, unsigned
histogramPanel->histogramChanged (rh, gh, bh, lh);
tpc->updateCurveBackgroundHistogram (bcrgb, bcl);
}
bool EditorPanel::on_expose_event(GdkEventExpose* event)
{
if(catalogPane->get_children().size() ==0 ){
fPanel->dirpaned->remove(*fPanel->fileCatalog);
catalogPane->add(*fCatalog);
fCatalog->fileBrowser->setArrangement(ThumbBrowserBase::TB_Horizontal);
fCatalog->redrawAll();
}
return Gtk::VBox::on_expose_event(event);
}