From bd37370a37ea6232733c099e1139940bc5cccfb2 Mon Sep 17 00:00:00 2001 From: ochibani <11yzyv86j@relay.firefox.com> Date: Thu, 6 Jun 2024 06:59:08 +0200 Subject: [PATCH] fix translation issue --- Cargo.lock | 17 +--- Cargo.toml | 1 - interfaces/main.ui | 25 +++++- locales/ar.ftl | 184 +++++++++++++++++++++++++++++------------- locales/ar_YE.ftl | 188 ++++++++++++++++++++++++++++--------------- locales/en_US.ftl | 196 +++++++++++++++++++++++++++++---------------- src/main.rs | 148 ++++++++++++++++++++++++++-------- src/timer.rs | 6 +- 8 files changed, 520 insertions(+), 245 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c030668..ba93014 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -391,7 +391,6 @@ dependencies = [ "dark-light", "dirs", "filename", - "fluent", "fluent-bundle", "gdk-pixbuf 0.9.0", "gdk4 0.9.0", @@ -771,16 +770,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "fluent" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb74634707bebd0ce645a981148e8fb8c7bccd4c33c652aeffd28bf2f96d555a" -dependencies = [ - "fluent-bundle", - "unic-langid", -] - [[package]] name = "fluent-bundle" version = "0.15.3" @@ -2604,7 +2593,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.9", + "winnow 0.6.11", ] [[package]] @@ -2987,9 +2976,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.9" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6" +checksum = "56c52728401e1dc672a56e81e593e912aa54c78f40246869f78359a2bf24d29d" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index e5be407..b407390 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,6 @@ async-std = {version = "1.12.0", features = ["attributes"]} chrono = "0.4.19" dark-light = "1.0.0" dirs = "4.0.0" -fluent = "0.16.1" fluent-bundle = "0.15.3" filename = "0.1.1" gdk = { git = "https://github.com/gtk-rs/gtk4-rs.git", package = "gdk4"} diff --git a/interfaces/main.ui b/interfaces/main.ui index f035192..f693eb7 100644 --- a/interfaces/main.ui +++ b/interfaces/main.ui @@ -8,7 +8,7 @@ True - 10000 + 10 1 2 @@ -108,7 +108,6 @@ True True True - label @@ -177,6 +176,7 @@ 5 5 5 + True True @@ -207,6 +207,7 @@ 10 5 5 + True @@ -227,6 +228,7 @@ 3 3 3 + True True @@ -262,6 +264,7 @@ 3 3 True + True True @@ -296,6 +299,7 @@ 3 3 3 + True True @@ -344,6 +348,7 @@ True False True + True @@ -353,6 +358,7 @@ True False True + True @@ -362,6 +368,7 @@ True False True + True 0 1 @@ -375,6 +382,7 @@ True False True + True 1 1 @@ -388,6 +396,7 @@ True False False + True 0 2 @@ -425,8 +434,10 @@ True True 2 - number + 2 + number adjustment2 + True @@ -446,9 +457,11 @@ True True 2 - number + 2 + number adjustment1 1 + True 1 1 @@ -528,6 +541,7 @@ 5 True True + True 1 0 @@ -548,6 +562,7 @@ True True True + True True @@ -578,6 +593,7 @@ True True True + True True @@ -629,6 +645,7 @@ True True True + True diff --git a/locales/ar.ftl b/locales/ar.ftl index fe6c2be..047f84c 100644 --- a/locales/ar.ftl +++ b/locales/ar.ftl @@ -1,75 +1,145 @@ -blue-recorder = المسجّل الأزرق - -area-chooser = محدد المنطقة - -wayland-msg = غير مدعوم في وايلاند - -default-command = أمرٌ ينفذ عند الانتهاء: - -file-name = اسم الملفّ الافتراضي: - -mp4-format = MP4 (MPEG-4 Part 14) - -mkv-format = MKV (Matroska multimedia container format) - -webm-format = WEBM (Open Web Media File) - -gif-format = GIF (Graphics Interchange Format) - -avi-format = AVI (Audio Video Interleaved) - -wmv-format = WMV (Windows Media Video) - -nut-format = NUT (NUT Recording Format) - -audio-input = مصدر صوت PulseAudio الافتراضي - -record-video = تسجيل الشاشة - -record-audio = تسجيل الصوت - -show-mouse = إظهار مؤشر الفأرة - -follow-mouse = متابعة مؤشر الفأرة - -auto-hide = إخفاء تلقائي - -run-command = أمرٌ ينفذ عند الانتهاء: - -frames = الإطارات: - -delay = التأخير: - -audio-source = مدخل الصوت: - +# About button about = عن البرنامج -dialog-comment = مسجّل شاشة لسطح مكتب لينكس، يدعم إكس ووايلاند. - -translator-credits = translator-credits +# Credits button +address-abdullah-al-baroty = Abdullah Al-Baroty +address-ahmad-gharib = Ahmad Gharib +address-ake-engelbrektson = Åke Engelbrektson https://github.com/eson57 +address-albanobattistella = albanobattistella https://github.com/albanobattistella +address-alessandro-toia = Alessandro Toia +address-alex-benishek = Alex Benishek +address-amerey = Amerey https://github.com/Amereyeu +address-chibani = O.Chibani <11yzyv86j@relay.firefox.com> +address-hanny-sabbagh = M.Hanny Sabbagh +address-gmou3 = gmou3 https://github.com/gmou3 +address-larry-wei = Larry Wei https://github.com/larryw3i +address-mark-wagie = Mark Wagie https://github.com/yochananmarqos +address-medium = Medium +address-mr-Narsus = Mr.Narsus https://github.com/MrNarsus +address-mustapha-assabar = Mustapha Assabar +address-salem-yaslem = Salem Yaslem +address-suliman-altassan = Suliman Altassan +address-william-grunow = William Grunow +# sections +authors = Created by: +patreon = Patreon Supporters: +design = Design by: +translate = Translated by: +# Overwrite warning already-exist = الملف موجود، أترغب بالكتابة عليه؟ -blue-recorder-preferences = تفضيلات المسجل الأزرق +# Area select apply button +apply = apply -file-name-overwritten = اسم الملف (سيُكتَبُ عليه) +# Area select button +area-chooser = محدد المنطقة -enter-command = اكتب الأمر هنا.. +# Audio source input +audio-input = مصدر صوت PulseAudio الافتراضي -select-window = حدد نافذة +# Audio source label +audio-source = مدخل الصوت: -select-area = حدد منطقة +# Auto hide label +auto-hide = إخفاء تلقائي -default-frames = عدد الإطارات الافتراضي: +# Output formats +avi-format = AVI (Audio Video Interleaved) +gif-format = GIF (Graphics Interchange Format) +mkv-format = MKV (Matroska multimedia container format) +mp4-format = MP4 (MPEG-4 Part 14) +nut-format = NUT (NUT Recording Format) +webm-format = WEBM (Open Web Media File) +wmv-format = WMV (Windows Media Video) -default-delay = التأخير الافتراضي: +# Name +blue-recorder = المسجّل الأزرق +# Copy right +copy-right = © 2021 Salem Yaslem + +# Run command label +default-command = أمرٌ ينفذ عند الانتهاء: + +# Default output folder default-folder = المجلد الافتراضي: -default-pipeline = Default pipeline: +# Delay label +delay = التأخير: -record-mouse = تسجيل مؤشر الفأرة +# Delay message +delay-title = Start Recording in… -position-msg = حُفِظَتْ إحداثيات المنطقة المحددة! +# Stop delay timer +delay-window-stop = إيقاف +# About message +dialog-comment = مسجّل شاشة لسطح مكتب لينكس، يدعم إكس ووايلاند. + +# Run command input +enter-command = اكتب الأمر هنا.. + +# Frames label +file-name = اسم الملفّ الافتراضي: + +# Overwritten file name +file-name-overwritten = اسم الملف (سيُكتَبُ عليه) + +# Follow mouse label +follow-mouse = متابعة مؤشر الفأرة + +# Frames label +frames = الإطارات: + +# License +license-website = http://www.gnu.org/licenses/ +license = + Blue Recorder is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + Blue Recorder is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Blue Recorder. If not, see { license-website }. + +# Recording button +record = سجل + +# Record audio label +record-audio = تسجيل الصوت + +# Record video label +record-video = تسجيل الصورة + +# Run command label +run-command = أمرٌ ينفذ عند الانتهاء: + +# Selection buttons +select-area = حدد منطقة +select-screen = حدد شاشة +select-window = حدد نافذة + +# Stop recording button stop-recording = إيقاف التسجيل + +# Show mouse label +show-mouse = إظهار مؤشر الفأرة + +# Website link +website = Website + +# Tooltip +about-tooltip = Blue Recorder information +area-tooltip = Select area to record +audio-source-tooltip = Select audio source +audio-tooltip = Audio recording +delay-tooltip = Delay time before starting record +folder-tooltip = Select storage location +follow-mouse-tooltip = Focus on mouse movement +format-tooltip = Select file format +frames-tooltip = Frames rate +hide-tooltip = Hide window when start recording +mouse-tooltip = Mouse appears in video recording +record-tooltip = Start screen record +screen-tooltip = Select screen to record +stop-tooltip = Stop screen recording +video-tooltip = Video recording +wayland-tooltip = Not supported in Wayland +window-tooltip = Select window to record diff --git a/locales/ar_YE.ftl b/locales/ar_YE.ftl index f5708f0..047f84c 100644 --- a/locales/ar_YE.ftl +++ b/locales/ar_YE.ftl @@ -1,87 +1,145 @@ -blue-recorder = المسجّل الأزرق - -area-chooser = محدد المنطقة - -wayland-msg = غير مدعوم في وايلاند - -default-command = تشغيل أمر عند الانتهاء: - -file-name = اسم الملفّ الافتراضي: - -mp4-format = MP4 (MPEG-4 Part 14) - -mkv-format = MKV (Matroska multimedia container format) - -webm-format = WEBM (Open Web Media File) - -gif-format = GIF (Graphics Interchange Format) - -avi-format = AVI (Audio Video Interleaved) - -wmv-format = WMV (Windows Media Video) - -nut-format = NUT (NUT Recording Format) - -audio-input = مصدر صوت PulseAudio الافتراضي - -record-video = تسجيل الصوت - -record-audio = تسجيل الصوت - -show-mouse = إظهار الفأرة - -follow-mouse = متابعة الفأرة - -auto-hide = إخفاء تلقائي - -run-command = تشغيل أمر عند الانتهاء: - -frames = الإطارات: - -delay = التأخير: - -audio-source = مدخل الصوت: - +# About button about = عن البرنامج -dialog-comment = مسجّل شاشة بسيط لسطح مكتب لينكس، يدعم إكس ووايلاند. +# Credits button +address-abdullah-al-baroty = Abdullah Al-Baroty +address-ahmad-gharib = Ahmad Gharib +address-ake-engelbrektson = Åke Engelbrektson https://github.com/eson57 +address-albanobattistella = albanobattistella https://github.com/albanobattistella +address-alessandro-toia = Alessandro Toia +address-alex-benishek = Alex Benishek +address-amerey = Amerey https://github.com/Amereyeu +address-chibani = O.Chibani <11yzyv86j@relay.firefox.com> +address-hanny-sabbagh = M.Hanny Sabbagh +address-gmou3 = gmou3 https://github.com/gmou3 +address-larry-wei = Larry Wei https://github.com/larryw3i +address-mark-wagie = Mark Wagie https://github.com/yochananmarqos +address-medium = Medium +address-mr-Narsus = Mr.Narsus https://github.com/MrNarsus +address-mustapha-assabar = Mustapha Assabar +address-salem-yaslem = Salem Yaslem +address-suliman-altassan = Suliman Altassan +address-william-grunow = William Grunow +# sections +authors = Created by: +patreon = Patreon Supporters: +design = Design by: +translate = Translated by: -translator-credits = translator-credits +# Overwrite warning +already-exist = الملف موجود، أترغب بالكتابة عليه؟ -already-exist = File already exist. Do you want to overwrite it? +# Area select apply button +apply = apply -blue-recorder-preferences = Blue Recorder Preferences +# Area select button +area-chooser = محدد المنطقة -file-name-overwritten = File Name (Will be overwritten).. +# Audio source input +audio-input = مصدر صوت PulseAudio الافتراضي -enter-command = Enter your command here.. +# Audio source label +audio-source = مدخل الصوت: -select-window = Select a Window +# Auto hide label +auto-hide = إخفاء تلقائي -delay-window-label = valuefsf +# Output formats +avi-format = AVI (Audio Video Interleaved) +gif-format = GIF (Graphics Interchange Format) +mkv-format = MKV (Matroska multimedia container format) +mp4-format = MP4 (MPEG-4 Part 14) +nut-format = NUT (NUT Recording Format) +webm-format = WEBM (Open Web Media File) +wmv-format = WMV (Windows Media Video) -default-frames = {$value} +# Name +blue-recorder = المسجّل الأزرق -default-delay = {$value} +# Copy right +copy-right = © 2021 Salem Yaslem -default-folder = Default folder: +# Run command label +default-command = أمرٌ ينفذ عند الانتهاء: -default-pipeline = Default pipeline: +# Default output folder +default-folder = المجلد الافتراضي: -record-mouse = Record Mouse - -record = سجل +# Delay label +delay = التأخير: +# Delay message delay-title = Start Recording in… -position-msg = Your area position has been saved! +# Stop delay timer +delay-window-stop = إيقاف -stop-recording = stop recording +# About message +dialog-comment = مسجّل شاشة لسطح مكتب لينكس، يدعم إكس ووايلاند. -apply = تطبيق +# Run command input +enter-command = اكتب الأمر هنا.. -select-area = اختار مساحة +# Frames label +file-name = اسم الملفّ الافتراضي: -select-screen = ختار شاشة +# Overwritten file name +file-name-overwritten = اسم الملف (سيُكتَبُ عليه) -delay-window-stop = Stop +# Follow mouse label +follow-mouse = متابعة مؤشر الفأرة + +# Frames label +frames = الإطارات: + +# License +license-website = http://www.gnu.org/licenses/ +license = + Blue Recorder is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + Blue Recorder is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Blue Recorder. If not, see { license-website }. + +# Recording button +record = سجل + +# Record audio label +record-audio = تسجيل الصوت + +# Record video label +record-video = تسجيل الصورة + +# Run command label +run-command = أمرٌ ينفذ عند الانتهاء: + +# Selection buttons +select-area = حدد منطقة +select-screen = حدد شاشة +select-window = حدد نافذة + +# Stop recording button +stop-recording = إيقاف التسجيل + +# Show mouse label +show-mouse = إظهار مؤشر الفأرة + +# Website link +website = Website + +# Tooltip +about-tooltip = Blue Recorder information +area-tooltip = Select area to record +audio-source-tooltip = Select audio source +audio-tooltip = Audio recording +delay-tooltip = Delay time before starting record +folder-tooltip = Select storage location +follow-mouse-tooltip = Focus on mouse movement +format-tooltip = Select file format +frames-tooltip = Frames rate +hide-tooltip = Hide window when start recording +mouse-tooltip = Mouse appears in video recording +record-tooltip = Start screen record +screen-tooltip = Select screen to record +stop-tooltip = Stop screen recording +video-tooltip = Video recording +wayland-tooltip = Not supported in Wayland +window-tooltip = Select window to record diff --git a/locales/en_US.ftl b/locales/en_US.ftl index 457ae48..8dfd4cd 100644 --- a/locales/en_US.ftl +++ b/locales/en_US.ftl @@ -1,87 +1,145 @@ -blue-recorder = Blue Recorder - -area-chooser = Area Chooser - -wayland-msg = Not supported in Wayland - -default-command = Default command: - -file-name = Default filename: - -mp4-format = MP4 (MPEG-4 Part 14) - -mkv-format = MKV (Matroska multimedia container format) - -webm-format = WEBM (Open Web Media File) - -gif-format = GIF (Graphics Interchange Format) - -avi-format = AVI (Audio Video Interleaved) - -wmv-format = WMV (Windows Media Video) - -nut-format = NUT (NUT Recording Format) - -audio-input = Default PulseAudio Input Source - -record-video = Record Video - -record-audio = Record Audio - -show-mouse = Show Mouse - -follow-mouse = Follow Mouse - -auto-hide = Auto Hide - -run-command = Run Command After Recording: - -frames = Frames: - -delay = Delay: - -audio-source = Audio Input Source: - +# About button about = About -apply = Apply - -dialog-comment = A simple screen recorder for Linux desktop. Supports Wayland & Xorg. - -translator-credits = translator-credits +# Credits button +address-abdullah-al-baroty = Abdullah Al-Baroty +address-ahmad-gharib = Ahmad Gharib +address-ake-engelbrektson = Åke Engelbrektson https://github.com/eson57 +address-albanobattistella = albanobattistella https://github.com/albanobattistella +address-alessandro-toia = Alessandro Toia +address-alex-benishek = Alex Benishek +address-amerey = Amerey https://github.com/Amereyeu +address-chibani = O.Chibani <11yzyv86j@relay.firefox.com> +address-hanny-sabbagh = M.Hanny Sabbagh +address-gmou3 = gmou3 https://github.com/gmou3 +address-larry-wei = Larry Wei https://github.com/larryw3i +address-mark-wagie = Mark Wagie https://github.com/yochananmarqos +address-medium = Medium +address-mr-Narsus = Mr.Narsus https://github.com/MrNarsus +address-mustapha-assabar = Mustapha Assabar +address-salem-yaslem = Salem Yaslem +address-suliman-altassan = Suliman Altassan +address-william-grunow = William Grunow +# sections +authors = Created by: +patreon = Patreon Supporters: +design = Design by: +translate = Translated by: +# Overwrite warning already-exist = File already exist. Do you want to overwrite it? -record = Record +# Area select apply button +apply = Apply -delay-title = Start Recording in… +# Area select button +area-chooser = Area Chooser -delay-window-label = {$value} +# Audio source input +audio-input = Default PulseAudio Input Source -delay-window-stop = Stop +# Audio source label +audio-source = Audio Input Source: -stop-recording = Stop recording +# Auto hide label +auto-hide = Auto Hide -blue-recorder-preferences = Blue Recorder Preferences +# Output formats +avi-format = AVI (Audio Video Interleaved) +gif-format = GIF (Graphics Interchange Format) +mkv-format = MKV (Matroska multimedia container format) +mp4-format = MP4 (MPEG-4 Part 14) +nut-format = NUT (NUT Recording Format) +webm-format = WEBM (Open Web Media File) +wmv-format = WMV (Windows Media Video) -file-name-overwritten = File Name (Will be overwritten).. +# Name +blue-recorder = Blue Recorder -enter-command = Enter your command here.. +# Copy right +copy-right = © 2021 Salem Yaslem -select-window = Select a Window - -select-area = Select an Area - -select-screen = Select a Screen - -default-frames = {$value} - -default-delay = {$value} +# Run command label +default-command = Default command: +# Default output folder default-folder = Default folder: -default-pipeline = Default pipeline: +# Delay label +delay = Delay: -record-mouse = Record Mouse +# Delay message +delay-title = Start Recording in… -position-msg = Your area position has been saved! +# Stop delay timer +delay-window-stop = Stop + +# About message +dialog-comment = A simple screen recorder for Linux desktop. Supports Wayland & Xorg. + +# Run command input +enter-command = Enter your command here.. + +# Frames label +file-name = Default filename: + +# Overwritten file name +file-name-overwritten = File Name (Will be overwritten).. + +# Follow mouse label +follow-mouse = Follow Mouse + +# Frames label +frames = Frames: + +# License +license-website = http://www.gnu.org/licenses/ +license = + Blue Recorder is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + Blue Recorder is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Blue Recorder. If not, see { license-website }. + +# Recording button +record = Record + +# Record audio label +record-audio = Record Audio + +# Record video label +record-video = Record Video + +# Run command label +run-command = Run Command After Recording: + +# Selection buttons +select-area = Select an Area +select-screen = Select a Screen +select-window = Select a Window + +# Stop recording button +stop-recording = Stop recording + +# Show mouse label +show-mouse = Show Mouse + +# Website link +website = Website + +# Tooltip +about-tooltip = Blue Recorder information +area-tooltip = Select area to record +audio-source-tooltip = Select audio source +audio-tooltip = Audio recording +delay-tooltip = Delay time before starting record +folder-tooltip = Select storage location +follow-mouse-tooltip = Focus on mouse movement +format-tooltip = Select file format +frames-tooltip = Frames rate +hide-tooltip = Hide window when start recording +mouse-tooltip = Mouse appears in video recording +record-tooltip = Start screen record +screen-tooltip = Select screen to record +stop-tooltip = Stop screen recording +video-tooltip = Video recording +wayland-tooltip = Not supported in Wayland +window-tooltip = Select window to record diff --git a/src/main.rs b/src/main.rs index 0974ccf..0298891 100644 --- a/src/main.rs +++ b/src/main.rs @@ -10,7 +10,7 @@ mod utils; use ffmpeg_interface::Ffmpeg; use fluent_bundle::bundle::FluentBundle; -use fluent_bundle::{FluentArgs, FluentResource}; +use fluent_bundle::FluentResource; use gtk::glib; use gtk::prelude::*; use gtk::{ @@ -50,7 +50,7 @@ pub fn build_ui(application: &Application) { }.join(Path::new("locales")); if !ftl_path.exists() { ftl_path = std::fs::canonicalize(Path::new( - &std::env::var("LOCPATH").unwrap_or_else(|_| String::from("locales")), + &std::env::var("LC_DIR").unwrap_or_else(|_| String::from("locales")), )).unwrap(); } let supported_lang: Vec = std::fs::read_dir(&ftl_path) @@ -61,7 +61,10 @@ pub fn build_ui(application: &Application) { }).collect(); let mut locale = std::env::var("LANG").unwrap_or("en_US".to_string()); if !supported_lang.contains(&locale) { - locale = String::from("en_US"); + locale = locale.split('_').next().unwrap().to_string(); + if !supported_lang.contains(&locale) { + locale = String::from("en_US"); + } } let ftl_file = std::fs::read_to_string( format!("{}/{}.ftl", ftl_path.to_str().unwrap(),locale.split('.').next().unwrap()) @@ -134,12 +137,23 @@ pub fn build_ui(application: &Application) { stop_button.hide(); play_button.hide(); + // Comboboxs tooltip + audio_source_combobox.set_tooltip_text(Some(&bundle.format_pattern(bundle.get_message("audio-source-tooltip").unwrap() + .value().unwrap(), None, &mut vec![]).to_string())); + format_chooser_combobox.set_tooltip_text(Some(&bundle.format_pattern(bundle.get_message("format-tooltip").unwrap() + .value().unwrap(), None, &mut vec![]).to_string())); + // Hide window grab button in Wayland + area_grab_button.set_tooltip_text(Some(&bundle.format_pattern(bundle.get_message("area-tooltip").unwrap() + .value().unwrap(), None, &mut vec![]).to_string())); + // Temporary solution if is_wayland() { - area_grab_button.set_can_focus(false); - area_grab_button.set_can_target(false); - area_grab_button.add_css_class("disabled"); - area_grab_button.set_tooltip_text(Some(&bundle.format_pattern(bundle.get_message("wayland-msg").unwrap() + // Disabled for the tooltip + //area_grab_button.set_can_focus(false); + //area_grab_button.set_can_target(false); + //area_grab_button.add_css_class("disabled"); + area_grab_button.set_sensitive(false); + area_grab_button.set_tooltip_text(Some(&bundle.format_pattern(bundle.get_message("wayland-tooltip").unwrap() .value().unwrap(), None, &mut vec![]).to_string())); } @@ -207,14 +221,24 @@ pub fn build_ui(application: &Application) { audio_source_combobox.set_active(Some(0)); // Switchs + video_switch.set_tooltip_text(Some(&bundle.format_pattern(bundle.get_message("video-tooltip").unwrap() + .value().unwrap(), None, &mut vec![]).to_string())); video_switch.set_label(Some(&bundle.format_pattern(bundle.get_message("record-video").unwrap() .value().unwrap(), None, &mut vec![]).to_string())); + audio_switch.set_tooltip_text(Some(&bundle.format_pattern(bundle.get_message("audio-tooltip").unwrap() + .value().unwrap(), None, &mut vec![]).to_string())); audio_switch.set_label(Some(&bundle.format_pattern(bundle.get_message("record-audio").unwrap() .value().unwrap(), None, &mut vec![]).to_string())); + mouse_switch.set_tooltip_text(Some(&bundle.format_pattern(bundle.get_message("mouse-tooltip").unwrap() + .value().unwrap(), None, &mut vec![]).to_string())); mouse_switch.set_label(Some(&bundle.format_pattern(bundle.get_message("show-mouse").unwrap() .value().unwrap(), None, &mut vec![]).to_string())); + follow_mouse_switch.set_tooltip_text(Some(&bundle.format_pattern(bundle.get_message("follow-mouse-tooltip").unwrap() + .value().unwrap(), None, &mut vec![]).to_string())); follow_mouse_switch.set_label(Some(&bundle.format_pattern(bundle.get_message("follow-mouse").unwrap() .value().unwrap(), None, &mut vec![]).to_string())); + hide_switch.set_tooltip_text(Some(&bundle.format_pattern(bundle.get_message("hide-tooltip").unwrap() + .value().unwrap(), None, &mut vec![]).to_string())); hide_switch.set_label(Some(&bundle.format_pattern(bundle.get_message("auto-hide").unwrap() .value().unwrap(), None, &mut vec![]).to_string())); video_switch.set_active(config_management::get_bool("default", "videocheck")); @@ -378,6 +402,11 @@ pub fn build_ui(application: &Application) { } // Spin + frames_spin.set_tooltip_text(Some(&bundle.format_pattern(bundle.get_message("frames-tooltip").unwrap() + .value().unwrap(), None, &mut vec![]).to_string())); + delay_spin.set_tooltip_text(Some(&bundle.format_pattern(bundle.get_message("delay-tooltip").unwrap() + .value().unwrap(), None, &mut vec![]).to_string())); + frames_spin.set_alignment(0.0); frames_spin.set_value( config_management::get("default", "frame") .parse::() @@ -404,20 +433,12 @@ pub fn build_ui(application: &Application) { }); // Labels - let mut frames_value = FluentArgs::new(); - frames_value.set("value", frames_spin.value()); - let mut delay_time_value = FluentArgs::new(); - delay_time_value.set("value", delay_spin.value()); command_label.set_label(&bundle.format_pattern(bundle.get_message("run-command").unwrap() .value().unwrap(), None, &mut vec![]).to_string()); frames_label.set_label(&bundle.format_pattern(bundle.get_message("frames").unwrap() .value().unwrap(), None, &mut vec![]).to_string()); - frames_spin.set_text(&bundle.format_pattern(bundle.get_message("default-frames").unwrap() - .value().unwrap(), Some(&frames_value), &mut vec![]).to_string()); delay_label.set_label(&bundle.format_pattern(bundle.get_message("delay").unwrap() .value().unwrap(), None, &mut vec![]).to_string()); - delay_spin.set_text(&bundle.format_pattern(bundle.get_message("default-delay").unwrap() - .value().unwrap(), Some(&delay_time_value), &mut vec![]).to_string()); audio_source_label.set_label(&bundle.format_pattern(bundle.get_message("audio-source").unwrap() .value().unwrap(), None, &mut vec![]).to_string()); @@ -444,6 +465,8 @@ pub fn build_ui(application: &Application) { folder_chooser_label.set_label(&folder_chooser_name.to_string_lossy()); let folder_chooser_icon = config_management::folder_icon(folder_chooser_name.to_str()); folder_chooser_image.set_icon_name(Some(folder_chooser_icon)); + folder_chooser_button.set_tooltip_text(Some(&bundle.format_pattern(bundle.get_message("folder-tooltip").unwrap() + .value().unwrap(), None, &mut vec![]).to_string())); // Show file chooser dialog folder_chooser_button.connect_clicked(glib::clone!(@strong folder_chooser_native => move |_| { folder_chooser_native.connect_response(glib::clone!(@strong folder_chooser_native, @strong folder_chooser_label, @strong folder_chooser_image => move |_, response| { @@ -463,6 +486,8 @@ pub fn build_ui(application: &Application) { // --- connections // Show dialog window when about button clicked then hide it after close let _about_dialog: AboutDialog = about_dialog.to_owned(); + about_button.set_tooltip_text(Some(&bundle.format_pattern(bundle.get_message("about-tooltip").unwrap() + .value().unwrap(), None, &mut vec![]).to_string())); about_button.set_label(&bundle.format_pattern(bundle.get_message("about").unwrap() .value().unwrap(), None, &mut vec![]).to_string()); about_button.connect_clicked(move |_| { @@ -495,6 +520,8 @@ pub fn build_ui(application: &Application) { let record_window: Rc> = Rc::new(RefCell::new(false)); let window_grab_button_record_window: Rc> = record_window.clone(); let screen_grab_button_record_window: Rc> = record_window.clone(); + screen_grab_button.set_tooltip_text(Some(&bundle.format_pattern(bundle.get_message("screen-tooltip").unwrap() + .value().unwrap(), None, &mut vec![]).to_string())); screen_grab_label.set_label(&bundle.format_pattern(bundle.get_message("select-screen").unwrap() .value().unwrap(), None, &mut vec![]).to_string()); screen_grab_button.connect_clicked(move |_| { @@ -505,6 +532,8 @@ pub fn build_ui(application: &Application) { let _area_chooser_window: Window = area_chooser_window.clone(); let mut _area_capture: Rc> = area_capture.clone(); + window_grab_button.set_tooltip_text(Some(&bundle.format_pattern(bundle.get_message("window-tooltip").unwrap() + .value().unwrap(), None, &mut vec![]).to_string())); window_grab_label.set_label(&bundle.format_pattern(bundle.get_message("select-window").unwrap() .value().unwrap(), None, &mut vec![]).to_string()); window_grab_button.connect_clicked(move |_| { @@ -558,6 +587,8 @@ pub fn build_ui(application: &Application) { let _record_button = record_button.clone(); let _record_time_label = record_time_label.clone(); let _stop_button = stop_button.clone(); + record_button.set_tooltip_text(Some(&bundle.format_pattern(bundle.get_message("record-tooltip").unwrap() + .value().unwrap(), None, &mut vec![]).to_string())); record_label.set_label(&bundle.format_pattern(bundle.get_message("record").unwrap() .value().unwrap(), None, &mut vec![]).to_string()); delay_window_title.set_label(&bundle.format_pattern(bundle.get_message("delay-title").unwrap() @@ -604,6 +635,8 @@ pub fn build_ui(application: &Application) { let mut _ffmpeg_record_interface = ffmpeg_record_interface.clone(); let _play_button = play_button.clone(); let _stop_button = stop_button.clone(); + stop_button.set_tooltip_text(Some(&bundle.format_pattern(bundle.get_message("stop-tooltip").unwrap() + .value().unwrap(), None, &mut vec![]).to_string())); stop_label.set_label(&bundle.format_pattern(bundle.get_message("stop-recording").unwrap() .value().unwrap(), None, &mut vec![]).to_string()); stop_button.connect_clicked(move |_| { @@ -647,27 +680,78 @@ pub fn build_ui(application: &Application) { about_dialog.set_program_name(Some(&bundle.format_pattern(bundle.get_message("blue-recorder").unwrap() .value().unwrap(), None, &mut vec![]).to_string())); about_dialog.set_version(Some("0.2.0")); - about_dialog.set_copyright(Some("© 2021 Salem Yaslem")); + about_dialog.set_copyright(Some(&bundle.format_pattern(bundle.get_message("copy-right").unwrap() + .value().unwrap(), None, &mut vec![]).to_string())); about_dialog.set_wrap_license(true); - about_dialog.set_license(Some("Blue Recorder is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n\nBlue Recorder is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\nSee the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Blue Recorder. If not, see .")); + about_dialog.set_license(Some(&bundle.format_pattern(bundle.get_message("license").unwrap() + .value().unwrap(), None, &mut vec![]).to_string())); about_dialog.set_comments(Some(&bundle.format_pattern(bundle.get_message("dialog-comment").unwrap() .value().unwrap(), None, &mut vec![]).to_string())); - about_dialog.set_authors(&[ - "Salem Yaslem ", - "M.Hanny Sabbagh ", - "Alessandro Toia ", - "Suliman Altassan ", - "O.Chibani <11yzyv86j@relay.firefox.com>", - "Patreon Supporters: Ahmad Gharib, Medium,\nWilliam Grunow, Alex Benishek.", - ]); - about_dialog.set_artists(&[ - "Mustapha Assabar", - "Abdullah Al-Baroty ", - ]); - // Translators: Replace "translator-credits" with your names, one name per line - about_dialog.set_translator_credits(Some(&bundle.format_pattern(bundle.get_message("translator-credits").unwrap() - .value().unwrap(), None, &mut vec![]).to_string())); + // Authors + about_dialog.add_credit_section( + &bundle.format_pattern(bundle.get_message("authors").unwrap() + .value().unwrap(), None, &mut vec![]).to_string(), + &[&bundle.format_pattern(bundle.get_message("address-abdullah-al-baroty").unwrap() + .value().unwrap(), None, &mut vec![]).to_string(), + &bundle.format_pattern(bundle.get_message("address-alessandro-toia").unwrap() + .value().unwrap(), None, &mut vec![]).to_string(), + &bundle.format_pattern(bundle.get_message("address-chibani").unwrap() + .value().unwrap(), None, &mut vec![]).to_string(), + &bundle.format_pattern(bundle.get_message("address-hanny-sabbagh").unwrap() + .value().unwrap(), None, &mut vec![]).to_string(), + &bundle.format_pattern(bundle.get_message("address-salem-yaslem").unwrap() + .value().unwrap(), None, &mut vec![]).to_string(), + &bundle.format_pattern(bundle.get_message("address-suliman-altassan").unwrap() + .value().unwrap(), None, &mut vec![]).to_string(), + ] + ); + // Patreon suppoters + about_dialog.add_credit_section( + &bundle.format_pattern(bundle.get_message("patreon").unwrap() + .value().unwrap(), None, &mut vec![]).to_string(), + &[&bundle.format_pattern(bundle.get_message("address-ahmad-gharib").unwrap() + .value().unwrap(), None, &mut vec![]).to_string(), + &bundle.format_pattern(bundle.get_message("address-medium").unwrap() + .value().unwrap(), None, &mut vec![]).to_string(), + &bundle.format_pattern(bundle.get_message("address-william-grunow").unwrap() + .value().unwrap(), None, &mut vec![]).to_string(), + &bundle.format_pattern(bundle.get_message("address-alex-benishek").unwrap() + .value().unwrap(), None, &mut vec![]).to_string(), + ] + ); + // Designers + about_dialog.add_credit_section( + &bundle.format_pattern(bundle.get_message("design").unwrap() + .value().unwrap(), None, &mut vec![]).to_string(), + &[&bundle.format_pattern(bundle.get_message("address-abdullah-al-baroty").unwrap() + .value().unwrap(), None, &mut vec![]).to_string(), + &bundle.format_pattern(bundle.get_message("address-mustapha-assabar").unwrap() + .value().unwrap(), None, &mut vec![]).to_string(), + ] + ); + // Translators + about_dialog.add_credit_section( + &bundle.format_pattern(bundle.get_message("translate").unwrap() + .value().unwrap(), None, &mut vec![]).to_string(), + &[&bundle.format_pattern(bundle.get_message("address-ake-engelbrektson").unwrap() + .value().unwrap(), None, &mut vec![]).to_string(), + &bundle.format_pattern(bundle.get_message("address-amerey").unwrap() + .value().unwrap(), None, &mut vec![]).to_string(), + &bundle.format_pattern(bundle.get_message("address-gmou3").unwrap() + .value().unwrap(), None, &mut vec![]).to_string(), + &bundle.format_pattern(bundle.get_message("address-larry-wei").unwrap() + .value().unwrap(), None, &mut vec![]).to_string(), + &bundle.format_pattern(bundle.get_message("address-mark-wagie").unwrap() + .value().unwrap(), None, &mut vec![]).to_string(), + &bundle.format_pattern(bundle.get_message("address-albanobattistella").unwrap() + .value().unwrap(), None, &mut vec![]).to_string(), + &bundle.format_pattern(bundle.get_message("address-mr-Narsus").unwrap() + .value().unwrap(), None, &mut vec![]).to_string(), + ] + ); about_dialog.set_website(Some("https://github.com/xlmnxp/blue-recorder/")); + about_dialog.set_website_label(&bundle.format_pattern(bundle.get_message("website").unwrap() + .value().unwrap(), None, &mut vec![]).to_string()); about_dialog.set_logo_icon_name(Some("blue-recorder")); about_dialog.set_logo(logo.paintable().as_ref()); about_dialog.set_modal(true); diff --git a/src/timer.rs b/src/timer.rs index b244c49..010bdcf 100644 --- a/src/timer.rs +++ b/src/timer.rs @@ -4,8 +4,8 @@ use gtk::glib; use gtk::{Button, ToggleButton, Label, SpinButton, Window}; use gtk::prelude::*; -pub fn recording_delay(delay_spin: SpinButton, mut delay_time: u64, delay_window: Window, - delay_window_button: ToggleButton, delay_window_label: Label, record_button: Button) { +pub fn recording_delay(delay_spin: SpinButton, mut delay_time: u64, delay_window: Window, delay_window_button: ToggleButton, + delay_window_label: Label, record_button: Button) { // Keep time label alive and update every 1sec let default_value = delay_time; let capture_delay_label = move || { @@ -56,7 +56,7 @@ pub fn stop_timer(record_time_label: Label) { fn current_delay_time(delay_time: u64) -> String { let delay = secfmt::from(delay_time); - format!("{:02}:{:02}", delay.minutes, delay.seconds) + format!("{:02}", delay.seconds) } fn current_record_time(start_time: u64) -> String {