Merge with e190c52ab7861c68762aaa552f3dc0f59fe2e225 from default
This revision compiles and runs on Win7x64- but further evaluation is necessary. There may be an issue with cmake step -After cmake I had to copy rtgui/version.h & config.h into out of source build /rtgui folder. Additional notes: - ImProcFunctions::hsv2rgb01 -> this likely need to be added to color.h & color.cc - Use of array2D should be verified in NR code - compilation warning for rtengine::RawImageSource::isWBProviderReady()
This commit is contained in:
@@ -20,12 +20,14 @@
|
||||
#define _FILEBROWSER_
|
||||
|
||||
#include <gtkmm.h>
|
||||
#include <map>
|
||||
#include "thumbbrowserbase.h"
|
||||
#include "exiffiltersettings.h"
|
||||
#include "filebrowserentry.h"
|
||||
#include "browserfilter.h"
|
||||
#include "partialpastedlg.h"
|
||||
#include "exportpanel.h"
|
||||
#include "extprog.h"
|
||||
|
||||
class FileBrowser;
|
||||
class FileBrowserEntry;
|
||||
@@ -76,6 +78,11 @@ class FileBrowser : public ThumbBrowserBase,
|
||||
Gtk::MenuItem* menuLabel;
|
||||
Gtk::MenuItem* menuFileOperations;
|
||||
Gtk::ImageMenuItem* menuProfileOperations;
|
||||
Gtk::MenuItem* menuExtProg;
|
||||
Gtk::MenuItem** amiExtProg;
|
||||
Gtk::MenuItem* miOpenDefaultViewer;
|
||||
std::map<Glib::ustring, ExtProgAction*> mMenuExtProgs; // key is menuitem label
|
||||
|
||||
Gtk::MenuItem* menuDF;
|
||||
Gtk::MenuItem* selectDF;
|
||||
Gtk::MenuItem* thisIsDF;
|
||||
|
Reference in New Issue
Block a user