VERSIONE 4.1.0

VERSIONE 4.0.0 VERSIONE 3.6.52 VERSIONE 3.6.47 VERSIONE 3.6.22
astrgl · Dec 3, 2023 · 8dc7ec5 · 8dc7ec5
1 parent 1bd84b3
commit 8dc7ec5
Show file tree

Hide file tree

Showing 127 changed files with 1,805 additions and 134 deletions.
diff --git a/.project b/.project
@@ -2,7 +2,7 @@
 Title=DnfDrake
 Startup=Fmain
 Icon=dnfdrake.svg
-Version=4.0.0
+Version=4.1.0
 Component=gb.image
 Component=gb.gui
 Component=gb.form

diff --git a/.src/FABOUT.class b/.src/FABOUT.class
@@ -5,7 +5,7 @@ Public Sub Form_Open()
 BTNCLOSE.Text = Fmain.Btnclose.Text
 TextArea1.Text = File.Load("/usr/share/dnfdrake/dnfdrake-ABOUT-" & Fmain.$LANG)
 Fmain.Enabled = False
-BTNCLOSE.Picture = Picture.Load("/usr/share/dnfdrake/close.png")
+BTNCLOSE.Picture = Picture.Load(FMAIN.$PATHICONS & "close" & FMain.$THEMESSUFFIX)
 End
 
 

diff --git a/.src/FABOUT.form b/.src/FABOUT.form
@@ -19,7 +19,7 @@
       MoveScaled(0,0,51,5)
       Font = Font["+7"]
       Alignment = Align.Center
-      Text = ("DNFDRAKE 4.0.0")
+      Text = ("DnfDrake 4.1.0")
     }
   }
 }
diff --git a/.src/FCONFIG.class b/.src/FCONFIG.class
@@ -12,9 +12,9 @@ Public Sub Form_Open()
         TXTDOWNGRADECMD.Text = Fmain.$DOWNGRADE
         TXTREINSTALLCMD.Text = Fmain.$REINSTALL
         TXTCUSTOMCMD.Text = Fmain.$CUSTOMCMD
-        BTNCLOSE.Picture = Picture.Load("/usr/share/dnfdrake/close.png")
-        BTNOK.Picture = Picture.Load("/usr/share/dnfdrake/ok.png")
-        BTNDEFAULT.Picture = Picture.Load("/usr/share/dnfdrake/default.png")
+        BTNCLOSE.Picture = Picture.Load(FMAIN.$PATHICONS & "close" & FMain.$THEMESSUFFIX)
+        BTNOK.Picture = Picture.Load(FMAIN.$PATHICONS & "ok" & FMain.$THEMESSUFFIX)
+        BTNDEFAULT.Picture = Picture.Load(FMAIN.$PATHICONS & "default" & FMain.$THEMESSUFFIX)
 
         If Fmain.$COLORTEXT = "color" Then
           CHKCOLORTEXT.Value = True

diff --git a/.src/FERROR.class b/.src/FERROR.class
@@ -25,8 +25,8 @@ If Fmain.Width > 1366 Then
   BTNCLOSE.Y = BTNCLOSE.Y + (FERROR.Height - 518)
 Endif
 '***************************************************
-BTNRETRY.Picture = Picture.Load("/usr/share/dnfdrake/refresh.png")
-BTNCLOSE.Picture = Picture.Load("/usr/share/dnfdrake/close.png")
+BTNRETRY.Picture = Picture.Load(FMAIN.$PATHICONS & "refresh" & FMain.$THEMESSUFFIX)
+BTNCLOSE.Picture = Picture.Load(FMAIN.$PATHICONS & "close" & FMain.$THEMESSUFFIX)
 
 End 
 Public Sub Form_Close()

diff --git a/.src/FEXCLUDELIST.class b/.src/FEXCLUDELIST.class
@@ -32,10 +32,10 @@ Public Sub Form_Open()
          LTITOLO.Text = Replace(ss$TTP[64], "_", " ") 
      Next
      flTTP.Close
-     BTNREMOVE.Picture = Picture.Load("/usr/share/dnfdrake/remove.png")
-     BTNREFRESH.Picture = Picture.Load("/usr/share/dnfdrake/refresh.png")
-     BTNSAVEAS.Picture = Picture.Load("/usr/share/dnfdrake/save-as.png")
-     BTNCLOSE.Picture = Picture.Load("/usr/share/dnfdrake/close.png")
+     BTNREMOVE.Picture = Picture.Load(FMAIN.$PATHICONS & "remove" & FMain.$THEMESSUFFIX)
+     BTNREFRESH.Picture = Picture.Load(FMAIN.$PATHICONS & "refresh" & FMain.$THEMESSUFFIX)
+     BTNSAVEAS.Picture = Picture.Load(FMAIN.$PATHICONS & "save-as" & FMain.$THEMESSUFFIX)
+     BTNCLOSE.Picture = Picture.Load(FMAIN.$PATHICONS & "close" & FMain.$THEMESSUFFIX)
  '*********************************************************************************
   Me.Mouse = Mouse.Wait  
     t = Open "/etc/dnf/dnf.conf"

diff --git a/.src/FEXTRA.class b/.src/FEXTRA.class
@@ -39,8 +39,8 @@ Public Sub Form_Open()
      Next
 '  
    flTTP.Close
-   BTNEXIT.Picture = Picture.Load("/usr/share/dnfdrake/close.png")
-   BTNCLOSE.Picture = Picture.Load("/usr/share/dnfdrake/ok.png")
+   BTNEXIT.Picture = Picture.Load(FMAIN.$PATHICONS & "close" & FMain.$THEMESSUFFIX)
+   BTNCLOSE.Picture = Picture.Load(FMAIN.$PATHICONS & "ok" & FMain.$THEMESSUFFIX)
  '*********************************************************************************
 
  If Fmain.$SECUREMODE = "SECURE" Then
@@ -121,6 +121,14 @@ Public Sub Form_Open()
  If Fmain.CHKNODEPS.Visible = True Then
     CHKNODEPS.Value = True
  Endif
+
+ If FMain.$THEMES = "Oxygen" Then
+     CMBTHEMES.Index = 0
+  Else If FMain.$THEMES = "Breeze" Then 
+     CMBTHEMES.Index = 1
+  Else If FMain.$THEMES = "BreezeDark" Then
+     CMBTHEMES.Index = 2   
+  Endif
 End
 
 
@@ -161,7 +169,7 @@ Public Sub BTNCLOSE_Click()
         Endif
     Endif    
 
-   If CHKDNFDRAKETRAY.VALUE = True Then
+   If CHKDNFDRAKETRAY.VALUE = True And If LBLDRAKETRAYSTATUS.Text = "Draketray is not running" Then
 '      If Not Exist(User.Home &/ "/.config/draketray/locktray") Then
       If Right(Left($LOCK)) <> "2" Then
           Fmain.$KILL = 2
@@ -280,6 +288,23 @@ Else
    Fmain.LBLNODEPS.Visible = False
    Fmain.PICNODEPS.Visible = False
 Endif
+'*******************************************************************************************
+ If CMBTHEMES.Index = 0 Then
+      File.Save(User.Home &/ "/.config/dnfdrake/themes", "Oxygen")
+      FMain.$THEMES = "Oxygen"
+      FMain.$THEMESSUFFIX = ".png"
+      FMain.LOADICONS
+   Else If CMBTHEMES.Index = 1 Then
+      File.Save(User.Home &/ "/.config/dnfdrake/themes", "Breeze")
+      FMain.$THEMES = "Breeze"
+      FMain.$THEMESSUFFIX = "-B.svg"
+      FMain.LOADICONS
+   Else If CMBTHEMES.Index = 2 Then
+      File.Save(User.Home &/ "/.config/dnfdrake/themes", "BreezeDark")   
+      FMain.$THEMES = "BreezeDark"  
+      FMain.$THEMESSUFFIX = "-BD.svg"  
+      FMain.LOADICONS
+   Endif
   Me.Close
 End
 

diff --git a/.src/FEXTRA.form b/.src/FEXTRA.form
@@ -1,11 +1,11 @@
 # Gambas Form File 3.0
 
 { Form Form
-  MoveScaled(0,0,64,81)
+  MoveScaled(0,0,64,86)
   Icon = Picture["dnfdrake.svg"]
   Resizable = False
   { Label5 Label
-    MoveScaled(2,60,60,13)
+    MoveScaled(2,65.4286,60,13)
     Border = Border.Plain
     BorderRadius = 10
   }
@@ -28,7 +28,7 @@
     BorderRadius = 10
   }
   { Label4 Label
-    MoveScaled(2,46,60,10)
+    MoveScaled(2,46,60,6)
     Border = Border.Plain
     BorderRadius = 10
   }
@@ -44,7 +44,7 @@
     Text = ("  Search")
   }
   { Label6 Label
-    MoveScaled(20,25,24,3)
+    MoveScaled(20,24.7143,24,3)
     Alignment = Align.Center
     Border = Border.Plain
     BorderRadius = 10
@@ -58,32 +58,27 @@
     Text = ("  Extra Option")
   }
   { BTNCLOSE Button
-    MoveScaled(3,75,16,4)
-  }
-  { CHKBTNDOWNGRADE CheckBox
-    MoveScaled(3,51,24,4)
-    Visible = False
-    Text = ("Downgrade")
+    MoveScaled(3,80.4286,16,4)
   }
   { CHKDNFDRAKETRAY CheckBox
-    MoveScaled(3,62,24,4)
+    MoveScaled(3,67.4286,24,4)
     Enabled = False
     Text = ("Check Updates")
   }
   { CHKDNFDRAKETRAYLAUNCH CheckBox
-    MoveScaled(36,62,24,4)
+    MoveScaled(36,67.4286,24,4)
     Enabled = False
     Text = ("Run on Startup")
   }
   { Label8 Label
-    MoveScaled(20,56.5714,24,3)
+    MoveScaled(20,62,24,3)
     Alignment = Align.Center
     Border = Border.Plain
     BorderRadius = 10
     Text = ("DrakeTray Config")
   }
   { Button1 Button
-    MoveScaled(3,68,16,4)
+    MoveScaled(3,73.4286,16,4)
     Visible = False
     Text = ("Reset")
   }
@@ -92,18 +87,13 @@
     Text = ("Search Offline")
     Value = CheckBox.True
   }
-  { CHKBTNVERSIONLOCK CheckBox
-    MoveScaled(36,51,24,4)
-    Visible = False
-    Text = ("Versionlock")
-  }
   { CHKBTNDISTROUPDATE CheckBox
     MoveScaled(3,30,32,4)
     ToolTip = ("Use for Rolling - Cooker")
     Text = ("Distro Update (Rolling -Cooker)")
   }
   { BTNEXIT Button
-    MoveScaled(45,75,16,4)
+    MoveScaled(45,80.4286,16,4)
   }
   { CHKBTNREINSTALL CheckBox
     MoveScaled(23,36,24,4)
@@ -128,7 +118,7 @@
     Text = ("Disable suspend during updates")
   }
   { LBLDRAKETRAYSTATUS Label
-    MoveScaled(20,68,24,3)
+    MoveScaled(20,73.4286,24,3)
     Alignment = Align.Center
     Border = Border.Plain
     BorderRadius = 15
@@ -137,4 +127,23 @@
     MoveScaled(36,30,24,4)
     Text = ("NoDeps")
   }
+  { Label9 Label
+    MoveScaled(2,56,60,5)
+    Border = Border.Plain
+    BorderRadius = 10
+    Text = ("Themes: ")
+  }
+  { CMBTHEMES ComboBox
+    MoveScaled(11,56.7143,16,3.5714)
+    Background = Color.Transparent
+    List = [("Oxygen"), ("Breeze"), ("Breeze Dark")]
+    Border = False
+  }
+  { Label10 Label
+    MoveScaled(20,52.7143,24,3)
+    Alignment = Align.Center
+    Border = Border.Plain
+    BorderRadius = 10
+    Text = ("Interface")
+  }
 }
diff --git a/.src/FINSTALL.class b/.src/FINSTALL.class
@@ -30,10 +30,10 @@ BTNINSTALL.Text = Fmain.btninstall.Text
 BTNANNULLA.Text = Fmain.btnstop.Text   
 BTNPKGUPDATE.Text = Fmain.BTNPKGUPDATE.Text  
 BTNPKGREINSTALL.Text = Fmain.BTNREINSTALL.Text  
-BTNINSTALL.Picture = Picture.Load("/usr/share/dnfdrake/add.png")
-BTNANNULLA.Picture = Picture.Load("/usr/share/dnfdrake/close.png")
-BTNPKGUPDATE.Picture = Picture.Load("/usr/share/dnfdrake/redo.png")
-BTNPKGREINSTALL.Picture = Picture.Load("/usr/share/dnfdrake/refresh.png")
+BTNINSTALL.Picture = Picture.Load(FMAIN.$PATHICONS & "add" & FMain.$THEMESSUFFIX)
+BTNANNULLA.Picture = Picture.Load(FMAIN.$PATHICONS & "close" & FMain.$THEMESSUFFIX)
+BTNPKGUPDATE.Picture = Picture.Load(FMAIN.$PATHICONS & "redo" & FMain.$THEMESSUFFIX)
+BTNPKGREINSTALL.Picture = Picture.Load(FMAIN.$PATHICONS & "refresh" & FMain.$THEMESSUFFIX)
 TXTRPMPATH.Text = $TXTRPMPATH & Right(Fmain.$RPMPATH, "-" & RInStr(Fmain.$RPMPATH, "/")) & " ?"
 If Fmain.$SECUREMODE = "SECURE" Then
   Fmain.Enabled = False  

diff --git a/.src/FLOADLISTE.class b/.src/FLOADLISTE.class
@@ -27,7 +27,7 @@ Public Sub Form_Open()
       $LOADAGG = Replace(ss$TTP[36], "_", " ")
   Next
   flTTP.Close
-  BTNSKIP.Picture = Picture.Load("/usr/share/dnfdrake/skip.png")
+  BTNSKIP.Picture = Picture.Load(FMAIN.$PATHICONS & "skip" & FMain.$THEMESSUFFIX)
  '*********************************************************************************
 TXTSTATO.Text = $LOADLIST
 If Fmain.$SECUREMODE = "SECURE" Then

diff --git a/.src/FMYREPO.class b/.src/FMYREPO.class
@@ -41,16 +41,16 @@ Public Sub Form_Open()
       BTNUNCHECKALL.Tooltip = Replace(ss$TTP[90], "_", " ")
   Next
    flTTP.Close 
-   BTNCLOSE.Picture = Picture.Load("/usr/share/dnfdrake/close.png")
-   BTNREMOVE.Picture = Picture.Load("/usr/share/dnfdrake/remove.png")
-   BTNADDREPO.Picture = Picture.Load("/usr/share/dnfdrake/ok.png")
-   BTNBUILDREPO.Picture = Picture.Load("/usr/share/dnfdrake/run-build.png")
-   BTNCHECKALL.Picture = Picture.Load("/usr/share/dnfdrake/checkall.png")
-   BTNUNCHECKALL.Picture = Picture.Load("/usr/share/dnfdrake/uncheckall.png")
-   BTNNOMECLEAR.Picture = Picture.Load("/usr/share/dnfdrake/clear.png")
-   BTNPULISCI.Picture = Picture.Load("/usr/share/dnfdrake/bacchetta.png")
-   Btnpathfile.Picture = Picture.Load("/usr/share/dnfdrake/open-folder.png")
-   BTNPATHGPG.Picture = Picture.Load("/usr/share/dnfdrake/open-folder.png")
+   BTNCLOSE.Picture = Picture.Load(FMAIN.$PATHICONS & "close" & FMain.$THEMESSUFFIX)
+   BTNREMOVE.Picture = Picture.Load(FMAIN.$PATHICONS & "remove" & FMain.$THEMESSUFFIX)
+   BTNADDREPO.Picture = Picture.Load(FMAIN.$PATHICONS & "ok" & FMain.$THEMESSUFFIX)
+   BTNBUILDREPO.Picture = Picture.Load(FMAIN.$PATHICONS & "run-build" & FMain.$THEMESSUFFIX)
+   BTNCHECKALL.Picture = Picture.Load(FMAIN.$PATHICONS & "checkall" & FMain.$THEMESSUFFIX)
+   BTNUNCHECKALL.Picture = Picture.Load(FMAIN.$PATHICONS & "uncheckall" & FMain.$THEMESSUFFIX)
+   BTNNOMECLEAR.Picture = Picture.Load(FMAIN.$PATHICONS & "clear" & FMain.$THEMESSUFFIX)
+   BTNPULISCI.Picture = Picture.Load(FMAIN.$PATHICONS & "bacchetta" & FMain.$THEMESSUFFIX)
+   Btnpathfile.Picture = Picture.Load(FMAIN.$PATHICONS & "open-folder" & FMain.$THEMESSUFFIX)
+   BTNPATHGPG.Picture = Picture.Load(FMAIN.$PATHICONS & "open-folder" & FMain.$THEMESSUFFIX)
 '*************************************************************************************
   If Fmain.$SECUREMODE = "SECURE" Then
       Fmain.Enabled = False 

diff --git a/.src/FOK.class b/.src/FOK.class
@@ -41,14 +41,14 @@ Public Sub Form_Open()
       FOK.Text = Replace(ss$TTP[22], "_", " ")
        Next
    flTTP.Close 
-   Btnclose.Picture = Picture.Load("/usr/share/dnfdrake/ok.png")
+   Btnclose.Picture = Picture.Load(FMAIN.$PATHICONS & "ok" & FMain.$THEMESSUFFIX)
 '*************************************************************************************
   Btnclose.SetFocus
 If FRUN.Visible = True Then
   FRUN.ProgressBar1.Pulse = False    
   FRUN.ProgressBar1.Value = 1
   FRUN.BTNSTOP.Text = Btnclose.Text
-  FRUN.BTNSTOP.Picture = Picture.Load("/usr/share/dnfdrake/ok.png")
+  FRUN.BTNSTOP.Picture = Picture.Load(FMAIN.$PATHICONS & "ok" & FMain.$THEMESSUFFIX)
   FRUN.MONITORVIEW.Visible = False
   FRUN.Text = "DnfDrake,  " & Fmain.$FATTO
   Me.Close 

diff --git a/.src/FPROGRESSWAIT.class b/.src/FPROGRESSWAIT.class
@@ -23,7 +23,7 @@ Public Sub Form_Open()
    flTTP.Close 
 
    BTNSTOP.Text = Fmain.btnstop.Text 
-   BTNSTOP.Picture = Picture.Load("/usr/share/dnfdrake/stop.png")
+   BTNSTOP.Picture = Picture.Load(FMAIN.$PATHICONS & "stop" & FMain.$THEMESSUFFIX)
 
    If Fmain.$SECUREMODE = "SECURE" Then
       Fmain.Enabled = False

diff --git a/.src/FPW.class b/.src/FPW.class
@@ -47,8 +47,8 @@ Public Sub Form_Open()
       FPW.Text = Replace(ss$TTP[21], "_", " ")
        Next
    flTTP.Close
-   BTNANNULLA.Picture = Picture.Load("/usr/share/dnfdrake/stop.png")
-   Btnok.Picture = Picture.Load("/usr/share/dnfdrake/ok.png")
+   BTNANNULLA.Picture = Picture.Load(FMAIN.$PATHICONS & "stop" & FMain.$THEMESSUFFIX)
+   Btnok.Picture = Picture.Load(FMAIN.$PATHICONS & "ok" & FMain.$THEMESSUFFIX)
 '************************************************************************************
 If Fmain.$SECUREMODE = "SECURE" Then
    Fmain.Enabled = False  

diff --git a/.src/FRUN.class b/.src/FRUN.class
@@ -32,7 +32,7 @@ Public Sub Form_Open()
      Fmain.txtconsole.Enabled = True
      BTNSTOP.Text = Fmain.btnstop.Text 
   Endif 
-  BTNSTOP.Picture = Picture.Load("/usr/share/dnfdrake/stop.png")
+  BTNSTOP.Picture = Picture.Load(FMAIN.$PATHICONS & "stop" & FMain.$THEMESSUFFIX)
      $CLOSEPASS = 0    
 
   Wait 0.2

diff --git a/.src/FSELECTION.class b/.src/FSELECTION.class
@@ -5,8 +5,8 @@ Public Sub Form_Open()
 
   FSELECTION.X = 1073
   FSELECTION.Y = 179
-  BTNOK.Picture = Picture.Load("/usr/share/dnfdrake/ok.png")
-  BTNANNULLA.Picture = Picture.Load("/usr/share/dnfdrake/stop.png")
+  BTNOK.Picture = Picture.Load(FMAIN.$PATHICONS & "ok" & FMain.$THEMESSUFFIX)
+  BTNANNULLA.Picture = Picture.Load(FMAIN.$PATHICONS & "stop" & FMain.$THEMESSUFFIX)
 End
 
 Public Sub BTNANNULLA_Click()

diff --git a/.src/FTEMPPKGLIST.class b/.src/FTEMPPKGLIST.class
@@ -28,10 +28,10 @@ Public Sub Form_Open()
          BTNCLOSE.Tooltip = Replace(ss$TTP[4], "_", " ") 
      Next
      flTTP.Close
-     BTNAPPLY.Picture = Picture.Load("/usr/share/dnfdrake/ok.png")
-     BTNREFRESH.Picture = Picture.Load("/usr/share/dnfdrake/refresh.png")
-     BTNSAVEAS.Picture = Picture.Load("/usr/share/dnfdrake/save-as.png")
-     BTNCLOSE.Picture = Picture.Load("/usr/share/dnfdrake/close.png")
+     BTNAPPLY.Picture = Picture.Load(FMAIN.$PATHICONS & "ok" & FMain.$THEMESSUFFIX)
+     BTNREFRESH.Picture = Picture.Load(FMAIN.$PATHICONS & "refresh" & FMain.$THEMESSUFFIX)
+     BTNSAVEAS.Picture = Picture.Load(FMAIN.$PATHICONS & "save-as" & FMain.$THEMESSUFFIX)
+     BTNCLOSE.Picture = Picture.Load(FMAIN.$PATHICONS & "close" & FMain.$THEMESSUFFIX)
  '*********************************************************************************
   Me.Mouse = Mouse.Wait  
   If Fmain.TXTPKGLISTNOME.Text = "Remove Package List" Then

diff --git a/.src/FUPDATERESUME.class b/.src/FUPDATERESUME.class
@@ -14,9 +14,9 @@ Public Sub Form_Open()
       FUPDATERESUME.Text = "DnfDrake Distro Update"
   Endif
   $SECURE = 0
-  BTNRESUME.Picture = Picture.Load("/usr/share/dnfdrake/redo.png")
-  BTNREUPADTE.Picture = Picture.Load("/usr/share/dnfdrake/refresh.png")
-  BTNANNULLA.Picture = Picture.Load("/usr/share/dnfdrake/stop.png")
+  BTNRESUME.Picture = Picture.Load(FMAIN.$PATHICONS & "redo" & FMain.$THEMESSUFFIX)
+  BTNREUPADTE.Picture = Picture.Load(FMAIN.$PATHICONS & "refresh" & FMain.$THEMESSUFFIX)
+  BTNANNULLA.Picture = Picture.Load(FMAIN.$PATHICONS & "stop" & FMain.$THEMESSUFFIX)
 End
 
 Private Sub FRUNSHOW()