drag win rework, new search, igor theme fixes, sams preset icon
authorGood Guy <[email protected]>
Fri, 27 Oct 2017 01:27:52 +0000 (19:27 -0600)
committerGood Guy <[email protected]>
Fri, 27 Oct 2017 01:27:52 +0000 (19:27 -0600)
62 files changed:
cinelerra-5.1/cinelerra/awindowgui.C
cinelerra-5.1/cinelerra/awindowgui.h
cinelerra-5.1/cinelerra/awindowgui.inc
cinelerra-5.1/cinelerra/plugindialog.C
cinelerra-5.1/cinelerra/plugindialog.h
cinelerra-5.1/cinelerra/trackcanvas.C
cinelerra-5.1/guicast/bcdragwindow.C
cinelerra-5.1/guicast/bcdragwindow.h
cinelerra-5.1/guicast/bclistbox.C
cinelerra-5.1/msg/txt
cinelerra-5.1/plugins/theme_blond/blondtheme.C
cinelerra-5.1/plugins/theme_blond/data/histogram_img.png [moved from cinelerra-5.1/plugins/theme_blond/data/histogram.png with 100% similarity]
cinelerra-5.1/plugins/theme_blond/data/preset_edit0.png
cinelerra-5.1/plugins/theme_blond/data/preset_edit1.png
cinelerra-5.1/plugins/theme_blond/data/preset_edit2.png
cinelerra-5.1/plugins/theme_blond/data/setformat_bg.png
cinelerra-5.1/plugins/theme_blond/data/setformat_bg.svg [new file with mode: 0644]
cinelerra-5.1/plugins/theme_blond_cv/data/histogram_img.png [moved from cinelerra-5.1/plugins/theme_blond_cv/data/histogram.png with 100% similarity]
cinelerra-5.1/plugins/theme_blond_cv/data/preset_edit0.png
cinelerra-5.1/plugins/theme_blond_cv/data/preset_edit1.png
cinelerra-5.1/plugins/theme_blond_cv/data/preset_edit2.png
cinelerra-5.1/plugins/theme_blue/bluetheme.C
cinelerra-5.1/plugins/theme_blue/data/histogram_img.png [moved from cinelerra-5.1/plugins/theme_blue/data/histogram.png with 100% similarity]
cinelerra-5.1/plugins/theme_blue/data/preset_edit0.png
cinelerra-5.1/plugins/theme_blue/data/preset_edit1.png
cinelerra-5.1/plugins/theme_blue/data/preset_edit2.png
cinelerra-5.1/plugins/theme_blue/data/setformat_bg.png
cinelerra-5.1/plugins/theme_blue/data/setformat_bg.svg [new file with mode: 0644]
cinelerra-5.1/plugins/theme_blue_dot/data/preset_edit0.png
cinelerra-5.1/plugins/theme_blue_dot/data/preset_edit1.png
cinelerra-5.1/plugins/theme_blue_dot/data/preset_edit2.png
cinelerra-5.1/plugins/theme_bright/brighttheme.C
cinelerra-5.1/plugins/theme_bright/data/histogram_img.png [moved from cinelerra-5.1/plugins/theme_bright/data/histogram.png with 100% similarity]
cinelerra-5.1/plugins/theme_bright/data/preset_edit0.png
cinelerra-5.1/plugins/theme_bright/data/preset_edit1.png
cinelerra-5.1/plugins/theme_bright/data/preset_edit2.png
cinelerra-5.1/plugins/theme_hulk/data/histogram_img.png [moved from cinelerra-5.1/plugins/theme_hulk/data/histogram.png with 100% similarity]
cinelerra-5.1/plugins/theme_hulk/data/preset_edit0.png
cinelerra-5.1/plugins/theme_hulk/data/preset_edit1.png
cinelerra-5.1/plugins/theme_hulk/data/preset_edit2.png
cinelerra-5.1/plugins/theme_hulk/data/setformat_bg.png
cinelerra-5.1/plugins/theme_hulk/data/setformat_bg.svg [new file with mode: 0644]
cinelerra-5.1/plugins/theme_hulk/hulktheme.C
cinelerra-5.1/plugins/theme_pinklady/data/histogram_img.png [moved from cinelerra-5.1/plugins/theme_pinklady/data/histogram.png with 100% similarity]
cinelerra-5.1/plugins/theme_pinklady/data/preset_edit0.png
cinelerra-5.1/plugins/theme_pinklady/data/preset_edit1.png
cinelerra-5.1/plugins/theme_pinklady/data/preset_edit2.png
cinelerra-5.1/plugins/theme_pinklady/data/setformat_bg.png
cinelerra-5.1/plugins/theme_pinklady/data/setformat_bg.svg [new file with mode: 0644]
cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C
cinelerra-5.1/plugins/theme_suv/data/histogram_img.png [moved from cinelerra-5.1/plugins/theme_suv/data/histogram.png with 100% similarity]
cinelerra-5.1/plugins/theme_suv/data/preset_edit0.png
cinelerra-5.1/plugins/theme_suv/data/preset_edit1.png
cinelerra-5.1/plugins/theme_suv/data/preset_edit2.png
cinelerra-5.1/plugins/theme_suv/suv.C
cinelerra-5.1/plugins/theme_unflat/data/histogram_img.png [moved from cinelerra-5.1/plugins/theme_unflat/data/histogram.png with 100% similarity]
cinelerra-5.1/plugins/theme_unflat/data/preset_edit0.png
cinelerra-5.1/plugins/theme_unflat/data/preset_edit1.png
cinelerra-5.1/plugins/theme_unflat/data/preset_edit2.png
cinelerra-5.1/plugins/theme_unflat/data/setformat_bg.png
cinelerra-5.1/plugins/theme_unflat/data/setformat_bg.svg [new file with mode: 0644]
cinelerra-5.1/plugins/theme_unflat/unflattheme.C

index 8b3bd1a2f07c36137171489cba3d8feac1c53457..f7d690acfb89fcf5ba265824d449caf995e037df 100644 (file)
 #include "assets.h"
 #include "awindowgui.h"
 #include "awindow.h"
+#include "bccmodels.h"
 #include "bcsignals.h"
 #include "bchash.h"
 #include "cache.h"
-#include "bccmodels.h"
+#include "clip.h"
 #include "clippopup.h"
 #include "cursors.h"
 #include "cwindowgui.h"
@@ -613,9 +614,13 @@ void AWindowGUI::create_objects()
        mwindow->theme->get_awindow_sizes(this);
        load_defaults(mwindow->defaults);
 
-       add_subwindow(asset_list = new AWindowAssets(mwindow, this,
-               mwindow->theme->alist_x, mwindow->theme->alist_y,
-               mwindow->theme->alist_w, mwindow->theme->alist_h));
+       int x1 = mwindow->theme->alist_x, y1 = mwindow->theme->alist_y + 5;
+       int w1 = mwindow->theme->alist_w, h1 = mwindow->theme->alist_h;
+       search_text = new AWindowSearchText(mwindow, this, x1, y1);
+       search_text->create_objects();
+       int dy = search_text->get_h() + 10;
+       y1 += dy;  h1 -= dy;
+       add_subwindow(asset_list = new AWindowAssets(mwindow, this, x1, y1, w1, h1));
 
        vicon_thread = new VIconThread(asset_list);
        vicon_thread->start();
@@ -713,9 +718,12 @@ int AWindowGUI::translation_event()
 
 void AWindowGUI::reposition_objects()
 {
-       asset_list->reposition_window(
-               mwindow->theme->alist_x, mwindow->theme->alist_y,
-               mwindow->theme->alist_w, mwindow->theme->alist_h);
+       int x1 = mwindow->theme->alist_x, y1 = mwindow->theme->alist_y + 5;
+       int w1 = mwindow->theme->alist_w, h1 = mwindow->theme->alist_h;
+       search_text->reposition_window(x1, y1, w1);
+       int dy = search_text->get_h() + 10;
+       y1 += dy;  h1 -= dy;
+       asset_list->reposition_window(x1, y1, w1, h1);
        divider->reposition_window(
                mwindow->theme->adivider_x, mwindow->theme->adivider_y,
                mwindow->theme->adivider_w, mwindow->theme->adivider_h);
@@ -1189,6 +1197,8 @@ void AWindowGUI::copy_picons(ArrayList<BC_ListBoxItem*> *dst,
                if( folder < 0 ||
                    (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;
                        BC_ListBoxItem *item2, *item1;
                        dst[0].append(item1 = picon);
                        if( picon->edl )
@@ -1198,8 +1208,8 @@ void AWindowGUI::copy_picons(ArrayList<BC_ListBoxItem*> *dst,
                                dst[1].append(item2 = new BC_ListBoxItem(picon->label->textstr));
                        else
                                dst[1].append(item2 = new BC_ListBoxItem(""));
-                       item1->set_autoplace_text(1);
-                       item2->set_autoplace_text(1);
+                       item1->set_autoplace_text(1);  item1->set_autoplace_icon(1);
+                       item2->set_autoplace_text(1);  item2->set_autoplace_icon(1);
                }
        }
 }
@@ -1760,16 +1770,63 @@ int AWindowAssets::focus_out_event()
        return BC_ListBox::focus_out_event();
 }
 
+AWindowSearchTextBox::AWindowSearchTextBox(AWindowSearchText *search_text, int x, int y, int w)
+ : BC_TextBox(x, y, w, 1, "")
+{
+       this->search_text = search_text;
+}
 
+int AWindowSearchTextBox::handle_event()
+{
+       return search_text->handle_event();
+}
 
+AWindowSearchText::AWindowSearchText(MWindow *mwindow, AWindowGUI *gui, int x, int y)
+{
+       this->mwindow = mwindow;
+       this->gui = gui;
+       this->x = x;
+       this->y = y;
+}
 
+void AWindowSearchText::create_objects()
+{
+       int x1 = x, y1 = y, margin = 10;
+       gui->add_subwindow(text_title = new BC_Title(x1, y1, _("Search:")));
+       x1 += text_title->get_w() + margin;
+       int w1 = gui->get_w() - x1 - 2*margin;
+       gui->add_subwindow(text_box = new AWindowSearchTextBox(this, x1, y1, w1));
+}
 
+int AWindowSearchText::handle_event()
+{
+       gui->async_update_assets();
+       return 1;
+}
 
+int AWindowSearchText::get_w()
+{
+       return text_box->get_w() + text_title->get_w() + 10;
+}
 
+int AWindowSearchText::get_h()
+{
+       return bmax(text_box->get_h(),text_title->get_h());
+}
 
+void AWindowSearchText::reposition_window(int x, int y, int w)
+{
+       int x1 = x, y1 = y, margin = 10;
+       text_title->reposition_window(x1, y1);
+       x1 += text_title->get_w() + margin;
+       int w1 = gui->get_w() - x1 - 2*margin;
+       text_box->reposition_window(x1, y1, w1);
+}
 
-
-
+const char *AWindowSearchText::get_text()
+{
+       return text_box->get_text();
+}
 
 AWindowNewFolder::AWindowNewFolder(MWindow *mwindow, AWindowGUI *gui, int x, int y)
  : BC_Button(x, y, mwindow->theme->newbin_data)
index e8bd76f542c52623a5beb977be8aedf719974d45..f7c90120c304dd9fba4aa263f00af68c704e8c0b 100644 (file)
@@ -179,6 +179,7 @@ public:
        AWindowAssets *asset_list;
        AWindowFolders *folder_list;
        AWindowDivider *divider;
+       AWindowSearchText *search_text;
 
 // Store data to speed up responses
 // Persistant data for listboxes
@@ -309,6 +310,34 @@ public:
        AWindowGUI *gui;
 };
 
+class AWindowSearchTextBox : public BC_TextBox
+{
+public:
+       AWindowSearchTextBox(AWindowSearchText *search_text, int x, int y, int w);
+       int handle_event();
+
+       AWindowSearchText *search_text;
+};
+
+class AWindowSearchText
+{
+public:
+       AWindowSearchText(MWindow *mwindow, AWindowGUI *gui, int x, int y);
+
+       int handle_event();
+       void create_objects();
+
+       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
 {
 public:
index e83b8de0d02b4b0c59e413510d05cb5e62167dd3..0fb16fbc3f31ffe5127aff0a875a59627bb6a4b6 100644 (file)
@@ -30,6 +30,8 @@ class AWindowRemovePlugin;
 class AWindowGUI;
 class AWindowAssets;
 class AWindowDivider;
+class AWindowSearchTextBox;
+class AWindowSearchText;
 class AWindowFolders;
 class AWindowNewFolder;
 class AWindowDeleteFolder;
index 172eaf91acb13b75e777a39d73baf7bdc3a732f9..5c682797c6c77e59e5497bbc1abef9114c91eb86 100644 (file)
@@ -277,8 +277,6 @@ void PluginDialog::create_objects()
                thread->data_type);
 
 // Construct listbox items
-       for(int i = 0; i < plugindb.total; i++)
-               standalone_data.append(new BC_ListBoxItem(_(plugindb.values[i]->title)));
        for(int i = 0; i < plugin_locations.total; i++)
        {
                Track *track = mwindow->edl->tracks->number(plugin_locations.values[i]->module);
@@ -309,12 +307,15 @@ void PluginDialog::create_objects()
        add_subwindow(standalone_title = new BC_Title(mwindow->theme->plugindialog_new_x,
                mwindow->theme->plugindialog_new_y - 20,
                _("Plugins:")));
+       int x1 = mwindow->theme->plugindialog_new_x, y1 = mwindow->theme->plugindialog_new_y;
+       int w1 = mwindow->theme->plugindialog_new_w, h1 = mwindow->theme->plugindialog_new_h;
+       add_subwindow(search_text = new PluginDialogSearchText(this, x1, y1, w1));
+       int dy = search_text->get_h() + 10;
+       y1 += dy;  h1 -= dy;
+       load_plugin_list(0);
+
        add_subwindow(standalone_list = new PluginDialogNew(this,
-               &standalone_data,
-               mwindow->theme->plugindialog_new_x,
-               mwindow->theme->plugindialog_new_y,
-               mwindow->theme->plugindialog_new_w,
-               mwindow->theme->plugindialog_new_h));
+               &standalone_data, x1, y1, w1, h1));
 //
 //     if(thread->plugin)
 //             add_subwindow(standalone_change = new PluginDialogChangeNew(mwindow,
@@ -421,10 +422,13 @@ int PluginDialog::resize_event(int w, int h)
 
        standalone_title->reposition_window(mwindow->theme->plugindialog_new_x,
                mwindow->theme->plugindialog_new_y - 20);
-       standalone_list->reposition_window(mwindow->theme->plugindialog_new_x,
-               mwindow->theme->plugindialog_new_y,
-               mwindow->theme->plugindialog_new_w,
-               mwindow->theme->plugindialog_new_h);
+       int x1 = mwindow->theme->plugindialog_new_x, y1 = mwindow->theme->plugindialog_new_y;
+       int w1 = mwindow->theme->plugindialog_new_w, h1 = mwindow->theme->plugindialog_new_h;
+       search_text->reposition_window(x1, y1, w1);
+       int dy = search_text->get_h() + 10;
+       y1 += dy;  h1 -= dy;
+       standalone_list->reposition_window(x1, y1, w1, h1);
+
 //     if(standalone_attach)
 //             standalone_attach->reposition_window(mwindow->theme->plugindialog_newattach_x,
 //                     mwindow->theme->plugindialog_newattach_y);
@@ -432,10 +436,6 @@ int PluginDialog::resize_event(int w, int h)
 //             standalone_change->reposition_window(mwindow->theme->plugindialog_newattach_x,
 //                     mwindow->theme->plugindialog_newattach_y);
 
-
-
-
-
        shared_title->reposition_window(mwindow->theme->plugindialog_shared_x,
                mwindow->theme->plugindialog_shared_y - 20);
        shared_list->reposition_window(mwindow->theme->plugindialog_shared_x,
@@ -559,19 +559,12 @@ void PluginDialog::save_settings()
 
 PluginDialogNew::PluginDialogNew(PluginDialog *dialog,
        ArrayList<BC_ListBoxItem*> *standalone_data,
-       int x,
-       int y,
-       int w,
-       int h)
- : BC_ListBox(x,
-       y,
-       w,
-       h,
-       LISTBOX_TEXT,
-       standalone_data)
+       int x, int y, int w, int h)
+ : BC_ListBox(x, y, w, h, LISTBOX_TEXT, standalone_data)
 {
        this->dialog = dialog;
 }
+
 PluginDialogNew::~PluginDialogNew() { }
 int PluginDialogNew::handle_event()
 {
@@ -753,6 +746,32 @@ int PluginDialogModules::selection_changed()
        return 1;
 }
 
+void PluginDialog::load_plugin_list(int redraw)
+{
+       standalone_data.remove_all_objects();
+       const char *text = search_text->get_text();
+
+       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( redraw )
+               standalone_list->draw_items(1);
+}
+
+PluginDialogSearchText::PluginDialogSearchText(PluginDialog *dialog, int x, int y, int w)
+ : BC_TextBox(x, y, w, 1, "")
+{
+       this->dialog = dialog;
+}
+
+int PluginDialogSearchText::handle_event()
+{
+       dialog->load_plugin_list(1);
+       return 1;
+}
 
 PluginDialogSingle::PluginDialogSingle(PluginDialog *dialog, int x, int y)
  : BC_CheckBox(x,
index 31c1b584d8f82f73ecc4cb680cc909352393d392..05d52fe025011349667e5edf8a62f758b3097d33 100644 (file)
@@ -26,6 +26,7 @@ class PluginDialogTextBox;
 class PluginDialogDetach;
 class PluginDialogNew;
 class PluginDialogShared;
+class PluginDialogSearchText;
 class PluginDialogModules;
 class PluginDialogAttachNew;
 class PluginDialogChangeNew;
@@ -104,6 +105,7 @@ public:
        int attach_module(int number);
        void save_settings();
        int resize_event(int w, int h);
+       void load_plugin_list(int redraw);
 
        BC_Title *standalone_title;
        PluginDialogNew *standalone_list;
@@ -112,7 +114,7 @@ public:
        BC_Title *module_title;
        PluginDialogModules *module_list;
        PluginDialogSingle *single_standalone;
-
+       PluginDialogSearchText *search_text;
 
        PluginDialogThru *thru;
 
@@ -236,6 +238,14 @@ public:
        PluginDialog *dialog;
 };
 
+class PluginDialogSearchText : public BC_TextBox
+{
+public:
+       PluginDialogSearchText(PluginDialog *dialog, int x, int y, int w);
+       int handle_event();
+
+       PluginDialog *dialog;
+};
 
 /*
  * class PluginDialogAttachShared : public BC_GenericButton
index 960598c36350b82aaf63d65178802d10be4e9b97..fc36e851f5bcae4b972274b6db229acaae9fa28b 100644 (file)
@@ -4531,8 +4531,6 @@ int TrackCanvas::do_edits(int cursor_x, int cursor_y, int button_press, int drag
 
                                                int cx, cy;
                                                get_abs_cursor(cx, cy);
-                                               cx -= mwindow->theme->get_image("clip_icon")->get_w() / 2,
-                                               cy -= mwindow->theme->get_image("clip_icon")->get_h() / 2;
                                                gui->drag_popup = new BC_DragWindow(gui,
                                                        mwindow->theme->get_image("clip_icon"), cx, cy);
 
@@ -4645,8 +4643,6 @@ int TrackCanvas::do_plugins(int cursor_x, int cursor_y, int drag_start,
                                        }
                                        int cx, cy;
                                        get_abs_cursor(cx, cy);
-                                       cx -= frame->get_w() / 2;
-                                       cy -= frame->get_h() / 2;
                                        gui->drag_popup = new BC_DragWindow(gui, frame, cx, cy);
                                                break; }
 
@@ -4655,8 +4651,6 @@ int TrackCanvas::do_plugins(int cursor_x, int cursor_y, int drag_start,
                                        VFrame *frame = mwindow->theme->get_image("clip_icon");
                                        int cx, cy;
                                        get_abs_cursor(cx, cy);
-                                       cx -= frame->get_w() / 2;
-                                       cy -= frame->get_h() / 2;
                                        gui->drag_popup = new BC_DragWindow(gui, frame, cx, cy);
                                        break; }
                                }
index 8d70fb8f99e30355a8ad633f9b44b7c71e4bd8cf..72e7c85029c85545a9a7f2261014d25f72e46fed 100644 (file)
  */
 
 #include "bcdragwindow.h"
+#include "bcbitmap.h"
 #include "bcpixmap.h"
 
 #include "vframe.h"
 #include <unistd.h>
 
 BC_DragWindow::BC_DragWindow(BC_WindowBase *parent_window,
-       BC_Pixmap *pixmap, int icon_x, int icon_y)
- : BC_Popup(parent_window, icon_x, icon_y, pixmap->get_w(), pixmap->get_h(),
-       -1, 0, pixmap)
+       BC_Pixmap *pixmap, int center_x, int center_y)
+ : BC_Popup(parent_window,
+       center_x - pixmap->get_w() / 2, center_y - pixmap->get_h() / 2,
+       pixmap->get_w(), pixmap->get_h(), -1, 0,
+       prepare_pixmap(pixmap, parent_window))
 {
        drag_pixmap = 0;
-       init_x = icon_x;
-       init_y = icon_y;
+       init_x = get_x();
+       init_y = get_y();
        end_x = BC_INFINITY;
        end_y = BC_INFINITY;
-       icon_offset_x = init_x - parent_window->get_abs_cursor_x(0);
-       icon_offset_y = init_y - parent_window->get_abs_cursor_y(0);
-//printf("BC_DragWindow::BC_DragWindow 1 %d %d\n", icon_offset_x, icon_offset_y);
        do_animation = 1;
 }
 
 
 BC_DragWindow::BC_DragWindow(BC_WindowBase *parent_window,
-       VFrame *frame, int icon_x, int icon_y)
- : BC_Popup(parent_window, icon_x, icon_y, frame->get_w(), frame->get_h(),
-       -1, 0, prepare_frame(frame, parent_window))
+       VFrame *frame, int center_x, int center_y)
+ : BC_Popup(parent_window,
+       center_x - frame->get_w() / 2, center_y - frame->get_h() / 2,
+       frame->get_w(), frame->get_h(), -1, 0,
+       prepare_frame(frame, parent_window))
 {
-       init_x = icon_x;
-       init_y = icon_y;
+       init_x = get_x();
+       init_y = get_y();
        end_x = BC_INFINITY;
        end_y = BC_INFINITY;
-       icon_offset_x = init_x - parent_window->get_abs_cursor_x(0);
-       icon_offset_y = init_y - parent_window->get_abs_cursor_y(0);
-//printf("BC_DragWindow::BC_DragWindow 1 %d %d\n", icon_offset_x, icon_offset_y);
        do_animation = 1;
 }
 
@@ -62,31 +61,13 @@ BC_DragWindow::~BC_DragWindow()
        delete drag_pixmap;
 }
 
-int BC_DragWindow::get_init_x(BC_WindowBase *parent_window, int icon_x)
-{
-       int output_x, temp = 0;
-       Window tempwin;
-       XTranslateCoordinates(parent_window->top_level->display,
-               parent_window->win, parent_window->top_level->rootwin,
-               icon_x, temp, &output_x, &temp, &tempwin);
-       return output_x;
-}
-
-int BC_DragWindow::get_init_y(BC_WindowBase *parent_window, int icon_y)
-{
-       int output_y, temp = 0;
-       Window tempwin;
-       XTranslateCoordinates(parent_window->top_level->display,
-               parent_window->win, parent_window->top_level->rootwin,
-               temp, icon_y, &temp, &output_y, &tempwin);
-       return output_y;
-}
-
 int BC_DragWindow::cursor_motion_event()
 {
        int cx, cy;
        get_abs_cursor(cx, cy);
-       reposition_window(cx + icon_offset_x, cy + icon_offset_y, get_w(), get_h());
+       cx -= get_w() / 2;
+       cy -= get_h() / 2;
+       reposition_window(cx, cy, get_w(), get_h());
        flush();
        return 1;
 }
@@ -97,16 +78,6 @@ int BC_DragWindow::button_release_event()
        return BC_WindowBase::button_release_event();
 }
 
-int BC_DragWindow::get_offset_x()
-{
-       return icon_offset_x;
-}
-
-int BC_DragWindow::get_offset_y()
-{
-       return icon_offset_y;
-}
-
 int BC_DragWindow::drag_failure_event()
 {
        if(!do_animation) return 0;
@@ -134,15 +105,13 @@ void BC_DragWindow::set_animation(int value)
 
 BC_Pixmap *BC_DragWindow::prepare_frame(VFrame *frame, BC_WindowBase *parent_window)
 {
-       VFrame *temp_frame = 0;
+       VFrame *temp_frame = frame;
        int tw = frame->get_w(), th = frame->get_h();
 
        if( frame->get_color_model() != BC_RGBA8888 ) {
                temp_frame = new VFrame(tw, th, BC_RGBA8888);
                temp_frame->transfer_from(frame);
        }
-       else
-               temp_frame = new VFrame(*frame);
 
        int tx = tw/2, ty = th/2, tx1 = tx-1, ty1 = ty-1, tx2 = tx+2, ty2 = ty+2;
        int bpp = BC_CModels::calculate_pixelsize(temp_frame->get_color_model());
@@ -155,8 +124,18 @@ BC_Pixmap *BC_DragWindow::prepare_frame(VFrame *frame, BC_WindowBase *parent_win
        }
        drag_pixmap = new BC_Pixmap(parent_window, temp_frame, PIXMAP_ALPHA);
 
-       delete temp_frame;
+       if( temp_frame != frame )
+               delete temp_frame;
        return drag_pixmap;
 }
 
+BC_Pixmap *BC_DragWindow::prepare_pixmap(BC_Pixmap *pixmap, BC_WindowBase *parent_window)
+{
+       int pix_w = pixmap->get_w(), pix_h = pixmap->get_h();
+       BC_Bitmap bitmap(parent_window, pix_w, pix_h, BC_RGB888, 0);
+       Pixmap xpixmap = pixmap->get_pixmap();
+       VFrame frame(pix_w, pix_h, BC_RGB888);
+       bitmap.read_drawable(xpixmap, 0,0,&frame);
+       return prepare_frame(&frame, parent_window);
+}
 
index 360b3e45f688f2daf8e8781c5912f7b76194f2e8..4312c8f05e99c90ad79f3ca1856b0b566cdfad50 100644 (file)
 class BC_DragWindow : public BC_Popup
 {
 public:
-       BC_DragWindow(BC_WindowBase *parent_window, BC_Pixmap *pixmap, int icon_x, int icon_y);
-       BC_DragWindow(BC_WindowBase *parent_window, VFrame *frame, int icon_x, int icon_y);
+       BC_DragWindow(BC_WindowBase *parent_window, BC_Pixmap *pixmap, int center_x, int center_y);
+       BC_DragWindow(BC_WindowBase *parent_window, VFrame *frame, int center_x, int center_y);
        ~BC_DragWindow();
 
        int cursor_motion_event();
        int button_release_event();
        int drag_failure_event();
-       int get_offset_x();
-       int get_offset_y();
 // Disable failure animation
        void set_animation(int value);
        BC_Pixmap *prepare_frame(VFrame *frame, BC_WindowBase *parent_window);
+       BC_Pixmap *prepare_pixmap(BC_Pixmap *pixmap, BC_WindowBase *parent_window);
 private:
-       static int get_init_x(BC_WindowBase *parent_window, int icon_x);
-       static int get_init_y(BC_WindowBase *parent_window, int icon_y);
-
        int init_x, init_y;
        int end_x, end_y;
-       int icon_offset_x, icon_offset_y;
        int do_animation;
        BC_Pixmap *drag_pixmap;
 };
index e85cb599d00915743081ba8eeab9fe3351c4401b..88afc836f39d9317b1856cfea66aaa02446918e6 100644 (file)
@@ -3126,22 +3126,15 @@ int BC_ListBox::drag_start_event()
                                int cx, cy;
                                get_abs_cursor(cx, cy);
                                if( item_return->icon_vframe ) {
-                                       cx -= item_return->icon_vframe->get_w() / 2,
-                                       cy -= item_return->icon_vframe->get_h() / 2;
                                        drag_popup = new BC_DragWindow(this,
                                                item_return->icon_vframe, cx, cy);
                                }
                                else
-// this probably works not!
                                if( item_return->icon ) {
-                                       cx -= item_return->icon->get_w() / 2,
-                                       cy -= item_return->icon->get_h() / 2;
                                        drag_popup = new BC_DragWindow(this,
                                                item_return->icon, cx, cy);
                                }
                                else {
-                                       cx -= drag_icon_vframe->get_w() / 2,
-                                       cy -= drag_icon_vframe->get_h() / 2;
                                        drag_popup = new BC_DragWindow(this,
                                                drag_icon_vframe, cx, cy);
                                }
@@ -3229,9 +3222,9 @@ int BC_ListBox::drag_stop_event()
                        if( display_format == LISTBOX_ICONS ) {
                                reposition_item(data,
                                        selection_number,
-                                       top_level->cursor_x + drag_popup->get_offset_x() -
+                                       top_level->cursor_x - drag_popup->get_w() / 2 -
                                                LISTBOX_MARGIN - 2 + xposition,
-                                       top_level->cursor_y + drag_popup->get_offset_y() -
+                                       top_level->cursor_y - drag_popup->get_h() / 2 -
                                                LISTBOX_MARGIN - 2 + yposition);
                        }
                        else
index c79bc58145a64e1997a9a7095f476e760b7da058..2b6e7e7daf68c164287d08ed6b34d30d6797c349 100644 (file)
@@ -6,10 +6,20 @@ For usage help, refer to the following:
   https://cinelerra-cv.org/five/Features5.pdf
   http://beccatoria.dreamwidth.org/144288.html#cutid2
   http://g-raffa.eu/Cinelerra/HOWTO/basics.html
-.
 Cinfinity icons selected in Preferences (Creative Common
   By https://creativecommons.org/licenses/by/3.0/)
 .
+October 2017 New Features of note:
+  HV7 mods merged in to include X11 Direct playback for
+   large format files and Presets for plugins with edit.
+  Multiple windows available now for multiple assets.
+  Many more new icons for ffmpeg plugins + others.
+  Alternative shortcut keys for computers without numpad.
+  Snap/Cut editing and snap while dragging stickiness.
+  Snapshot capability for single frame png, jpg, or tiff.
+  Preference for Set Input Focus when window entered.
+  Upgraded Russian translation provided by Igor.
+  Search box in the Resources window to narrow choices.
 September 2017 New Features of note:
   Proxy Editing added to Settings pulldown.
   OpenCV optional compile with 4 plugins now available.
index a037c8551f43a48d3d4bca5edb7d63eac07a02b9..31d29f891fd201c654d866d0f51edaff076fefc9 100644 (file)
@@ -525,10 +525,10 @@ void BlondTheme::initialize()
        setformat_w = get_image("setformat_bg")->get_w();
        setformat_h = get_image("setformat_bg")->get_h();
        setformat_x1 = 15;
-       setformat_x2 = 100;
+       setformat_x2 = 110;
 
        setformat_x3 = 315;
-       setformat_x4 = 415;
+       setformat_x4 = 425;
        setformat_y1 = 20;
        setformat_y2 = 85;
        setformat_y3 = 125;
@@ -698,7 +698,7 @@ void BlondTheme::initialize()
                "scope_toggle");
 
        new_button("picture.png", editpanel_up, editpanel_hi, editpanel_dn, "picture");
-       new_button("histogram.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram");
+       new_button("histogram_img.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram_img");
 
 
        new_button("copy.png", editpanel_up, editpanel_hi, editpanel_dn, "copy");
index a9777b508745383abc7ed38cdb274a567b1eba41..88d80576a46ea9a4c529e7f83423d65b06ea0186 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
index cb69617666bd289f2d99384c68d1353d0a221147..20e200a24e27d33fc949158ef8f430fb1e95add8 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond/data/preset_edit1.png and b/cinelerra-5.1/plugins/theme_blond/data/preset_edit1.png differ
index c07d30463ade30ac8ab987587003ef036bea21b2..3496ac75a7112b93de15c2e8580f72544d5c5428 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond/data/preset_edit2.png and b/cinelerra-5.1/plugins/theme_blond/data/preset_edit2.png differ
index 982905098b0433238813c31c425054f5e6f6d5c6..e8e24ffd66af49fe202f7b313c309978e7ca90d6 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond/data/setformat_bg.png and b/cinelerra-5.1/plugins/theme_blond/data/setformat_bg.png differ
diff --git a/cinelerra-5.1/plugins/theme_blond/data/setformat_bg.svg b/cinelerra-5.1/plugins/theme_blond/data/setformat_bg.svg
new file mode 100644 (file)
index 0000000..cff43cd
--- /dev/null
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   width="630"
+   height="560"
+   sodipodi:docname="setformat_bg.svg"
+   inkscape:export-filename="/home/dell/Downloads/CNR/ADDITIONS/them/5.1/img_for_5.1(1004)/BLOND/setformat_bg.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <linearGradient
+       id="linearGradient3709">
+      <stop
+         style="stop-color:#1a1a1a;stop-opacity:1;"
+         offset="0"
+         id="stop3711" />
+      <stop
+         style="stop-color:#9e9e9e;stop-opacity:1;"
+         offset="1"
+         id="stop3713" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective10-3"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3709"
+       id="linearGradient3715"
+       x1="447.5"
+       y1="530"
+       x2="448.77637"
+       y2="81.708862"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99902889,0,0,1.002011,0.28960303,-1.0330366)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3709"
+       id="linearGradient3731"
+       x1="122.52665"
+       y1="173.40161"
+       x2="122.44225"
+       y2="18.06407"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#ded9b3"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="696"
+     id="namedview4"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="0.70710678"
+     inkscape:cx="454.5"
+     inkscape:cy="261"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     inkscape:showpageshadow="false" />
+  <rect
+     style="fill:#cecea2;fill-opacity:1;stroke:none"
+     id="rect3604"
+     width="630"
+     height="560"
+     x="0"
+     y="0" />
+  <path
+     style="fill:#c8c696;fill-opacity:1;stroke:#ded9b3;stroke-width:0.81815666;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+     d="m 0.40907832,10.409079 239.18184168,0 0,59.181843 -239.18184168,0 0,-59.181843 z"
+     id="rect2818"
+     sodipodi:nodetypes="ccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#c8c696;fill-opacity:1;stroke:#ded9b3;stroke-width:0.99802053;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 10.49901,82.49901 0,32.85659 0,400.14539 279.00198,0 0,-419.049 -170.15328,0 0,-1.09639 C 110.86273,84.082402 108.08141,82.49901 94.10451,82.49901 l -83.6055,0 z"
+     id="rect2820"
+     sodipodi:nodetypes="ccccccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     id="path2933"
+     d="m 309.50005,82.500049 0,31.055831 0,401.94407 310.00095,0 0,-418.8395 -202.99089,0 0,-1.10457 C 405.8772,82.642261 405.22853,82.500049 391.23263,82.500049 z"
+     style="fill:#c8c696;fill-opacity:1;stroke:#ded9b3;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     sodipodi:nodetypes="ccccccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#000000;fill-opacity:1;stroke:#ded9b3;stroke-width:2.10565186;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+     d="m 270.94717,367.5 c 0,67.07342 -54.37376,121.44717 -121.44717,121.44717 -67.073423,0 -121.447174,-54.37375 -121.447174,-121.44717 0,-67.07342 54.373751,-121.44717 121.447174,-121.44717 67.07341,0 121.44717,54.37375 121.44717,121.44717 z"
+     id="path3707"
+     sodipodi:nodetypes="csssc"
+     inkscape:connector-curvature="0" />
+</svg>
index a9777b508745383abc7ed38cdb274a567b1eba41..88d80576a46ea9a4c529e7f83423d65b06ea0186 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
index cb69617666bd289f2d99384c68d1353d0a221147..20e200a24e27d33fc949158ef8f430fb1e95add8 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/preset_edit1.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/preset_edit1.png differ
index c07d30463ade30ac8ab987587003ef036bea21b2..3496ac75a7112b93de15c2e8580f72544d5c5428 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/preset_edit2.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/preset_edit2.png differ
index a821e92be0045106cb486a6455f090ea87db9708..33a3fb87e385a98744d6ab4ca5bb13bc85035a29 100644 (file)
@@ -525,10 +525,10 @@ void BlueDotTheme::initialize()
        setformat_w = get_image("setformat_bg")->get_w();
        setformat_h = get_image("setformat_bg")->get_h();
        setformat_x1 = 15;
-       setformat_x2 = 100;
+       setformat_x2 = 110;
 
        setformat_x3 = 315;
-       setformat_x4 = 415;
+       setformat_x4 = 425;
        setformat_y1 = 20;
        setformat_y2 = 85;
        setformat_y3 = 125;
@@ -698,7 +698,7 @@ void BlueDotTheme::initialize()
                "scope_toggle");
 
        new_button("picture.png", editpanel_up, editpanel_hi, editpanel_dn, "picture");
-       new_button("histogram.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram");
+       new_button("histogram_img.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram_img");
 
 
        new_button("copy.png", editpanel_up, editpanel_hi, editpanel_dn, "copy");
index a9777b508745383abc7ed38cdb274a567b1eba41..88d80576a46ea9a4c529e7f83423d65b06ea0186 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
index cb69617666bd289f2d99384c68d1353d0a221147..20e200a24e27d33fc949158ef8f430fb1e95add8 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue/data/preset_edit1.png and b/cinelerra-5.1/plugins/theme_blue/data/preset_edit1.png differ
index c07d30463ade30ac8ab987587003ef036bea21b2..3496ac75a7112b93de15c2e8580f72544d5c5428 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue/data/preset_edit2.png and b/cinelerra-5.1/plugins/theme_blue/data/preset_edit2.png differ
index a97aa62d20e035056d27896e3736b6a0f8f91064..92328937634a1589c8d12ddb7166b2f599735f78 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue/data/setformat_bg.png and b/cinelerra-5.1/plugins/theme_blue/data/setformat_bg.png differ
diff --git a/cinelerra-5.1/plugins/theme_blue/data/setformat_bg.svg b/cinelerra-5.1/plugins/theme_blue/data/setformat_bg.svg
new file mode 100644 (file)
index 0000000..e925e87
--- /dev/null
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   width="630"
+   height="560"
+   sodipodi:docname="setformat_bg.svg">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <linearGradient
+       id="linearGradient3709">
+      <stop
+         style="stop-color:#1a1a1a;stop-opacity:1;"
+         offset="0"
+         id="stop3711" />
+      <stop
+         style="stop-color:#9e9e9e;stop-opacity:1;"
+         offset="1"
+         id="stop3713" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective10-3"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3709"
+       id="linearGradient3715"
+       x1="447.5"
+       y1="530"
+       x2="448.77637"
+       y2="81.708862"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99902889,0,0,1.002011,0.28960303,-1.0330366)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3709"
+       id="linearGradient3731"
+       x1="122.52665"
+       y1="173.40161"
+       x2="122.44225"
+       y2="18.06407"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#092340"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="696"
+     id="namedview4"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="0.77227792"
+     inkscape:cx="454.5"
+     inkscape:cy="261"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <rect
+     style="fill:#1a1447;fill-opacity:1;stroke:none"
+     id="rect3604"
+     width="630"
+     height="560"
+     x="0"
+     y="0" />
+  <path
+     style="fill:#939ed4;fill-opacity:1;stroke:#092340;stroke-width:0.81815666;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+     d="m 0.40907832,10.409079 239.18184168,0 0,59.181843 -239.18184168,0 0,-59.181843 z"
+     id="rect2818"
+     sodipodi:nodetypes="ccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#939ed4;fill-opacity:1;stroke:#092340;stroke-width:0.99802053;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 10.49901,82.49901 0,32.85659 0,400.14539 279.00198,0 0,-419.049 -170.15328,0 0,-1.09639 C 110.86273,84.082402 108.08141,82.49901 94.10451,82.49901 l -83.6055,0 z"
+     id="rect2820"
+     sodipodi:nodetypes="ccccccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     id="path2933"
+     d="m 309.50005,82.500049 0,31.055831 0,401.94407 310.00095,0 0,-418.8395 -202.99089,0 0,-1.10457 C 405.8772,82.642261 405.22853,82.500049 391.23263,82.500049 z"
+     style="fill:#939ed4;fill-opacity:1;stroke:#092340;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     sodipodi:nodetypes="ccccccccc"
+     inkscape:connector-curvature="0"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90" />
+  <path
+     style="fill:#000000;fill-opacity:1;stroke:#092340;stroke-width:2.10565186;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+     d="m 270.94717,367.5 c 0,67.07342 -54.37376,121.44717 -121.44717,121.44717 -67.073423,0 -121.447174,-54.37375 -121.447174,-121.44717 0,-67.07342 54.373751,-121.44717 121.447174,-121.44717 67.07341,0 121.44717,54.37375 121.44717,121.44717 z"
+     id="path3707"
+     sodipodi:nodetypes="csssc"
+     inkscape:connector-curvature="0" />
+</svg>
index a9777b508745383abc7ed38cdb274a567b1eba41..88d80576a46ea9a4c529e7f83423d65b06ea0186 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
index cb69617666bd289f2d99384c68d1353d0a221147..20e200a24e27d33fc949158ef8f430fb1e95add8 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/preset_edit1.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/preset_edit1.png differ
index c07d30463ade30ac8ab987587003ef036bea21b2..3496ac75a7112b93de15c2e8580f72544d5c5428 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/preset_edit2.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/preset_edit2.png differ
index 0e83545b81cccf01ba782787b6024c6077184e20..1bfb1666d57b18e3759619b520b927d78ed3b3d3 100644 (file)
@@ -704,7 +704,7 @@ void BrightTheme::initialize()
                "scope_toggle");
 
        new_button("picture.png", editpanel_up, editpanel_hi, editpanel_dn, "picture");
-       new_button("histogram.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram");
+       new_button("histogram_img.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram_img");
 
        new_button("copy.png", editpanel_up, editpanel_hi, editpanel_dn, "copy");
        new_button("commercial.png", editpanel_up, editpanel_hi, editpanel_dn, "commercial");
index a9777b508745383abc7ed38cdb274a567b1eba41..88d80576a46ea9a4c529e7f83423d65b06ea0186 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
index cb69617666bd289f2d99384c68d1353d0a221147..20e200a24e27d33fc949158ef8f430fb1e95add8 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_bright/data/preset_edit1.png and b/cinelerra-5.1/plugins/theme_bright/data/preset_edit1.png differ
index c07d30463ade30ac8ab987587003ef036bea21b2..3496ac75a7112b93de15c2e8580f72544d5c5428 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_bright/data/preset_edit2.png and b/cinelerra-5.1/plugins/theme_bright/data/preset_edit2.png differ
index a9777b508745383abc7ed38cdb274a567b1eba41..88d80576a46ea9a4c529e7f83423d65b06ea0186 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
index cb69617666bd289f2d99384c68d1353d0a221147..20e200a24e27d33fc949158ef8f430fb1e95add8 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/preset_edit1.png and b/cinelerra-5.1/plugins/theme_hulk/data/preset_edit1.png differ
index c07d30463ade30ac8ab987587003ef036bea21b2..3496ac75a7112b93de15c2e8580f72544d5c5428 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/preset_edit2.png and b/cinelerra-5.1/plugins/theme_hulk/data/preset_edit2.png differ
index 33c8958d0fb6ba156b4086e5c82255b22d42bb51..cb1ba1b96225877e872d37a3cfad899a641d9ec9 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/setformat_bg.png and b/cinelerra-5.1/plugins/theme_hulk/data/setformat_bg.png differ
diff --git a/cinelerra-5.1/plugins/theme_hulk/data/setformat_bg.svg b/cinelerra-5.1/plugins/theme_hulk/data/setformat_bg.svg
new file mode 100644 (file)
index 0000000..3955163
--- /dev/null
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   width="630"
+   height="560"
+   sodipodi:docname="setformat_bg.svg"
+   inkscape:export-filename="/home/dell/Downloads/CNR/ADDITIONS/them/5.1/img_for_5.1(1004)/HULK/setformat_bg.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <linearGradient
+       id="linearGradient3709">
+      <stop
+         style="stop-color:#1a1a1a;stop-opacity:1;"
+         offset="0"
+         id="stop3711" />
+      <stop
+         style="stop-color:#9e9e9e;stop-opacity:1;"
+         offset="1"
+         id="stop3713" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective10-3"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3709"
+       id="linearGradient3715"
+       x1="447.5"
+       y1="530"
+       x2="448.77637"
+       y2="81.708862"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99902889,0,0,1.002011,0.28960303,-1.0330366)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3709"
+       id="linearGradient3731"
+       x1="122.52665"
+       y1="173.40161"
+       x2="122.44225"
+       y2="18.06407"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#560070"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="696"
+     id="namedview4"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="0.38613896"
+     inkscape:cx="454.5"
+     inkscape:cy="261"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     inkscape:showpageshadow="false" />
+  <rect
+     style="fill:#75b697;fill-opacity:1;stroke:none"
+     id="rect3604"
+     width="630"
+     height="560"
+     x="0"
+     y="0" />
+  <path
+     style="fill:#82d4a9;fill-opacity:1;stroke:#560070;stroke-width:0.81815666;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+     d="m 0.40907832,10.409079 239.18184168,0 0,59.181843 -239.18184168,0 0,-59.181843 z"
+     id="rect2818"
+     sodipodi:nodetypes="ccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#82d4a9;fill-opacity:1;stroke:#560070;stroke-width:0.99802053;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 10.49901,82.49901 0,32.85659 0,400.14539 279.00198,0 0,-419.049 -170.15328,0 0,-1.09639 C 110.86273,84.082402 108.08141,82.49901 94.10451,82.49901 l -83.6055,0 z"
+     id="rect2820"
+     sodipodi:nodetypes="ccccccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     id="path2933"
+     d="m 309.50005,82.500049 0,31.055831 0,401.94407 310.00095,0 0,-418.8395 -202.99089,0 0,-1.10457 C 405.8772,82.642261 405.22853,82.500049 391.23263,82.500049 z"
+     style="fill:#82d4a9;fill-opacity:1;stroke:#560070;stroke-width:1.00010681;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     sodipodi:nodetypes="ccccccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#000000;fill-opacity:1;stroke:#560070;stroke-width:2.10565186;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+     d="m 270.94717,367.5 c 0,67.07342 -54.37376,121.44717 -121.44717,121.44717 -67.073423,0 -121.447174,-54.37375 -121.447174,-121.44717 0,-67.07342 54.373751,-121.44717 121.447174,-121.44717 67.07341,0 121.44717,54.37375 121.44717,121.44717 z"
+     id="path3707"
+     sodipodi:nodetypes="csssc"
+     inkscape:connector-curvature="0" />
+</svg>
index bb33e96f981d9a5e105f4f9575a10560971fc88e..518a2cccf272fd6aae7959593ef693adb0ddaae4 100644 (file)
@@ -526,10 +526,10 @@ void HULKTHEME::initialize()
        setformat_w = get_image("setformat_bg")->get_w();
        setformat_h = get_image("setformat_bg")->get_h();
        setformat_x1 = 15;
-       setformat_x2 = 100;
+       setformat_x2 = 110;
 
        setformat_x3 = 315;
-       setformat_x4 = 415;
+       setformat_x4 = 425;
        setformat_y1 = 20;
        setformat_y2 = 85;
        setformat_y3 = 125;
@@ -699,7 +699,7 @@ void HULKTHEME::initialize()
                "scope_toggle");
 
        new_button("picture.png", editpanel_up, editpanel_hi, editpanel_dn, "picture");
-       new_button("histogram.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram");
+       new_button("histogram_img.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram_img");
 
 
        new_button("copy.png", editpanel_up, editpanel_hi, editpanel_dn, "copy");
index a9777b508745383abc7ed38cdb274a567b1eba41..88d80576a46ea9a4c529e7f83423d65b06ea0186 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
index cb69617666bd289f2d99384c68d1353d0a221147..20e200a24e27d33fc949158ef8f430fb1e95add8 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/preset_edit1.png and b/cinelerra-5.1/plugins/theme_pinklady/data/preset_edit1.png differ
index c07d30463ade30ac8ab987587003ef036bea21b2..3496ac75a7112b93de15c2e8580f72544d5c5428 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/preset_edit2.png and b/cinelerra-5.1/plugins/theme_pinklady/data/preset_edit2.png differ
index bb7be124da1f0a6a0bb8cfd44c18ebb3d08444fe..c4c72bd346314bcdfdcead036eadfa6d5b023afa 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/setformat_bg.png and b/cinelerra-5.1/plugins/theme_pinklady/data/setformat_bg.png differ
diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/setformat_bg.svg b/cinelerra-5.1/plugins/theme_pinklady/data/setformat_bg.svg
new file mode 100644 (file)
index 0000000..67b5c10
--- /dev/null
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   width="630"
+   height="560"
+   sodipodi:docname="setformat_bg.svg">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <linearGradient
+       id="linearGradient3709">
+      <stop
+         style="stop-color:#1a1a1a;stop-opacity:1;"
+         offset="0"
+         id="stop3711" />
+      <stop
+         style="stop-color:#9e9e9e;stop-opacity:1;"
+         offset="1"
+         id="stop3713" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective10-3"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3709"
+       id="linearGradient3715"
+       x1="447.5"
+       y1="530"
+       x2="448.77637"
+       y2="81.708862"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99902889,0,0,1.002011,0.28960303,-1.0330366)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3709"
+       id="linearGradient3731"
+       x1="122.52665"
+       y1="173.40161"
+       x2="122.44225"
+       y2="18.06407"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#70002d"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="696"
+     id="namedview4"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="0.38613896"
+     inkscape:cx="454.5"
+     inkscape:cy="261"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <rect
+     style="fill:#ffb1d0;fill-opacity:1;stroke:none"
+     id="rect3604"
+     width="630"
+     height="560"
+     x="0"
+     y="0" />
+  <path
+     style="fill:#d46a95;fill-opacity:1;stroke:#70002d;stroke-width:0.81815666;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+     d="m 0.40907832,10.409079 239.18184168,0 0,59.181843 -239.18184168,0 0,-59.181843 z"
+     id="rect2818"
+     sodipodi:nodetypes="ccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#d46a95;fill-opacity:1;stroke:#70002d;stroke-width:0.99802053;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 10.49901,82.49901 0,32.85659 0,400.14539 279.00198,0 0,-419.049 -170.15328,0 0,-1.09639 C 110.86273,84.082402 108.08141,82.49901 94.10451,82.49901 l -83.6055,0 z"
+     id="rect2820"
+     sodipodi:nodetypes="ccccccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     id="path2933"
+     d="m 309.50005,82.500049 0,31.055831 0,401.94407 310.00095,0 0,-418.8395 -202.99089,0 0,-1.10457 C 405.8772,82.642261 405.22853,82.500049 391.23263,82.500049 z"
+     style="fill:#d46a95;fill-opacity:1;stroke:#70002d;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     sodipodi:nodetypes="ccccccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#000000;fill-opacity:1;stroke:#70002d;stroke-width:2.10565186;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+     d="m 270.94717,367.5 c 0,67.07342 -54.37376,121.44717 -121.44717,121.44717 -67.073423,0 -121.447174,-54.37375 -121.447174,-121.44717 0,-67.07342 54.373751,-121.44717 121.447174,-121.44717 67.07341,0 121.44717,54.37375 121.44717,121.44717 z"
+     id="path3707"
+     sodipodi:nodetypes="csssc"
+     inkscape:connector-curvature="0" />
+</svg>
index 87dfc4763c0b15d4b619d82b83e77d7c44c174b4..321ec319b6fd154a8e24e8bb73ec616cfd470b37 100644 (file)
@@ -511,10 +511,10 @@ void PINKLADY::initialize()
        setformat_w = get_image("setformat_bg")->get_w();
        setformat_h = get_image("setformat_bg")->get_h();
        setformat_x1 = 15;
-       setformat_x2 = 100;
+       setformat_x2 = 110;
 
        setformat_x3 = 315;
-       setformat_x4 = 415;
+       setformat_x4 = 425;
        setformat_y1 = 20;
        setformat_y2 = 85;
        setformat_y3 = 125;
@@ -684,7 +684,7 @@ void PINKLADY::initialize()
                "scope_toggle");
 
        new_button("picture.png", editpanel_up, editpanel_hi, editpanel_dn, "picture");
-       new_button("histogram.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram");
+       new_button("histogram_img.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram_img");
 
 
        new_button("copy.png", editpanel_up, editpanel_hi, editpanel_dn, "copy");
index a9777b508745383abc7ed38cdb274a567b1eba41..88d80576a46ea9a4c529e7f83423d65b06ea0186 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
index cb69617666bd289f2d99384c68d1353d0a221147..20e200a24e27d33fc949158ef8f430fb1e95add8 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_suv/data/preset_edit1.png and b/cinelerra-5.1/plugins/theme_suv/data/preset_edit1.png differ
index c07d30463ade30ac8ab987587003ef036bea21b2..3496ac75a7112b93de15c2e8580f72544d5c5428 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_suv/data/preset_edit2.png and b/cinelerra-5.1/plugins/theme_suv/data/preset_edit2.png differ
index 87eb46ce1929c40496918ad88c8847dc42a2b552..e294c888277bf0d037d59fba22542b6b4bed083f 100644 (file)
@@ -686,7 +686,7 @@ void SUV::initialize()
                "scope_toggle");
 
        new_button("picture.png", editpanel_up, editpanel_hi, editpanel_dn, "picture");
-       new_button("histogram.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram");
+       new_button("histogram_img.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram_img");
 
 
        new_button("copy.png", editpanel_up, editpanel_hi, editpanel_dn, "copy");
index a9777b508745383abc7ed38cdb274a567b1eba41..88d80576a46ea9a4c529e7f83423d65b06ea0186 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
index cb69617666bd289f2d99384c68d1353d0a221147..20e200a24e27d33fc949158ef8f430fb1e95add8 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/preset_edit1.png and b/cinelerra-5.1/plugins/theme_unflat/data/preset_edit1.png differ
index c07d30463ade30ac8ab987587003ef036bea21b2..3496ac75a7112b93de15c2e8580f72544d5c5428 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/preset_edit2.png and b/cinelerra-5.1/plugins/theme_unflat/data/preset_edit2.png differ
index cc59e995c1f3b24f934db911b03f9aca364009d3..f9e802684313de4df0fbf3b60412b9b88bfda206 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/setformat_bg.png and b/cinelerra-5.1/plugins/theme_unflat/data/setformat_bg.png differ
diff --git a/cinelerra-5.1/plugins/theme_unflat/data/setformat_bg.svg b/cinelerra-5.1/plugins/theme_unflat/data/setformat_bg.svg
new file mode 100644 (file)
index 0000000..5a26490
--- /dev/null
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   width="630"
+   height="560"
+   sodipodi:docname="setformat_bg.svg"
+   inkscape:export-filename="/home/dell/Downloads/CNR/ADDITIONS/them/setformat_bgUNF630.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <linearGradient
+       id="linearGradient3709">
+      <stop
+         style="stop-color:#1a1a1a;stop-opacity:1;"
+         offset="0"
+         id="stop3711" />
+      <stop
+         style="stop-color:#9e9e9e;stop-opacity:1;"
+         offset="1"
+         id="stop3713" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective10-3"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3709"
+       id="linearGradient3715"
+       x1="447.5"
+       y1="530"
+       x2="448.77637"
+       y2="81.708862"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99902889,0,0,1.002011,0.28960303,-1.0330366)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3709"
+       id="linearGradient3731"
+       x1="122.52665"
+       y1="173.40161"
+       x2="122.44225"
+       y2="18.06407"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="696"
+     id="namedview4"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="0.77227792"
+     inkscape:cx="511.00945"
+     inkscape:cy="249.87888"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     inkscape:showpageshadow="false" />
+  <rect
+     style="fill:#333333;fill-opacity:1;stroke:none"
+     id="rect3604"
+     width="630"
+     height="560"
+     x="0"
+     y="0" />
+  <path
+     style="fill:#4d4d4d;fill-opacity:1;stroke:#666666;stroke-width:0.81815666;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+     d="m 0.40907832,10.409079 239.18184168,0 0,59.181843 -239.18184168,0 0,-59.181843 z"
+     id="rect2818"
+     sodipodi:nodetypes="ccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#4d4d4d;fill-opacity:1;stroke:#666666;stroke-width:0.99802053;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 10.49901,82.49901 0,32.85659 0,400.14539 279.00198,0 0,-419.049 -170.15328,0 0,-1.09639 C 110.86273,84.082402 108.08141,82.49901 94.10451,82.49901 l -83.6055,0 z"
+     id="rect2820"
+     sodipodi:nodetypes="ccccccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     id="path2933"
+     d="m 309.50005,82.500049 0,31.055831 0,401.94407 310.00095,0 0,-418.8395 -202.99089,0 0,-1.10457 C 405.8772,82.642261 405.22853,82.500049 391.23263,82.500049 z"
+     style="fill:#4d4d4d;fill-opacity:1;stroke:#666666;stroke-width:1.00010681;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     sodipodi:nodetypes="ccccccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#000000;fill-opacity:1;stroke:#666666;stroke-width:2.10565186;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+     d="m 270.94717,367.5 c 0,67.07342 -54.37376,121.44717 -121.44717,121.44717 -67.073423,0 -121.447174,-54.37375 -121.447174,-121.44717 0,-67.07342 54.373751,-121.44717 121.447174,-121.44717 67.07341,0 121.44717,54.37375 121.44717,121.44717 z"
+     id="path3707"
+     sodipodi:nodetypes="csssc"
+     inkscape:connector-curvature="0" />
+</svg>
index 4374f19bd799991126f1514845942a9e13a85fba..26859167cae28a689b2b3f5c714a2dedc3faa059 100644 (file)
@@ -520,10 +520,10 @@ void UNFLATTHEME::initialize()
        setformat_w = get_image("setformat_bg")->get_w();
        setformat_h = get_image("setformat_bg")->get_h();
        setformat_x1 = 15;
-       setformat_x2 = 100;
+       setformat_x2 = 110;
 
        setformat_x3 = 315;
-       setformat_x4 = 415;
+       setformat_x4 = 425;
        setformat_y1 = 20;
        setformat_y2 = 85;
        setformat_y3 = 125;
@@ -693,7 +693,7 @@ void UNFLATTHEME::initialize()
                "scope_toggle");
 
        new_button("picture.png", editpanel_up, editpanel_hi, editpanel_dn, "picture");
-       new_button("histogram.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram");
+       new_button("histogram_img.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram_img");
 
 
        new_button("copy.png", editpanel_up, editpanel_hi, editpanel_dn, "copy");