Dodano wykrywanie więkrzej ilości dystrybucji oraz dodano kilka opcji

i-nex · Sep 27, 2011 · c730332 · c730332
1 parent b023347
commit c730332
Show file tree

Hide file tree

Showing 15 changed files with 299 additions and 266 deletions.
diff --git a/src/Silicon/.gambas/DISTRODETECT b/src/Silicon/.gambas/DISTRODETECT
diff --git a/src/Silicon/.gambas/FINFOSYS b/src/Silicon/.gambas/FINFOSYS
diff --git a/src/Silicon/.gambas/FZASLUGI b/src/Silicon/.gambas/FZASLUGI
diff --git a/src/Silicon/.gambas/GLOBAL b/src/Silicon/.gambas/GLOBAL
diff --git a/src/Silicon/.gambas/LAST1 b/src/Silicon/.gambas/LAST1
diff --git a/src/Silicon/.lang/.pot b/src/Silicon/.lang/.pot
diff --git a/src/Silicon/.lang/Finfosys.pot b/src/Silicon/.lang/Finfosys.pot
diff --git a/src/Silicon/.lang/Last1.pot b/src/Silicon/.lang/Last1.pot
diff --git a/src/Silicon/.settings b/src/Silicon/.settings
@@ -13,9 +13,9 @@ SearchString=True
 
 [OpenFile]
 File[1]="Finfosys.form"
-File[2]="Finfosys.class:182.45"
-Active=2
-File[3]="Global.class:76.34"
+File[2]="Finfosys.class:181.2"
+File[3]="Global.class:69.2"
+Active=3
 File[4]="linuxmint.png"
 File[5]="intellogo.gif"
 File[6]="About.form"
@@ -29,13 +29,11 @@ File[13]="amdphenom.png"
 File[14]="intelpentium2.png"
 File[15]="730143272452F1.jpg"
 File[16]="730143272452F11.jpg"
-File[17]="Last1.form"
-File[18]="Last1.class:5.32"
-File[19]="11068_9016_16_network_globe_icon.png"
-File[20]="Packages.form"
-File[21]="Packages.class:34.17"
-File[22]="distrodetect.class:23.37"
-Count=22
+File[17]="11068_9016_16_network_globe_icon.png"
+File[18]="Packages.form"
+File[19]="Packages.class:24.34"
+File[20]="distrodetect.class:38.26"
+Count=20
 
 [Watches]
 Count=0

diff --git a/src/Silicon/Finfosys.class b/src/Silicon/Finfosys.class
@@ -159,12 +159,18 @@ PUBLIC SUB dysk()
 END
 
 PUBLIC SUB bios()
-DIM bios_vendor, bios_version, bios_date, board_name, board_vendor AS String
+  DIM bios_vendor, bios_version, bios_date, board_name, board_vendor AS String
+
   SHELL "cat /sys/devices/virtual/dmi/id/bios_vendor" TO bios_vendor
   SHELL "cat /sys/devices/virtual/dmi/id/bios_version" TO bios_version
   SHELL "cat /sys/devices/virtual/dmi/id/bios_date" TO bios_date
   SHELL "cat /sys/devices/virtual/dmi/id/board_vendor" TO board_vendor
   SHELL "cat /sys/devices/virtual/dmi/id/board_name" TO board_name
+  SHELL "hwinfo --bios | grep 'Unique ID:' | sed -e 's/Unique ID://' -e 's/\t//g'" WAIT TO TextArea49.Text
+  SHELL "hwinfo --bios | grep 'Hardware Class:' | sed -e 's/Hardware Class://' -e 's/\t//g'" WAIT TO TextArea50.Text
+  'SHELL "hwinfo --bios | grep 'BIOS Keyboard LED Status:' | sed -e 's/BIOS Keyboard LED Status://' -e 's/\t//g'" WAIT TO TextArea51.Text
+
+
   TextArea25.Text = bios_vendor
   TextArea26.Text = bios_version
   TextArea27.Text = bios_date

diff --git a/src/Silicon/Finfosys.form b/src/Silicon/Finfosys.form
@@ -185,7 +185,7 @@
     Text = ("Płyta główna / Bios")
     Picture = Picture["motherboard.png"]
     { Frame1 Frame
-      Move(7,147,462,112)
+      Move(7,147,462,168)
       Text = ("Bios")
       { TextLabel33 TextLabel
         Move(7,21,77,21)
@@ -199,6 +199,25 @@
         Move(7,77,42,21)
         Text = ("Data:")
       }
+      { TextLabel25 TextLabel
+        Move(7,105,77,21)
+        Text = ("Unique Id:")
+      }
+      { TextArea49 TextArea
+        Move(91,105,364,21)
+        Text = ("TextArea49")
+        ReadOnly = True
+        ScrollBar = Scroll.None
+      }
+      { TextLabel42 TextLabel
+        Move(7,133,119,21)
+        Text = ("Hardware Class:")
+      }
+      { TextArea50 TextArea
+        Move(119,133,105,21)
+        Text = ("TextArea50")
+        ScrollBar = Scroll.None
+      }
     }
     { Frame5 Frame
       Move(7,7,462,133)
@@ -277,7 +296,7 @@
         Text = ("OpenGL vendor string:")
       }
       { TextArea19 TextArea
-        Move(154,21,301,21)
+        Move(161,21,294,21)
         Text = ("TextArea19")
         ReadOnly = True
         ScrollBar = Scroll.None
@@ -297,7 +316,7 @@
         Text = ("OpenGL version string:")
       }
       { TextArea21 TextArea
-        Move(154,91,301,21)
+        Move(161,91,294,21)
         Text = ("TextArea21")
         ReadOnly = True
         ScrollBar = Scroll.None
@@ -307,7 +326,7 @@
         Text = ("Obecna rozdzielczo\xC5\x9B\xC4\x87:")
       }
       { TextArea38 TextArea
-        Move(154,126,301,21)
+        Move(161,126,294,21)
         Text = ("N/A")
         ReadOnly = True
         ScrollBar = Scroll.None

diff --git a/src/Silicon/Global.class b/src/Silicon/Global.class
@@ -69,7 +69,7 @@ STATIC PUBLIC SUB ikonaprocka()
   ENDIF
 
   IF Finfosys.TextArea1.Text LIKE "*AMD Athlon(tm) II X2*" THEN 
-  Finfosys.PictureBox3.Picture = Picture["730143272452F11.jpg"]
+  Finfosys.PictureBox3.Picture = Picture["730143272452F1.jpg"]
   ENDIF 
 
 END

diff --git a/src/Silicon/Last1.class b/src/Silicon/Last1.class
diff --git a/src/Silicon/Last1.form b/src/Silicon/Last1.form
diff --git a/src/Silicon/distrodetect.class b/src/Silicon/distrodetect.class
@@ -22,6 +22,26 @@ STATIC PUBLIC SUB distro_detect()
   IF distro LIKE "LinuxMint" THEN 
   Finfosys.TextArea29.Text = "Linux Mint"
   Finfosys.TextArea32.Text = codename
+  IF distro LIKE "*Fedora*" THEN 
+  Finfosys.TextArea29.Text = "Fedora"
+  Finfosys.TextArea32.Text = codename
+  IF distro LIKE "*CrunchBang*" THEN 
+  Finfosys.TextArea29.Text = "CrunchBang"
+  Finfosys.TextArea32.Text = codename
+  IF distro LIKE "*frugalware*" THEN 
+  Finfosys.TextArea29.Text = "frugalware"
+  Finfosys.TextArea32.Text = codename
+  IF distro LIKE "*Peppermint*" THEN 
+  Finfosys.TextArea29.Text = "Peppermint"
+  Finfosys.TextArea32.Text = codename
+  IF Exist("/etc/SuSE-release") THEN 
+  Finfosys.TextArea29.Text = "OpenSUSE"
+  Finfosys.TextArea32.Text = codename
+                    ENDIF 
+                  ENDIF 
+                ENDIF 
+              ENDIF 
+            ENDIF
           ENDIF 
         ENDIF 
       ENDIF