Versione 4.1.5

-Aggiunta la verifica della connessione prima della rigenerazione delle liste
astrgl · Jan 12, 2024 · 9864358 · 9864358
1 parent 3071994
commit 9864358
Show file tree

Hide file tree

Showing 22 changed files with 107 additions and 24 deletions.
diff --git a/.project b/.project
@@ -2,7 +2,7 @@
 Title=DnfDrake
 Startup=Fmain
 Icon=dnfdrake.svg
-Version=4.1.2
+Version=4.1.5
 Component=gb.image
 Component=gb.gui
 Component=gb.form

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.1.2")
+      Text = ("DnfDrake 4.1.5")
     }
   }
 }
diff --git a/.src/FEXTRA.class b/.src/FEXTRA.class
@@ -169,13 +169,17 @@ Public Sub BTNCLOSE_Click()
         Endif
     Endif    
 
-   If CHKDNFDRAKETRAY.VALUE = True And If LBLDRAKETRAYSTATUS.Text = "Draketray is not running" Then
+   ' If CHKDNFDRAKETRAY.VALUE = True And If LBLDRAKETRAYSTATUS.Text = "Draketray is not running" Then
+   If CHKDNFDRAKETRAY.VALUE = True Then
+
 '      If Not Exist(User.Home &/ "/.config/draketray/locktray") Then
+    If LBLDRAKETRAYSTATUS.Text = "Draketray is not running" Then
       If Right(Left($LOCK)) <> "2" Then
           Fmain.$KILL = 2
           Shell ("/usr/bin/draketray.gambas")
           Sleep 1.1
         Endif
+      Endif   
       ' Shell "ps aux | grep gbr3 | grep draketray | wc -l" Wait To $LOCK  
       '  If Right(Left($LOCK)) = "2" Then 
       '     'CHKDNFDRAKETRAY.Value = True

diff --git a/.src/FLOADLISTE.class b/.src/FLOADLISTE.class
@@ -5,7 +5,8 @@ Public $LOADINST As String
 Public $LOADNONINST As String
 Public $LOADAGG As String
 Public $UPDATEDIPS As String
-
+Public $CONNECTION As Integer       'STATO CONNESSIONE INTERNET 0=DISCONNESSO 1=CONNESSO
+Public $MSGCONNECTION As String     'MESSAGGIO DI CONNESSIONE NON DISPONIBILE
 
 Public Sub Form_Open()
  Dim flTTP As File  
@@ -25,6 +26,7 @@ Public Sub Form_Open()
       $LOADINST = Replace(ss$TTP[34], "_", " ")
       $LOADNONINST = Replace(ss$TTP[35], "_", " ")
       $LOADAGG = Replace(ss$TTP[36], "_", " ")
+      $MSGCONNECTION = Replace(ss$TTP[36], "_", " ")
   Next
   flTTP.Close
   BTNSKIP.Picture = Picture.Load(FMAIN.$PATHICONS & "skip" & FMain.$THEMESSUFFIX)
@@ -43,6 +45,7 @@ If Fmain.$RPMPATH = "" Then
       'Fmain.$RPMPATH = ""      ELIMINATA PER GESTIONE CON FINSTALL
       Me.Close 
 Endif
+CHECKCONNECTION
 
 End
 
@@ -56,7 +59,7 @@ Public Sub ProgressBar1_MouseDown()
 End
 
 Public Sub Timer1_Timer()
-
+If $CONNECTION = 1 Then 
 Dim b As Byte
     For b = 1 To 10
        ProgressBar1.Value = b / 100
@@ -87,9 +90,12 @@ Dim b As Byte
        Me.Close
      Endif
      Timer1.Enabled = False
-
-CHECKUPDATES
-
+  CHECKUPDATES
+Else 
+  Message.Info($MSGCONNECTION, "Ok")
+  BTNSKIP_Click
+Endif
+
 End
 Private Sub CHECKUPDATES()
 'VERIFICA SE PRESENTI AGGIORNAMENTI
@@ -118,9 +124,21 @@ Dim ss$UPD As New String[]
       Fmain.btncerca_CLICK
    Endif
  Endif
+End 
+Private Sub CHECKCONNECTION()
+Dim sOutput As String
+Dim sTemp As String = "8.8.8.8"  
+   Shell "ping -c1 -w1 8.8.8.8" To sOutput
+  ' Exec ["ping ", "-c1 " "-w1 ", sTemp] To sOutput                                    'Ping the target and store the output in sOutput"
+    If InStr(sOutput, "64 bytes from") Then                                               'If '64 bytes from' exists in sOutput then..
+      $CONNECTION = 1
+     ' Message.Info("CONNESSIONE=" & $CONNECTION, "ok")   
+    Else 
+      $CONNECTION = 0
+     ' Message.Info("CONNESSIONE=" & $CONNECTION, "ok")                                                  
+    End If 
+
 End
-
-
 Public Sub BTNSKIP_Click()
    BTNSKIP.Enabled = False
    Timer1.Enabled = False

diff --git a/.src/FLOADLISTE.form b/.src/FLOADLISTE.form
@@ -15,7 +15,7 @@
     Move(231,17,364,14)
   }
   { Timer1 #Timer
-    #Move(497,0)
+    #Move(497,7)
     Enabled = True
     Delay = 3000
   }

diff --git a/.src/Fmain.class b/.src/Fmain.class
@@ -2644,8 +2644,8 @@ Public Sub LOADICONS()
     BTNPKGLISTCLEAN.Picture = Picture.Load($PATHICONS & "trash" & $THEMESSUFFIX)
     BTNADDPKGLIST.Picture = Picture.Load($PATHICONS & "insert-text" & $THEMESSUFFIX)
     BTNPKGLISTVIEW.Picture = Picture.Load($PATHICONS & "view-log" & $THEMESSUFFIX)
-    PCTCONNECT.Picture = Picture.Load($PATHICONS & "offline.png")
-    PCTDISCONNECT.Picture = Picture.Load($PATHICONS & "online.png")
+    PCTCONNECT.Picture = Picture.Load($PATHICONS & "offline" & $THEMESSUFFIX)
+    PCTDISCONNECT.Picture = Picture.Load($PATHICONS & "online" & $THEMESSUFFIX)
     PICSUSPEND.Picture = Picture.Load($PATHICONS & "suspend" & $THEMESSUFFIX)
     PICSUSPENDLOCK.Picture = Picture.Load($PATHICONS & "lock" & $THEMESSUFFIX)
     BTNCUSTOM.Picture = Picture.Load($PATHICONS & "bacchetta" & $THEMESSUFFIX)

diff --git a/FILE-EXTRA/dnfdrake-TTP-br_BR b/FILE-EXTRA/dnfdrake-TTP-br_BR
@@ -93,4 +93,5 @@ Start_DrakeTray_on_startup
 For_info_click_with_the_right_mouse_button
 NoDeps_allows_you_to_install,_remove_and_upgrade_packages_without_considering_dependencies._Only_one_package_at_a_time._Use_it_with_caution!
 Type_your_choice!
-Select_icon_theme_for_DnfDrake.
+Select_icon_theme_for_DnfDrake.
+The_connection_is_unaviable,_please_check it!
diff --git a/FILE-EXTRA/dnfdrake-TTP-ca_ES b/FILE-EXTRA/dnfdrake-TTP-ca_ES
@@ -93,4 +93,5 @@ Start_DrakeTray_on_startup
 For_info_click_with_the_right_mouse_button
 NoDeps_allows_you_to_install,_remove_and_upgrade_packages_without_considering_dependencies._Only_one_package_at_a_time._Use_it_with_caution!
 Type_your_choice!
-Select_icon_theme_for_DnfDrake.
+Select_icon_theme_for_DnfDrake.
+The_connection_is_unaviable,_please_check it!
diff --git a/FILE-EXTRA/dnfdrake-TTP-de_DE b/FILE-EXTRA/dnfdrake-TTP-de_DE
@@ -93,4 +93,5 @@ Start_DrakeTray_on_startup
 For_info_click_with_the_right_mouse_button
 NoDeps_allows_you_to_install,_remove_and_upgrade_packages_without_considering_dependencies._Only_one_package_at_a_time._Use_it_with_caution!
 Type_your_choice!
-Select_icon_theme_for_DnfDrake.
+Select_icon_theme_for_DnfDrake.
+The_connection_is_unaviable,_please_check it!
diff --git a/FILE-EXTRA/dnfdrake-TTP-en_GB b/FILE-EXTRA/dnfdrake-TTP-en_GB
@@ -93,4 +93,5 @@ Start_DrakeTray_on_startup
 For_info_click_with_the_right_mouse_button
 NoDeps_allows_you_to_install,_remove_and_upgrade_packages_without_considering_dependencies._Only_one_package_at_a_time._Use_it_with_caution!
 Type_your_choice!
-Select_icon_theme_for_DnfDrake.
+Select_icon_theme_for_DnfDrake.
+The_connection_is_unaviable,_please_check it!
diff --git a/FILE-EXTRA/dnfdrake-TTP-en_US b/FILE-EXTRA/dnfdrake-TTP-en_US
@@ -93,4 +93,5 @@ Start_DrakeTray_on_startup
 For_info_click_with_the_right_mouse_button
 NoDeps_allows_you_to_install,_remove_and_upgrade_packages_without_considering_dependencies._Only_one_package_at_a_time._Use_it_with_caution!
 Type_your_choice!
-Select_icon_theme_for_DnfDrake.
+Select_icon_theme_for_DnfDrake.
+The_connection_is_unaviable,_please_check it!
diff --git a/FILE-EXTRA/dnfdrake-TTP-es_ES b/FILE-EXTRA/dnfdrake-TTP-es_ES
@@ -93,4 +93,5 @@ Start_DrakeTray_on_startup
 For_info_click_with_the_right_mouse_button
 NoDeps_allows_you_to_install,_remove_and_upgrade_packages_without_considering_dependencies._Only_one_package_at_a_time._Use_it_with_caution!
 Type_your_choice!
-Select_icon_theme_for_DnfDrake.
+Select_icon_theme_for_DnfDrake.
+The_connection_is_unaviable,_please_check it!
diff --git a/FILE-EXTRA/dnfdrake-TTP-fr_FR b/FILE-EXTRA/dnfdrake-TTP-fr_FR
@@ -93,4 +93,5 @@ Start_DrakeTray_on_startup
 For_info_click_with_the_right_mouse_button
 NoDeps_allows_you_to_install,_remove_and_upgrade_packages_without_considering_dependencies._Only_one_package_at_a_time._Use_it_with_caution!
 Type_your_choice!
-Select_icon_theme_for_DnfDrake.
+Select_icon_theme_for_DnfDrake.
+The_connection_is_unaviable,_please_check it!
diff --git a/FILE-EXTRA/dnfdrake-TTP-gb_GB b/FILE-EXTRA/dnfdrake-TTP-gb_GB
@@ -93,4 +93,5 @@ Start_DrakeTray_on_startup
 For_info_click_with_the_right_mouse_button
 NoDeps_allows_you_to_install,_remove_and_upgrade_packages_without_considering_dependencies._Only_one_package_at_a_time._Use_it_with_caution!
 Type_your_choice!
-Select_icon_theme_for_DnfDrake.
+Select_icon_theme_for_DnfDrake.
+The_connection_is_unaviable,_please_check it!
diff --git a/FILE-EXTRA/dnfdrake-TTP-it_IT b/FILE-EXTRA/dnfdrake-TTP-it_IT
@@ -93,4 +93,5 @@ Avvia_DrakeTray_all'avvio
 Per_info_clicca_col_tasto_destro_del_mouse
 NoDeps_consente_di_installare,_disinstallare_e_aggiornare_pacchetti_senza_considerare_le_dipendenze._Un_solo_pacchetto_per_volta._Usalo_con_cautela!
 Digita_la_tua_scelta!
-Quale_tema_di_icone_vuoi_usare_in_DnfDrake?
+Quale_tema_di_icone_vuoi_usare_in_DnfDrake?
+The_connection_is_unaviable,_please_check it!
diff --git a/FILE-EXTRA/dnfdrake-TTP-pl_PL b/FILE-EXTRA/dnfdrake-TTP-pl_PL
@@ -93,4 +93,5 @@ Start_DrakeTray_on_startup
 For_info_click_with_the_right_mouse_button
 NoDeps_allows_you_to_install,_remove_and_upgrade_packages_without_considering_dependencies._Only_one_package_at_a_time._Use_it_with_caution!
 Type_your_choice!
-Select_icon_theme_for_DnfDrake.
+Select_icon_theme_for_DnfDrake.
+The_connection_is_unaviable,_please_check it!
diff --git a/FILE-EXTRA/dnfdrake-TTP-ru_RU b/FILE-EXTRA/dnfdrake-TTP-ru_RU
@@ -94,4 +94,5 @@ For_info_click_with_the_right_mouse_button
 NoDeps_allows_you_to_install,_uninstall_and_upgrade_packages_without_considering_dependencies._Only_one_package_at_a_time._Use_it_with_caution!
 NoDeps_allows_you_to_install,_remove_and_upgrade_packages_without_considering_dependencies._Only_one_package_at_a_time._Use_it_with_caution!
 Type_your_choice!
-Select_icon_theme_for_DnfDrake.
+Select_icon_theme_for_DnfDrake.
+La_connessione_non_è_disponibile,_verificare!
diff --git a/ICONS-EXTRA/offline-B.svg b/ICONS-EXTRA/offline-B.svg
diff --git a/ICONS-EXTRA/offline-BD.svg b/ICONS-EXTRA/offline-BD.svg
diff --git a/ICONS-EXTRA/online-B.svg b/ICONS-EXTRA/online-B.svg
diff --git a/ICONS-EXTRA/online-BD.png b/ICONS-EXTRA/online-BD.png
diff --git a/ICONS-EXTRA/online-BD.svg b/ICONS-EXTRA/online-BD.svg