Added support for:

AMD Duron AMD E2-Vision AMD Geode AMD Opteron K10 AMD Opteron K8 AMD Sempron Mobile AMD Sempron K7 AMD Sempron K8 AMD Turion X2 AMD Turion X2 Ultra AMD Turion64-X2 AMD Turion64 AMD Vision Intel Atom Intel Core i7
i-nex · Feb 18, 2012 · 4ec9186 · 4ec9186
1 parent eef0614
commit 4ec9186
Show file tree

Hide file tree

Showing 24 changed files with 365 additions and 311 deletions.
diff --git a/src/i-nex/.lang/.pot b/src/i-nex/.lang/.pot
diff --git a/src/i-nex/.lang/Finfosys.pot b/src/i-nex/.lang/Finfosys.pot
diff --git a/src/i-nex/.settings b/src/i-nex/.settings
@@ -21,10 +21,10 @@ SearchComment=False
 SearchString=True
 
 [OpenFile]
-Active=1
 File[1]=".src/Finfosys.form"
-File[2]=".src/Finfosys.class:137.26"
-File[3]=".src/Global.class:127.23"
+Active=2
+File[2]=".src/Finfosys.class:197.27"
+File[3]=".src/Global.class:152.7"
 File[4]=".src/About.form"
 File[5]=".src/About.class:63.30"
 File[6]=".src/distrodetect.class:12.30"

diff --git a/src/i-nex/.src/Finfosys.class b/src/i-nex/.src/Finfosys.class
@@ -1,5 +1,6 @@
 ' Gambas class file
 
+Public flags As String
 Public Sub Form_Open()
   Dim default_display_manager As Boolean = Exist("/etc/X11/default-display-manager")
   Dim cpuz0, cpuz1, cpuz2, cpuz3, cpuz4, cpuz5, cpuz6, cpuz7, cpuz8, cpuz9, cpuz10, cpuz11 As String
@@ -247,7 +248,7 @@ End
 
 Public Sub Wykrywanie_procesorow()
   Dim eloaders, eloaders2, eloaders3 As String
-  Dim obrazekcpu, cpu, vendor_id, flags, cpu_MHz As String
+  Dim obrazekcpu, cpu, vendor_id, cpu_MHz As String
   Dim model, stepping, cpu_family, bogomips As String
   Dim address_sizes, cache_size, ldata, linstruction As String
   Dim physical_id, cpu_cores, level3cache As String

diff --git a/src/i-nex/.src/Finfosys.form b/src/i-nex/.src/Finfosys.form
@@ -19,79 +19,94 @@
       Move(6,0,462,150)
       Font = Font["10"]
       Text = ("The main information\n")
-      { HBox1 HBox
-        Move(6,24,360,24)
-        { Label1 Label
-          Move(0,6,78,24)
-          Font = Font["Bold"]
-          AutoResize = True
-          Text = ("Manufacture:   ")
-        }
-        { TextBox28 TextBox
-          Move(78,0,144,24)
-          Expand = True
-        }
-      }
       { TextArea2 TextArea
         Move(84,364,301,21)
         Text = ("TextArea2")
         ReadOnly = True
         ScrollBar = Scroll.None
       }
-      { Button4 Button
-        Move(378,126,72,21)
-        Font = Font["10"]
-        Text = ("Info")
-        Picture = Picture["icon:/16/info"]
-        Border = False
-      }
-      { HBox2 HBox
-        Move(6,54,360,24)
-        { Label2 Label
-          Move(0,0,42,24)
-          Font = Font["Bold"]
-          AutoResize = True
-          Text = ("Model:   ")
-        }
-        { TextBox29 TextBox
-          Move(78,0,144,24)
-          Expand = True
-        }
-      }
-      { HBox3 HBox
-        Move(6,84,360,24)
-        { Label5 Label
-          Move(0,0,66,24)
-          Font = Font["Bold"]
-          AutoResize = True
-          Text = ("CPU Speed:   ")
-        }
-        { TextBox30 TextBox
-          Move(72,0,144,24)
+      { HBox1 HBox
+        Move(6,18,450,126)
+        { HPanel4 HPanel
+          Move(0,0,306,120)
           Expand = True
+          { HBox2 HBox
+            Move(0,0,306,24)
+            Expand = True
+            { Label1 Label
+              Move(0,6,78,24)
+              Font = Font["Bold"]
+              AutoResize = True
+              Text = ("Manufacture:   ")
+            }
+            { TextBox28 TextBox
+              Move(78,0,144,24)
+              Expand = True
+            }
+          }
+          { HBox3 HBox
+            Move(0,30,306,24)
+            Expand = True
+            { Label2 Label
+              Move(0,0,42,24)
+              Font = Font["Bold"]
+              AutoResize = True
+              Text = ("Model:   ")
+            }
+            { TextBox29 TextBox
+              Move(78,0,144,24)
+              Expand = True
+            }
+          }
+          { HBox24 HBox
+            Move(0,60,306,24)
+            Expand = True
+            { Label5 Label
+              Move(0,0,66,24)
+              Font = Font["Bold"]
+              AutoResize = True
+              Text = ("CPU Speed:   ")
+            }
+            { TextBox30 TextBox
+              Move(72,0,144,24)
+              Expand = True
+            }
+          }
+          { HBox25 HBox
+            Move(0,90,252,24)
+            { Label92 Label
+              Move(0,0,204,24)
+              Foreground = &HFF0000&
+              AutoResize = True
+            }
+          }
+          { HBox28 HBox
+            Move(258,90,102,24)
+            { Label93 Label
+              Move(0,0,84,24)
+              Font = Font["Bold"]
+              AutoResize = True
+            }
+          }
         }
-      }
-      { HBox24 HBox
-        Move(6,114,252,24)
-        { Label92 Label
-          Move(0,0,204,24)
-          Foreground = &HFF0000&
+        { HBox27 HBox
+          Move(312,0,150,90)
           AutoResize = True
+          { PictureBox3 PictureBox
+            Move(0,0,60,60)
+            AutoResize = True
+            Alignment = Align.Justify
+          }
         }
       }
-      { HBox25 HBox
-        Move(264,114,102,24)
-        { Label93 Label
-          Move(0,0,84,24)
-          Font = Font["Bold"]
-          AutoResize = True
-        }
+      { Button4 Button
+        Move(384,126,72,21)
+        Font = Font["10"]
+        Text = ("Info")
+        Picture = Picture["icon:/16/info"]
+        Border = False
       }
     }
-    { PictureBox3 PictureBox
-      Move(378,24,80,95)
-      Alignment = Align.Justify
-    }
     { Frame4 Frame
       Move(6,312,462,138)
       Font = Font["10"]

diff --git a/src/i-nex/.src/Global.class b/src/i-nex/.src/Global.class
@@ -36,12 +36,12 @@ Static Public Sub ikonaprocka()
   Finfosys.PictureBox3.Picture = Picture["intelp4.png"]
   Endif
 
-  If Finfosys.TextBox29.Text Like "*Intel(R) Atom(TM)*" Then
-  Finfosys.PictureBox3.Picture = Picture["atom.png"]
+  If Finfosys.TextBox29.Text Like "*Intel(R) Atom(TM) CPU*" Then
+  Finfosys.PictureBox3.Picture = Picture["Processors/Intel-Atom.png"]
   Endif
 
   If Finfosys.TextBox29.Text Like "*Intel(R) Core(TM) i7*" Then
-  Finfosys.PictureBox3.Picture = Picture["Processors/intel_core_i7.png"]
+  Finfosys.PictureBox3.Picture = Picture["Processors/Intel-Core-i7.png"]
   Endif
 
   If Finfosys.TextBox29.Text Like "*Intel(R) Core(TM) i5*" Then
@@ -69,14 +69,6 @@ Static Public Sub ikonaprocka()
   Finfosys.PictureBox3.Picture = Picture["amdsempron.png"]
   Endif
 
-  If Finfosys.TextBox29.Text Like "*Mobile AMD Sempron*" Then
-  Finfosys.PictureBox3.Picture = Picture["amdsempronmobile.png"]
-  Endif
-
-  If Finfosys.TextBox29.Text Like "*AMD Opteron(tm)*" Then
-  Finfosys.PictureBox3.Picture = Picture["amdopteron.png"]
-  Endif
-
   If Finfosys.TextBox29.Text Like "*AMD Athlon(tm) XP*" Then
   Finfosys.PictureBox3.Picture = Picture["amdathlonxp.png"]
   Endif
@@ -85,10 +77,6 @@ Static Public Sub ikonaprocka()
   Finfosys.PictureBox3.Picture = Picture["amdathlon64.png"]
   Endif
 
-  If Finfosys.TextBox29.Text Like "*AMD Phenom(tm)*" Then
-  Finfosys.PictureBox3.Picture = Picture["amdphenom.png"]
-  Endif
-
   If Finfosys.TextBox29.Text Like "*AMD Athlon(tm) II X2*" Then
   Finfosys.PictureBox3.Picture = Picture["Processors/amd_athlon_x2.png"]
   Endif
@@ -101,10 +89,6 @@ Static Public Sub ikonaprocka()
   Finfosys.PictureBox3.Picture = Picture["Processors/amd_fx_eight_core_processor.png"]
   Endif
 
-  If Finfosys.TextBox29.Text Like "*AMD Opteron*6*" Then
-  Finfosys.PictureBox3.Picture = Picture["Processors/amd_opteron_processor_6xxx.png"]
-  Endif
-
   If Finfosys.TextBox29.Text Like "*AMD Athlon(tm) II X3*" Then
   Finfosys.PictureBox3.Picture = Picture["Processors/amd_athlon_2_x3.png"]
   Endif
@@ -113,6 +97,60 @@ Static Public Sub ikonaprocka()
   Finfosys.PictureBox3.Picture = Picture["Processors/amd_athlon_x2_dual_core_processors.png"]
   Endif
 
+  'AMD APU
+  If Finfosys.TextBox29.Text Like "*AMD E-450.*" Then
+  Finfosys.PictureBox3.Picture = Picture["Processors/AMD-E2-Vision.jpg"]
+  Endif
+
+  If Finfosys.TextBox29.Text Like "*AMD E-350.*" Then
+  Finfosys.PictureBox3.Picture = Picture["Processors/AMD-Vision.jpg"]
+  Endif
+  'Sempron / Duron
+  If Finfosys.TextBox29.Text Like "*Mobile AMD Sempron*" Then
+  Finfosys.PictureBox3.Picture = Picture["Processors/AMD-Sempron-Mobile.png"]
+  Endif
+
+  If Finfosys.TextBox29.Text Like "*AMD Sempron (tm)*" And If Finfosys.flags Like "*lm*" Then
+  Finfosys.PictureBox3.Picture = Picture["Processors/AMD-Sempron_K8.png"]
+  Else If Finfosys.TextBox29.Text Like "*AMD Sempron (tm)*" Then
+  Finfosys.PictureBox3.Picture = Picture["Processors/AMD-Sempron_K7.png"]
+  Endif
+
+  If Finfosys.TextBox29.Text Like "*AMD Duron (tm)*" Then
+  Finfosys.PictureBox3.Picture = Picture["Processors/AMD-Duron.png"]
+  Endif
+  'Opteron
+  If Finfosys.TextBox29.Text Like "*Quad-Core AMD Opteron (tm)*" Then
+  Finfosys.PictureBox3.Picture = Picture["Processors/AMD-Opteron_K10.png"]
+  Else If Finfosys.TextBox29.Text Like "*Six-Core AMD Opteron (tm)*" Then
+  Finfosys.PictureBox3.Picture = Picture["Processors/AMD-Opteron_K10.png"]
+  Endif
+
+  If Finfosys.TextBox29.Text Like "*AMD Opteron(tm)*" Then
+  Finfosys.PictureBox3.Picture = Picture["Processors/AMD-Opteron_K8.png"]
+  Else If Finfosys.TextBox29.Text Like "*Dual-Core AMD Opteron (tm)*" Then
+  Finfosys.PictureBox3.Picture = Picture["Processors/AMD-Opteron_K8.png"]
+  Endif
+  'Turion
+  If Finfosys.TextBox29.Text Like "*AMD Turion (tm) 64*" Then
+  Finfosys.PictureBox3.Picture = Picture["Processors/Intel-Core-i7.png"]
+  Endif
+
+  If Finfosys.TextBox29.Text Like "*AMD Turion (tm) 64 X2" Then
+  Finfosys.PictureBox3.Picture = Picture["Processors/AMD-Turion64-X2.png"]
+  Endif
+
+  If Finfosys.TextBox29.Text Like "*AMD Turion (tm) X2*" Then
+  Finfosys.PictureBox3.Picture = Picture["Processors/AMD-Turion-X2.png"]
+  Endif
+
+  If Finfosys.TextBox29.Text Like "*AMD Turion (tm) X2 Ultra*" Then
+  Finfosys.PictureBox3.Picture = Picture["Processors/AMD-Turion-X2Ultra.png"]
+  Endif
+  'Phenom/Phenom II
+  If Finfosys.TextBox29.Text Like "*AMD Phenom(tm)*" Then
+  Finfosys.PictureBox3.Picture = Picture["amdphenom.png"]
+  Endif
 End
 
 Static Public Sub kartagraficzna()

diff --git a/src/i-nex/Processors/AMD-Duron.png b/src/i-nex/Processors/AMD-Duron.png
diff --git a/src/i-nex/Processors/AMD-E2-Vision.png b/src/i-nex/Processors/AMD-E2-Vision.png
diff --git a/src/i-nex/Processors/AMD-Geode.png b/src/i-nex/Processors/AMD-Geode.png
diff --git a/src/i-nex/Processors/AMD-Opteron_K10.png b/src/i-nex/Processors/AMD-Opteron_K10.png
diff --git a/src/i-nex/Processors/AMD-Opteron_K8.png b/src/i-nex/Processors/AMD-Opteron_K8.png
diff --git a/src/i-nex/Processors/AMD-Sempron-Mobile.png b/src/i-nex/Processors/AMD-Sempron-Mobile.png
diff --git a/src/i-nex/Processors/AMD-Sempron_K7.png b/src/i-nex/Processors/AMD-Sempron_K7.png
diff --git a/src/i-nex/Processors/AMD-Sempron_K8.png b/src/i-nex/Processors/AMD-Sempron_K8.png
diff --git a/src/i-nex/Processors/AMD-Turion-X2.png b/src/i-nex/Processors/AMD-Turion-X2.png
diff --git a/src/i-nex/Processors/AMD-Turion-X2Ultra.png b/src/i-nex/Processors/AMD-Turion-X2Ultra.png
diff --git a/src/i-nex/Processors/AMD-Turion64-X2.png b/src/i-nex/Processors/AMD-Turion64-X2.png
diff --git a/src/i-nex/Processors/AMD-Turion64.png b/src/i-nex/Processors/AMD-Turion64.png
diff --git a/src/i-nex/Processors/AMD-Vision.jpg b/src/i-nex/Processors/AMD-Vision.jpg
diff --git a/src/i-nex/Processors/Intel-Atom.png b/src/i-nex/Processors/Intel-Atom.png
diff --git a/src/i-nex/Processors/Intel-Core-i7.png b/src/i-nex/Processors/Intel-Core-i7.png
diff --git a/src/i-nex/Processors/intel_core_i7.png b/src/i-nex/Processors/intel_core_i7.png
diff --git a/src/i-nex/amdsempronmobile.png b/src/i-nex/amdsempronmobile.png
diff --git a/src/i-nex/atom.png b/src/i-nex/atom.png