From dadb74efc09745dfe102811f87dcf37d9e9bcb90 Mon Sep 17 00:00:00 2001 From: vcatafesta Date: Mon, 5 Aug 2024 19:54:35 -0400 Subject: [PATCH 1/7] seg 05 ago 2024 19:54:35 -04 Vilmar Catafesta (vcatafesta@gmail.com) --- .../bcc/apps/big-store/config.sh.htm | 169 +++++++++--------- .../bcc/apps/big-store/icons/pamac.svg | 8 + 2 files changed, 94 insertions(+), 83 deletions(-) create mode 100644 big-store/usr/share/bigbashview/bcc/apps/big-store/icons/pamac.svg diff --git a/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm b/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm index f55665022..160799a03 100755 --- a/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm +++ b/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm @@ -40,7 +40,7 @@ [[ -f "${LIBRARY}/tinilib.sh" ]] && source "${LIBRARY}/tinilib.sh" [[ -f "${LIBRARY}/bstrlib.sh" ]] && source "${LIBRARY}/bstrlib.sh" -function sh_config { +function sh_config_sh_htm_config { #Translation export TEXTDOMAINDIR="/usr/share/locale" export TEXTDOMAIN=big-store @@ -68,10 +68,11 @@ declare -g Configuracoes=$"Configurações" declare -g MsgSnap=$"Para os programas Snap aparecerem no menu do sistema finalize a sessão e faça login novamente." declare -g MsgFlatpak=$"Para os programas Flatpak aparecerem no menu do sistema finalize a sessão e faça login novamente." + declare -g Ao_instalar_pacotes_verificar_se_ha_atualizacoes=$"Ao instalar pacotes, verificar se há atualizações:" declare -g tmp_file_upgradeable="${TMP_FOLDER}/upgradeable.txt" } -function sh_style { +function sh_config_sh_htm_style { cat <<-EOF + + + From ce2abcd65e94b3c8a1add7bd1aa343ebd3ecbe06 Mon Sep 17 00:00:00 2001 From: vcatafesta Date: Mon, 5 Aug 2024 21:29:07 -0400 Subject: [PATCH 2/7] seg 05 ago 2024 21:29:07 -04 Vilmar Catafesta (vcatafesta@gmail.com) --- .../bcc/apps/big-store/big-store-start.sh | 4 ++++ .../bcc/apps/big-store/config.sh.htm | 20 +++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/big-store/usr/share/bigbashview/bcc/apps/big-store/big-store-start.sh b/big-store/usr/share/bigbashview/bcc/apps/big-store/big-store-start.sh index 8ddc03db1..5f6846caf 100755 --- a/big-store/usr/share/bigbashview/bcc/apps/big-store/big-store-start.sh +++ b/big-store/usr/share/bigbashview/bcc/apps/big-store/big-store-start.sh @@ -100,6 +100,10 @@ function sh_big_store_start_sh_main { [[ ! -e "$flatpak_cache_file" ]] || [[ "$(find "$flatpak_cache_file" -mtime +1 -print)" ]] && sh_update_cache_flatpak "$processamento_em_paralelo" & fi + if [[ -z "$(TIni.Get "$INI_FILE_BIG_STORE" "PAMAC" "SimpleInstall")" ]]; then + TIni.Set "$INI_FILE_BIG_STORE" "PAMAC" "SimpleInstall" '1' + fi + if [[ ! -e $FILE_SUMMARY_JSON_CUSTOM ]]; then if [[ -e $FILE_SUMMARY_JSON ]]; then cp -f $FILE_SUMMARY_JSON $FILE_SUMMARY_JSON_CUSTOM diff --git a/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm b/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm index 160799a03..5659977fc 100755 --- a/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm +++ b/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm @@ -84,6 +84,7 @@ } function sh_config_sh_htm_main { + local SimpleInstall sh_config_sh_htm_style source header.sh.htm @@ -126,12 +127,25 @@ TIni.Set "$INI_FILE_BIG_STORE" "snap" "snap_active" '1' kdialog --title $"Big-Store" --msgbox "$MsgSnap\n\n$(systemctl status apparmor --lines=0)\n\n$(systemctl status snapd.apparmor --lines=0)\n\n$(systemctl status snapd --lines=0)" pacman -Qu | cut -f1 -d" " >>"$tmp_file_upgradeable" - fi - if [[ "$pkg_snap" = "n" ]]; then + elif [[ "$pkg_snap" = "n" ]]; then TIni.Set "$INI_FILE_BIG_STORE" "snap" "snap_active" '0' pacman -Qu | cut -f1 -d" " >>"$tmp_file_upgradeable" fi + if [[ "$update_SimpleInstall" = "y" ]]; then + SimpleInstall=$(sh_check_simple_install) + TIni.Set "$INI_FILE_BIG_STORE" "PAMAC" "SimpleInstall" '1' + if ! ((SimpleInstall)); then + pkexec sh_toggle_comment_pamac_conf 'comment' "SimpleInstall" "/etc/pamac.conf" + fi + elif [[ "$update_SimpleInstall" = "n" ]]; then + SimpleInstall=$(sh_check_simple_install) + TIni.Set "$INI_FILE_BIG_STORE" "PAMAC" "SimpleInstall" '0' + if !((SimpleInstall)); then + pkexec sh_toggle_comment_pamac_conf 'uncomment' "SimpleInstall" "/etc/pamac.conf" + fi + fi + [[ "$update_pacman" = "y" ]] && sh_run_action "update_pacman" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER" [[ "$update_pamac" = "y" ]] && sh_run_action "update_pamac" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER" [[ "$update_mirror" = "y" ]] && sh_run_action "update_mirror" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER" @@ -146,8 +160,6 @@ [[ "$update_traducao" = "n" ]] && TIni.Set "$INI_FILE_BIG_STORE" "bigstore" "traducao_online" '0' [[ "$update_xiva" = "y" ]] && TIni.Set "$INI_FILE_BIG_STORE" "XIVA" "xiva_active" '1' [[ "$update_xiva" = "n" ]] && TIni.Set "$INI_FILE_BIG_STORE" "XIVA" "xiva_active" '0' - [[ "$update_SimpleInstall" = "y" ]] && TIni.Set "$INI_FILE_BIG_STORE" "PAMAC" "SimpleInstall" '1' - [[ "$update_SimpleInstall" = "n" ]] && TIni.Set "$INI_FILE_BIG_STORE" "PAMAC" "SimpleInstall" '0' cat <<-EOF
From 4379784ffc1df98228a8a994e66da362bfe6889a Mon Sep 17 00:00:00 2001 From: vcatafesta Date: Mon, 5 Aug 2024 21:47:40 -0400 Subject: [PATCH 3/7] seg 05 ago 2024 21:47:40 -04 Vilmar Catafesta (vcatafesta@gmail.com) --- .../usr/share/bigbashview/bcc/apps/big-store/config.sh.htm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm b/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm index 5659977fc..5fcaff81d 100755 --- a/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm +++ b/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm @@ -136,13 +136,13 @@ SimpleInstall=$(sh_check_simple_install) TIni.Set "$INI_FILE_BIG_STORE" "PAMAC" "SimpleInstall" '1' if ! ((SimpleInstall)); then - pkexec sh_toggle_comment_pamac_conf 'comment' "SimpleInstall" "/etc/pamac.conf" + pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY sh_toggle_comment_pamac_conf 'comment' "SimpleInstall" "/etc/pamac.conf" fi elif [[ "$update_SimpleInstall" = "n" ]]; then SimpleInstall=$(sh_check_simple_install) TIni.Set "$INI_FILE_BIG_STORE" "PAMAC" "SimpleInstall" '0' if !((SimpleInstall)); then - pkexec sh_toggle_comment_pamac_conf 'uncomment' "SimpleInstall" "/etc/pamac.conf" + pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY sh_toggle_comment_pamac_conf 'uncomment' "SimpleInstall" "/etc/pamac.conf" fi fi From c9080d2b81f0e64fdc6b392ac1fbdf93f1eb0789 Mon Sep 17 00:00:00 2001 From: vcatafesta Date: Tue, 6 Aug 2024 00:58:08 -0400 Subject: [PATCH 4/7] ter 06 ago 2024 00:58:08 -04 Vilmar Catafesta (vcatafesta@gmail.com) --- .../bcc/apps/big-store/config.sh.htm | 153 +++++++++--------- .../bcc/apps/big-store/index.sh.htm | 8 +- 2 files changed, 79 insertions(+), 82 deletions(-) diff --git a/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm b/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm index 5fcaff81d..e8a207481 100755 --- a/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm +++ b/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm @@ -6,7 +6,7 @@ # Description: Big Store installing programs for BigLinux # # Created: 2022/11/01 -# Altered: 2024/07/31 +# Altered: 2024/08/05 # # Copyright (c) 2023-2024, Vilmar Catafesta # 2022-2023, Bruno Gonçalves @@ -34,7 +34,7 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. APP="${0##*/}" -_VERSION_="1.0.0-20240731" +_VERSION_="1.0.0-20240805" LIBRARY=${LIBRARY:-'/usr/share/bigbashview/bcc/shell'} [[ -f "${LIBRARY}/bcclib.sh" ]] && source "${LIBRARY}/bcclib.sh" [[ -f "${LIBRARY}/tinilib.sh" ]] && source "${LIBRARY}/tinilib.sh" @@ -66,8 +66,8 @@ declare -g Forcar_atualizacao_text=$"Forçar atualizações, utilize essa opção se não estiver conseguindo atualizar o sistema, porém, na atualização forçada alguns programas podem ser removidos." declare -g Repositorios_nativos_text=$"Repositórios nativos" declare -g Configuracoes=$"Configurações" - declare -g MsgSnap=$"Para os programas Snap aparecerem no menu do sistema finalize a sessão e faça login novamente." - declare -g MsgFlatpak=$"Para os programas Flatpak aparecerem no menu do sistema finalize a sessão e faça login novamente." + declare -g MsgSnap=$"Para o Snap aparecer no menu do sistema finalize essa instância do Big-Store e inicie novamente." + declare -g MsgFlatpak=$"Para o Flatpak aparecer no menu do sistema finalize essa instância do Big-Store e inicie novamente." declare -g Ao_instalar_pacotes_verificar_se_ha_atualizacoes=$"Ao instalar pacotes, verificar se há atualizações:" declare -g tmp_file_upgradeable="${TMP_FOLDER}/upgradeable.txt" } @@ -88,50 +88,50 @@ sh_config_sh_htm_style source header.sh.htm - # param $1 pkg_name libpamac-flatpak-plugin - # libpamac-snap-plugin +######################################################################################################################################################################################################## - if [[ -n "$pkg_install" ]] && [[ "$pkg_name" == "libpamac-snap-plugin" ]]; then - if ! sh_package_is_installed "$pkg_name"; then - sh_run_pamac_installer "$pkg_name" 'apparmor' 'snapd' - fi - # sh_run_action "enable_snapd" - sh_run_action_standalone "sh_enable_snapd_and_apparmor" - TIni.Set "$INI_FILE_BIG_STORE" "snap" "snap_active" '1' - kdialog --title $"Big-Store" --msgbox "$MsgSnap\n\n$(systemctl status apparmor --lines=0)\n\n$(systemctl status snapd.apparmor --lines=0)\n\n$(systemctl status snapd --lines=0)" - pacman -Qu | cut -f1 -d" " >>"$tmp_file_upgradeable" - fi - - if [[ -n "$pkg_install" ]] && [[ "$pkg_name" == "libpamac-flatpak-plugin" ]]; then + if [[ "$pkg_flatpak" = "y" ]]; then + pkg_name='libpamac-flatpak-plugin' if ! sh_package_is_installed "$pkg_name"; then sh_run_pamac_installer "$pkg_name" 'flatpak' fi TIni.Set "$INI_FILE_BIG_STORE" "flatpak" "flatpak_active" '1' - kdialog --title $"Big-Store" --msgbox "$MsgFlatpak\n\n$(flatpak --version)\n$(flatpak remotes)" [[ ! -e "$flatpak_cache_file" ]] || [[ "$(find "$flatpak_cache_file" -mtime +1 -print)" ]] && sh_update_cache_flatpak "$processamento_em_paralelo" 'quiet' & + kdialog --title $"Big-Store" --msgbox "$MsgFlatpak\n\n$(flatpak --version)\n$(flatpak remotes)" & pacman -Qu | cut -f1 -d" " >>"$tmp_file_upgradeable" - fi - - if [[ -n "$pkg_remove" ]]; then - if [[ "$pkg_name" = "libpamac-flatpak-plugin" ]]; then - TIni.Set "$INI_FILE_BIG_STORE" "flatpak" "flatpak_active" '0' - fi - if [[ "$pkg_name" = "libpamac-snap-plugin" ]]; then - TIni.Set "$INI_FILE_BIG_STORE" "snap" "snap_active" '0' - fi - # sh_run_pamac_remove $pkg_name + wait + elif [[ "$pkg_flatpak" = "n" ]]; then + TIni.Set "$INI_FILE_BIG_STORE" "flatpak" "flatpak_active" '0' pacman -Qu | cut -f1 -d" " >>"$tmp_file_upgradeable" fi +######################################################################################################################################################################################################## + if [[ "$pkg_snap" = "y" ]]; then + pkg_name='libpamac-snap-plugin' + if ! sh_package_is_installed "$pkg_name"; then + sh_run_pamac_installer "$pkg_name" 'apparmor' 'snapd' + fi + # sh_run_action "enable_snapd" + sh_run_action_standalone "sh_enable_snapd_and_apparmor" TIni.Set "$INI_FILE_BIG_STORE" "snap" "snap_active" '1' - kdialog --title $"Big-Store" --msgbox "$MsgSnap\n\n$(systemctl status apparmor --lines=0)\n\n$(systemctl status snapd.apparmor --lines=0)\n\n$(systemctl status snapd --lines=0)" + kdialog \ + --title $"Big-Store" \ + --msgbox "$MsgSnap +\nAVISO: Caso observe o erro (code=exited, status=42) no snapd, isso é esperado +quando nenhum snap é/está instalado. O snapd desliga em tais cenários. +\n$(systemctl status snapd --lines=0) +$(systemctl status apparmor --lines=0) +$(systemctl status snapd.apparmor --lines=0)" & pacman -Qu | cut -f1 -d" " >>"$tmp_file_upgradeable" + wait elif [[ "$pkg_snap" = "n" ]]; then TIni.Set "$INI_FILE_BIG_STORE" "snap" "snap_active" '0' pacman -Qu | cut -f1 -d" " >>"$tmp_file_upgradeable" fi +######################################################################################################################################################################################################## + if [[ "$update_SimpleInstall" = "y" ]]; then SimpleInstall=$(sh_check_simple_install) TIni.Set "$INI_FILE_BIG_STORE" "PAMAC" "SimpleInstall" '1' @@ -146,6 +146,8 @@ fi fi +######################################################################################################################################################################################################## + [[ "$update_pacman" = "y" ]] && sh_run_action "update_pacman" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER" [[ "$update_pamac" = "y" ]] && sh_run_action "update_pamac" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER" [[ "$update_mirror" = "y" ]] && sh_run_action "update_mirror" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER" @@ -161,6 +163,8 @@ [[ "$update_xiva" = "y" ]] && TIni.Set "$INI_FILE_BIG_STORE" "XIVA" "xiva_active" '1' [[ "$update_xiva" = "n" ]] && TIni.Set "$INI_FILE_BIG_STORE" "XIVA" "xiva_active" '0' +######################################################################################################################################################################################################## + cat <<-EOF
@@ -187,41 +191,34 @@
EOF if TIni.Exist "$INI_FILE_BIG_STORE" "flatpak" "flatpak_active" '1' && [[ -e "/usr/lib/libpamac-flatpak.so" ]]; then - cat <<-EOF - - - $Ativado_text - -
-
- -
-
- + local _circle='true' + local _checked='checked' + local _handle='n' + local _text=$Ativado_text + else + local _circle='false' + local _checked='' + local _handle='y' + local _text=$Desativado_text + fi + cat <<-EOF + + + $Ativado_text + +
+
+ +
+
+ EOF - else - cat <<-EOF - - - $Desativado_text - -
-
- -
-
- - EOF - fi - #FLATPAK + #FLATPAK END - #SNAP + #SNAP BEGIN cat <<-EOF
  • @@ -243,21 +240,21 @@ local _handle='y' local _text=$Desativado_text fi - cat <<-EOF - - - $_text - -
    -
    - -
    -
    -
    • - EOF + cat <<-EOF + + + $_text + +
    +
    + +
    +
    + + EOF #SNAP #TRADUCAO BEGIN diff --git a/big-store/usr/share/bigbashview/bcc/apps/big-store/index.sh.htm b/big-store/usr/share/bigbashview/bcc/apps/big-store/index.sh.htm index 78996c1ff..b9b0c0b76 100755 --- a/big-store/usr/share/bigbashview/bcc/apps/big-store/index.sh.htm +++ b/big-store/usr/share/bigbashview/bcc/apps/big-store/index.sh.htm @@ -665,10 +665,10 @@

    • $(gettext "Desenvolvedores"):
      • -     Vilmar, vcatafesta@gmail.com -
          Bruno, biglinux.com.br -
          Rafael, rruscher@gmail.com -
          eltonff, biglinux.com.br +     2023-2024 Vilmar, vcatafesta@gmail.com +
          2020-2022 Bruno, biglinux.com.br +
          2020-2022 Rafael, rruscher@gmail.com +
          2020-2022 eltonff, biglinux.com.br

    From 186f043d8eb39502dec198f7f6922cad9705b259 Mon Sep 17 00:00:00 2001 From: vcatafesta Date: Wed, 7 Aug 2024 04:08:45 -0400 Subject: [PATCH 5/7] qua 07 ago 2024 04:08:45 -04 Vilmar Catafesta (vcatafesta@gmail.com) --- .../bcc/apps/big-store/config.sh.htm | 266 ++++--- .../bcc/apps/big-store/css/style.css | 697 +++++++++--------- .../bcc/apps/big-store/index.sh.htm | 6 +- 3 files changed, 532 insertions(+), 437 deletions(-) diff --git a/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm b/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm index e8a207481..e03fec831 100755 --- a/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm +++ b/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm @@ -6,7 +6,7 @@ # Description: Big Store installing programs for BigLinux # # Created: 2022/11/01 -# Altered: 2024/08/05 +# Altered: 2024/08/07 # # Copyright (c) 2023-2024, Vilmar Catafesta # 2022-2023, Bruno Gonçalves @@ -34,7 +34,7 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. APP="${0##*/}" -_VERSION_="1.0.0-20240805" +_VERSION_="1.0.0-20240807" LIBRARY=${LIBRARY:-'/usr/share/bigbashview/bcc/shell'} [[ -f "${LIBRARY}/bcclib.sh" ]] && source "${LIBRARY}/bcclib.sh" [[ -f "${LIBRARY}/tinilib.sh" ]] && source "${LIBRARY}/tinilib.sh" @@ -44,7 +44,8 @@ #Translation export TEXTDOMAINDIR="/usr/share/locale" export TEXTDOMAIN=big-store - declare -g Pacotes_text=$"Pacotes" +# declare -g Pacotes_text=$"Pacotes" + declare -g Pacotes_text=$"Geral" declare -g Pacotes_flatpak_text=$"Pacotes Flatpak" declare -g Pacotes_Snap_text=$"Pacotes Snap" declare -g Traducao_Online_text=$"Tradução online da descrição dos pacotes" @@ -55,8 +56,9 @@ declare -g Atualizar_sistema_text=$"Atualizar seu sistema" declare -g Atualizar_text=$"Atualizar" declare -g Atualizado_text=$"Atualizado em" - declare -g Atualizar_cache_text=$"Atualizar cache dos repositórios nativos" - declare -g Atualizar_cache_pamac_text=$"Atualizar cache do Pamac" + declare -g Repositorios_nativos=$"Repositórios nativos" + declare -g Atualizar_cache_dos_repositorios_nativos=$"Atualizar cache dos repositórios nativos" + declare -g Atualizar_cache_do_pamac=$"Atualizar cache do Pamac" declare -g Procurar_servidor_mais_rapido_text=$"Procurar servidor de repositórios nativos mais rápidos" declare -g Utilize_as_opcoes_a_seguir_com_Cautela_text=$"Utilize as opções a seguir com cautela" declare -g Reinstalar_text=$"Reinstalação" @@ -64,7 +66,6 @@ declare -g Reinstalar_chaves=$"Atualizar as chaves dos repositórios BigLinux, Manjaro e Archlinux. Lembre que se você ativou repositórios complementares será necessário adicionar as chaves desses repositórios novamente." declare -g Executar_text=$"Executar" declare -g Forcar_atualizacao_text=$"Forçar atualizações, utilize essa opção se não estiver conseguindo atualizar o sistema, porém, na atualização forçada alguns programas podem ser removidos." - declare -g Repositorios_nativos_text=$"Repositórios nativos" declare -g Configuracoes=$"Configurações" declare -g MsgSnap=$"Para o Snap aparecer no menu do sistema finalize essa instância do Big-Store e inicie novamente." declare -g MsgFlatpak=$"Para o Flatpak aparecer no menu do sistema finalize essa instância do Big-Store e inicie novamente." @@ -88,6 +89,8 @@ sh_config_sh_htm_style source header.sh.htm +# xdebug "1-$update_flatpak\n2-$update_snap" + ######################################################################################################################################################################################################## if [[ "$pkg_flatpak" = "y" ]]; then @@ -96,7 +99,7 @@ sh_run_pamac_installer "$pkg_name" 'flatpak' fi TIni.Set "$INI_FILE_BIG_STORE" "flatpak" "flatpak_active" '1' - [[ ! -e "$flatpak_cache_file" ]] || [[ "$(find "$flatpak_cache_file" -mtime +1 -print)" ]] && sh_update_cache_flatpak "$processamento_em_paralelo" 'quiet' & + [[ ! -e "$flatpak_cache_file" ]] || [[ "$(find "$flatpak_cache_file" -mtime +1 -print)" ]] && sh_run_action_standalone "sh_update_cache_flatpak" & kdialog --title $"Big-Store" --msgbox "$MsgFlatpak\n\n$(flatpak --version)\n$(flatpak remotes)" & pacman -Qu | cut -f1 -d" " >>"$tmp_file_upgradeable" wait @@ -112,9 +115,9 @@ if ! sh_package_is_installed "$pkg_name"; then sh_run_pamac_installer "$pkg_name" 'apparmor' 'snapd' fi - # sh_run_action "enable_snapd" sh_run_action_standalone "sh_enable_snapd_and_apparmor" TIni.Set "$INI_FILE_BIG_STORE" "snap" "snap_active" '1' + [[ ! -e "$snap_cache_file" ]] || [[ "$(find "$snap_cache_file" -mtime +1 -print)" ]] && sh_run_action_standalone "sh_update_cache_snap" & kdialog \ --title $"Big-Store" \ --msgbox "$MsgSnap @@ -147,7 +150,6 @@ fi ######################################################################################################################################################################################################## - [[ "$update_pacman" = "y" ]] && sh_run_action "update_pacman" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER" [[ "$update_pamac" = "y" ]] && sh_run_action "update_pamac" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER" [[ "$update_mirror" = "y" ]] && sh_run_action "update_mirror" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER" @@ -156,20 +158,19 @@ [[ "$reinstall_allpkg" = "y" ]] && sh_run_action "reinstall_allpkg" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER" [[ "$system_upgrade" = "y" ]] && sh_run_action "system_upgrade" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER" [[ "$system_upgradetotal" = "y" ]] && sh_run_action "system_upgradetotal" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER" - [[ "$update_flatpak" = "y" ]] && sh_run_action "update_flatpak" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER" - [[ "$update_snap" = "y" ]] && sh_run_action "update_snap" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER" + [[ "$update_flatpak" = "y" ]] && sh_run_action_standalone "sh_update_cache_flatpak" + [[ "$update_snap" = "y" ]] && sh_run_action_standalone "sh_update_cache_snap" [[ "$update_traducao" = "y" ]] && TIni.Set "$INI_FILE_BIG_STORE" "bigstore" "traducao_online" '1' [[ "$update_traducao" = "n" ]] && TIni.Set "$INI_FILE_BIG_STORE" "bigstore" "traducao_online" '0' [[ "$update_xiva" = "y" ]] && TIni.Set "$INI_FILE_BIG_STORE" "XIVA" "xiva_active" '1' [[ "$update_xiva" = "n" ]] && TIni.Set "$INI_FILE_BIG_STORE" "XIVA" "xiva_active" '0' - -######################################################################################################################################################################################################## +################################################################################################################################################################################################################################### cat <<-EOF -
    -
    -
    -
    +
    +
    +
    +
    $Configuracoes
    @@ -220,7 +221,7 @@ #SNAP BEGIN cat <<-EOF -
  • +
  • @@ -242,7 +243,7 @@ fi cat <<-EOF - + $_text
    @@ -259,7 +260,7 @@ #TRADUCAO BEGIN cat <<-EOF -
  • +
  • $Traducao_online_text $Traducao_Online_text @@ -295,7 +296,7 @@ #PAMAC UPDATE BEGIN cat <<-EOF -
  • +
  • $Ao_instalar_pacotes_verificar_se_ha_atualizacoes $Ao_instalar_pacotes_verificar_se_ha_atualizacoes @@ -326,19 +327,12 @@
    • - EOF #PAMAC UPDATE END #XIVA BEGIN cat <<-EOF -
  • +
  • $Ativar_XIVA_Store $Ativar_XIVA_Store @@ -363,24 +357,12 @@
    • - EOF #XIVA END @@ -389,13 +371,13 @@
    EOF - #NATIVOS BEGIN +################################################################################################################################################################################################################################### + cat <<-EOF
    - $Repositorios_nativos_text + $Repositorios_nativos
    -
    • @@ -403,27 +385,25 @@ - $Atualizar_cache_text + $Atualizar_cache_dos_repositorios_nativos
      EOF - if TIni.Exist "$INI_FILE_BIG_STORE" "nativo" "nativo_atualizado" '1'; then local nativo_data_atualizacao=$(TIni.Get "$INI_FILE_BIG_STORE" "nativo" "nativo_data_atualizacao") - cat <<-EOF - - - $Atualizado_text $nativo_data_atualizacao - EOF + local _circle='true' + local _checked='checked' + local _handle='n' + local _text="$Atualizado_text $nativo_data_atualizacao" else - cat <<-EOF - - - $Atualizar_text - EOF + local _circle='false' + local _checked='' + local _handle='y' + local _text=$Atualizar_text fi - cat <<-EOF + + $_text
      • EOF -# ter 09 jan 2024 00:25:25 -04 cat <<-EOF -
    • +
    • - $Atualizar_cache_pamac_text + $Atualizar_cache_do_pamac
      + + EOF + if TIni.Exist "$INI_FILE_BIG_STORE" "PAMAC" "pamac_atualizado" '1'; then + local pamac_data_atualizacao=$(TIni.Get "$INI_FILE_BIG_STORE" "PAMAC" "pamac_data_atualizacao") + local _circle='true' + local _checked='checked' + local _handle='n' + local _text="$Atualizado_text $pamac_data_atualizacao" + else + local _circle='false' + local _checked='' + local _handle='y' + local _text=$Atualizar_text + fi + cat <<-EOF + + $_text +
      • EOF -# ter 09 jan 2024 00:25:25 -04 cat <<-EOF
    • @@ -470,15 +466,30 @@
    EOF - #NATIVOS END - +################################################################################################################################################################################################################################### if TIni.Exist "$INI_FILE_BIG_STORE" "flatpak" "flatpak_active" '1' && [[ -e "/usr/lib/libpamac-flatpak.so" ]]; then cat <<-EOF - +
    $(gettext "Repositório Flatpak")
    + EOF + #BEGIN-Reconstruir base de dados Flatpak + if TIni.Exist "$INI_FILE_BIG_STORE" "flatpak" "flatpak_atualizado" '1'; then + local flatpak_data_atualizacao=$(TIni.Get "$INI_FILE_BIG_STORE" "flatpak" "flatpak_data_atualizacao") + local _circle='true' + local _checked='checked' + local _handle='n' + local _text="$Atualizado_text $flatpak_data_atualizacao" + else + local _circle='false' + local _checked='unchecked' + local _handle='y' + local _text=$Atualizar_text + fi + cat <<-EOF +
    • @@ -489,23 +500,34 @@ $(gettext "Reconstruir base de dados Flatpak")
      + + $_text + +
      + +
      +
      • +
    + EOF + #END-Reconstruir base de dados Flatpak - if TIni.Exist "$INI_FILE_BIG_STORE" "flatpak" "flatpak_atualizado" '1'; then - local flatpak_data_atualizacao=$(TIni.Get "$INI_FILE_BIG_STORE" "flatpak" "flatpak_data_atualizacao") - cat <<-EOF - - - $Atualizado_text $flatpak_data_atualizacao - EOF - else - cat <<-EOF - - - $Atualizar_text - EOF - fi cat <<-EOF + +
      +
    • +
      + + + + + $(gettext "Outro procedimento com Flatpak") +
      + + + $_text
    -
    EOF + #END-Reconstruir base de dados Flatpak + + cat <<-EOF +
    + + EOF fi +################################################################################################################################################################################################################################### if TIni.Exist "$INI_FILE_BIG_STORE" "snap" "snap_active" '1' && [[ -e "/usr/lib/libpamac-snap.so" ]]; then cat <<-EOF @@ -539,22 +567,22 @@ EOF if TIni.Exist "$INI_FILE_BIG_STORE" "snap" "snap_atualizado" '1'; then local snap_data_atualizacao=$(TIni.Get "$INI_FILE_BIG_STORE" "snap" "snap_data_atualizacao") - cat <<-EOF - - - $Atualizado_text $snap_data_atualizacao - EOF + local _circle='true' + local _checked='checked' + local _handle='n' + local _text="$Atualizado_text $snap_data_atualizacao" else - cat <<-EOF - - - $Atualizar_text - EOF + local _circle='false' + local _checked='unchecked' + local _handle='y' + local _text=$Atualizar_text fi cat <<-EOF + + $_text
    -
    @@ -565,6 +593,8 @@ EOF fi +################################################################################################################################################################################################################################### + cat <<-EOF
    @@ -637,6 +667,62 @@
    + + + EOF diff --git a/big-store/usr/share/bigbashview/bcc/apps/big-store/css/style.css b/big-store/usr/share/bigbashview/bcc/apps/big-store/css/style.css index 9cdf2b525..f2d3f913f 100644 --- a/big-store/usr/share/bigbashview/bcc/apps/big-store/css/style.css +++ b/big-store/usr/share/bigbashview/bcc/apps/big-store/css/style.css @@ -1,5 +1,5 @@ * { - box-sizing: border-box; + box-sizing: border-box; --text-size-tiny: 12px; --text-size-small: 14px; --text-size-medium: 15px; @@ -9,85 +9,88 @@ } :root { - --body-bg-color: #3d4550; - --theme-bg-color: rgba(16 18 27 / 40%); - --border-color: rgba(113 119 144 / 25%); - --theme-color: #f9fafb; - --inactive-color: rgb(113 119 144 / 78%); - --hover-menu-bg: rgba(12 15 25 / 30%); - --content-title-color: #797e84; - --content-bg: rgb(146 151 179 / 13%); - --button-inactive: rgb(249 250 251 / 55%); - --border-card-color: rgb(70 70 70); - --dropdown-bg: #21242d; - --dropdown-hover: rgb(42 46 60); - --popup-bg: rgb(22 25 37); - --subtitle-bg: rgb(0 102 153); - --search-bg: rgb(255 255 255 / 8%); - --overlay-bg: rgba(36, 39, 59, 0.3); - --scrollbar-bg: #428bff; - --border-box: #777; - --shador-color-icons: rgb(79 79 79 / 100%); - --subtitle: rgb(255 255 255 / 100%); - --search-color: rgb(155 155 155 / 100%); - --search-color-over: #fff; - --footer-bg-color: #2a303a; - --box-color-shadow-01: rgba(0, 0, 0, 0.2); - --text-a-color: #ccc; - --text-neon-color: #00ffff; - --tit-tooltip: #1d2028; - --text-green-color: #00cd00; - --text-red-color: #ff0000; + --body-bg-color: #3d4550; + --theme-bg-color: rgba(16 18 27 / 40%); + --border-color: rgba(113 119 144 / 25%); + --theme-color: #f9fafb; + --inactive-color: rgb(113 119 144 / 78%); + --hover-menu-bg: rgba(12 15 25 / 30%); + --content-title-color: #797e84; + --content-bg: rgb(146 151 179 / 13%); + --button-inactive: rgb(249 250 251 / 55%); + --border-card-color: rgb(70 70 70); + --dropdown-bg: #21242d; + --dropdown-hover: rgb(42 46 60); + --popup-bg: rgb(22 25 37); + --subtitle-bg: rgb(0 102 153); + --search-bg: rgb(255 255 255 / 8%); + --overlay-bg: rgba(36, 39, 59, 0.3); + --scrollbar-bg: #428bff; + --border-box: #777; + --shador-color-icons: rgb(79 79 79 / 100%); + --subtitle: rgb(255 255 255 / 100%); + --search-color: rgb(155 155 155 / 100%); + --search-color-over: #fff; + --footer-bg-color: #2a303a; + --box-color-shadow-01: rgba(0, 0, 0, 0.2); + --text-a-color: #ccc; + --text-neon-color: #00ffff; + --tit-tooltip: #1d2028; + --text-green-color: #00cd00; + --text-red-color: #ff0000; } .light-mode { - --body-bg-color: #252d37; - --theme-bg-color: rgb(255 255 255 / 31%); - --theme-color: #3c3a3a; - --inactive-color: #333333; - --button-inactive: #3c3a3a; - --border-card-color: rgb(188 191 193); - --search-bg: rgb(255 255 255 / 31%); - --dropdown-bg: #f7f7f7; - --overlay-bg: rgb(255 255 255 / 30%); - --dropdown-hover: rgb(236 236 236); - --border-color: rgb(255 255 255 / 35%); - --popup-bg: rgb(255 255 255); - --subtitle-bg: rgb(255 255 255); - --hover-menu-bg: rgba(255 255 255 / 35%); - --scrollbar-bg: #428bff; - --content-title-color: --theme-color; - --content-bg: rgb(255 255 255 / 19%); - --border-box: #aaa; - --logo-big: invert(100%); - --shador-color-icons: rgb(0 0 0 / 28%); - --subtitle: rgb(0 0 0 / 100%); - --search-color: rgb(100 100 100 / 100%); - --search-color-over: #000; - --footer-bg-color: #6c6d6d; - --box-color-shadow-01: rgba(0, 0, 0, 0.2); - --text-a-color: #444; - --text-neon-color: #0047ff; - --tit-tooltip: #c1c2c4; - --text-green-color: #188f18; - --text-red-color: #e51212; + --body-bg-color: #252d37; + --theme-bg-color: rgb(255 255 255 / 31%); + --theme-color: #3c3a3a; + --inactive-color: #333333; + --button-inactive: #3c3a3a; + --border-card-color: rgb(188 191 193); + --search-bg: rgb(255 255 255 / 31%); + --dropdown-bg: #f7f7f7; + --overlay-bg: rgb(255 255 255 / 30%); + --dropdown-hover: rgb(236 236 236); + --border-color: rgb(255 255 255 / 35%); + --popup-bg: rgb(255 255 255); + --subtitle-bg: rgb(255 255 255); + --hover-menu-bg: rgba(255 255 255 / 35%); + --scrollbar-bg: #428bff; + --content-title-color: --theme-color; + --content-bg: rgb(255 255 255 / 19%); + --border-box: #aaa; + --logo-big: invert(100%); + --shador-color-icons: rgb(0 0 0 / 28%); + --subtitle: rgb(0 0 0 / 100%); + --search-color: rgb(100 100 100 / 100%); + --search-color-over: #000; + --footer-bg-color: #6c6d6d; + --box-color-shadow-01: rgba(0, 0, 0, 0.2); + --text-a-color: #444; + --text-neon-color: #0047ff; + --tit-tooltip: #c1c2c4; + --text-green-color: #188f18; + --text-red-color: #e51212; } body { - /*background-image: url(https://forum.biglinux.com.br/uploads/default/original/2X/f/f5679ca17fad618b3dc755347e2cb2677dd5ecfb.jpeg);*/ - background-color: var(--body-bg-color); - display: flex; - flex-direction: column; - padding: 0; - width: 100%; - height: 100vh; - margin: 0; - font-family: Ubuntu Condensed, Lato, sans-serif; + /*background-image: url(https://forum.biglinux.com.br/uploads/default/original/2X/f/f5679ca17fad618b3dc755347e2cb2677dd5ecfb.jpeg);*/ + background-color: var(--body-bg-color); + display: flex; + flex-direction: column; + padding: 0; + width: 100%; + height: 100vh; + margin: 0; + font-family: + Ubuntu Condensed, + Lato, + sans-serif; } @supports (-webkit-appearance: none) or (-moz-appearance: none) { - input[type=checkbox], -input[type=radio] { + input[type="checkbox"], + input[type="radio"] { --active: #275efe; --active-inner: #fff; --focus: 2px rgba(39, 94, 254, 0.3); @@ -107,62 +110,67 @@ input[type=radio] { cursor: pointer; border: 1px solid var(--bc, var(--border)); background: var(--b, var(--background)); - transition: background 0.3s, border-color 0.3s, box-shadow 0.2s; + transition: + background 0.3s, + border-color 0.3s, + box-shadow 0.2s; } - input[type=checkbox]:after, -input[type=radio]:after { + input[type="checkbox"]:after, + input[type="radio"]:after { content: ""; display: block; left: 0; top: 0; position: absolute; - transition: transform var(--d-t, 0.3s) var(--d-t-e, ease), opacity var(--d-o, 0.2s); + transition: + transform var(--d-t, 0.3s) var(--d-t-e, ease), + opacity var(--d-o, 0.2s); } - input[type=checkbox]:checked, -input[type=radio]:checked { + input[type="checkbox"]:checked, + input[type="radio"]:checked { --b: var(--active); --bc: var(--active); --d-o: 0.3s; --d-t: 0.6s; --d-t-e: cubic-bezier(0.2, 0.85, 0.32, 1.2); } - input[type=checkbox]:disabled, -input[type=radio]:disabled { + input[type="checkbox"]:disabled, + input[type="radio"]:disabled { --b: var(--disabled); cursor: not-allowed; opacity: 0.9; } - input[type=checkbox]:disabled:checked, -input[type=radio]:disabled:checked { + input[type="checkbox"]:disabled:checked, + input[type="radio"]:disabled:checked { --b: var(--disabled-inner); --bc: var(--border); } - input[type=checkbox]:disabled + label, -input[type=radio]:disabled + label { + input[type="checkbox"]:disabled + label, + input[type="radio"]:disabled + label { cursor: not-allowed; } - input[type=checkbox]:hover:not(:checked):not(:disabled), -input[type=radio]:hover:not(:checked):not(:disabled) { + input[type="checkbox"]:hover:not(:checked):not(:disabled), + input[type="radio"]:hover:not(:checked):not(:disabled) { --bc: var(--border-hover); } - input[type=checkbox]:focus, -input[type=radio]:focus { + input[type="checkbox"]:focus, + input[type="radio"]:focus { box-shadow: 0 0 0 var(--focus); } - input[type=checkbox]:not(.switch), -input[type=radio]:not(.switch) { + input[type="checkbox"]:not(.switch), + input[type="radio"]:not(.switch) { width: 21px; } - input[type=checkbox]:not(.switch):after, -input[type=radio]:not(.switch):after { + input[type="checkbox"]:not(.switch):after, + input[type="radio"]:not(.switch):after { opacity: var(--o, 0); } - input[type=checkbox]:not(.switch):checked, -input[type=radio]:not(.switch):checked { + input[type="checkbox"]:not(.switch):checked, + input[type="radio"]:not(.switch):checked { --o: 1; } - input[type=checkbox] + label, -input[type=radio] + label { + input[type="checkbox"] + label, + input[type="radio"] + label { font-size: 14px; line-height: 21px; display: inline-block; @@ -171,10 +179,10 @@ input[type=radio] + label { margin-left: 4px; } - input[type=checkbox]:not(.switch) { + input[type="checkbox"]:not(.switch) { border-radius: 7px; } - input[type=checkbox]:not(.switch):after { + input[type="checkbox"]:not(.switch):after { width: 5px; height: 9px; border: 2px solid var(--active-inner); @@ -184,14 +192,14 @@ input[type=radio] + label { top: 4px; transform: rotate(var(--r, 20deg)); } - input[type=checkbox]:not(.switch):checked { + input[type="checkbox"]:not(.switch):checked { --r: 43deg; } - input[type=checkbox].switch { + input[type="checkbox"].switch { width: 38px; border-radius: 11px; } - input[type=checkbox].switch:after { + input[type="checkbox"].switch:after { left: 2px; top: 2px; border-radius: 50%; @@ -200,18 +208,18 @@ input[type=radio] + label { background: var(--ab, var(--border)); transform: translateX(var(--x, 0)); } - input[type=checkbox].switch:checked { + input[type="checkbox"].switch:checked { --ab: var(--active-inner); --x: 17px; } - input[type=checkbox].switch:disabled:not(:checked):after { + input[type="checkbox"].switch:disabled:not(:checked):after { opacity: 0.6; } - input[type=radio] { + input[type="radio"] { border-radius: 50%; } - input[type=radio]:after { + input[type="radio"]:after { width: 19px; height: 19px; border-radius: 50%; @@ -219,20 +227,19 @@ input[type=radio] + label { opacity: 0; transform: scale(var(--s, 0.7)); } - input[type=radio]:checked { + input[type="radio"]:checked { --s: 0.5; } } label { - color: var(--text-a-color) !important; + color: var(--text-a-color) !important; } .logo-biglinux { - filter: var(--logo-big); + filter: var(--logo-big); } - html { box-sizing: border-box; -webkit-font-smoothing: antialiased; @@ -302,19 +309,23 @@ body.light-mode .video-bg:before { width: 100%; height: 100vh; z-index: -1; - background: linear-gradient(180deg, rgba(255, 255, 255, 0.72) 0%, rgba(255, 255, 255, 0.45) 100%); + background: linear-gradient( + 180deg, + rgba(255, 255, 255, 0.72) 0%, + rgba(255, 255, 255, 0.45) 100% + ); } .app { - background-color: var(--theme-bg-color); - height: 100vh; - display: flex; - flex-direction: column; - overflow: hidden; - width: 100%; - border-radius: 14px; - font-size: 15px; - font-weight: 500; + background-color: var(--theme-bg-color); + height: 100vh; + display: flex; + flex-direction: column; + overflow: hidden; + width: 100%; + border-radius: 14px; + font-size: 15px; + font-weight: 500; } #welcome { @@ -322,13 +333,12 @@ body.light-mode .video-bg:before { } .header-menu { - display: inline-flex; - justify-content: center; - margin-left: -270px; - width: calc(100% - -287px); - margin-top: -25px; -} - + display: inline-flex; + justify-content: center; + margin-left: -270px; + width: calc(100% - -287px); + margin-top: -25px; +} @media screen and (max-width: 1055px) { .main-header .header-menu { @@ -343,43 +353,41 @@ body.light-mode .video-bg:before { } } .header { - display: flex; - align-items: center; - flex-shrink: 0; - height: 58px; - width: 100%; - /*width: calc(100% - -280px);*/ - border-bottom: 1px solid var(--border-color); - padding: 0 30px; - white-space: nowrap; - @media screen and (max-width: 480px) { - padding: 0 16px; - } - &-menu { display: flex; align-items: center; - a { - padding: 20px 30px; - text-decoration: none; - color: var(--inactive-color); - border-bottom: 2px solid transparent; - transition: 0.3s; - @media screen and (max-width: 610px) { - &:not(.main-header-link) { - display: none; + flex-shrink: 0; + height: 58px; + width: 100%; + /*width: calc(100% - -280px);*/ + border-bottom: 1px solid var(--border-color); + padding: 0 30px; + white-space: nowrap; + @media screen and (max-width: 480px) { + padding: 0 16px; + } + &-menu { + display: flex; + align-items: center; + a { + padding: 20px 30px; + text-decoration: none; + color: var(--inactive-color); + border-bottom: 2px solid transparent; + transition: 0.3s; + @media screen and (max-width: 610px) { + &:not(.main-header-link) { + display: none; + } + } + &.is-active, + &:hover { + color: var(--theme-color); + border-bottom: 2px solid var(--theme-color); + } } - } - &.is-active, - &:hover { - color: var(--theme-color); - border-bottom: 2px solid var(--theme-color); - } } - } } - - .notify { position: relative; } @@ -404,7 +412,9 @@ body.light-mode .video-bg:before { height: 15px; background-color: #f96057; border-radius: 50%; - box-shadow: 24px 0 0 0 #f8ce52, 48px 0 0 0 #5fcf65; + box-shadow: + 24px 0 0 0 #f8ce52, + 48px 0 0 0 #5fcf65; margin-right: 195px; flex-shrink: 0; } @@ -434,66 +444,65 @@ body.light-mode .video-bg:before { } .search-bar { - max-width: 600px; - margin: auto; - transition: 0.4s; - padding-left: 0; - height: 40px; - width: 100%; - max-width: 300px; - border-radius: 4px; - margin-left: calc(50% - 149px); + max-width: 600px; + margin: auto; + transition: 0.4s; + padding-left: 0; + height: 40px; + width: 100%; + max-width: 300px; + border-radius: 4px; + margin-left: calc(50% - 149px); } @media screen and (max-width: 1000px) { -.search-bar { - margin-left: calc(40% - 52px); -} -} + .search-bar { + margin-left: calc(40% - 52px); + } +} .search-bar input { - border-radius: 5px; - border-bottom: 0px !important; - box-shadow: 0 0 0 0 !important; - line-height: 1; - box-sizing: border-box; - outline: none; - width: 100%; - height: 100%; - border: none; - background-color: var(--search-bg); - font-family: var(--body-font); - font-size: 15px; - font-weight: 500; - padding: 0 20px 0 40px; - box-shadow: 0 0 0 2px rgb(134 140 160 / 2%); - background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 56.966 56.966' fill='%23717790c7'%3e%3cpath d='M55.146 51.887L41.588 37.786A22.926 22.926 0 0046.984 23c0-12.682-10.318-23-23-23s-23 10.318-23 23 10.318 23 23 23c4.761 0 9.298-1.436 13.177-4.162l13.661 14.208c.571.593 1.339.92 2.162.92.779 0 1.518-.297 2.079-.837a3.004 3.004 0 00.083-4.242zM23.984 6c9.374 0 17 7.626 17 17s-7.626 17-17 17-17-7.626-17-17 7.626-17 17-17z'/%3e%3c/svg%3e"); - background-size: 14px; - background-repeat: no-repeat; - background-position: 16px 48%; - color: var(--search-color-over); - + border-radius: 5px; + border-bottom: 0px !important; + box-shadow: 0 0 0 0 !important; + line-height: 1; + box-sizing: border-box; + outline: none; + width: 100%; + height: 100%; + border: none; + background-color: var(--search-bg); + font-family: var(--body-font); + font-size: 15px; + font-weight: 500; + padding: 0 20px 0 40px; + box-shadow: 0 0 0 2px rgb(134 140 160 / 2%); + background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 56.966 56.966' fill='%23717790c7'%3e%3cpath d='M55.146 51.887L41.588 37.786A22.926 22.926 0 0046.984 23c0-12.682-10.318-23-23-23s-23 10.318-23 23 10.318 23 23 23c4.761 0 9.298-1.436 13.177-4.162l13.661 14.208c.571.593 1.339.92 2.162.92.779 0 1.518-.297 2.079-.837a3.004 3.004 0 00.083-4.242zM23.984 6c9.374 0 17 7.626 17 17s-7.626 17-17 17-17-7.626-17-17 7.626-17 17-17z'/%3e%3c/svg%3e"); + background-size: 14px; + background-repeat: no-repeat; + background-position: 16px 48%; + color: var(--search-color-over); } .search-bar input::placeholder { - font-size: var(--text-size-medium); - font-weight: 500; - color: var(--search-color); + font-size: var(--text-size-medium); + font-weight: 500; + color: var(--search-color); } input::placeholder { - color: var(--search-color); -} + color: var(--search-color); +} .header-profile-back { - flex-shrink: 0; - z-index: 1; - position: relative; - width: 32px; - height: 43px; - padding-top: 0px; -} + flex-shrink: 0; + z-index: 1; + position: relative; + width: 32px; + height: 43px; + padding-top: 0px; +} .header-profile { - flex-shrink: 0; - z-index: 1; - position: relative; + flex-shrink: 0; + z-index: 1; + position: relative; } .header-profile-back svg { width: 22px; @@ -541,62 +550,60 @@ input::placeholder { } .wide .search-bar input { - width: 130%; - margin-left: -45px; + width: 130%; + margin-left: -45px; } - .wide .menu-circle { - margin-right: 0; + margin-right: 0; } .wrapper { - display: flex; - flex-grow: 1; - overflow: hidden; + display: flex; + flex-grow: 1; + overflow: hidden; } .left-side { - flex-basis: 240px; - padding: 26px; - padding-bottom: 0px; - overflow: auto; - flex-shrink: 0; + flex-basis: 240px; + padding: 26px; + padding-bottom: 0px; + overflow: auto; + flex-shrink: 0; } @media screen and (max-width: 1000px) { - .left-side { - flex-basis: 75px; - padding: 10px; - } - #box-status-bar { - left: 75px !important; - } - .left-side .side-menu { - text-indent: 100%; - white-space: nowrap; - overflow: hidden; - } - .left-side .side-menu svg { - display: block; - margin: 0 auto; - text-align: center; - } - .left-side .side-menu span { - display: none; - } - .left-side .side-menu a { - display: flex; - align-items: center; - justify-content: center; - width: 44px; - height: 44px; - margin: -4px 0px; - padding: 0px; - } + .left-side { + flex-basis: 75px; + padding: 10px; + } + #box-status-bar { + left: 75px !important; + } + .left-side .side-menu { + text-indent: 100%; + white-space: nowrap; + overflow: hidden; + } + .left-side .side-menu svg { + display: block; + margin: 0 auto; + text-align: center; + } + .left-side .side-menu span { + display: none; + } + .left-side .side-menu a { + display: flex; + align-items: center; + justify-content: center; + width: 44px; + height: 44px; + margin: -4px 0px; + padding: 0px; + } } - .side-wrapper + .side-wrapper { margin-top: 20px; } @@ -608,33 +615,33 @@ input::placeholder { } .side-menu { - display: flex; - flex-direction: column; - white-space: nowrap; - padding-top: 6px; - padding-bottom: 6px; + display: flex; + flex-direction: column; + white-space: nowrap; + padding-top: 6px; + padding-bottom: 6px; } .side-menu a { - text-decoration: none; - color: var(--theme-color); - display: flex; - align-items: center; - font-weight: 400; - padding: 8px; - font-size: var(--text-size-small); - border-radius: 6px; - transition: 0.3s; - border: 1px solid rgb(255 255 255 / 0%); + text-decoration: none; + color: var(--theme-color); + display: flex; + align-items: center; + font-weight: 400; + padding: 8px; + font-size: var(--text-size-small); + border-radius: 6px; + transition: 0.3s; + border: 1px solid rgb(255 255 255 / 0%); } .side-menu a:hover { - background-color: var(--hover-menu-bg); + background-color: var(--hover-menu-bg); } .side-menu a:active { - background-color: var(--popup-bg); - border: 1px solid var(--search-color); + background-color: var(--popup-bg); + border: 1px solid var(--search-color); } .side-menu svg { @@ -653,12 +660,12 @@ input::placeholder { } .main-header { - /*display: flex;*/ - align-items: center; - justify-content: center; - height: 58px; - flex-shrink: 0; - width: 100%; + /*display: flex;*/ + align-items: center; + justify-content: center; + height: 58px; + flex-shrink: 0; + width: 100%; } .main-header .header-menu a { @@ -698,20 +705,21 @@ input::placeholder { padding: 20px; } } -.content-wrapper-header { - display: flex; - align-items: center; - width: calc(100% - 0px); - justify-content: space-between; - background-image: url("https://www.transparenttextures.com/patterns/cubes.png"), linear-gradient(to right top, #512DA8, #673AB7, #7303c0); - border-radius: 14px; - padding: 10px 40px 10px 40px; +.content-wrapper-header { + display: flex; + align-items: center; + width: calc(100% - 0px); + justify-content: space-between; + background-image: url("https://www.transparenttextures.com/patterns/cubes.png"), + linear-gradient(to right top, #512da8, #673ab7, #7303c0); + border-radius: 14px; + padding: 10px 40px 10px 40px; } @media screen and (max-width: 415px) { - .content-wrapper-header { - padding: 20px; - } + .content-wrapper-header { + padding: 20px; + } } .content-wrapper.overlay { @@ -738,60 +746,60 @@ input::placeholder { } .img-content { - font-weight: 500; - font-size: var(--text-size-large); - display: flex; - align-items: center; - color: white; - margin: 0; + font-weight: 500; + font-size: var(--text-size-large); + display: flex; + align-items: center; + color: white; + margin: 0; } .img-content .img { - width: 64px; - margin: 0 10px 0 0; + width: 64px; + margin: 0 10px 0 0; } .content-text { - font-weight: 400; - font-size: var(--text-size-small); - margin-top: 16px; - line-height: 1.7em; - color: #ebecec; - display: -webkit-box; - -webkit-line-clamp: 4; - -webkit-box-orient: vertical; - overflow: hidden; - text-overflow: ellipsis; + font-weight: 400; + font-size: var(--text-size-small); + margin-top: 16px; + line-height: 1.7em; + color: #ebecec; + display: -webkit-box; + -webkit-line-clamp: 4; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; } .content-wrapper-context { - max-width: 600px; - display: contents; + max-width: 600px; + display: contents; } .content-button { - background-color: #3a6df0; - border: none; - padding: 8px 26px; - color: #fff; - border-radius: 20px; - margin-top: 16px; - cursor: pointer; - transition: 0.3s; - white-space: nowrap; - text-decoration: none; + background-color: #3a6df0; + border: none; + padding: 8px 26px; + color: #fff; + border-radius: 20px; + margin-top: 16px; + cursor: pointer; + transition: 0.3s; + white-space: nowrap; + text-decoration: none; } .content-wrapper-img { - width: 96px; - object-fit: cover; - object-position: center; + width: 96px; + object-fit: cover; + object-position: center; } @media screen and (max-width: 570px) { - .content-wrapper-img { - width: 110px; - } + .content-wrapper-img { + width: 110px; + } } .content-section { @@ -806,7 +814,7 @@ input::placeholder { .content-section ul { display: flex; flex-direction: column; - width: 100%; + width: 100% height: 100%; justify-content: space-around; background-color: var(--content-bg); @@ -824,7 +832,8 @@ input::placeholder { align-items: center; font-size: 16px; width: 100%; - height: 100%; +/* height: 100%;*/ /*deixar largo*/ + height: 50px; /*deixar mesma largura dos outros itens*/ white-space: nowrap; transition: 0.3s; } @@ -839,10 +848,10 @@ input::placeholder { } .content-section ul li + li { /*border-top: 1px solid var(--border-color);*/ - border-top: 1px solid var(--border-box); + border-top: 1px solid var(--border-box); } .content-section ul svg { - width: 28px; + width: 28px; border-radius: 6px; margin-right: 16px; flex-shrink: 0; @@ -853,7 +862,8 @@ input::placeholder { display: flex; align-items: center; width: 100%; - height: 45px; +/* height: 45px;*/ + height: 100%; /* @media screen and (min-width: 480px) { width: 300px; font-size: 1.1vw; @@ -872,23 +882,21 @@ input::placeholder { /* border: 1px solid #fff;*/ } +.any-product { + display: flex; + align-items: center; + font-size: 16px; + width: 100%; + height: 90px; +/* height: 100%;*/ +} + .txt { width: 100%; white-space: pre-line; font-size: 15px; - /*@media screen and (min-width: 500px) { - background-color: red; - width: 120px; - font-size: 1.1vw; - - }*/ + height: 90px; } -/*@media screen and (max-width: 1200px) { - .txt { - width: 100%; - font-size: 1.1vw; - } -}*/ @media screen and (max-width: 950px) { .txt { /* border: 1px solid #fff; */ @@ -954,7 +962,9 @@ input::placeholder { height: 5px; background-color: var(--button-inactive); border-radius: 50%; - box-shadow: 7px 0 0 0 var(--button-inactive), 14px 0 0 0 var(--button-inactive); + box-shadow: + 7px 0 0 0 var(--button-inactive), + 14px 0 0 0 var(--button-inactive); margin: 0 12px; } @@ -1201,12 +1211,12 @@ input::placeholder { /* LOGO */ .logo { - z-index: 2; - position: absolute; - top: 10px; - left: 15px; - width: 40px; - height: 40px; + z-index: 2; + position: absolute; + top: 10px; + left: 15px; + width: 40px; + height: 40px; } .logo img { @@ -1235,4 +1245,3 @@ input::placeholder { background: var(--scrollbar-bg); border-radius: 10px; } - diff --git a/big-store/usr/share/bigbashview/bcc/apps/big-store/index.sh.htm b/big-store/usr/share/bigbashview/bcc/apps/big-store/index.sh.htm index b9b0c0b76..a7cfe93ac 100755 --- a/big-store/usr/share/bigbashview/bcc/apps/big-store/index.sh.htm +++ b/big-store/usr/share/bigbashview/bcc/apps/big-store/index.sh.htm @@ -6,7 +6,7 @@ # Description: Big Store installing programs for BigLinux # # Created: 2020/01/11 -# Altered: 2024/08/05 +# Altered: 2024/08/07 # # Copyright (c) 2023-2024, Vilmar Catafesta # 2022-2024, Bruno Gonçalves @@ -34,8 +34,8 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. APP="${0##*/}" -_DATE_ALTERED_='05-08-2024 - 12:10' -_VERSION_="1.0.0-20240805" +_DATE_ALTERED_='07-08-2024 - 04:08' +_VERSION_="1.0.0-20240807" _HTML_VERSION_="${_VERSION_} - ${_DATE_ALTERED_}" _UPDATED_="${_DATE_ALTERED_}" LIBRARY=${LIBRARY:-'/usr/share/bigbashview/bcc/shell'} From 8b52e0646304e9270fe1db83a1b6630e42ca8093 Mon Sep 17 00:00:00 2001 From: vcatafesta Date: Wed, 7 Aug 2024 08:16:16 -0400 Subject: [PATCH 6/7] qua 07 ago 2024 08:16:16 -04 Vilmar Catafesta (vcatafesta@gmail.com) --- .../bcc/apps/big-store/config.sh.htm | 11 +++++++++++ .../bcc/apps/big-store/css/style.css | 17 +++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm b/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm index e03fec831..542703adf 100755 --- a/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm +++ b/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm @@ -71,6 +71,7 @@ declare -g MsgFlatpak=$"Para o Flatpak aparecer no menu do sistema finalize essa instância do Big-Store e inicie novamente." declare -g Ao_instalar_pacotes_verificar_se_ha_atualizacoes=$"Ao instalar pacotes, verificar se há atualizações:" declare -g tmp_file_upgradeable="${TMP_FOLDER}/upgradeable.txt" + declare -g traducao_tooltipped=$"Ativar tradução online automática das descrições dos pacotes.
    Obs: A tradução online pode aumentar a latência na busca dos pacotes." } function sh_config_sh_htm_style { @@ -208,6 +209,7 @@ $Ativado_text
    +
    +
    EOF #FLATPAK END @@ -247,6 +250,7 @@ $_text
    +
    +
    EOF #SNAP @@ -283,6 +288,7 @@ $_text
    +
    +
    EOF #TRADUCAO END @@ -319,6 +326,7 @@ $_text
    +
    +
    EOF #PAMAC UPDATE END @@ -355,6 +364,7 @@ $_text
    +
    +
    EOF #XIVA END diff --git a/big-store/usr/share/bigbashview/bcc/apps/big-store/css/style.css b/big-store/usr/share/bigbashview/bcc/apps/big-store/css/style.css index f2d3f913f..11250cf1a 100644 --- a/big-store/usr/share/bigbashview/bcc/apps/big-store/css/style.css +++ b/big-store/usr/share/bigbashview/bcc/apps/big-store/css/style.css @@ -808,7 +808,8 @@ input::placeholder { flex-direction: column; } .content-section-title { - color: var(--content-title-color); +/* color: var(--content-title-color);*/ + color: var(--text-red-color); margin-bottom: 14px; } .content-section ul { @@ -830,7 +831,7 @@ input::placeholder { padding: 10px 18px; display: flex; align-items: center; - font-size: 16px; +/* font-size: 16px;*/ width: 100%; /* height: 100%;*/ /*deixar largo*/ height: 50px; /*deixar mesma largura dos outros itens*/ @@ -885,7 +886,7 @@ input::placeholder { .any-product { display: flex; align-items: center; - font-size: 16px; +/* font-size: 16px;*/ width: 100%; height: 90px; /* height: 100%;*/ @@ -894,7 +895,7 @@ input::placeholder { .txt { width: 100%; white-space: pre-line; - font-size: 15px; +/* font-size: 15px;*/ height: 90px; } @media screen and (max-width: 950px) { @@ -1245,3 +1246,11 @@ input::placeholder { background: var(--scrollbar-bg); border-radius: 10px; } + +/* +.button-wrapper .tooltipped { + background-color: #ff0000; /* Fundo vermelho */ + color: #ffffff; /* Texto branco */ + border: 1px solid #ffffff; /* Opcional: borda branca */ + border-radius: 15px; +} */ From 7024fd557a54f3dc3eb9efe5cc8a0ab2c4eaab24 Mon Sep 17 00:00:00 2001 From: vcatafesta Date: Wed, 7 Aug 2024 08:48:27 -0400 Subject: [PATCH 7/7] qua 07 ago 2024 08:48:27 -04 Vilmar Catafesta (vcatafesta@gmail.com) --- .../bcc/apps/big-store/config.sh.htm | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm b/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm index 542703adf..3e4e0e8b5 100755 --- a/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm +++ b/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm @@ -151,7 +151,13 @@ fi ######################################################################################################################################################################################################## - [[ "$update_pacman" = "y" ]] && sh_run_action "update_pacman" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER" + [[ "$update_pacman" = "y" ]] && { +# sh_run_action "update_pacman" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER" + sh_run_action_standalone "paru -Syy" + sh_run_action_standalone "paru -Fyy" + TIni.Set "$INI_FILE_BIG_STORE" "nativo" "nativo_atualizado" '1' + TIni.Set "$INI_FILE_BIG_STORE" "nativo" "nativo_data_atualizacao" "$(date "+%d/%m/%y %H:%M")" + } [[ "$update_pamac" = "y" ]] && sh_run_action "update_pamac" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER" [[ "$update_mirror" = "y" ]] && sh_run_action "update_mirror" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER" [[ "$update_keys" = "y" ]] && sh_run_action "update_keys" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER" @@ -417,7 +423,7 @@ $_text
    -
    @@ -452,7 +458,7 @@ $_text
    -
    @@ -469,7 +475,7 @@ $Procurar_servidor_mais_rapido_text
    -
    @@ -625,7 +631,7 @@ $Reinstalar_text
    -
    @@ -645,7 +651,7 @@
    -
    @@ -664,7 +670,7 @@
    -