Merge branch 'dev' into browser-preview-applied-pparams
This commit is contained in:
@@ -37,7 +37,6 @@
|
||||
|
||||
//extern Glib::Threads::Thread* mainThread;
|
||||
|
||||
bool FileBrowserEntry::iconsLoaded(false);
|
||||
Glib::RefPtr<Gdk::Pixbuf> FileBrowserEntry::editedIcon;
|
||||
Glib::RefPtr<Gdk::Pixbuf> FileBrowserEntry::recentlySavedIcon;
|
||||
Glib::RefPtr<Gdk::Pixbuf> FileBrowserEntry::enqueuedIcon;
|
||||
@@ -58,15 +57,6 @@ FileBrowserEntry::FileBrowserEntry (Thumbnail* thm, const Glib::ustring& fname)
|
||||
|
||||
scale = 1;
|
||||
|
||||
if (!iconsLoaded) {
|
||||
editedIcon = RTImage::createPixbufFromFile ("tick-small.png");
|
||||
recentlySavedIcon = RTImage::createPixbufFromFile ("save-small.png");
|
||||
enqueuedIcon = RTImage::createPixbufFromFile ("gears-small.png");
|
||||
hdr = RTImage::createPixbufFromFile ("filetype-hdr.png");
|
||||
ps = RTImage::createPixbufFromFile ("filetype-ps.png");
|
||||
iconsLoaded = true;
|
||||
}
|
||||
|
||||
thumbnail->addThumbnailListener (this);
|
||||
}
|
||||
|
||||
@@ -90,6 +80,15 @@ FileBrowserEntry::~FileBrowserEntry ()
|
||||
}
|
||||
}
|
||||
|
||||
void FileBrowserEntry::init ()
|
||||
{
|
||||
editedIcon = RTImage::createPixbufFromFile ("tick-small.png");
|
||||
recentlySavedIcon = RTImage::createPixbufFromFile ("save-small.png");
|
||||
enqueuedIcon = RTImage::createPixbufFromFile ("gears-small.png");
|
||||
hdr = RTImage::createPixbufFromFile ("filetype-hdr.png");
|
||||
ps = RTImage::createPixbufFromFile ("filetype-ps.png");
|
||||
}
|
||||
|
||||
void FileBrowserEntry::refreshThumbnailImage(bool upgradeHint)
|
||||
{
|
||||
|
||||
|
Reference in New Issue
Block a user