Add Celeron T3000 Support and some fixes

Database/intel.json

@@ -10602,6 +10602,33 @@
       "PROCESSOR_SOCKET_IMAGE": "147.gif",
       "PROCESSOR_MODEL_NAME": "Pentium III 1133"
     },
+    {
+      "PROCESSOR_RELEASED": "Jun 2009",
+      "PROCESSOR_PRODUCTION_STATUS": "EOL",
+      "PROCESSOR_PART": "N/A",
+      "PROCESSOR_CODENAME": "Penryn-3M",
+      "PROCESSOR_TDP": "35 W",
+      "PROCESSOR_VOLTAGE": "1V - 1.25V",
+      "PROCESSOR_MULTIPLIER": "9",
+      "PROCESSOR_TURBOCLOCK": "NA",
+      "PROCESSOR_MEMORYSUPPORT": "N/A",
+      "PROCESSOR_OFCORES": "2",
+      "PROCESSOR_SMPCPUS": "2",
+      "PROCESSOR_INTEGRATEDGRAPHIC": "N/A",
+      "PROCESSOR_CACHEL1": "2 x 32 KB",
+      "PROCESSOR_CACHEL2": "1 MB 4-way",
+      "PROCESSOR_CACHEL3": "N/A",
+      "PROCESSOR_MARKET": "Mobile",
+      "PROCESSOR_FREQUENCY": "1800 MHz",
+      "PROCESSOR_TCASEMAX": "105°C",
+      "PROCESSOR_PACKAGE": "478 PGA",
+      "PROCESSOR_DIE_SIZE": "N/A",
+      "PROCESSOR_TRANSISTORS": "410 million",
+      "PROCESSOR_PROCESS_SIZE": "45 nm",
+      "PROCESSOR_SOCKET": "Socket P",
+      "PROCESSOR_SOCKET_IMAGE": "276.gif",
+      "PROCESSOR_MODEL_NAME": "Celeron T3000"
+    },
     {
       "PROCESSOR_RELEASED": "Jan 2014",
       "PROCESSOR_PRODUCTION_STATUS": "unknown",

I-Nex/i-nex/.project

@@ -7,11 +7,13 @@ Version=7.4.0
 Component=gb.image
 Component=gb.qt4
 Component=gb.form
+Component=gb.desktop.x11
 Component=gb.desktop
 Description="I-Nex is an application that gathers information for hardware components available on your system and displays it using an user interface similar to the popular Windows tool CPU-Z.\n\nI-Nex can display information for the following components: CPU, GPU, Motherboard, Sound, Hard disks, RAM, Network and USB as well as some system info like the hostname, Linux distribution and version, Xorg, GCC, GLX versions and Linux Kernel info.\n\n\nThe difference between I-Nex and the other hardware information GUI tools available for Linux is that the information is better organized and is displayed faster (than lshw-gtk for instance). Also, the hardware information is presented in a way that’s easier to understand than other such tools.\n\nBesides being able to display hardware information, I-Nex can also generate an advanced report for which you can select what to include and optionally send the report to a service such as Pastebin (and others). It also features an option to take a screenshot of the I-Nex window directly from the application."
 Authors="eloaders"
 Environment="LANG=C\nLC_ALL=C\nLIBOVERLAY_SCROLLBAR=0\nAPPMENU_DISPLAY_BOTH=1\nSHELL=/bin/bash"
 TabSize=1
+Language=pl
 ControlPublic=1
 ModulePublic=1
 SourcePath=/home/michal/Pulpit
@@ -32,5 +34,4 @@ Groups=suse:"Development"
 Menus=ubuntu:"Applications/System/Hardware"
 Categories=ubuntu:"System"
 Groups=ubuntu:"gnome"
-Dependencies=
 GambasVersion=3.8

I-Nex/i-nex/.settings

@@ -17,6 +17,9 @@ Geometry=[-9,212,180,180]
 [DebugWindow/User]
 Geometry=[236,249,180,180]
 
+[Executable]
+Path="/home/michal/Pulpit/i-nex.gambas"
+
 [FFind]
 SearchIn="Module"
 CaseSensitive=False

I-Nex/i-nex/.src/FCpudb.module

@@ -68,18 +68,22 @@ Function _inits()
   '
   '
   Else If Finfosys.Label14.Text Like "*atom*" Then
-   Logs("Use Intel Atom CPU Database", Logger.Info)
+   Logs("Use Intel CPU Database (Atom)", Logger.Info)
     buffer = File.Load("/etc/i-nex/Database/atom.json") 'Load the database to a temporary buffer
     Finfosys.Label14.Text = Replace(Finfosys.Label14.Text, "Intel", "")
   Else If Finfosys.Label14.Text Like "*intel*" Then
-   Logs("Use Intel CPU Database", Logger.Info)
+   Logs("Use Intel CPU Database (Intel All)", Logger.Info)
     buffer = File.Load("/etc/i-nex/Database/intel.json") 'Load the database to a temporary buffer
     Finfosys.Label14.Text = Replace(Finfosys.Label14.Text, "Intel", "")
   Else If Finfosys.Label14.Text Like "*Pentium*" Then
-   Logs("Use Intel CPU Database", Logger.Info)
+   Logs("Use Intel CPU Database (Pentium)", Logger.Info)
+    buffer = File.Load("/etc/i-nex/Database/intel.json") 'Load the database to a temporary buffer
+  Else If Finfosys.Label14.Text Like "*Celeron*" Then
+   Logs("Use Intel CPU Database (Celeron)", Logger.Info)
     buffer = File.Load("/etc/i-nex/Database/intel.json") 'Load the database to a temporary buffer
   Endif
 
+  'Celeron(R)Dual - Core CPU T3000@1.80 GHz
   Logs("Decode CPU Database", Logger.Info)
   database = JSON.Decode(buffer) 'Convert JSON data to Collection
   buffer = Null
@@ -115,7 +119,9 @@ Function _inits()
    cpucache = Replace(cpucache, "Core", "*")
    cpucache = Replace(cpucache, "Dual", "*")
   Endif
-
+
+  Logs("CPU Cache (I-Nex)" & cpucache & "", Logger.Info)
+
   For z = 0 To database["DATABASE"].Count - 1
     If database["DATABASE"][z]["PROCESSOR_MODEL_NAME"] Like "*" & cpucache & "*" Then 
       Print database["DATABASE"][z]["PROCESSOR_MODEL_NAME"]

I-Nex/i-nex/.src/Finfosys.class

@@ -503,7 +503,7 @@ Public Sub Wykrywanie_procesorow()
 
     sKey = Trim(Left$(sLine, iPos - 1))
     sVal = Trim(Mid$(sLine, iPos + 1))
-
+    
     Select Case sKey
       Case "processor"
        CPU_PROCESSOR.Add(sVal)
@@ -513,7 +513,7 @@ Public Sub Wykrywanie_procesorow()
        CPU_FAMILYz.Add(sVal)
       Case "model"
        CPU_MODEL.Add(sVal)
-      Case "model name"
+      Case Like "[Mm]odel name"
        Character = InStr(sVal, "@")
        CPU_MODEL_NAME.Add(Trim(Left$(sVal, Character - 1)))
       Case "stepping"

I-Nex/i-nex/.startup

@@ -7,5 +7,6 @@ I-Nex
 gb.image
 gb.qt4
 gb.form
+gb.desktop.x11
 gb.desktop