From 66cb484dc283f7d2fabe6bcb1d8171c2bb79103c Mon Sep 17 00:00:00 2001 From: Sam <17427046+Samillion@users.noreply.github.com> Date: Sat, 26 Oct 2024 00:33:41 +0300 Subject: [PATCH 1/3] revert: commit to fluent icon style --- modernz.lua | 115 +++++++++++++++++----------------------------------- 1 file changed, 37 insertions(+), 78 deletions(-) diff --git a/modernz.lua b/modernz.lua index f43670f..d10ba8c 100644 --- a/modernz.lua +++ b/modernz.lua @@ -20,8 +20,6 @@ local user_opts = { showwindowed = true, -- show OSC when windowed? showfullscreen = true, -- show OSC when fullscreen? greenandgrumpy = false, -- disable santa hat in December - icon_style = "fluent", -- choose icon style. fluent, material - -- Requires font files provided in repo in /fonts -- Colors osc_color = "#000000", -- accent of the OSC and the title bar @@ -172,80 +170,42 @@ local osc_param = { -- calculated by osc_init() areas = {}, } + local icons = { - fluent = { - play = "\238\166\143", - pause = "\238\163\140", - replay = "\238\189\191", - previous = "\239\152\167", - next = "\239\149\168", - rewind = "\238\168\158", - forward = "\238\152\135", - - audio = '\238\175\139', - subtitle = '\238\175\141', - playlist = "\238\161\159", - volume_mute = '\238\173\138', - volume_quiet = '\238\172\184', - volume_low = '\238\172\189', - volume_high = '\238\173\130', - - download = "\239\133\144", - downloading = "\239\140\174", - screenshot = "\238\169\183", - ontop_on = "\238\165\190", - ontop_off = "\238\166\129", - loop_off = "\239\133\178", - loop_on = "\239\133\181", - info = "\239\146\164", - fullscreen = "\239\133\160", - fullscreen_exit = "\239\133\166", - - jumpicons = { - [5] = {"\238\171\186", "\238\171\187"}, - [10] = {"\238\171\188", "\238\172\129"}, - [30] = {"\238\172\133", "\238\172\134"}, - default = {"\238\172\138", "\238\172\138"}, -- second icon is mirrored in layout() - } - }, - material = { - play = "\239\142\170", - pause = "\239\142\167", - replay = "\239\142\178", - previous = "\239\142\181", - next = "\239\142\180", - rewind = "\239\142\160", - forward = "\239\142\159", - - audio = "\239\142\183", - subtitle = "\239\140\164", - playlist = "\239\137\135", - volume_mute = "\239\142\187", - volume_quiet = "\239\142\185", - volume_low = "\239\142\185", - volume_high = "\239\142\188", - - download = "\239\136\160", - downloading = "\239\134\185", - screenshot = "\239\135\168", - ontop_on = "\239\142\150", - ontop_off = "\239\142\149", - loop_off = "\239\134\181", - loop_on = "\239\134\183", - info = "\239\135\183", - fullscreen = "\239\133\173", - fullscreen_exit = "\239\133\172", - - jumpicons = { - [5] = {"\239\142\177", "\239\142\163"}, - [10] = {"\239\142\175", "\239\142\161"}, - [30] = {"\239\142\176", "\239\142\162"}, - default = {"\239\142\178", "\239\142\178"}, -- second icon is mirrored in layout() - } + play = "\238\166\143", + pause = "\238\163\140", + replay = "\238\189\191", + previous = "\239\152\167", + next = "\239\149\168", + rewind = "\238\168\158", + forward = "\238\152\135", + + audio = '\238\175\139', + subtitle = '\238\175\141', + playlist = "\238\161\159", + volume_mute = '\238\173\138', + volume_quiet = '\238\172\184', + volume_low = '\238\172\189', + volume_high = '\238\173\130', + + download = "\239\133\144", + downloading = "\239\140\174", + screenshot = "\238\156\153", + ontop_on = "\238\165\190", + ontop_off = "\238\166\129", + loop_off = "\239\133\178", + loop_on = "\239\133\181", + info = "\239\146\164", + fullscreen = "\239\133\160", + fullscreen_exit = "\239\133\166", + + jumpicons = { + [5] = {"\238\171\186", "\238\171\187"}, + [10] = {"\238\171\188", "\238\172\129"}, + [30] = {"\238\172\133", "\238\172\134"}, + default = {"\238\172\138", "\238\172\138"}, -- second icon is mirrored in layout() } - } -icons = user_opts.icon_style == "fluent" and icons.fluent or icons.material --- Localization local language = { @@ -315,8 +275,7 @@ local sub_track_count = 0 local window_control_box_width = 138 local is_december = os.date("*t").month == 12 local UNICODE_MINUS = string.char(0xe2, 0x88, 0x92) -- UTF-8 for U+2212 MINUS SIGN -local iconfont = user_opts.icon_style == "fluent" and "fluent-system-icons" or "Material-Design-Iconic-Round" -local iconfont_size = user_opts.icon_style == "fluent" and 30 or 36 +local iconfont = "fluent-system-icons" local function osc_color_convert(color) return color:sub(6,7) .. color:sub(4,5) .. color:sub(2,3) @@ -331,7 +290,7 @@ local function set_osc_styles() SeekbarFg = "{\\blur1\\bord1\\1c&H" .. osc_color_convert(user_opts.seekbarfg_color) .. "&}", VolumebarBg = "{\\blur0\\bord0\\1c&H999999&}", VolumebarFg = "{\\blur1\\bord1\\1c&H" .. osc_color_convert(user_opts.side_buttons_color) .. "&}", - Ctrl1 = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.playpause_color) .. "&\\3c&HFFFFFF&\\fs" .. iconfont_size .. "\\fn" .. iconfont .. "}", + Ctrl1 = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.playpause_color) .. "&\\3c&HFFFFFF&\\fs30\\fn" .. iconfont .. "}", Ctrl2 = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.middle_buttons_color) .. "&\\3c&HFFFFFF&\\fs24\\fn" .. iconfont .. "}", Ctrl2Flip = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.middle_buttons_color) .. "&\\3c&HFFFFFF&\\fs24\\fn" .. iconfont .. "\\fry180}", Ctrl3 = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.side_buttons_color) .. "&\\3c&HFFFFFF&\\fs24\\fn" .. iconfont .. "}", @@ -1551,7 +1510,7 @@ layouts = function () if showjump then lo = add_layout("jump_backward") lo.geometry = {x = refX - 60, y = refY - 40 , an = 5, w = 30, h = 24} - lo.style = user_opts.icon_style == "fluent" and ((user_opts.jumpiconnumber and icons.jumpicons[user_opts.jumpamount] ~= nil) and osc_styles.Ctrl2 or osc_styles.Ctrl2Flip) or osc_styles.Ctrl2 + lo.style = (user_opts.jumpiconnumber and icons.jumpicons[user_opts.jumpamount] ~= nil) and osc_styles.Ctrl2 or osc_styles.Ctrl2Flip end lo = add_layout("play_pause") @@ -1561,7 +1520,7 @@ layouts = function () if showjump then lo = add_layout("jump_forward") lo.geometry = {x = refX + 60, y = refY - 40 , an = 5, w = 30, h = 24} - lo.style = user_opts.icon_style == "fluent" and osc_styles.Ctrl2 or ((user_opts.jumpiconnumber and icons.jumpicons[user_opts.jumpamount] ~= nil) and osc_styles.Ctrl2 or osc_styles.Ctrl2Flip) + lo.style = osc_styles.Ctrl2 end if showskip then From 1e00806fa4ecfcec50084e53cec95f45eed5d5d0 Mon Sep 17 00:00:00 2001 From: Sam <17427046+Samillion@users.noreply.github.com> Date: Sat, 26 Oct 2024 00:41:26 +0300 Subject: [PATCH 2/3] rem: only need fluent font --- Material-Design-Iconic-Round.ttf | Bin 48396 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Material-Design-Iconic-Round.ttf diff --git a/Material-Design-Iconic-Round.ttf b/Material-Design-Iconic-Round.ttf deleted file mode 100644 index 3fb799a2a2b437f68ef64313e82fd549b7ff63bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48396 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 Date: Sat, 26 Oct 2024 01:17:50 +0300 Subject: [PATCH 3/3] docs: update previous and reference credit for fluent font --- README.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 345e502..3cbd11f 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ A sleek and modern OSC for [mpv](https://mpv.io/), this project is a fork of ModernX designed to enhance functionality by adding more features, all while preserving the core standards of mpv's OSC. -![ModernZ OSC Screenshot](https://github.com/user-attachments/assets/57dc6e88-c222-4a62-b650-5ae6c88b4fc0) +![ModernZ OSC Screenshot](https://github.com/user-attachments/assets/236f0035-e2b1-401f-8650-f5a49d44a6e0)

Installation » @@ -31,8 +31,9 @@ A sleek and modern OSC for [mpv](https://mpv.io/), this project is a fork of Mod Don't like the default white buttons and text? ModernZ is fully customizable! Change colors and button layouts to match your style: -![Custom Titlebar Example](https://github.com/user-attachments/assets/7968b6f0-df16-44fd-8306-01e581b4e1a7) -![Custom Colors Example](https://github.com/user-attachments/assets/637f0c50-16ac-4d8c-a341-187e3d71d2d3) +![modernz_ui_top](https://github.com/user-attachments/assets/7765900e-93a0-46fa-9f9a-0e7c696ab3a0) + +![modernz_ui_bottom](https://github.com/user-attachments/assets/16921c25-b040-4e52-899f-ba4513954be2) See the [Color Customization](docs/USER_OPTS.md#colors) section in the configuration guide for details on how to customize colors and buttons. @@ -44,7 +45,7 @@ See the [Color Customization](docs/USER_OPTS.md#colors) section in the configura 2. **Copy Files** - Place `modernz.lua` in your mpv scripts directory - - Place `Material-Design-Iconic-Round.ttf` in your mpv fonts directory + - Place `fluent-system-icons.ttf` in your mpv fonts directory - (OPTIONAL) Place `thumbfast.lua` in your mpv scripts directory 3. **Locations** @@ -59,7 +60,7 @@ See the [Color Customization](docs/USER_OPTS.md#colors) section in the configura ``` mpv/ ├── fonts/ - │ └── Material-Design-Iconic-Round.ttf + │ └── fluent-system-icons.ttf ├── script-opts/ │ └── modernz.conf └── scripts/ @@ -118,7 +119,7 @@ z script-message-to modernz osc-idlescreen # Toggle idle screen ModernZ supports mpv's built-in select.lua ([v0.39+](https://github.com/mpv-player/mpv/discussions/14903)) for playlist and chapter navigation. -https://github.com/user-attachments/assets/188992ba-1ad8-4d71-a96c-44c3c99df4e0 +https://github.com/user-attachments/assets/f47a2eb6-d926-4f3b-8a5d-19301c70c7a5 > [!TIP] > If the font size for the interactive playlist is too small, you can add the following in your `mpv.conf` @@ -196,3 +197,6 @@ For even more useful scripts, check out the [mpv User Scripts Wiki](https://gith In essence, to modernize and revive the `Modern` origin. Having said that, ModernZ still uses parts of the old code, and every previous and current fork author and contributor deserve credit (including mpv's stock osc), that is why they're mentioned in detail. + +#### Credits: +Fluent System Icons font was modified by [Xurdejl](https://github.com/Xurdejl) for use on ModernZ, they also contributed with code, reports and tests. 😻