From: Good Guy Date: Fri, 7 Sep 2018 23:12:42 +0000 (-0600) Subject: olaf: neophyte theme update + de.po, fullscreen geom tweak X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=a21c48689604ad7142a02d6f0a8dd4776e8d4422;p=goodguy%2Fhistory.git olaf: neophyte theme update + de.po, fullscreen geom tweak --- diff --git a/cinelerra-5.1/cinelerra/canvas.C b/cinelerra-5.1/cinelerra/canvas.C index dc6d44a5..4f9d9234 100644 --- a/cinelerra-5.1/cinelerra/canvas.C +++ b/cinelerra-5.1/cinelerra/canvas.C @@ -739,23 +739,8 @@ void Canvas::create_canvas() wdw->stop_video(); } - int x = subwindow->get_screen_x(0, -1); - int y = subwindow->get_screen_y(0, -1); - int w = root_w; - int h = root_h; - if( mwindow->screens == 1 && root_w > scr_w0 ) { - // Xinerama - if( subwindow->get_x() >= scr_w0 ) { - // assumes right side is the big one - w = root_w - scr_w0; - h = root_h; - } - else { - // use same aspect ratio to compute left height - w = scr_w0; - h = (w*root_h) / (root_w-scr_w0); - } - } + int x, y, w, h; + wdw->get_fullscreen_geometry(x, y, w, h); if( canvas_fullscreen ) { diff --git a/cinelerra-5.1/guicast/bcwindowbase.C b/cinelerra-5.1/guicast/bcwindowbase.C index 421a26fe..f5759dd8 100644 --- a/cinelerra-5.1/guicast/bcwindowbase.C +++ b/cinelerra-5.1/guicast/bcwindowbase.C @@ -3467,6 +3467,38 @@ BC_WindowBase::get_xinerama_info(int screen) return 0; } +void BC_WindowBase::get_fullscreen_geometry(int &wx, int &wy, int &ww, int &wh) +{ + XineramaScreenInfo *info = top_level->get_xinerama_info(-1); + if( info ) { + wx = info->x_org; wy = info->y_org; + ww = info->width; wh = info->height; + } + else { + wx = get_screen_x(0, -1); + wy = get_screen_y(0, -1); + int scr_w0 = get_screen_w(0, 0); + int root_w = get_root_w(0); + int root_h = get_root_h(0); + if( root_w > scr_w0 ) { // multi-headed + if( wx >= scr_w0 ) { + // assumes right side is the big one + ww = root_w - scr_w0; + wh = root_h; + } + else { + // use same aspect ratio to compute left height + ww = scr_w0; + wh = (w*root_h) / (root_w-scr_w0); + } + } + else { + ww = root_w; + wh = root_h; + } + } +} + int BC_WindowBase::get_screen_x(int lock_display, int screen) { int result = -1; diff --git a/cinelerra-5.1/guicast/bcwindowbase.h b/cinelerra-5.1/guicast/bcwindowbase.h index a1f930de..336b9693 100644 --- a/cinelerra-5.1/guicast/bcwindowbase.h +++ b/cinelerra-5.1/guicast/bcwindowbase.h @@ -277,6 +277,7 @@ public: int get_root_w(int lock_display); int get_root_h(int lock_display); XineramaScreenInfo *get_xinerama_info(int screen); + void get_fullscreen_geometry(int &wx, int &wy, int &ww, int &wh); int get_screen_w(int lock_display, int screen); int get_screen_h(int lock_display, int screen); int get_screen_x(int lock_display, int screen); diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/Source/plugin_bg.svg b/cinelerra-5.1/plugins/theme_neophyte/data/Source/plugin_bg.svg index 3fe143af..90634fa3 100644 --- a/cinelerra-5.1/plugins/theme_neophyte/data/Source/plugin_bg.svg +++ b/cinelerra-5.1/plugins/theme_neophyte/data/Source/plugin_bg.svg @@ -84,7 +84,7 @@ xlink:href="#linearGradient1817" id="linearGradient895-9" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.5769228,0,0,0.52941163,-159.59297,-73.634019)" + gradientTransform="matrix(3.5769228,0,0,0.52941163,-95.810222,-74.228268)" x1="44.737286" y1="1.0084742" x2="44.737286" @@ -98,7 +98,7 @@ x2="44.737286" y2="18.728813" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.5769228,0,0,0.52941163,-163.23962,54.261106)" /> + gradientTransform="matrix(3.5769228,0,0,0.52941163,-227.02237,54.855355)" /> + gradientTransform="matrix(3.5769228,0,0,1.0588232,-230.96917,25.72795)" /> + borderlayer="true"> + + + + + @@ -203,41 +224,63 @@ id="rect3597-9-2-4-3-1-9-4-7-1" width="92.50132" height="17.501316" - x="-48.073975" - y="55.196907" + x="-111.85672" + y="55.791157" inkscape:transform-center-x="18.420788" inkscape:transform-center-y="-33.390726" /> - + x="-116.05285" + y="27.100882" /> + + + + diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/Source/resource1024.svg b/cinelerra-5.1/plugins/theme_neophyte/data/Source/resource1024.svg index 610ce3f4..961b56ce 100644 --- a/cinelerra-5.1/plugins/theme_neophyte/data/Source/resource1024.svg +++ b/cinelerra-5.1/plugins/theme_neophyte/data/Source/resource1024.svg @@ -27,7 +27,7 @@ image/svg+xml - + 2018-08-01 @@ -127,9 +127,9 @@ inkscape:window-height="721" id="namedview4" showgrid="false" - inkscape:zoom="0.92578125" - inkscape:cx="234.9415" - inkscape:cy="552.99516" + inkscape:zoom="0.87697814" + inkscape:cx="512" + inkscape:cy="512" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -201,9 +201,9 @@ height="1023.9996" width="1" id="rect3613-6" - style="fill:#141414;fill-opacity:1;stroke:none;stroke-width:3.99999928" /> + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.99999928" /> + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.99999928" /> diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/Source/resource128.svg b/cinelerra-5.1/plugins/theme_neophyte/data/Source/resource128.svg index e8be68b9..a55ff58f 100644 --- a/cinelerra-5.1/plugins/theme_neophyte/data/Source/resource128.svg +++ b/cinelerra-5.1/plugins/theme_neophyte/data/Source/resource128.svg @@ -65,16 +65,6 @@ offset="1" id="stop3607" /> - - - - - - @@ -191,9 +143,9 @@ height="127.99998" width="1" id="rect3613-1" - style="fill:#141414;fill-opacity:1;stroke:none;stroke-width:1.41421342" /> + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.41421342" /> + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.41421342" /> diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/Source/resource256.svg b/cinelerra-5.1/plugins/theme_neophyte/data/Source/resource256.svg index 19b244eb..81ba9fc3 100644 --- a/cinelerra-5.1/plugins/theme_neophyte/data/Source/resource256.svg +++ b/cinelerra-5.1/plugins/theme_neophyte/data/Source/resource256.svg @@ -27,7 +27,7 @@ image/svg+xml - + 2018-08-01 @@ -72,16 +72,6 @@ offset="1" id="stop3607" /> - - - - - - @@ -199,9 +151,9 @@ height="255.99995" width="1" id="rect3613-6" - style="fill:#141414;fill-opacity:1;stroke:none;stroke-width:1.99999976" /> + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.99999976" /> + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.99999976" /> diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/Source/resource32.svg b/cinelerra-5.1/plugins/theme_neophyte/data/Source/resource32.svg index 59792770..b2cc6c59 100644 --- a/cinelerra-5.1/plugins/theme_neophyte/data/Source/resource32.svg +++ b/cinelerra-5.1/plugins/theme_neophyte/data/Source/resource32.svg @@ -27,7 +27,7 @@ image/svg+xml - + 2018-08-01 @@ -121,8 +121,8 @@ id="namedview4" showgrid="false" inkscape:zoom="20.85965" - inkscape:cx="4.6572231" - inkscape:cy="9.7690415" + inkscape:cx="13.669838" + inkscape:cy="14.17947" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -196,9 +196,9 @@ height="31.999996" width="1" id="rect3613-9" - style="fill:#141414;fill-opacity:1;stroke:none;stroke-width:0.70710671" /> + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70710671" /> + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70710677" /> diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/Source/resource512.svg b/cinelerra-5.1/plugins/theme_neophyte/data/Source/resource512.svg index bc0b30ef..f1476503 100644 --- a/cinelerra-5.1/plugins/theme_neophyte/data/Source/resource512.svg +++ b/cinelerra-5.1/plugins/theme_neophyte/data/Source/resource512.svg @@ -27,7 +27,7 @@ image/svg+xml - + 2018-08-01 @@ -51,16 +51,6 @@ offset="1" id="stop3607" /> - - - - - - @@ -180,9 +132,9 @@ height="511.99982" width="1" id="rect3613-1" - style="fill:#141414;fill-opacity:1;stroke:none;stroke-width:2.8284266" /> + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.8284266" /> + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.8284266" /> diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/Source/resource64.svg b/cinelerra-5.1/plugins/theme_neophyte/data/Source/resource64.svg index 499f66df..1396a951 100644 --- a/cinelerra-5.1/plugins/theme_neophyte/data/Source/resource64.svg +++ b/cinelerra-5.1/plugins/theme_neophyte/data/Source/resource64.svg @@ -147,63 +147,93 @@ inkscape:window-height="721" id="namedview4" showgrid="false" - inkscape:zoom="5.2149125" - inkscape:cx="26.033898" - inkscape:cy="25.956808" + inkscape:zoom="14.03165" + inkscape:cx="32" + inkscape:cy="29.984252" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" - inkscape:current-layer="svg2" + inkscape:current-layer="layer2" inkscape:showpageshadow="false" /> + inkscape:groupmode="layer" + id="layer2" + inkscape:label="res64" + style="display:inline"> + + + + + + + + + + + + + style="display:inline;opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.53122687;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect867-5-7-1" + width="1" + height="64" + x="0" + y="0" /> + style="display:inline;opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.53122687;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect867-5-7-1-0" + width="1" + height="64" + x="76.82589" + y="0.57013965" /> - - - - + diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/Source/title_bg.svg b/cinelerra-5.1/plugins/theme_neophyte/data/Source/title_bg.svg index 877f5172..5bdd0cd9 100644 --- a/cinelerra-5.1/plugins/theme_neophyte/data/Source/title_bg.svg +++ b/cinelerra-5.1/plugins/theme_neophyte/data/Source/title_bg.svg @@ -40,6 +40,28 @@ + + + + + + + + + id="linearGradient1817-5-9"> + + + inkscape:pagecheckerboard="false"> + + + + + + inkscape:label="original" + style="display:inline"> + + + + + + + diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/plugin_bg.png b/cinelerra-5.1/plugins/theme_neophyte/data/plugin_bg.png index ec59e0de..8d2ad502 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/plugin_bg.png and b/cinelerra-5.1/plugins/theme_neophyte/data/plugin_bg.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/resource1024.png b/cinelerra-5.1/plugins/theme_neophyte/data/resource1024.png index 4a172b3c..70127d06 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/resource1024.png and b/cinelerra-5.1/plugins/theme_neophyte/data/resource1024.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/resource128.png b/cinelerra-5.1/plugins/theme_neophyte/data/resource128.png index fc26ee32..489d01f7 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/resource128.png and b/cinelerra-5.1/plugins/theme_neophyte/data/resource128.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/resource256.png b/cinelerra-5.1/plugins/theme_neophyte/data/resource256.png index 9f629c83..d0d21f89 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/resource256.png and b/cinelerra-5.1/plugins/theme_neophyte/data/resource256.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/resource32.png b/cinelerra-5.1/plugins/theme_neophyte/data/resource32.png index 567a5c52..ce7980da 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/resource32.png and b/cinelerra-5.1/plugins/theme_neophyte/data/resource32.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/resource512.png b/cinelerra-5.1/plugins/theme_neophyte/data/resource512.png index c29273e3..4376bcde 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/resource512.png and b/cinelerra-5.1/plugins/theme_neophyte/data/resource512.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/resource64.png b/cinelerra-5.1/plugins/theme_neophyte/data/resource64.png index ecfc51e0..b085759f 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/resource64.png and b/cinelerra-5.1/plugins/theme_neophyte/data/resource64.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/title_bg.png b/cinelerra-5.1/plugins/theme_neophyte/data/title_bg.png index c4dfa519..16d4cd03 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/title_bg.png and b/cinelerra-5.1/plugins/theme_neophyte/data/title_bg.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C index 4bc9f521..ac64d8b7 100644 --- a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C +++ b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C @@ -144,7 +144,9 @@ void NEOPHYTETHEME::initialize() resources->menu_item_text = WHITE; resources->menu_highlighted_fontcolor = CreamyWhiteBright; - resources->generic_button_margin = 20; // [15] (Pref top right: ~17) + /* This indent is too global and the fullness ultimately depends + * on the text. (Pref. top right, engl.: ~17) */ + resources->generic_button_margin = 20; // [15] resources->pot_needle_color = CreamyWhite; // [resources->text_default] – marginal resources->pot_offset = 1; // only the needle resources->progress_text = resources->text_default; @@ -224,6 +226,10 @@ void NEOPHYTETHEME::initialize() clock_fg_color = ComicYellow; // clock_bg_color = ALARM; // see vclock + // The line between the in and out markings + inout_highlight_color=BabyBlue; + + new_toggle( "loadmode_new.png", "loadmode_up.png", diff --git a/cinelerra-5.1/po/de.po b/cinelerra-5.1/po/de.po index 81db7e44..423b3a34 100644 --- a/cinelerra-5.1/po/de.po +++ b/cinelerra-5.1/po/de.po @@ -2053,43 +2053,43 @@ msgstr "Farbauswahl" #: cinelerra/colorpicker.C:175 msgid "colorpicker#H:" -msgstr "Farbauswahl#H:" +msgstr "H:" #: cinelerra/colorpicker.C:176 msgid "colorpicker#S:" -msgstr "Farbauswahl#S:" +msgstr "S:" #: cinelerra/colorpicker.C:177 msgid "colorpicker_value#V:" -msgstr "Farbauswahl_Wert#V:" +msgstr "V:" #: cinelerra/colorpicker.C:178 msgid "colorpicker#R:" -msgstr "Farbauswahl#R:" +msgstr "R:" #: cinelerra/colorpicker.C:179 msgid "colorpicker#G:" -msgstr "Farbauswahl#G:" +msgstr "G:" #: cinelerra/colorpicker.C:180 msgid "colorpicker#B:" -msgstr "Farbauswahl#B:" +msgstr "B:" #: cinelerra/colorpicker.C:181 msgid "colorpicker#Y:" -msgstr "Farbauswahl#Y:" +msgstr "Y:" #: cinelerra/colorpicker.C:182 msgid "colorpicker#U:" -msgstr "Farbauswahl#U:" +msgstr "U:" #: cinelerra/colorpicker.C:183 msgid "colorpicker_Cr#V:" -msgstr "Farbauswahl_Cr#V:" +msgstr "V:" #: cinelerra/colorpicker.C:185 msgid "colorpicker#A:" -msgstr "Farbauswahl#A:" +msgstr "A:" #: cinelerra/colorpicker.C:201 msgid "Hue" @@ -7669,7 +7669,7 @@ msgstr "Alt-r" #: cinelerra/proxy.C:87 msgid "Original size" -msgstr "Originalgröße" +msgstr "– aus –" #: cinelerra/proxy.C:332 msgid "Creating proxy files..."