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

29
rtgui/filepanel.cc
View File

@@ -38,7 +38,7 @@ FilePanel::FilePanel () : parent(NULL) {
placesBrowser = new PlacesBrowser ();
recentBrowser = new RecentBrowser ();
placespaned = new Gtk::HPaned ();
placespaned = new Gtk::VPaned ();
placespaned->set_position (options.dirBrowserHeight);
Gtk::VBox* obox = Gtk::manage (new Gtk::VBox ());
@@ -51,6 +51,20 @@ FilePanel::FilePanel () : parent(NULL) {
dirpaned->pack1 (*placespaned, true, true);
tpc = new BatchToolPanelCoordinator (this);
fileCatalog = new FileCatalog (tpc->coarse, tpc->getToolBar());
dirpaned->pack2 (*fileCatalog, true, true);
dirBrowser->addDirSelectionListener (fileCatalog);
fileCatalog->setFileSelectionListener (this);
fileCatalog->setFileSelectionChangeListener (tpc);
Gtk::ScrolledWindow* sFilterPanel = new Gtk::ScrolledWindow();
filterPanel = new FilterPanel ();
sFilterPanel->add (*filterPanel);
sFilterPanel->set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
fileCatalog->setFilterPanel (filterPanel);
fileCatalog->setImageAreaToolListener (tpc);
placesBrowser->setDirBrowserRemoteInterface (dirBrowser);
recentBrowser->setDirBrowserRemoteInterface (dirBrowser);
dirBrowser->addDirSelectionListener (recentBrowser);
@@ -163,3 +177,16 @@ bool FilePanel::handleShortcutKey (GdkEventKey* event) {
return false;
}
bool FilePanel::on_expose_event(GdkEventExpose* event)
{
if(dirpaned->get_children().size() ==1 ){
parent->epanel->catalogPane->remove(*fileCatalog);
fileCatalog->fileBrowser->setArrangement(ThumbBrowserBase::TB_Vertical);
dirpaned->pack2(*fileCatalog,true,true);
fileCatalog->redrawAll();
}
return Gtk::HPaned::on_expose_event(event);
}