auto images = new wxImageList (16, 16);
wxIcon tick_icon;
wxIcon no_tick_icon;
- tick_icon.LoadFile (bitmap_path("tick"), wxBITMAP_TYPE_PNG);
- no_tick_icon.LoadFile (bitmap_path("no_tick"), wxBITMAP_TYPE_PNG);
+ tick_icon.LoadFile (bitmap_path("tick.png"), wxBITMAP_TYPE_PNG);
+ no_tick_icon.LoadFile (bitmap_path("no_tick.png"), wxBITMAP_TYPE_PNG);
images->Add (tick_icon);
images->Add (no_tick_icon);
#else
string const colour = gui_is_dark() ? "white" : "black";
wxBitmap bitmap (
- bitmap_path(String::compose("dcpomatic_small_%1", colour)),
+ bitmap_path(String::compose("dcpomatic_small_%1.png", colour)),
wxBITMAP_TYPE_PNG
);
wxIcon icon;
wxBitmap
LocationsPage::GetLargeIcon () const
{
- return wxBitmap(bitmap_path("locations"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(bitmap_path("locations.png"), wxBITMAP_TYPE_PNG);
}
#endif
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(bitmap_path("general"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(bitmap_path("general.png"), wxBITMAP_TYPE_PNG);
}
#endif
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(bitmap_path("keys"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(bitmap_path("keys.png"), wxBITMAP_TYPE_PNG);
}
#endif
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(bitmap_path("sound"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(bitmap_path("sound.png"), wxBITMAP_TYPE_PNG);
}
#endif
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(bitmap_path("defaults"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(bitmap_path("defaults.png"), wxBITMAP_TYPE_PNG);
}
#endif
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(bitmap_path("servers"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(bitmap_path("servers.png"), wxBITMAP_TYPE_PNG);
}
#endif
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(bitmap_path("tms"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(bitmap_path("tms.png"), wxBITMAP_TYPE_PNG);
}
#endif
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(bitmap_path("email"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(bitmap_path("email.png"), wxBITMAP_TYPE_PNG);
}
#endif
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(bitmap_path("kdm_email"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(bitmap_path("kdm_email.png"), wxBITMAP_TYPE_PNG);
}
#endif
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(bitmap_path("notifications"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(bitmap_path("notifications.png"), wxBITMAP_TYPE_PNG);
}
#endif
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(bitmap_path("cover_sheet"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(bitmap_path("cover_sheet.png"), wxBITMAP_TYPE_PNG);
}
#endif
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(bitmap_path("identifiers"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(bitmap_path("identifiers.png"), wxBITMAP_TYPE_PNG);
}
#endif
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(bitmap_path("advanced"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(bitmap_path("advanced.png"), wxBITMAP_TYPE_PNG);
}
#endif
{
auto sizer = new wxBoxSizer (wxVERTICAL);
- wxBitmap select (bitmap_path("select"), wxBITMAP_TYPE_PNG);
- wxBitmap zoom (bitmap_path("zoom"), wxBITMAP_TYPE_PNG);
- wxBitmap zoom_all (bitmap_path("zoom_all"), wxBITMAP_TYPE_PNG);
- wxBitmap snap (bitmap_path("snap"), wxBITMAP_TYPE_PNG);
- wxBitmap sequence (bitmap_path("sequence"), wxBITMAP_TYPE_PNG);
+ wxBitmap select (bitmap_path("select.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap zoom (bitmap_path("zoom.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap zoom_all (bitmap_path("zoom_all.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap snap (bitmap_path("snap.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap sequence (bitmap_path("sequence.png"), wxBITMAP_TYPE_PNG);
_toolbar = new wxToolBar (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL);
_toolbar->SetMargins (4, 4);
);
_left_right_link = new wxToggleButton (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(link_width, link_height));
- _left_right_link->SetBitmap (wxBitmap(bitmap_path("link"), wxBITMAP_TYPE_PNG));
+ _left_right_link->SetBitmap (wxBitmap(bitmap_path("link.png"), wxBITMAP_TYPE_PNG));
_right_crop_label = create_label (this, _("Right"), true);
_right_crop = new ContentSpinCtrl<VideoContent> (
);
_top_bottom_link = new wxToggleButton (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(link_width, link_height));
- _top_bottom_link->SetBitmap (wxBitmap(bitmap_path("link"), wxBITMAP_TYPE_PNG));
+ _top_bottom_link->SetBitmap (wxBitmap(bitmap_path("link.png"), wxBITMAP_TYPE_PNG));
_bottom_crop_label = create_label (this, _("Bottom"), true);
_bottom_crop = new ContentSpinCtrl<VideoContent> (
wxSplashScreen* splash = nullptr;
try {
wxBitmap bitmap;
- if (bitmap.LoadFile(bitmap_path("splash"), wxBITMAP_TYPE_PNG)) {
+ if (bitmap.LoadFile(bitmap_path("splash.png"), wxBITMAP_TYPE_PNG)) {
{
/* This wxMemoryDC must be destroyed before bitmap can be used elsewhere */
wxMemoryDC dc(bitmap);
base = resources_path();
#endif
- auto p = base / String::compose("%1.png", name);
+ auto p = base / name;
return std_to_wx (p.string());
}