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

Merge branch 'dev' into hidpi-icons

Browse Source
This commit is contained in:
Hombre
2018-11-29 00:15:57 +01:00
parent 3d7ef4286e 15c18325c0
commit 434e121f99
264 changed files with 6738 additions and 5146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rtgui/batchqueueentry.h
View File

@@ -56,21 +56,21 @@ public:
bool fast_pipeline;
BatchQueueEntry (rtengine::ProcessingJob* job, const rtengine::procparams::ProcParams& pparams, Glib::ustring fname, int prevw, int prevh, Thumbnail* thm = nullptr);
~BatchQueueEntry ();
~BatchQueueEntry () override;
void refreshThumbnailImage ();
void calcThumbnailSize ();
void refreshThumbnailImage () override;
void calcThumbnailSize () override;
void drawProgressBar (Glib::RefPtr<Gdk::Window> win, const Gdk::RGBA& foregr, const Gdk::RGBA& backgr, int x, int w, int y, int h);
void drawProgressBar (Glib::RefPtr<Gdk::Window> win, const Gdk::RGBA& foregr, const Gdk::RGBA& backgr, int x, int w, int y, int h) override;
void removeButtonSet ();
virtual std::vector<Cairo::RefPtr<Cairo::ImageSurface> > getIconsOnImageArea ();
virtual void getIconSize (int& w, int& h);
virtual Glib::ustring getToolTip (int x, int y);
std::vector<Cairo::RefPtr<Cairo::ImageSurface> > getIconsOnImageArea () override;
void getIconSize (int& w, int& h) override;
Glib::ustring getToolTip (int x, int y) override;
// bqentryupdatelistener interface
void updateImage (guint8* img, int w, int h, int origw, int origh, guint8* newOPreview);
void updateImage (guint8* img, int w, int h, int origw, int origh, guint8* newOPreview) override;
void _updateImage (guint8* img, int w, int h); // inside gtk thread
};