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

Merge branch 'master' into gtk3

Browse Source
This commit is contained in:
Hombre
2016-01-11 00:54:25 +01:00
parent a4d49ee5f2 5ff270bf51
commit a54dd81b1a
69 changed files with 1940 additions and 1001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rtgui/filepanel.cc
View File

@@ -67,14 +67,15 @@ FilePanel::FilePanel () : parent(NULL)
ribbonPane->set_size_request(50, 150);
dirpaned->pack2 (*ribbonPane, true, true);
placesBrowser->setDirBrowserRemoteInterface (dirBrowser);
recentBrowser->setDirBrowserRemoteInterface (dirBrowser);
dirBrowser->addDirSelectionListener (fileCatalog);
dirBrowser->addDirSelectionListener (recentBrowser);
dirBrowser->addDirSelectionListener (placesBrowser);
dirBrowser->addDirSelectionListener (tpc);
DirBrowser::DirSelectionSignal dirSelected = dirBrowser->dirSelected ();
dirSelected.connect (sigc::mem_fun (fileCatalog, &FileCatalog::dirSelected));
dirSelected.connect (sigc::mem_fun (recentBrowser, &RecentBrowser::dirSelected));
dirSelected.connect (sigc::mem_fun (placesBrowser, &PlacesBrowser::dirSelected));
dirSelected.connect (sigc::mem_fun (tpc, &BatchToolPanelCoordinator::dirSelected));
fileCatalog->setDirSelector (sigc::mem_fun (dirBrowser, &DirBrowser::selectDir));
placesBrowser->setDirSelector (sigc::mem_fun (dirBrowser, &DirBrowser::selectDir));
recentBrowser->setDirSelector (sigc::mem_fun (dirBrowser, &DirBrowser::selectDir));
fileCatalog->setFileSelectionListener (this);
fileCatalog->setDirBrowserRemoteInterface (dirBrowser);
rightBox = Gtk::manage ( new Gtk::HBox () );
rightBox->set_size_request(350, 100);