Add Include SCSI

i-nex · Feb 8, 2012 · fa96a75 · fa96a75
1 parent c07c53f
commit fa96a75
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 24 deletions.
diff --git a/src/i-nex/.lang/.pot b/src/i-nex/.lang/.pot
@@ -18,7 +18,7 @@ msgstr ""
 msgid "About"
 msgstr ""
 
-#: About.form:45 FReport_Gen.form:55 Finfosys.form:1829
+#: About.form:45 FReport_Gen.form:56 Finfosys.form:1829
 msgid "Close"
 msgstr ""
 
@@ -114,42 +114,46 @@ msgstr ""
 msgid "I-Nex Home page"
 msgstr ""
 
-#: FReport_Gen.form:23
+#: FReport_Gen.form:24
 msgid "Generate report"
 msgstr ""
 
-#: FReport_Gen.form:46
+#: FReport_Gen.form:47
 msgid "Generate"
 msgstr ""
 
-#: FReport_Gen.form:66
+#: FReport_Gen.form:67
 msgid "CPU Tab"
 msgstr ""
 
-#: FReport_Gen.form:72
+#: FReport_Gen.form:73
 msgid "Motherboard / Bios Tab"
 msgstr ""
 
-#: FReport_Gen.form:78
+#: FReport_Gen.form:79
 msgid "Sound Tab"
 msgstr ""
 
-#: FReport_Gen.form:84
+#: FReport_Gen.form:85
 msgid "Graphics Tab"
 msgstr ""
 
-#: FReport_Gen.form:90
+#: FReport_Gen.form:91
 msgid "System Tab"
 msgstr ""
 
-#: FReport_Gen.form:100
+#: FReport_Gen.form:101
 msgid "Include lspci"
 msgstr ""
 
-#: FReport_Gen.form:106
+#: FReport_Gen.form:107
 msgid "Include lsusb"
 msgstr ""
 
+#: FReport_Gen.form:113
+msgid "Include /proc/scsi/scsi"
+msgstr ""
+
 #: Finfosys.form:268
 msgid "CPU"
 msgstr ""

diff --git a/src/i-nex/.lang/FReport_Gen.pot b/src/i-nex/.lang/FReport_Gen.pot
@@ -14,43 +14,47 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: FReport_Gen.form:23
+#: FReport_Gen.form:24
 msgid "Generate report"
 msgstr ""
 
-#: FReport_Gen.form:46
+#: FReport_Gen.form:47
 msgid "Generate"
 msgstr ""
 
-#: FReport_Gen.form:55
+#: FReport_Gen.form:56
 msgid "Close"
 msgstr ""
 
-#: FReport_Gen.form:66
+#: FReport_Gen.form:67
 msgid "CPU Tab"
 msgstr ""
 
-#: FReport_Gen.form:72
+#: FReport_Gen.form:73
 msgid "Motherboard / Bios Tab"
 msgstr ""
 
-#: FReport_Gen.form:78
+#: FReport_Gen.form:79
 msgid "Sound Tab"
 msgstr ""
 
-#: FReport_Gen.form:84
+#: FReport_Gen.form:85
 msgid "Graphics Tab"
 msgstr ""
 
-#: FReport_Gen.form:90
+#: FReport_Gen.form:91
 msgid "System Tab"
 msgstr ""
 
-#: FReport_Gen.form:100
+#: FReport_Gen.form:101
 msgid "Include lspci"
 msgstr ""
 
-#: FReport_Gen.form:106
+#: FReport_Gen.form:107
 msgid "Include lsusb"
 msgstr ""
 
+#: FReport_Gen.form:113
+msgid "Include /proc/scsi/scsi"
+msgstr ""
+
diff --git a/src/i-nex/.src/FReport_Gen.class b/src/i-nex/.src/FReport_Gen.class
@@ -13,7 +13,7 @@ Public Sub Button1_Click()
  Else
  Shell "rm " & ButtonBox1.Text & ""
  Reportm._generate(CheckBox1.Value, CheckBox2.Value, CheckBox3.Value, CheckBox4.Value, ButtonBox1.Text)
- Reportm.include(CheckBox6.Value, CheckBox7.Value, ButtonBox1.Text)
+ Reportm.include(CheckBox6.Value, CheckBox7.Value, CheckBox8.Value, ButtonBox1.Text)
  Me.Close
  Endif
 End

diff --git a/src/i-nex/.src/FReport_Gen.form b/src/i-nex/.src/FReport_Gen.form
@@ -73,6 +73,11 @@
       Expand = True
       Text = ("Include lsusb")
     }
+    { CheckBox8 CheckBox
+      Move(0,48,144,24)
+      Expand = True
+      Text = ("Include /proc/scsi/scsi")
+    }
   }
   { Separator1 Separator
     Move(216,0,6,186)

diff --git a/src/i-nex/.src/Reportm.module b/src/i-nex/.src/Reportm.module
@@ -213,7 +213,7 @@ Public Sub PBV(ProgressBar_Value As Float)
 
 End
 
-Public Sub include(lspci As Boolean, lsusb As Boolean, save_dir As String)
+Public Sub include(lspci As Boolean, lsusb As Boolean, scsi As Boolean, save_dir As String)
  If lspci = True Then
   TextInfo("Include lspci information")
   Wait 0.1
@@ -264,7 +264,28 @@ Public Sub include(lspci As Boolean, lsusb As Boolean, save_dir As String)
   TextInfo("Include lsusb information ... ... ... Done")
   PBV(1)
  Endif
-
+ If scsi = True Then
+  Shell "echo '' >>" & save_dir & ""
+  Wait 0.1
+  PBV(0.2)
+  TextInfo("Include SCSI information")
+  Shell "echo '========================== SCSI ==============================' >>" & save_dir & ""
+  Wait 0.1
+  PBV(0.4)
+  TextInfo("Include SCSI information...")
+  Shell "cat /proc/scsi/scsi >>" & save_dir & "" Wait
+  Wait 0.1
+  PBV(0.6)
+  TextInfo("Include SCSI information... ...")
+  Shell "echo '======================== SCSI END ============================' >>" & save_dir & ""
+  Wait 0.1
+  PBV(0.8)
+  TextInfo("Include SCSI information... ... ...")
+  Shell "echo '' >>" & save_dir & ""
+  Wait 0.1
+  PBV(1)
+  TextInfo("Include SCSI information... ... ... Done")
+ Endif
 End
 
 

diff --git a/src/i-nex/.src/Start_App_Args.class b/src/i-nex/.src/Start_App_Args.class
@@ -28,7 +28,7 @@ Public Sub Form_Open()
   If Application.Args[1] = "devel" Then
    root()
   Endif
-  Me.Center
+  Try Me.Center
 End
 
 Public Sub root()