4 bt fixes, xft unrefd font fix, add: find in resources, add: user title, filebox...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / assetpopup.C

diff --git a/cinelerra-5.1/cinelerra/assetpopup.C b/cinelerra-5.1/cinelerra/assetpopup.C
index 026806a1c9eb3e6bddf15acdbc020e5da5246b93..59357d184851754ac3c031c508e95c92f0aac12a 100644 (file)
--- a/cinelerra-5.1/cinelerra/assetpopup.C
+++ b/cinelerra-5.1/cinelerra/assetpopup.C
@@ -37,6 +37,7 @@
 #include "edl.h"
 #include "edlsession.h"
 #include "file.h"
+#include "filesystem.h"
 #include "filexml.h"
 #include "language.h"
 #include "loadfile.h"
@@ -579,6 +580,7 @@ AssetCopyWindow::~AssetCopyWindow()
 
 void AssetCopyWindow::create_objects()
 {
+       lock_window("AssetCopyWindow::create_objects");
        BC_Title *title;
        int x = 10, y = 10, pad = 5;
        add_subwindow(title = new BC_Title(x, y, _("List of asset paths:")));
@@ -593,6 +595,7 @@ void AssetCopyWindow::create_objects()
 
        add_subwindow(new BC_OKButton(this));
        show_window();
+       unlock_window();
 }
 
 int AssetCopyWindow::resize_event(int w, int h)
@@ -704,6 +707,7 @@ AssetPasteWindow::~AssetPasteWindow()
 
 void AssetPasteWindow::create_objects()
 {
+       lock_window("AssetPasteWindow::create_objects()");
        BC_Title *title;
        int x = 10, y = 10, pad = 5;
        add_subwindow(title = new BC_Title(x, y, _("Enter list of asset paths:")));
@@ -716,6 +720,7 @@ void AssetPasteWindow::create_objects()
        add_subwindow(new BC_OKButton(this));
        add_subwindow(new BC_CancelButton(this));
        show_window();
+       unlock_window();
 }
 
 int AssetPasteWindow::resize_event(int w, int h)
@@ -776,10 +781,13 @@ int SnapshotMenuItem::handle_event()
                preferences->snapshot_path, _("snap"),
                1900+tm.tm_year,1+tm.tm_mon,tm.tm_mday,
                tm.tm_hour,tm.tm_min,tm.tm_sec, exts[mode]);
+       char *asset_path = FileSystem::basepath(filename);
+       Asset *asset = new Asset(asset_path);
+       delete [] asset_path;
+
        int fw = edl->get_w(), fh = edl->get_h();
        int fcolor_model = edl->session->color_model;
 
-       Asset *asset = new Asset(filename);
        switch( mode ) {
        case SNAPSHOT_PNG:
                asset->format = FILE_PNG;
@@ -998,8 +1006,9 @@ int GrabshotPopup::grab_event(XEvent *event)
                preferences->snapshot_path, _("grab"),
                1900+tm.tm_year,1+tm.tm_mon,tm.tm_mday,
                tm.tm_hour,tm.tm_min,tm.tm_sec, exts[mode]);
-
-       Asset *asset = new Asset(filename);
+       char *asset_path = FileSystem::basepath(filename);
+       Asset *asset = new Asset(asset_path);
+       delete [] asset_path;
        switch( mode ) {
        case GRABSHOT_PNG:
                asset->format = FILE_PNG;