From 90b7e449b76219ee981fbd5588f65334a9b9aaa0 Mon Sep 17 00:00:00 2001 From: Arthur <79015591+arthur-adriansens@users.noreply.github.com> Date: Sat, 7 Dec 2024 15:46:01 +0000 Subject: [PATCH 1/6] Added "Toggling apps to minimize once it clicked" #944 feature --- src/gui/src/UI/UITaskbarItem.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/gui/src/UI/UITaskbarItem.js b/src/gui/src/UI/UITaskbarItem.js index 31007ee9c..d3937dee3 100644 --- a/src/gui/src/UI/UITaskbarItem.js +++ b/src/gui/src/UI/UITaskbarItem.js @@ -73,8 +73,16 @@ function UITaskbarItem(options){ return; if(options.onClick === undefined || options.onClick(el_taskbar_item) === false){ + const clicked_window = $(`.window[data-app="${options.app}"]`) + + // hide window, unless there's more than one in app group + if (clicked_window.hasClass("window-active") && clicked_window.length < 2) { + clicked_window.hideWindow(); + return; + } + // re-show each window in this app group - $(`.window[data-app="${options.app}"]`).showWindow(); + clicked_window.showWindow(); } }) From 6a2f5f0eeec0f91f7c5ab4fba8cc820b6fb2d0b8 Mon Sep 17 00:00:00 2001 From: Arthur <79015591+arthur-adriansens@users.noreply.github.com> Date: Sat, 7 Dec 2024 16:20:22 +0000 Subject: [PATCH 2/6] Added sattisfying taskbar icon animation --- src/gui/src/UI/UITaskbarItem.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/gui/src/UI/UITaskbarItem.js b/src/gui/src/UI/UITaskbarItem.js index d3937dee3..28fc78922 100644 --- a/src/gui/src/UI/UITaskbarItem.js +++ b/src/gui/src/UI/UITaskbarItem.js @@ -72,11 +72,23 @@ function UITaskbarItem(options){ if($(el_taskbar_item).hasClass('has-open-contextmenu')) return; + el_taskbar_item.querySelector("img").animate( + [ + { transform: 'translateY(0) scale(1)' }, + { transform: 'translateY(-5px) scale(1.2)' }, + { transform: 'translateY(0) scale(1)' } + ], + { + duration: 300, + easing: 'ease-out', + } + ); + if(options.onClick === undefined || options.onClick(el_taskbar_item) === false){ const clicked_window = $(`.window[data-app="${options.app}"]`) // hide window, unless there's more than one in app group - if (clicked_window.hasClass("window-active") && clicked_window.length < 2) { + if (clicked_window.hasClass("window-active") && clicked_window.length < 2) { clicked_window.hideWindow(); return; } From 1d6bc54ae6c4d6bc3940c86feb80d7317689f8a4 Mon Sep 17 00:00:00 2001 From: wildanhkm Date: Sat, 7 Dec 2024 23:20:47 +0700 Subject: [PATCH 3/6] update id translations --- src/gui/src/i18n/translations/id.js | 92 ++++++++++++++--------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/src/gui/src/i18n/translations/id.js b/src/gui/src/i18n/translations/id.js index adf4b55aa..13fc1a232 100644 --- a/src/gui/src/i18n/translations/id.js +++ b/src/gui/src/i18n/translations/id.js @@ -386,52 +386,52 @@ const id = { // ---------------------------------------- // Missing translations: // ---------------------------------------- - "billing.change_payment_method": undefined, // In English: "Change" - "billing.cancel": undefined, // In English: "Cancel" - "billing.download_invoice": undefined, // In English: "Download" - "billing.payment_method": undefined, // In English: "Payment Method" - "billing.payment_method_updated": undefined, // In English: "Payment method updated!" - "billing.confirm_payment_method": undefined, // In English: "Confirm Payment Method" - "billing.payment_history": undefined, // In English: "Payment History" - "billing.refunded": undefined, // In English: "Refunded" - "billing.paid": undefined, // In English: "Paid" - "billing.ok": undefined, // In English: "OK" - "billing.resume_subscription": undefined, // In English: "Resume Subscription" - "billing.subscription_cancelled": undefined, // In English: "Your subscription has been canceled." - "billing.subscription_cancelled_description": undefined, // In English: "You will still have access to your subscription until the end of this billing period." - "billing.offering.free": undefined, // In English: "Free" - "billing.offering.pro": undefined, // In English: "Professional" - "billing.offering.business": undefined, // In English: "Business" - "billing.cloud_storage": undefined, // In English: "Cloud Storage" - "billing.ai_access": undefined, // In English: "AI Access" - "billing.bandwidth": undefined, // In English: "Bandwidth" - "billing.apps_and_games": undefined, // In English: "Apps & Games" - "billing.upgrade_to_pro": undefined, // In English: "Upgrade to %strong%" - "billing.switch_to": undefined, // In English: "Switch to %strong%" - "billing.payment_setup": undefined, // In English: "Payment Setup" - "billing.back": undefined, // In English: "Back" - "billing.you_are_now_subscribed_to": undefined, // In English: "You are now subscribed to %strong% tier." - "billing.you_are_now_subscribed_to_without_tier": undefined, // In English: "You are now subscribed" - "billing.subscription_cancellation_confirmation": undefined, // In English: "Are you sure you want to cancel your subscription?" - "billing.subscription_setup": undefined, // In English: "Subscription Setup" - "billing.cancel_it": undefined, // In English: "Cancel It" - "billing.keep_it": undefined, // In English: "Keep It" - "billing.subscription_resumed": undefined, // In English: "Your %strong% subscription has been resumed!" - "billing.upgrade_now": undefined, // In English: "Upgrade Now" - "billing.upgrade": undefined, // In English: "Upgrade" - "billing.currently_on_free_plan": undefined, // In English: "You are currently on the free plan." - "billing.download_receipt": undefined, // In English: "Download Receipt" - "billing.subscription_check_error": undefined, // In English: "A problem occurred while checking your subscription status." - "billing.email_confirmation_needed": undefined, // In English: "Your email has not been confirmed. We'll send you a code to confirm it now." - "billing.sub_cancelled_but_valid_until": undefined, // In English: "You have cancelled your subscription and it will automatically switch to the free tier at the end of the billing period. You will not be charged again unless you re-subscribe." - "billing.current_plan_until_end_of_period": undefined, // In English: "Your current plan until the end of this billing period." - "billing.current_plan": undefined, // In English: "Current plan" - "billing.cancelled_subscription_tier": undefined, // In English: "Cancelled Subscription (%%)" - "billing.manage": undefined, // In English: "Manage" - "billing.limited": undefined, // In English: "Limited" - "billing.expanded": undefined, // In English: "Expanded" - "billing.accelerated": undefined, // In English: "Accelerated" - "billing.enjoy_msg": undefined, // In English: "Enjoy %% of Cloud Storage plus other benefits." + "billing.change_payment_method": "Ubah metode pembayaran", // In English: "Change" + "billing.cancel": "Batalkan", // In English: "Cancel" + "billing.download_invoice": "Unduh faktur", // In English: "Download" + "billing.payment_method": "Metode pembayaran", // In English: "Payment Method" + "billing.payment_method_updated": "Berhasil memperbarui metode pembayaran", // In English: "Payment method updated!" + "billing.confirm_payment_method": "Konfirmasi metode pembayaran", // In English: "Confirm Payment Method" + "billing.payment_history": "Riwayat pembayaran", // In English: "Payment History" + "billing.refunded": "Dana dikembalikan", // In English: "Refunded" + "billing.paid": "Terbayar", // In English: "Paid" + "billing.ok": "OK", // In English: "OK" + "billing.resume_subscription": "Lanjutkann berlangganan", // In English: "Resume Subscription" + "billing.subscription_cancelled": "Langganan Anda sudah dibatalkan", // In English: "Your subscription has been canceled." + "billing.subscription_cancelled_description": "Anda masih akan memiliki akses ke langganan Anda hingga akhir periode penagihan ini", // In English: "You will still have access to your subscription until the end of this billing period." + "billing.offering.free": "Gratis", // In English: "Free" + "billing.offering.pro": "Profesional", // In English: "Professional" + "billing.offering.business": "Bisnis", // In English: "Business" + "billing.cloud_storage": "Penyimpanan Awan", // In English: "Cloud Storage" + "billing.ai_access": "Akses Kecerdasan Buatan", // In English: "AI Access" + "billing.bandwidth": "Lebar pita", // In English: "Bandwidth" + "billing.apps_and_games": "Aplikasi & Permainan", // In English: "Apps & Games" + "billing.upgrade_to_pro": "Tingkatkan ke %strong%", // In English: "Upgrade to %strong%" + "billing.switch_to": "Ubah ke %strong%", // In English: "Switch to %strong%" + "billing.payment_setup": "Pengaturan pembayaran", // In English: "Payment Setup" + "billing.back": "Kembali", // In English: "Back" + "billing.you_are_now_subscribed_to": "Saat ini Anda berlangganan paket %strong%", // In English: "You are now subscribed to %strong% tier." + "billing.you_are_now_subscribed_to_without_tier": "Saat ini Anda sudah berlangganan", // In English: "You are now subscribed" + "billing.subscription_cancellation_confirmation": "Apakah Anda yakin untuk membatalkan langganan Anda?", // In English: "Are you sure you want to cancel your subscription?" + "billing.subscription_setup": "Pengaturan langganan", // In English: "Subscription Setup" + "billing.cancel_it": "Batalkan", // In English: "Cancel It" + "billing.keep_it": "Simpan", // In English: "Keep It" + "billing.subscription_resumed": "Paket langganan %strong% Anda telah dilanjutkan", // In English: "Your %strong% subscription has been resumed!" + "billing.upgrade_now": "Tingkatkan Sekarang", // In English: "Upgrade Now" + "billing.upgrade": "Tingkatkan", // In English: "Upgrade" + "billing.currently_on_free_plan": "Saat ini Anda menggunakan paket gratis", // In English: "You are currently on the free plan." + "billing.download_receipt": "Unduh Kuitansi", // In English: "Download Receipt" + "billing.subscription_check_error": "Terjadi kesalahan saat memeriksa status berlangganan Anda", // In English: "A problem occurred while checking your subscription status." + "billing.email_confirmation_needed": "Email Anda belum terkonfirmasi. Kami akan mengirimkan kode untuk mengonfirmasinya", // In English: "Your email has not been confirmed. We'll send you a code to confirm it now." + "billing.sub_cancelled_but_valid_until": "Anda telah membatalkan langganan Anda dan akan secara otomatis berubah ke paket gratis pada akhir periode tagihan. Anda tidak akan ditagih kecuali Anda memilih untuk berlangganan kembali", // In English: "You have cancelled your subscription and it will automatically switch to the free tier at the end of the billing period. You will not be charged again unless you re-subscribe." + "billing.current_plan_until_end_of_period": "Paket langganan Anda sampai akhir periode tagihan ini", // In English: "Your current plan until the end of this billing period." + "billing.current_plan": "Paket saat ini", // In English: "Current plan" + "billing.cancelled_subscription_tier": "Langganan yang Dibatalkan (%%)", // In English: "Cancelled Subscription (%%)" + "billing.manage": "Kelola", // In English: "Manage" + "billing.limited": "Terbatas", // In English: "Limited" + "billing.expanded": "Diperluas", // In English: "Expanded" + "billing.accelerated": "Dipercepat", // In English: "Accelerated" + "billing.enjoy_msg": "Nikmati %% Penyimpanan Awan serta manfaat lainnya", // In English: "Enjoy %% of Cloud Storage plus other benefits." }, }; From 34ab6dbdffa793cc51029e85d3e640c3e4a25c75 Mon Sep 17 00:00:00 2001 From: raf Date: Sat, 7 Dec 2024 23:47:58 +0700 Subject: [PATCH 4/6] Fix issue #970: [updated undefined values for bahasa translation] --- src/gui/src/i18n/translations/id.js | 93 +++++++++++++++-------------- 1 file changed, 47 insertions(+), 46 deletions(-) diff --git a/src/gui/src/i18n/translations/id.js b/src/gui/src/i18n/translations/id.js index adf4b55aa..4fe520de6 100644 --- a/src/gui/src/i18n/translations/id.js +++ b/src/gui/src/i18n/translations/id.js @@ -386,52 +386,53 @@ const id = { // ---------------------------------------- // Missing translations: // ---------------------------------------- - "billing.change_payment_method": undefined, // In English: "Change" - "billing.cancel": undefined, // In English: "Cancel" - "billing.download_invoice": undefined, // In English: "Download" - "billing.payment_method": undefined, // In English: "Payment Method" - "billing.payment_method_updated": undefined, // In English: "Payment method updated!" - "billing.confirm_payment_method": undefined, // In English: "Confirm Payment Method" - "billing.payment_history": undefined, // In English: "Payment History" - "billing.refunded": undefined, // In English: "Refunded" - "billing.paid": undefined, // In English: "Paid" - "billing.ok": undefined, // In English: "OK" - "billing.resume_subscription": undefined, // In English: "Resume Subscription" - "billing.subscription_cancelled": undefined, // In English: "Your subscription has been canceled." - "billing.subscription_cancelled_description": undefined, // In English: "You will still have access to your subscription until the end of this billing period." - "billing.offering.free": undefined, // In English: "Free" - "billing.offering.pro": undefined, // In English: "Professional" - "billing.offering.business": undefined, // In English: "Business" - "billing.cloud_storage": undefined, // In English: "Cloud Storage" - "billing.ai_access": undefined, // In English: "AI Access" - "billing.bandwidth": undefined, // In English: "Bandwidth" - "billing.apps_and_games": undefined, // In English: "Apps & Games" - "billing.upgrade_to_pro": undefined, // In English: "Upgrade to %strong%" - "billing.switch_to": undefined, // In English: "Switch to %strong%" - "billing.payment_setup": undefined, // In English: "Payment Setup" - "billing.back": undefined, // In English: "Back" - "billing.you_are_now_subscribed_to": undefined, // In English: "You are now subscribed to %strong% tier." - "billing.you_are_now_subscribed_to_without_tier": undefined, // In English: "You are now subscribed" - "billing.subscription_cancellation_confirmation": undefined, // In English: "Are you sure you want to cancel your subscription?" - "billing.subscription_setup": undefined, // In English: "Subscription Setup" - "billing.cancel_it": undefined, // In English: "Cancel It" - "billing.keep_it": undefined, // In English: "Keep It" - "billing.subscription_resumed": undefined, // In English: "Your %strong% subscription has been resumed!" - "billing.upgrade_now": undefined, // In English: "Upgrade Now" - "billing.upgrade": undefined, // In English: "Upgrade" - "billing.currently_on_free_plan": undefined, // In English: "You are currently on the free plan." - "billing.download_receipt": undefined, // In English: "Download Receipt" - "billing.subscription_check_error": undefined, // In English: "A problem occurred while checking your subscription status." - "billing.email_confirmation_needed": undefined, // In English: "Your email has not been confirmed. We'll send you a code to confirm it now." - "billing.sub_cancelled_but_valid_until": undefined, // In English: "You have cancelled your subscription and it will automatically switch to the free tier at the end of the billing period. You will not be charged again unless you re-subscribe." - "billing.current_plan_until_end_of_period": undefined, // In English: "Your current plan until the end of this billing period." - "billing.current_plan": undefined, // In English: "Current plan" - "billing.cancelled_subscription_tier": undefined, // In English: "Cancelled Subscription (%%)" - "billing.manage": undefined, // In English: "Manage" - "billing.limited": undefined, // In English: "Limited" - "billing.expanded": undefined, // In English: "Expanded" - "billing.accelerated": undefined, // In English: "Accelerated" - "billing.enjoy_msg": undefined, // In English: "Enjoy %% of Cloud Storage plus other benefits." + "billing.change_payment_method": "Ubah", // In English: "Change" + "billing.cancel": "Batal", // In English: "Cancel" + "billing.download_invoice": "Unduh", // In English: "Download" + "billing.payment_method": "Metode Pembayaran", // In English: "Payment Method" + "billing.payment_method_updated": "Metode pembayaran diperbarui!", // In English: "Payment method updated!" + "billing.confirm_payment_method": "Konfirmasi Metode Pembayaran", // In English: "Confirm Payment Method" + "billing.payment_history": "Riwayat Pembayaran", // In English: "Payment History" + "billing.refunded": "Dikembalikan", // In English: "Refunded" + "billing.paid": "Dibayar", // In English: "Paid" + "billing.ok": "OK", // In English: "OK" + "billing.resume_subscription": "Lanjutkan Berlangganan", // In English: "Resume Subscription" + "billing.subscription_cancelled": "Langganan Anda telah dibatalkan.", // In English: "Your subscription has been canceled." + "billing.subscription_cancelled_description": "Anda masih memiliki akses ke langganan Anda hingga akhir periode penagihan ini.", // In English: "You will still have access to your subscription until the end of this billing period." + "billing.offering.free": "Gratis", // In English: "Free" + "billing.offering.pro": "Profesional", // In English: "Professional" + "billing.offering.business": "Bisnis", // In English: "Business" + "billing.cloud_storage": "Penyimpanan Cloud", // In English: "Cloud Storage" + "billing.ai_access": "Akses AI", // In English: "AI Access" + "billing.bandwidth": "Bandwidth", // In English: "Bandwidth" + "billing.apps_and_games": "Aplikasi & Game", // In English: "Apps & Games" + "billing.switch_to": "Beralih ke %strong%", // In English: "Switch to %strong%" + "billing.payment_setup": "Pengaturan Pembayaran", // In English: "Payment Setup" + "billing.back": "Kembali", // In English: "Back" + "billing.you_are_now_subscribed_to": "Anda sekarang berlangganan paket %strong%.", // In English: "You are now subscribed to %strong% tier." + "billing.you_are_now_subscribed_to_without_tier": "Anda sekarang berlangganan", // In English: "You are now subscribed" + "billing.subscription_cancellation_confirmation": "Apakah Anda yakin ingin membatalkan langganan Anda?", // In English: "Are you sure you want to cancel your subscription?" + "billing.subscription_setup": "Pengaturan Langganan", // In English: "Subscription Setup" + "billing.cancel_it": "Batalkan", // In English: "Cancel It" + "billing.keep_it": "Pertahankan", // In English: "Keep It" + "billing.subscription_resumed": "Langganan %strong% Anda telah dilanjutkan!", // In English: "Your %strong% subscription has been resumed!" + //Note: literal translation of 'upgrade' is 'tingkatkan' but for this context 'upgrade' more commonly used + "billing.upgrade": "Upgrade", // In English: "Upgrade" + "billing.upgrade_to_pro": "Upgrade ke %strong%", // In English: "Upgrade to %strong%" + "billing.upgrade_now": "Upgrade Sekarang", // In English: "Upgrade Now" + "billing.currently_on_free_plan": "Anda saat ini menggunakan paket gratis.", // In English: "You are currently on the free plan." + "billing.download_receipt": "Unduh Bukti Pembayaran", // In English: "Download Receipt" + "billing.subscription_check_error": "Terjadi masalah saat memeriksa status langganan Anda.", // In English: "A problem occurred while checking your subscription status." + "billing.email_confirmation_needed": "Email Anda belum dikonfirmasi. Kami akan mengirimkan kode untuk mengonfirmasinya sekarang.", // In English: "Your email has not been confirmed. We'll send you a code to confirm it now." + "billing.sub_cancelled_but_valid_until": "Anda telah membatalkan langganan Anda dan secara otomatis akan beralih ke paket gratis di akhir periode penagihan. Anda tidak akan dikenakan biaya lagi kecuali Anda berlangganan ulang.", // In English: "You have cancelled your subscription and it will automatically switch to the free tier at the end of the billing period. You will not be charged again unless you re-subscribe." + "billing.current_plan_until_end_of_period": "Paket Anda saat ini berlaku hingga akhir periode penagihan ini.", // In English: "Your current plan until the end of this billing period." + "billing.current_plan": "Paket saat ini", // In English: "Current plan" + "billing.cancelled_subscription_tier": "Langganan Dibatalkan (%%)", // In English: "Cancelled Subscription (%%)" + "billing.manage": "Kelola", // In English: "Manage" + "billing.limited": "Terbatas", // In English: "Limited" + "billing.expanded": "Diperluas", // In English: "Expanded" + "billing.accelerated": "Dipercepat", // In English: "Accelerated" + "billing.enjoy_msg": "Nikmati %% dari Penyimpanan Cloud dan manfaat lainnya." // In English: "Enjoy %% of Cloud Storage plus other benefits." }, }; From 383b4841ae3eaf3dea92cf388651f668dd5989de Mon Sep 17 00:00:00 2001 From: jelveh Date: Sat, 7 Dec 2024 10:16:25 -0800 Subject: [PATCH 5/6] fix the issue with windows losing focus right after they're opened --- src/gui/src/UI/UITaskbarItem.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/src/UI/UITaskbarItem.js b/src/gui/src/UI/UITaskbarItem.js index 28fc78922..687c11c35 100644 --- a/src/gui/src/UI/UITaskbarItem.js +++ b/src/gui/src/UI/UITaskbarItem.js @@ -67,7 +67,10 @@ function UITaskbarItem(options){ // fade in the taskbar item $(el_taskbar_item).show(50); - $(el_taskbar_item).on("click", function(){ + $(el_taskbar_item).on("click", function(e){ + e.preventDefault(); + e.stopPropagation(); + // If this item has an open context menu, don't do anything if($(el_taskbar_item).hasClass('has-open-contextmenu')) return; From e9ac20b8b00c2a54cb6d6e6406cede63b754dd5f Mon Sep 17 00:00:00 2001 From: Nariman Jelveh Date: Sat, 7 Dec 2024 10:30:28 -0800 Subject: [PATCH 6/6] Update id.js --- src/gui/src/i18n/translations/id.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/gui/src/i18n/translations/id.js b/src/gui/src/i18n/translations/id.js index 4fe520de6..b83892319 100644 --- a/src/gui/src/i18n/translations/id.js +++ b/src/gui/src/i18n/translations/id.js @@ -383,9 +383,6 @@ const id = { "You can't share with yourself.": "Anda tidak bisa membaginya dengan diri sendiri.", // In English: "You can't share with yourself." "This user already has access to this item": "Pengguna ini telah memiliki akses ke barang ini", // In English: "This user already has access to this item" - // ---------------------------------------- - // Missing translations: - // ---------------------------------------- "billing.change_payment_method": "Ubah", // In English: "Change" "billing.cancel": "Batal", // In English: "Cancel" "billing.download_invoice": "Unduh", // In English: "Download"