From 020ccf9e27140e6eb0c2a171d2e30a458da059d6 Mon Sep 17 00:00:00 2001
From: Bruno Goncalves <bigbruno@gmail.com>
Date: Mon, 10 Oct 2022 02:57:08 -0300
Subject: [PATCH] Change in materia theme and change message to logout after
 change theme

---
 .../bcc/apps/biglinux-themes-gui/index.sh.htm | 26 ++++---------------
 .../materia-dark/.config/gtk-3.0/settings.ini |  5 ++--
 .../materia-dark/.config/gtk-4.0/settings.ini |  2 +-
 .../.config/xsettingsd/xsettingsd.conf        |  2 +-
 4 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/usr/share/bigbashview/bcc/apps/biglinux-themes-gui/index.sh.htm b/usr/share/bigbashview/bcc/apps/biglinux-themes-gui/index.sh.htm
index 0133acba..0fdf082a 100644
--- a/usr/share/bigbashview/bcc/apps/biglinux-themes-gui/index.sh.htm
+++ b/usr/share/bigbashview/bcc/apps/biglinux-themes-gui/index.sh.htm
@@ -62,7 +62,7 @@
 NumLock_text=$"Ativar o NumLock ao ligar o sistema"
 
 Theme_change=$"Tema aplicado"
-Need_restart=$"É preciso reiniciar a sessão para concluir a configuração. Deseja fazer agora?"
+Need_restart=$"É preciso reiniciar a sessão para concluir a configuração."
 Config_desktop=$"Configuração do Desktop"
 Desktop_detect=$"Você já utilizou esse desktop antes, deseja  restaurar sua personalização ou utilizar a configuração original?"
 YES=$"Sim"
@@ -324,18 +324,9 @@
               </div>
               <div class="pop-up__subtitle">$Need_restart</div>
               <div id="desc">
-                <ul id="menu">
-                  <li>
                     <div class="content-button-wrapper" style="text-align: right;">
-                      <button class="content-button close" onclick="_run('qdbus org.kde.ksmserver /KSMServer org.kde.KSMServerInterface.closeSession')">$YES</button>
-                    </div>
-                  </li>
-                  <li>
-                    <div class="content-button-wrapper" style="text-align: left;">
-                      <button class="content-button close">$NO</button>
+                      <button class="content-button close">$CLOSE</button>
                     </div>
-                  </li>
-                </ul>
               </div>
             </div>             
             
@@ -663,18 +654,11 @@
                   </div>
                   <div class="pop-up__subtitle">$Need_restart</div>
                   <div id="desc">
-                    <ul id="menu">
-                      <li>
+
                         <div class="content-button-wrapper" style="text-align: right;">
-                          <button id="btnClick" class="content-button close" onclick="_run('qdbus org.kde.ksmserver /KSMServer org.kde.KSMServerInterface.closeSession')">$YES</button>
+                          <button id="btnClick" class="content-button close">$CLOSE</button>
                         </div>
-                      </li>
-                      <li>
-                        <div class="content-button-wrapper" style="text-align: left;">
-                          <button id="btnClick" class="content-button close">$NO</button>
-                        </div>
-                      </li>
-                    </ul>
+
                   </div>
                 </div>                                
 <!-- END RESTART SESSION -->
diff --git a/usr/share/biglinux/themes/materia-dark/.config/gtk-3.0/settings.ini b/usr/share/biglinux/themes/materia-dark/.config/gtk-3.0/settings.ini
index fb175668..6a944900 100644
--- a/usr/share/biglinux/themes/materia-dark/.config/gtk-3.0/settings.ini
+++ b/usr/share/biglinux/themes/materia-dark/.config/gtk-3.0/settings.ini
@@ -1,15 +1,14 @@
 [Settings]
+AdwStyleManager=true
 gtk-application-prefer-dark-theme=true
 gtk-button-images=true
 gtk-cursor-theme-name=Breeze_Snow
 gtk-cursor-theme-size=24
 gtk-decoration-layout=icon:minimize,maximize,close
 gtk-enable-animations=true
-gtk-fallback-icon-theme=Adwaita
 gtk-font-name=Lato Medium, Demi Bold 11
 gtk-icon-theme-name=Fluent
 gtk-menu-images=true
-gtk-modules=window-decorations-gtk-module:colorreload-gtk-module
 gtk-primary-button-warps-slider=false
-gtk-theme-name=materiav2-dark-aqua
+gtk-theme-name=Adwaita-dark
 gtk-toolbar-style=3
diff --git a/usr/share/biglinux/themes/materia-dark/.config/gtk-4.0/settings.ini b/usr/share/biglinux/themes/materia-dark/.config/gtk-4.0/settings.ini
index 9f4a94e9..a2023db2 100644
--- a/usr/share/biglinux/themes/materia-dark/.config/gtk-4.0/settings.ini
+++ b/usr/share/biglinux/themes/materia-dark/.config/gtk-4.0/settings.ini
@@ -9,5 +9,5 @@ gtk-font-name=Lato Medium, Demi Bold 11
 gtk-icon-theme-name=Fluent
 gtk-menu-images=true
 gtk-primary-button-warps-slider=false
-gtk-theme-name=materiav2-dark-aqua
+gtk-theme-name=Adwaita-dark
 gtk-toolbar-style=3
diff --git a/usr/share/biglinux/themes/materia-dark/.config/xsettingsd/xsettingsd.conf b/usr/share/biglinux/themes/materia-dark/.config/xsettingsd/xsettingsd.conf
index 43026b1f..8e8d1a7f 100644
--- a/usr/share/biglinux/themes/materia-dark/.config/xsettingsd/xsettingsd.conf
+++ b/usr/share/biglinux/themes/materia-dark/.config/xsettingsd/xsettingsd.conf
@@ -1,5 +1,5 @@
 Gtk/CursorThemeSize 24
-Net/ThemeName "materiav2-dark-aqua"
+Net/ThemeName "Adwaita-dark"
 Gtk/EnableAnimations 1
 Gtk/DecorationLayout "icon:minimize,maximize,close"
 Gtk/PrimaryButtonWarpsSlider 0