projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
preset edit button, intl fix, drag window tweak, empty keyframe edit fix
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
awindowgui.C
diff --git
a/cinelerra-5.1/cinelerra/awindowgui.C
b/cinelerra-5.1/cinelerra/awindowgui.C
index 7b717feef86555fd0b2f1efe3b553eaed93f3b39..8b3bd1a2f07c36137171489cba3d8feac1c53457 100644
(file)
--- a/
cinelerra-5.1/cinelerra/awindowgui.C
+++ b/
cinelerra-5.1/cinelerra/awindowgui.C
@@
-519,15
+519,21
@@
VFrame *AWindowGUI::get_picon(const char *name, const char *plugin_icons)
{
char png_path[BCTEXTLEN];
char *pp = png_path, *ep = pp + sizeof(png_path)-1;
{
char png_path[BCTEXTLEN];
char *pp = png_path, *ep = pp + sizeof(png_path)-1;
- snprintf(pp, ep-pp, "%s/picon
_
%s/%s.png",
+ snprintf(pp, ep-pp, "%s/picon
/
%s/%s.png",
File::get_plugin_path(), plugin_icons, name);
File::get_plugin_path(), plugin_icons, name);
+ if( access(png_path, R_OK) ) return 0;
return VFramePng::vframe_png(png_path,0,0);
}
VFrame *AWindowGUI::get_picon(const char *name)
{
VFrame *vframe = get_picon(name, mwindow->preferences->plugin_icons);
return VFramePng::vframe_png(png_path,0,0);
}
VFrame *AWindowGUI::get_picon(const char *name)
{
VFrame *vframe = get_picon(name, mwindow->preferences->plugin_icons);
- if( !vframe ) vframe = get_picon(name, DEFAULT_PICON);
+ if( !vframe ) {
+ char png_name[BCSTRLEN], *pp = png_name, *ep = pp + sizeof(png_name)-1;
+ snprintf(pp, ep-pp, "%s.png", name);
+ unsigned char *data = mwindow->theme->get_image_data(png_name);
+ if( data ) vframe = new VFramePng(data, 0.);
+ }
return vframe;
}
return vframe;
}
@@
-553,7
+559,7
@@
void AWindowGUI::plugin_icon(VFrame *&vfrm, BC_Pixmap *&icon, const char *fn, un
void AWindowGUI::create_objects()
{
lock_window("AWindowGUI::create_objects");
void AWindowGUI::create_objects()
{
lock_window("AWindowGUI::create_objects");
- asset_titles[0] = _("Title");
+ asset_titles[0] =
C
_("Title");
asset_titles[1] = _("Comments");
set_icon(mwindow->theme->get_image("awindow_icon"));
asset_titles[1] = _("Comments");
set_icon(mwindow->theme->get_image("awindow_icon"));
@@
-839,17
+845,19
@@
void AWindowRemovePlugin::handle_close_event(int result)
snprintf(index_path, sizeof(index_path), "%s/%s",
mwindow->preferences->plugin_dir, PLUGIN_FILE);
remove(index_path);
snprintf(index_path, sizeof(index_path), "%s/%s",
mwindow->preferences->plugin_dir, PLUGIN_FILE);
remove(index_path);
+ char picon_path[BCTEXTLEN];
FileSystem fs;
FileSystem fs;
- fs.update(File::get_plugin_path());
+ snprintf(picon_path, sizeof(picon_path), "%s/picon",
+ File::get_plugin_path());
+ char png_name[BCSTRLEN], png_path[BCTEXTLEN];
+ plugin->get_plugin_png_name(png_name);
+ fs.update(picon_path);
for( int i=0; i<fs.dir_list.total; ++i ) {
char *fs_path = fs.dir_list[i]->path;
if( !fs.is_dir(fs_path) ) continue;
for( int i=0; i<fs.dir_list.total; ++i ) {
char *fs_path = fs.dir_list[i]->path;
if( !fs.is_dir(fs_path) ) continue;
- char *cp = strrchr(fs_path,'/');
- cp = !cp ? fs_path : cp+1;
- if( strncmp("picon_", cp, 6) ) continue;
- char png_path[BCTEXTLEN];
- if( !plugin->get_plugin_png_path(png_path, cp+6) )
- remove(png_path);
+ snprintf(png_path, sizeof(picon_path), "%s/%s",
+ fs_path, png_name);
+ remove(png_path);
}
delete plugin; plugin = 0;
awindow->gui->async_update_assets();
}
delete plugin; plugin = 0;
awindow->gui->async_update_assets();
@@
-1222,7
+1230,7
@@
void AWindowGUI::sort_picons(ArrayList<BC_ListBoxItem*> *src)
void AWindowGUI::filter_displayed_assets()
{
//allow_iconlisting = 1;
void AWindowGUI::filter_displayed_assets()
{
//allow_iconlisting = 1;
- asset_titles[0] = _("Title");
+ asset_titles[0] =
C
_("Title");
asset_titles[1] = _("Comments");
switch( mwindow->edl->session->awindow_folder ) {
asset_titles[1] = _("Comments");
switch( mwindow->edl->session->awindow_folder ) {
@@
-1241,7
+1249,7
@@
void AWindowGUI::filter_displayed_assets()
case AW_LABEL_FOLDER:
copy_picons(displayed_assets, &labellist, AW_NO_FOLDER);
asset_titles[0] = _("Time Stamps");
case AW_LABEL_FOLDER:
copy_picons(displayed_assets, &labellist, AW_NO_FOLDER);
asset_titles[0] = _("Time Stamps");
- asset_titles[1] = _("Title");
+ asset_titles[1] =
C
_("Title");
//allow_iconlisting = 0;
break;
default:
//allow_iconlisting = 0;
break;
default:
@@
-1844,7
+1852,7
@@
int AWindowDeleteProject::handle_event()
// int AWindowInfo::handle_event()
// {
// int cur_x, cur_y;
// int AWindowInfo::handle_event()
// {
// int cur_x, cur_y;
-// gui->get_abs_cursor
_xy
(cur_x, cur_y, 0);
+// gui->get_abs_cursor(cur_x, cur_y, 0);
// gui->awindow->asset_edit->edit_asset(gui->selected_asset(), cur_x, cur_y);
// return 1;
// }
// gui->awindow->asset_edit->edit_asset(gui->selected_asset(), cur_x, cur_y);
// return 1;
// }