search fixes, preset fixes, ladspa icon logging, igor pref theme, drag btn rollover

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index f7d690acfb89fcf5ba265824d449caf995e037df..a984e20cdf66c45455fc08607471f5ed8bd0292b 100644 (file)
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -436,6 +436,7 @@ AWindowGUI::AWindowGUI(MWindow *mwindow, AWindow *awindow)
        labellist_menu = 0;
        folderlist_menu = 0;
        temp_picon = 0;
+       search_text = 0;
        allow_iconlisting = 1;
        remove_plugin = 0;
        vicon_thread = 0;
@@ -465,6 +466,7 @@ AWindowGUI::~AWindowGUI()
        delete cliplist_menu;
        delete labellist_menu;
        delete folderlist_menu;
+       delete search_text;
        delete temp_picon;
        delete remove_plugin;
 
@@ -943,7 +945,6 @@ void AWindowGUI::async_update_assets()
 
 void AWindowGUI::update_folder_list()
 {
-       stop_vicon_drawing();
        for( int i = 0; i < folders.total; i++ ) {
                AssetPicon *picon = (AssetPicon*)folders.values[i];
                picon->in_use = 0;
@@ -981,8 +982,6 @@ void AWindowGUI::update_folder_list()
                        folders.remove_number(i);
                }
        }
-
-       start_vicon_drawing();
 }
 
 void AWindowGUI::create_persistent_folder(ArrayList<BC_ListBoxItem*> *output,
@@ -1198,7 +1197,9 @@ void AWindowGUI::copy_picons(ArrayList<BC_ListBoxItem*> *dst,
                    (picon->indexable && picon->indexable->awindow_folder == folder) ||
                    (picon->edl && picon->edl->local_session->awindow_folder == folder) ) {
                        const char *text = search_text->get_text();
-                       if( text && text[0] && !strstr(picon->get_text(), text) ) continue;
+                       int hidden = text && text[0] && !strcasestr(picon->get_text(), text);
+                       if( picon->vicon ) picon->vicon->hidden = hidden;
+                       if( hidden ) continue;
                        BC_ListBoxItem *item2, *item1;
                        dst[0].append(item1 = picon);
                        if( picon->edl )
@@ -1279,10 +1280,14 @@ void AWindowGUI::filter_displayed_assets()
 
 void AWindowGUI::update_assets()
 {
+       stop_vicon_drawing();
        update_folder_list();
        update_asset_list();
        labellist.remove_all_objects();
        create_label_folder();
+
+       if( displayed_folder != mwindow->edl->session->awindow_folder )
+               search_text->clear();
        filter_displayed_assets();
 
        if( mwindow->edl->session->folderlist_format != folder_list->get_format() ) {
@@ -1307,6 +1312,7 @@ void AWindowGUI::update_assets()
        asset_list->center_selection();
 
        flush();
+       start_vicon_drawing();
        return;
 }
 
@@ -1744,11 +1750,13 @@ int AWindowAssets::drag_stop_event()
 
        lock_window("AWindowAssets::drag_stop_event");
 
-       if( result ) get_drag_popup()->set_animation(0);
+       if( result )
+               get_drag_popup()->set_animation(0);
 
        BC_ListBox::drag_stop_event();
-       mwindow->session->current_operation = ::NO_OPERATION; // since NO_OPERATION is also defined in listbox, we have to reach for global scope...
-       return 0;
+// since NO_OPERATION is also defined in listbox, we have to reach for global scope...
+       mwindow->session->current_operation = ::NO_OPERATION;
+       return 1;
 }
 
 int AWindowAssets::column_resize_event()
@@ -1828,6 +1836,11 @@ const char *AWindowSearchText::get_text()
        return text_box->get_text();
 }
 
+void AWindowSearchText::clear()
+{
+       text_box->update("");
+}
+
 AWindowNewFolder::AWindowNewFolder(MWindow *mwindow, AWindowGUI *gui, int x, int y)
  : BC_Button(x, y, mwindow->theme->newbin_data)
 {

diff --git a/cinelerra-5.1/cinelerra/awindowgui.h b/cinelerra-5.1/cinelerra/awindowgui.h
index f7c90120c304dd9fba4aa263f00af68c704e8c0b..2e9228694b73fb2d62aa538e6e0f70ce74d1e7c4 100644 (file)
--- a/cinelerra-5.1/cinelerra/awindowgui.h
+++ b/cinelerra-5.1/cinelerra/awindowgui.h
@@ -326,16 +326,17 @@ public:
 
        int handle_event();
        void create_objects();
+       int get_w();
+       int get_h();
+       void reposition_window(int x, int y, int w);
+       const char *get_text();
+       void clear();
 
        MWindow *mwindow;
        AWindowGUI *gui;
        int x, y;
        BC_Title *text_title;
        BC_TextBox *text_box;
-       int get_w();
-       int get_h();
-       void reposition_window(int x, int y, int w);
-       const char *get_text();
 };
 
 class AWindowNewFolder : public BC_Button

diff --git a/cinelerra-5.1/cinelerra/keyframegui.C b/cinelerra-5.1/cinelerra/keyframegui.C
index 7f54004821882a4fdd35644afe20c2a35762ac4f..a8f99a73c51f2003c35d51dc3112a0bcbe6855a2 100644 (file)
--- a/cinelerra-5.1/cinelerra/keyframegui.C
+++ b/cinelerra-5.1/cinelerra/keyframegui.C
@@ -149,6 +149,7 @@ void KeyFrameThread::start_window(Plugin *plugin, KeyFrame *keyframe)
                if( !mwindow->edl->tracks->plugin_exists(plugin) ) return;
                this->keyframe = keyframe;
                this->plugin = plugin;
+               this->preset_text[0] = 0;
                plugin->calculate_title(plugin_title, 0);
                sprintf(window_title, _("%s: %s Keyframe"), _(PROGRAM_NAME), plugin_title);
 

diff --git a/cinelerra-5.1/cinelerra/plugindialog.C b/cinelerra-5.1/cinelerra/plugindialog.C
index 5c682797c6c77e59e5497bbc1abef9114c91eb86..6068ce1c73bf74ff6007b914dd706d7c40f2f37a 100644 (file)
--- a/cinelerra-5.1/cinelerra/plugindialog.C
+++ b/cinelerra-5.1/cinelerra/plugindialog.C
@@ -479,7 +479,7 @@ int PluginDialog::resize_event(int w, int h)
 
 int PluginDialog::attach_new(int number)
 {
-       if(number > -1 && number < standalone_data.total)
+       if(number >= 0 && number < plugindb.size())
        {
                strcpy(thread->plugin_title, plugindb.values[number]->title);
                thread->plugin_type = PLUGIN_STANDALONE;         // type is plugin
@@ -489,7 +489,7 @@ int PluginDialog::attach_new(int number)
 
 int PluginDialog::attach_shared(int number)
 {
-       if(number > -1 && number < shared_data.total)
+       if(number >= 0 && number < plugin_locations.size())
        {
                thread->plugin_type = PLUGIN_SHAREDPLUGIN;         // type is shared plugin
                thread->shared_location = *(plugin_locations.values[number]); // copy location
@@ -499,7 +499,7 @@ int PluginDialog::attach_shared(int number)
 
 int PluginDialog::attach_module(int number)
 {
-       if(number > -1 && number < module_data.total)
+       if(number >= 0 && number < module_locations.size())
        {
 //             title->update(module_data.values[number]->get_text());
                thread->plugin_type = PLUGIN_SHAREDMODULE;         // type is module
@@ -576,14 +576,14 @@ int PluginDialogNew::handle_event()
 }
 int PluginDialogNew::selection_changed()
 {
-       dialog->selected_available = get_selection_number(0, 0);
-
-
+       int no = get_selection_number(0, 0);
+       dialog->selected_available = no >= 0 && no < dialog->standalone_data.size() ?
+               ((PluginDialogListItem *)dialog->standalone_data[no])->item_no : -1;
        dialog->shared_list->set_all_selected(&dialog->shared_data, 0);
        dialog->shared_list->draw_items(1);
+       dialog->selected_shared = -1;
        dialog->module_list->set_all_selected(&dialog->module_data, 0);
        dialog->module_list->draw_items(1);
-       dialog->selected_shared = -1;
        dialog->selected_modules = -1;
        return 1;
 }
@@ -753,8 +753,8 @@ void PluginDialog::load_plugin_list(int redraw)
 
        for( int i=0; i<plugindb.total; ++i ) {
                const char *title = plugindb.values[i]->title;
-               if( text && text[0] && !strstr(title, text) ) continue;
-               standalone_data.append(new BC_ListBoxItem(title));
+               if( text && text[0] && !strcasestr(title, text) ) continue;
+               standalone_data.append(new PluginDialogListItem(title, i));
        }
 
        if( redraw )

diff --git a/cinelerra-5.1/cinelerra/plugindialog.h b/cinelerra-5.1/cinelerra/plugindialog.h
index 05d52fe025011349667e5edf8a62f758b3097d33..e53e0f22f5c430cb27981f9b906fa11bc4d88b73 100644 (file)
--- a/cinelerra-5.1/cinelerra/plugindialog.h
+++ b/cinelerra-5.1/cinelerra/plugindialog.h
@@ -88,6 +88,14 @@ public:
        int single_standalone;
 };
 
+class PluginDialogListItem : public BC_ListBoxItem
+{
+public:
+       PluginDialogListItem(const char *item, int n)
+        : BC_ListBoxItem(item), item_no(n) {}
+       int item_no;
+};
+
 class PluginDialog : public BC_Window
 {
 public:

diff --git a/cinelerra-5.1/cinelerra/pluginserver.C b/cinelerra-5.1/cinelerra/pluginserver.C
index a3fd1e542092dccd6eba2f9f2aa5b0c877d79821..aff809f39da4768b205d655d37494ec15665f05d 100644 (file)
--- a/cinelerra-5.1/cinelerra/pluginserver.C
+++ b/cinelerra-5.1/cinelerra/pluginserver.C
@@ -1257,7 +1257,7 @@ VFrame *PluginServer::get_plugin_images()
                return VFramePng::vframe_png(png_path,0,0);
        char png_name[BCSTRLEN];
        get_plugin_png_name(png_name);
-       unsigned char *data = mwindow->theme->get_image_data(png_name);
+       unsigned char *data = mwindow->theme->get_image_data(png_name, 0);
        return data ? new VFramePng(data, 0.) : 0;
 }
 

diff --git a/cinelerra-5.1/cinelerra/presets.C b/cinelerra-5.1/cinelerra/presets.C
index 8a2890902a6b9e419965b0432883ca4bfc22a67f..3a6e18e5c7ad633009b3ee727a4300e30814e18f 100644 (file)
--- a/cinelerra-5.1/cinelerra/presets.C
+++ b/cinelerra-5.1/cinelerra/presets.C
@@ -381,9 +381,10 @@ void PresetsDBPlugin::delete_keyframe(const char *title)
 {
        for( int i=0; i<keyframes.size(); ++i ) {
                PresetsDBKeyframe *keyframe = keyframes[i];
-               if( !strcasecmp(keyframe->title, title) && !keyframe->is_factory )
-                   keyframes.remove_object_number(i);
+               if( !strcasecmp(keyframe->title, title) && !keyframe->is_factory ) {
+                       keyframes.remove_object_number(i);
                        return;
+               }
        }
 }
 

diff --git a/cinelerra-5.1/guicast/bcdragwindow.C b/cinelerra-5.1/guicast/bcdragwindow.C
index 72e7c85029c85545a9a7f2261014d25f72e46fed..82ac5762d588c9de97dd89534d9f7a150d5f4c49 100644 (file)
--- a/cinelerra-5.1/guicast/bcdragwindow.C
+++ b/cinelerra-5.1/guicast/bcdragwindow.C
@@ -93,7 +93,7 @@ int BC_DragWindow::drag_failure_event()
 
                reposition_window(new_x, new_y, get_w(), get_h());
                flush();
-               usleep(1000);
+               usleep(250000/10);
        }
        return 0;
 }

diff --git a/cinelerra-5.1/guicast/bclistbox.C b/cinelerra-5.1/guicast/bclistbox.C
index 88afc836f39d9317b1856cfea66aaa02446918e6..4a7d7543212c3ff0eb2b53b6240b7fd59d0773fa 100644 (file)
--- a/cinelerra-5.1/guicast/bclistbox.C
+++ b/cinelerra-5.1/guicast/bclistbox.C
@@ -2443,6 +2443,14 @@ int BC_ListBox::button_press_event()
                        if( debug ) printf("BC_ListBox::button_press_event %d\n", __LINE__);
                }
 
+               if( current_operation != NO_OPERATION ) {
+                       switch( current_operation ) {
+                       case DRAG_ITEM:
+                       case COLUMN_DRAG:
+                               return drag_stop_event();
+                       }
+               }
+
 // Wheel mouse pressed
                if( get_buttonpress() == 4 ) {
                        if( current_operation == NO_OPERATION ) {
@@ -3208,6 +3216,7 @@ int BC_ListBox::drag_motion_event()
 
 int BC_ListBox::drag_stop_event()
 {
+       int result = 0;
        switch( current_operation ) {
        case DRAG_ITEM:
                unset_repeat(get_resources()->scroll_repeat);
@@ -3248,13 +3257,8 @@ int BC_ListBox::drag_stop_event()
                }
                else
                        drag_popup->drag_failure_event();
-
-               delete drag_popup;
-               flush();
-               drag_popup = 0;
-               current_operation = NO_OPERATION;
-               new_value = 0;
-               return 1;
+               result = 1;
+               break;
 
        case COLUMN_DRAG:
                if( dragged_title != highlighted_title ) {
@@ -3264,13 +3268,18 @@ int BC_ListBox::drag_stop_event()
                        else
                                drag_popup->drag_failure_event();
                }
+               result = 1;
+       }
+
+       if( result ) {
                current_operation = NO_OPERATION;
                delete drag_popup;
                flush();
                drag_popup = 0;
-               return 1;
+               new_value = 0;
        }
-       return 0;
+
+       return result;
 }
 
 BC_DragWindow* BC_ListBox::get_drag_popup()

diff --git a/cinelerra-5.1/guicast/bctextbox.C b/cinelerra-5.1/guicast/bctextbox.C
index bdbe6040e51cf63939c1e1a1464c567ceccf941c..506b578da030d88d710bd38ed32432f14bea0a59 100644 (file)
--- a/cinelerra-5.1/guicast/bctextbox.C
+++ b/cinelerra-5.1/guicast/bctextbox.C
@@ -191,8 +191,9 @@ int BC_TextBox::tstrlen()
 
 int BC_TextBox::tstrcmp(const char *cp)
 {
-       if( !tsize ) return strcmp(text, cp);
-       return strncmp(text, cp, tsize);
+       const char *tp = get_text();
+       if( !tsize ) return strcmp(tp, cp);
+       return strncmp(tp, cp, tsize);
 }
 
 char *BC_TextBox::tstrcpy(const char *cp)

diff --git a/cinelerra-5.1/guicast/bctheme.C b/cinelerra-5.1/guicast/bctheme.C
index 7a65b290be7e64160e28a249b1a313d1fe55d679..2c5410a5bbc16c9908c30e16a0636a6b5ae4a2c5 100644 (file)
--- a/cinelerra-5.1/guicast/bctheme.C
+++ b/cinelerra-5.1/guicast/bctheme.C
@@ -417,7 +417,7 @@ int BC_Theme::images_cmpr(const void *ap, const void *bp)
         return strcasecmp(a->name, b->name);
 }
 
-unsigned char* BC_Theme::get_image_data(const char *name)
+unsigned char* BC_Theme::get_image_data(const char *name, int log_errs)
 {
        if( images_dirty ) {
                images_dirty = 0;
@@ -443,7 +443,8 @@ unsigned char* BC_Theme::get_image_data(const char *name)
                 if( n > 0 ) l = m; else r = m;
         }
 
-       fprintf(stderr, _("Theme::get_image: %s not found.\n"), name);
+       if( log_errs )
+               fprintf(stderr, _("Theme::get_image: %s not found.\n"), name);
        return 0;
 }
 

diff --git a/cinelerra-5.1/guicast/bctheme.h b/cinelerra-5.1/guicast/bctheme.h
index 165e7d7a58e9edead930ae34e2cd42006d682245..2db0a75e61408f19ccf6936f231f48146923ddcf 100644 (file)
--- a/cinelerra-5.1/guicast/bctheme.h
+++ b/cinelerra-5.1/guicast/bctheme.h
@@ -101,7 +101,7 @@ public:
        BC_ThemeSet* get_image_set_object(const char *title);
 
 // Loads compressed data into temporary
-       unsigned char* get_image_data(const char *title);
+       unsigned char* get_image_data(const char *title, int log_errs=1);
 
 // Verify all images have been used after initialization.
        void check_used();

diff --git a/cinelerra-5.1/guicast/vicon.C b/cinelerra-5.1/guicast/vicon.C
index e9a71b154fae09ee47ef23992ce11d84d571d679..92986663ccc25c910fbeee2ae369b4cb2aa177d2 100644 (file)
--- a/cinelerra-5.1/guicast/vicon.C
+++ b/cinelerra-5.1/guicast/vicon.C
@@ -17,6 +17,7 @@ VIcon(int vw, int vh, double rate)
        this->age = 0;
        this->seq_no = 0;
        this->in_use = 1;
+       this->hidden = 0;
 }
 
 VIcon::
@@ -132,6 +133,7 @@ int ViewPopup::button_press_event()
 bool VIconThread::
 visible(VIcon *vicon, int x, int y)
 {
+       if( vicon->hidden ) return false;
        int y0 = 0;
        int my = y + vicon->vh;
        if( my <= y0 ) return false;

diff --git a/cinelerra-5.1/guicast/vicon.h b/cinelerra-5.1/guicast/vicon.h
index 6af17b2a4e109d43fee144231d14d0840e6302fb..bbb0549af9834a108b8228b14505ab19a57d583c 100644 (file)
--- a/cinelerra-5.1/guicast/vicon.h
+++ b/cinelerra-5.1/guicast/vicon.h
@@ -37,7 +37,7 @@ public:
 class VIcon
 {
 public:
-       int vw, vh, in_use;
+       int vw, vh, in_use, hidden;
        ArrayList<VIFrame *> images;
         int64_t seq_no;
         double cycle_start, age, frame_rate;

diff --git a/cinelerra-5.1/plugins/theme_blond/data/preferences_bg.png b/cinelerra-5.1/plugins/theme_blond/data/preferences_bg.png
index 20b02311d2d69b4a251cec85a229a7b29ff9aca5..ddd3c7d10a3d9f9ddbb9d2ea447153a113a09a06 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond/data/preferences_bg.png and b/cinelerra-5.1/plugins/theme_blond/data/preferences_bg.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond/data/preferences_bg.svg b/cinelerra-5.1/plugins/theme_blond/data/preferences_bg.svg
index 2c6de519fedcec9957f809d6feacaa4f90b13aeb..13249ced0c8e59697207937cd355a960d1af4503 100644 (file)
--- a/cinelerra-5.1/plugins/theme_blond/data/preferences_bg.svg
+++ b/cinelerra-5.1/plugins/theme_blond/data/preferences_bg.svg
@@ -13,7 +13,7 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.48.0 r9654"
-   width="880"
+   width="1004"
    height="77"
    sodipodi:docname="preferences_bg.svg">
   <metadata
@@ -365,11 +365,11 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1366"
-     inkscape:window-height="693"
+     inkscape:window-height="696"
      id="namedview4"
      showgrid="false"
      inkscape:zoom="1.1134575"
-     inkscape:cx="464.44849"
+     inkscape:cx="1048.8839"
      inkscape:cy="25.329944"
      inkscape:window-x="0"
      inkscape:window-y="24"
@@ -379,13 +379,13 @@
   <rect
      style="fill:#cecea2;fill-opacity:1;stroke:none"
      id="rect3611"
-     width="880"
+     width="1004"
      height="77"
      x="0"
      y="0" />
   <path
      style="fill:#c8c696;fill-opacity:1;stroke:none"
-     d="M 0,27 0,77 880,77 880,27 0,27 z"
+     d="m 0,27 0,50 1004,0 0,-50 L 0,27 z"
      id="rect2818"
      sodipodi:nodetypes="ccccc"
      inkscape:connector-curvature="0" />
@@ -399,7 +399,7 @@
   <path
      sodipodi:nodetypes="ccccc"
      id="path3042"
-     d="m 0,26 0,1 880,0 0,-1 -880,0 z"
+     d="m 0,26 0,1 1004,0 0,-1 L 0,26 z"
      style="fill:#4d5013;fill-opacity:1;stroke:none"
      inkscape:connector-curvature="0" />
 </svg>

diff --git a/cinelerra-5.1/plugins/theme_blond/data/preset_edit0.png b/cinelerra-5.1/plugins/theme_blond/data/preset_edit0.png
index 88d80576a46ea9a4c529e7f83423d65b06ea0186..ca4625de2874eaff76aa5c8939f4d7d0fa90559c 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond/data/preset_edit0.png and b/cinelerra-5.1/plugins/theme_blond/data/preset_edit0.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/preferences_bg.png b/cinelerra-5.1/plugins/theme_blond_cv/data/preferences_bg.png
index 4fd39d5ba182cc4e296d7dfd157cc38723f505e4..f543132e0d23660396d3225c01879f497274b9a9 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/preferences_bg.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/preferences_bg.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/preset_edit0.png b/cinelerra-5.1/plugins/theme_blond_cv/data/preset_edit0.png
index 88d80576a46ea9a4c529e7f83423d65b06ea0186..ca4625de2874eaff76aa5c8939f4d7d0fa90559c 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/preset_edit0.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/preset_edit0.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue/data/preferences_bg.png b/cinelerra-5.1/plugins/theme_blue/data/preferences_bg.png
index d16f5a833eefe9712c2b6e6a999cfe94c0f37505..78deed5822e4410ef59017f1cf13ac97e825f81e 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue/data/preferences_bg.png and b/cinelerra-5.1/plugins/theme_blue/data/preferences_bg.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue/data/preferences_bg.svg b/cinelerra-5.1/plugins/theme_blue/data/preferences_bg.svg
index ff8faff9236d479d2e8d18bf80de5e03ccd236fa..43ab5035ef0975e1c848ac073e436c300ed18824 100644 (file)
--- a/cinelerra-5.1/plugins/theme_blue/data/preferences_bg.svg
+++ b/cinelerra-5.1/plugins/theme_blue/data/preferences_bg.svg
@@ -13,9 +13,9 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.48.0 r9654"
-   width="880"
+   width="1004"
    height="77"
-   sodipodi:docname="preferences_bg.svg">
+   sodipodi:docname="preferences_bgBLUE.svg">
   <metadata
      id="metadata8">
     <rdf:RDF>
@@ -365,41 +365,40 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1366"
-     inkscape:window-height="693"
+     inkscape:window-height="696"
      id="namedview4"
      showgrid="false"
-     inkscape:zoom="0.5"
-     inkscape:cx="487.04185"
+     inkscape:zoom="1.5746667"
+     inkscape:cx="966.5614"
      inkscape:cy="25.329944"
      inkscape:window-x="0"
      inkscape:window-y="24"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:showpageshadow="false" />
+     inkscape:current-layer="svg2" />
   <rect
      style="fill:#1a1447;fill-opacity:1;stroke:none"
      id="rect3611"
-     width="880"
+     width="1004"
      height="77"
      x="0"
      y="0" />
   <path
      style="fill:#939ed4;fill-opacity:1;stroke:none"
-     d="M 0,27 0,77 880,77 880,27 0,27 z"
+     d="m 0,27 0,50 1004,0 0,-50 L 0,27 z"
      id="rect2818"
      sodipodi:nodetypes="ccccc"
      inkscape:connector-curvature="0" />
   <rect
      style="fill:none;stroke:none"
      id="rect2818-5"
-     width="141.23457"
+     width="130"
      height="100"
-     x="456.82379"
+     x="420.48553"
      y="10.160921" />
   <path
      sodipodi:nodetypes="ccccc"
      id="path3042"
-     d="m 0,26 0,1 880,0 0,-1 -880,0 z"
+     d="m 0,26 0,1 1004,0 0,-1 L 0,26 z"
      style="fill:#a7abdc;fill-opacity:1;stroke:none"
      inkscape:connector-curvature="0" />
 </svg>

diff --git a/cinelerra-5.1/plugins/theme_blue/data/preset_edit0.png b/cinelerra-5.1/plugins/theme_blue/data/preset_edit0.png
index 88d80576a46ea9a4c529e7f83423d65b06ea0186..ca4625de2874eaff76aa5c8939f4d7d0fa90559c 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue/data/preset_edit0.png and b/cinelerra-5.1/plugins/theme_blue/data/preset_edit0.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/preferences_bg.png b/cinelerra-5.1/plugins/theme_blue_dot/data/preferences_bg.png
index fdfb4bff171f60797937da188c4315093ea8ee6f..ad8445bf338f3797b59c6d64b9027a5ddbbe1140 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/preferences_bg.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/preferences_bg.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/preset_edit0.png b/cinelerra-5.1/plugins/theme_blue_dot/data/preset_edit0.png
index 88d80576a46ea9a4c529e7f83423d65b06ea0186..ca4625de2874eaff76aa5c8939f4d7d0fa90559c 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/preset_edit0.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/preset_edit0.png differ

diff --git a/cinelerra-5.1/plugins/theme_bright/data/preferences_bg.png b/cinelerra-5.1/plugins/theme_bright/data/preferences_bg.png
index 7c650edf1969c94984b66ffae35e524fc0eb1d13..6b6039516b40984dc7939a71eecc91e58371b908 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_bright/data/preferences_bg.png and b/cinelerra-5.1/plugins/theme_bright/data/preferences_bg.png differ

diff --git a/cinelerra-5.1/plugins/theme_bright/data/preset_edit0.png b/cinelerra-5.1/plugins/theme_bright/data/preset_edit0.png
index 88d80576a46ea9a4c529e7f83423d65b06ea0186..ca4625de2874eaff76aa5c8939f4d7d0fa90559c 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_bright/data/preset_edit0.png and b/cinelerra-5.1/plugins/theme_bright/data/preset_edit0.png differ

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/preferences_bg.png b/cinelerra-5.1/plugins/theme_hulk/data/preferences_bg.png
index a8c5e0570c7bf7d244c5d5716c889911b276ee4c..ca7f540bff21a75c62aa79d5886965aabb8c37f8 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/preferences_bg.png and b/cinelerra-5.1/plugins/theme_hulk/data/preferences_bg.png differ

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/preferences_bg.svg b/cinelerra-5.1/plugins/theme_hulk/data/preferences_bg.svg
index 10cdadff34182992e39443c055fe3437466c26b2..15a067e9f6a3ebc44da297cc8f6d60e5093d2535 100644 (file)
--- a/cinelerra-5.1/plugins/theme_hulk/data/preferences_bg.svg
+++ b/cinelerra-5.1/plugins/theme_hulk/data/preferences_bg.svg
@@ -13,7 +13,7 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.48.0 r9654"
-   width="880"
+   width="1004"
    height="77"
    sodipodi:docname="preferences_bg.svg">
   <metadata
@@ -365,7 +365,7 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1366"
-     inkscape:window-height="693"
+     inkscape:window-height="696"
      id="namedview4"
      showgrid="false"
      inkscape:zoom="0.5"
@@ -379,13 +379,16 @@
   <rect
      style="fill:#75b697;fill-opacity:1;stroke:none"
      id="rect3611"
-     width="880"
+     width="1004"
      height="77"
      x="0"
-     y="0" />
+     y="0"
+     inkscape:export-filename="/home/dell/Рабочий стол/новая папка 2/preferences_bgHULK.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90" />
   <path
      style="fill:#82d4a9;fill-opacity:1;stroke:none"
-     d="M 0,27 0,77 880,77 880,27 0,27 z"
+     d="m 0,27 0,50 1004,0 0,-50 L 0,27 z"
      id="rect2818"
      sodipodi:nodetypes="ccccc"
      inkscape:connector-curvature="0" />
@@ -399,7 +402,7 @@
   <path
      sodipodi:nodetypes="ccccc"
      id="path3042"
-     d="m 0,26 0,1 880,0 0,-1 -880,0 z"
+     d="m 0,26 0,1 1004,0 0,-1 L 0,26 z"
      style="fill:#217842;fill-opacity:1;stroke:none"
      inkscape:connector-curvature="0" />
 </svg>

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/preset_edit0.png b/cinelerra-5.1/plugins/theme_hulk/data/preset_edit0.png
index 88d80576a46ea9a4c529e7f83423d65b06ea0186..ca4625de2874eaff76aa5c8939f4d7d0fa90559c 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/preset_edit0.png and b/cinelerra-5.1/plugins/theme_hulk/data/preset_edit0.png differ

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/preferences_bg.png b/cinelerra-5.1/plugins/theme_pinklady/data/preferences_bg.png
index 7fff7ced0048ced7d2af5fa4639f93cf4d136695..88ec80fb61ad2f4b10dd11a233658392ec883675 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/preferences_bg.png and b/cinelerra-5.1/plugins/theme_pinklady/data/preferences_bg.png differ

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/preferences_bg.svg b/cinelerra-5.1/plugins/theme_pinklady/data/preferences_bg.svg
index 12ec8c38be1536b4b488a0ab3312f39716b4f030..10cabedace4d30b8f1a8665b4f874f09f12dac8f 100644 (file)
--- a/cinelerra-5.1/plugins/theme_pinklady/data/preferences_bg.svg
+++ b/cinelerra-5.1/plugins/theme_pinklady/data/preferences_bg.svg
@@ -13,9 +13,9 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.48.0 r9654"
-   width="880"
+   width="1004"
    height="77"
-   sodipodi:docname="preferences_bg.svg">
+   sodipodi:docname="preferences_bgPINKLADY.svg">
   <metadata
      id="metadata8">
     <rdf:RDF>
@@ -365,41 +365,43 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1366"
-     inkscape:window-height="693"
+     inkscape:window-height="696"
      id="namedview4"
      showgrid="false"
-     inkscape:zoom="0.5"
-     inkscape:cx="486.66113"
+     inkscape:zoom="1.5746667"
+     inkscape:cx="789.38827"
      inkscape:cy="25.329944"
      inkscape:window-x="0"
      inkscape:window-y="24"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:showpageshadow="false" />
+     inkscape:current-layer="svg2" />
   <rect
      style="fill:#ffb1d0;fill-opacity:1;stroke:none"
      id="rect3611"
-     width="880"
+     width="1004"
      height="77"
      x="0"
-     y="0" />
+     y="0"
+     inkscape:export-filename="/home/dell/Рабочий стол/новая папка 2/preferences_bgPINKLADY.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90" />
   <path
      style="fill:#d46a95;fill-opacity:1;stroke:none"
-     d="M 0,27 0,77 880,77 880,27 0,27 z"
+     d="m 0,27 0,50 1004,0 0,-50 L 0,27 z"
      id="rect2818"
      sodipodi:nodetypes="ccccc"
      inkscape:connector-curvature="0" />
   <rect
      style="fill:none;stroke:none"
      id="rect2818-5"
-     width="141.23457"
+     width="130"
      height="100"
-     x="456.82379"
+     x="420.48553"
      y="10.160921" />
   <path
      sodipodi:nodetypes="ccccc"
      id="path3042"
-     d="m 0,26 0,1 880,0 0,-1 -880,0 z"
+     d="m 0,26 0,1 1004,0 0,-1 L 0,26 z"
      style="fill:#78216f;fill-opacity:1;stroke:none"
      inkscape:connector-curvature="0" />
 </svg>

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/preset_edit0.png b/cinelerra-5.1/plugins/theme_pinklady/data/preset_edit0.png
index 88d80576a46ea9a4c529e7f83423d65b06ea0186..ca4625de2874eaff76aa5c8939f4d7d0fa90559c 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/preset_edit0.png and b/cinelerra-5.1/plugins/theme_pinklady/data/preset_edit0.png differ

diff --git a/cinelerra-5.1/plugins/theme_suv/data/preferences_bg.png b/cinelerra-5.1/plugins/theme_suv/data/preferences_bg.png
index 43a1fa18aeb8c2925b1cc70a1236eaaf2c4106fd..84deaeb0e6c1e24b57f1f273529ec116fe553393 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_suv/data/preferences_bg.png and b/cinelerra-5.1/plugins/theme_suv/data/preferences_bg.png differ

diff --git a/cinelerra-5.1/plugins/theme_suv/data/preset_edit0.png b/cinelerra-5.1/plugins/theme_suv/data/preset_edit0.png
index 88d80576a46ea9a4c529e7f83423d65b06ea0186..ca4625de2874eaff76aa5c8939f4d7d0fa90559c 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_suv/data/preset_edit0.png and b/cinelerra-5.1/plugins/theme_suv/data/preset_edit0.png differ

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/preferences_bg.png b/cinelerra-5.1/plugins/theme_unflat/data/preferences_bg.png
index 6ab007ff817dddc4de35f4710d439127d5d2e49e..5e82c8dd5989997c5bd23b9a562dfb775cb85bf3 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/preferences_bg.png and b/cinelerra-5.1/plugins/theme_unflat/data/preferences_bg.png differ

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/preferences_bg.svg b/cinelerra-5.1/plugins/theme_unflat/data/preferences_bg.svg
index 2d7ab16919a5cf81cfe374536eec25f7b51b58a0..1b234994dd43ecba8ee000fc183fecae0c618224 100644 (file)
--- a/cinelerra-5.1/plugins/theme_unflat/data/preferences_bg.svg
+++ b/cinelerra-5.1/plugins/theme_unflat/data/preferences_bg.svg
@@ -13,7 +13,7 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.48.0 r9654"
-   width="880"
+   width="1004"
    height="77"
    sodipodi:docname="preferences_bg.svg">
   <metadata
@@ -365,11 +365,11 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1366"
-     inkscape:window-height="693"
+     inkscape:window-height="696"
      id="namedview4"
      showgrid="false"
-     inkscape:zoom="1"
-     inkscape:cx="487.04185"
+     inkscape:zoom="1.5746667"
+     inkscape:cx="687.02157"
      inkscape:cy="25.329944"
      inkscape:window-x="0"
      inkscape:window-y="24"
@@ -378,13 +378,13 @@
   <rect
      style="fill:#333333;fill-opacity:1;stroke:none"
      id="rect3611"
-     width="880"
+     width="1004"
      height="77"
      x="0"
      y="0" />
   <path
      style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-     d="m -1,28 0,50 880,0 0,-50 -880,0 z"
+     d="m 0,27 0,50 1004,0 0,-50 L 0,27 z"
      id="rect2818"
      sodipodi:nodetypes="ccccc"
      inkscape:connector-curvature="0" />
@@ -398,7 +398,7 @@
   <path
      sodipodi:nodetypes="ccccc"
      id="path3042"
-     d="m 0,26 0,1 880,0 0,-1 -880,0 z"
+     d="m 0,26 0,1 1004,0 0,-1 L 0,26 z"
      style="fill:#989898;fill-opacity:1;stroke:none"
      inkscape:connector-curvature="0" />
 </svg>

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/preset_edit0.png b/cinelerra-5.1/plugins/theme_unflat/data/preset_edit0.png
index 88d80576a46ea9a4c529e7f83423d65b06ea0186..ca4625de2874eaff76aa5c8939f4d7d0fa90559c 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/preset_edit0.png and b/cinelerra-5.1/plugins/theme_unflat/data/preset_edit0.png differ