update features5.pdf, fix intl titlebars, add sams icons

diff --git a/cinelerra-5.1/doc/Features5.pdf b/cinelerra-5.1/doc/Features5.pdf
index b6bb27db5fe7a277dce28f292d907ca3bb42deb8..0b5df7886e97b184b9380ad8c202b4b63dfad5d4 100644 (file)
Binary files a/cinelerra-5.1/doc/Features5.pdf and b/cinelerra-5.1/doc/Features5.pdf differ

diff --git a/cinelerra-5.1/guicast/bcwindowbase.C b/cinelerra-5.1/guicast/bcwindowbase.C
index cee19e7adaf812f51cce88886196d7d79a3f94d7..5909aced83e841ac9b33925f1b2c442b48ee6be9 100644 (file)
--- a/cinelerra-5.1/guicast/bcwindowbase.C
+++ b/cinelerra-5.1/guicast/bcwindowbase.C
@@ -530,22 +530,9 @@ int BC_WindowBase::create_window(BC_WindowBase *parent_window,
                        size_hints.x = this->x;
                        size_hints.y = this->y;
                }
-
-               char *txlist[2];
-               txlist[0] = this->title;
-               txlist[1] = 0;
-               XTextProperty titleprop;
-               if(options & WINDOW_UTF8)
-                       Xutf8TextListToTextProperty(display, txlist,  1,
-                               XUTF8StringStyle, &titleprop);
-               else
-                       XmbTextListToTextProperty(display, txlist, 1,
-                               XStdICCTextStyle, &titleprop);
-               XSetWMProperties(display, win, &titleprop, &titleprop,
-                       0, 0, &size_hints, 0, 0);
-               XFree(titleprop.value);
+               XSetWMProperties(display, win, 0, 0, 0, 0, &size_hints, 0, 0);
                get_atoms();
-
+               set_title(title);
 #ifndef SINGLE_THREAD
                clipboard = new BC_Clipboard(this);
                clipboard->start_clipboard();
@@ -4124,39 +4111,30 @@ void BC_WindowBase::put_title(const char *text)
        *cp = 0;
 }
 
-void BC_WindowBase::set_title(const char *text)
+void BC_WindowBase::set_title(const char *text, int utf8)
 {
+// utf8>0: wm + net_wm, utf8=0: wm only,  utf<0: net_wm only
        put_title(_(text));
-
-       char *txlist[2];
-       txlist[0] = this->title;
-       txlist[1] = 0;
-
-       XTextProperty titleprop;
-       XmbTextListToTextProperty(top_level->display, txlist, 1,
-               XStdICCTextStyle, &titleprop);
-       XSetWMName(top_level->display, top_level->win, &titleprop);
-       XSetWMIconName(top_level->display, top_level->win, &titleprop);
-       XFree(titleprop.value);
-
-       flush();
-}
-
-void BC_WindowBase::set_utf8title(const char *text)
-{
-       XTextProperty titleprop;
-       char *txlist[2];
-
-       strcpy(this->title, text);
-       txlist[0] = this->title;
-       txlist[1] = 0;
-
-       Xutf8TextListToTextProperty(top_level->display, txlist,  1,
-               XUTF8StringStyle, &titleprop);
-       XSetWMName(top_level->display, top_level->win, &titleprop);
-       XSetWMIconName(top_level->display, top_level->win, &titleprop);
-       XFree(titleprop.value);
-
+       const unsigned char *wm_title = (const unsigned char *)title;
+       int title_len = strlen((const char *)title);
+       if( utf8 >= 0 ) {
+               Atom xa_wm_name = XA_WM_NAME;
+               Atom xa_icon_name = XA_WM_ICON_NAME;
+               Atom xa_string = XA_STRING;
+               XChangeProperty(display, win, xa_wm_name, xa_string, 8,
+                               PropModeReplace, wm_title, title_len);
+               XChangeProperty(display, win, xa_icon_name, xa_string, 8,
+                               PropModeReplace, wm_title, title_len);
+       }
+       if( utf8 != 0 ) {
+               Atom xa_net_wm_name = XInternAtom(display, "_NET_WM_NAME", True);
+               Atom xa_net_icon_name = XInternAtom(display, "_NET_WM_ICON_NAME", True);
+               Atom xa_utf8_string = XInternAtom(display, "UTF8_STRING", True);
+               XChangeProperty(display, win, xa_net_wm_name, xa_utf8_string, 8,
+                                       PropModeReplace, wm_title, title_len);
+               XChangeProperty(display, win, xa_net_icon_name, xa_utf8_string, 8,
+                                       PropModeReplace, wm_title, title_len);
+       }
        flush();
 }
 

diff --git a/cinelerra-5.1/guicast/bcwindowbase.h b/cinelerra-5.1/guicast/bcwindowbase.h
index 8272f4ff14bbfb0e844063b2e0a27f17d45e8481..3029e16ea6440d068061ab96a4b273d55534be47 100644 (file)
--- a/cinelerra-5.1/guicast/bcwindowbase.h
+++ b/cinelerra-5.1/guicast/bcwindowbase.h
@@ -450,9 +450,8 @@ public:
        void set_background(VFrame *bitmap);
 // Change the window title.
        void put_title(const char *text);
-       void set_title(const char *text);
+       void set_title(const char *text, int utf8=1);
        const char *get_title();
-       void set_utf8title(const char *text);
 // Change the window title.  The title is translated internally.
        void start_video();
        void stop_video();

diff --git a/cinelerra-5.1/picon_cinfinity/ff_removegrain.png b/cinelerra-5.1/picon_cinfinity/ff_removegrain.png
new file mode 100644 (file)
index 0000000..f386af4
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_removegrain.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_repeatfields.png b/cinelerra-5.1/picon_cinfinity/ff_repeatfields.png
new file mode 100644 (file)
index 0000000..5be755f
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_repeatfields.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_rotate.png b/cinelerra-5.1/picon_cinfinity/ff_rotate.png
new file mode 100644 (file)
index 0000000..5161d35
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_rotate.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_sab.png b/cinelerra-5.1/picon_cinfinity/ff_sab.png
new file mode 100644 (file)
index 0000000..152de63
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_sab.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_separatefields.png b/cinelerra-5.1/picon_cinfinity/ff_separatefields.png
new file mode 100644 (file)
index 0000000..dd92314
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_separatefields.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_showinfo.png b/cinelerra-5.1/picon_cinfinity/ff_showinfo.png
new file mode 100644 (file)
index 0000000..d568b70
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_showinfo.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_shuffleframes.png b/cinelerra-5.1/picon_cinfinity/ff_shuffleframes.png
new file mode 100644 (file)
index 0000000..acba03b
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_shuffleframes.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_shuffleplanes.png b/cinelerra-5.1/picon_cinfinity/ff_shuffleplanes.png
new file mode 100644 (file)
index 0000000..11258b3
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_shuffleplanes.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_signalstats.png b/cinelerra-5.1/picon_cinfinity/ff_signalstats.png
new file mode 100644 (file)
index 0000000..ce2026b
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_signalstats.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_smartblur.png b/cinelerra-5.1/picon_cinfinity/ff_smartblur.png
new file mode 100644 (file)
index 0000000..12a6971
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_smartblur.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_sobel.png b/cinelerra-5.1/picon_cinfinity/ff_sobel.png
new file mode 100644 (file)
index 0000000..cd78458
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_sobel.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_spp.png b/cinelerra-5.1/picon_cinfinity/ff_spp.png
new file mode 100644 (file)
index 0000000..a95c255
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_spp.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_stereo3d.png b/cinelerra-5.1/picon_cinfinity/ff_stereo3d.png
new file mode 100644 (file)
index 0000000..1ba8550
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_stereo3d.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_super2xsai.png b/cinelerra-5.1/picon_cinfinity/ff_super2xsai.png
new file mode 100644 (file)
index 0000000..41b2d61
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_super2xsai.png differ

diff --git a/cinelerra-5.1/po/de.po b/cinelerra-5.1/po/de.po
index fb339015227e4a644038031c645e81cce0a262c6..26c6e964492001e820dd66d3a05829147f292336 100644 (file)
--- a/cinelerra-5.1/po/de.po
+++ b/cinelerra-5.1/po/de.po
@@ -10444,3 +10444,21 @@ msgstr "Zoom"
 #: plugins/zoomblur/zoomblur.C:402
 msgid "Zoom Blur"
 msgstr "Zoom-Unschärfe"
+
+#: proxy window
+msgid "Proxy settings..."
+msgstr "Proxy-Einstellungen..."
+msgid "proxy"
+msgstr "proxy"
+msgid "Cinelerra: Proxy settings"
+msgstr "Cinelerra: Proxy-Einstellungen"
+msgid "Use scaler   (FFMPEG only)"
+msgstr "Verwenden scaler   (Nur FFMPEG)"
+msgid "Original size"
+msgstr "Urspr. größe"
+msgid "New media dimensions: "
+msgstr "Neue medien abmessungen: "
+msgid "Auto proxy/scale media loads"
+msgstr "Automatisch proxy/scalieren medien laden"
+msgid "Creating proxy files..."
+msgstr "Dateien proxy erstelle..."