From: Good Guy Date: Fri, 29 Sep 2017 22:57:38 +0000 (-0600) Subject: update features5.pdf, fix intl titlebars, add sams icons X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=commitdiff_plain;h=7dd4a71f0c957c2d95ae83fe789076d7445ecb60 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 b6bb27db..0b5df788 100644 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 cee19e7a..5909aced 100644 --- 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 8272f4ff..3029e16e 100644 --- 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 index 00000000..f386af46 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 index 00000000..5be755ff 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 index 00000000..5161d353 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 index 00000000..152de63d 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 index 00000000..dd923140 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 index 00000000..d568b70a 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 index 00000000..acba03bf 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 index 00000000..11258b3a 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 index 00000000..ce2026b7 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 index 00000000..12a69717 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 index 00000000..cd784584 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 index 00000000..a95c2554 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 index 00000000..1ba8550a 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 index 00000000..41b2d61d 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 fb339015..26c6e964 100644 --- 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..."