Skip to content

Commit

Permalink
Add Bash modules, update system report and show more info in system tab
Browse files Browse the repository at this point in the history
  • Loading branch information
eloaders committed Dec 22, 2013
1 parent 93e8b43 commit c3e4132
Show file tree
Hide file tree
Showing 13 changed files with 1,089 additions and 139 deletions.
16 changes: 10 additions & 6 deletions src/i-nex/.settings
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[Bookmarks]
Finfosys=[]

[Breakpoints]
Count=0

Expand All @@ -21,7 +24,6 @@ SearchComment=False
SearchString=True

[OpenFile]
Active=1
File[1]=".src/Finfosys.form"
File[2]=".src/Global.class:88.35"
File[3]=".src/About.form"
Expand All @@ -34,7 +36,7 @@ File[9]=".src/ScreenShotM.module:7.0"
File[10]=".src/USB_Drives.module:13.0"
File[11]=".src/Asound_Drives.module:34.12"
File[12]=".src/FReport_Gen.form"
File[13]=".src/FReport_Gen.class:4.0"
File[13]=".src/FReport_Gen.class:17.35"
File[14]=".src/Start_App_Args.form"
File[15]=".src/Start_App_Args.class:4.2"
File[16]=".src/ChkPrm.module:21.19"
Expand All @@ -44,9 +46,9 @@ File[19]=".src/FModules.class:20.10"
File[20]=".src/Input_Devices.module:8.1"
File[21]=".src/net.module:104.1"
File[22]="Data/report-ng.sh:27.36"
File[23]=".src/Distribution_Detect.module:5.39"
File[23]=".src/Distribution_Detect.module:2.18"
File[24]=".src/FFlags.module:90.19"
File[25]=".src/Finfosys.class:198.29"
File[25]=".src/Finfosys.class:230.0"
File[26]=".src/FDF.form"
File[27]=".src/FDF.class:28.69"
File[28]=".src/FNET_R_T.form"
Expand All @@ -70,12 +72,14 @@ File[45]=".src/Reports/MMOBO_REPORT.module:12.7"
File[46]=".src/Reports/MGPU_REPORT.module:47.77"
File[47]=".src/Reports/MSOUND_REPORT.module:13.14"
File[48]=".src/Reports/MPastebinit.module:16.14"
File[49]=".src/Reports/MSYSTEM_REPORT.module:27.1"
Active=49
File[49]=".src/Reports/MSYSTEM_REPORT.module:22.35"
File[50]=".src/Reports/MKERNEL_REPORT.module:19.1"
File[51]=".src/Reports/MInclude.module:72.15"
File[52]=".src/Reports/MDRIVES_REPORT.module:12.40"
File[53]=".src/FInputDate.form"
Count=53
File[54]=".src/MInit.module:32.41"
Count=54

[Watches]
Count=0
Expand Down
11 changes: 0 additions & 11 deletions src/i-nex/.src/Distribution_Detect.module
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
' Gambas module file

Public Sub _init()

If Exist("~/.i-nex/report-ng.sh") Then
Shell "rm ~/.i-nex/report-ng.sh" Wait
Endif
If Exist("~/.i-nex") Then
Print "i-nex in home folder is exist"
Else
Shell "mkdir -p ~/.i-nex/" Wait
Endif
Copy "Data/report-ng.sh" To User.Home &/ ".i-nex/report-ng.sh"
Shell "/bin/bash ~/.i-nex/report-ng.sh" Wait

Select Case File.Load("" & User.Home & "/.i-nex/DistributionVendor.conf")
Case Like "*LinuxMint*"
Expand Down
17 changes: 17 additions & 0 deletions src/i-nex/.src/Finfosys.class
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ Public Sub Form_Open()
Me.Close
Endif
Finfosys.TabStrip1[9].Visible = False
Debug ""
Object.Call(MInit, "_init")
Debug "Settings default dir = " & Settings.DefaultDir & ""
Button14.Visible = ChkPrm.ChkExec("udisks")
Debug "Check for Battery"
Expand Down Expand Up @@ -226,6 +228,21 @@ Public Sub System()
Label135.Text = "Distro Release: " & Replace(Replace(Replace(File.Load("" & User.Home & "/.i-nex/DistributionRelease.conf"), "\n", ""), " ", ""), "\n", "")
Label144.Text = Replace(File.Load("" & User.Home & "/.i-nex/Binutils.conf"), "\n", "")
Label145.Text = "Linux C Library: " & Replace(File.Load("" & User.Home & "/.i-nex/Lnxclib.conf"), "\n", "")
Label37.Text = "Desktop environment: " & Replace(File.Load("" & User.Home & "/.i-nex/DE.conf"), "\n", "")
Label60.Text = "Window manager: " & Replace(Replace(Replace(File.Load("" & User.Home & "/.i-nex/WM.conf"), "\n", ""), " ", ""), "\n", "")
Label61.Text = "Window manager Theme: " & Replace(Replace(Replace(File.Load("" & User.Home & "/.i-nex/Win_theme.conf"), "\n", ""), " ", ""), "\n", "")
Label62.Text = "GTK+ 2 Theme: " & Replace(Replace(Replace(File.Load("" & User.Home & "/.i-nex/gtk2Theme.conf"), "\n", ""), " ", ""), "\n", "")
Label63.Text = "GTK+ 3 Theme: " & Replace(Replace(Replace(File.Load("" & User.Home & "/.i-nex/gtk3Theme.conf"), "\n", ""), " ", ""), "\n", "")
Label147.Text = "GTK Font: " & Replace(Replace(Replace(File.Load("" & User.Home & "/.i-nex/gtkFont.conf"), "\n", ""), " ", ""), "\n", "")
Label148.Text = "GTK Icons: " & Replace(Replace(Replace(File.Load("" & User.Home & "/.i-nex/gtkIcons.conf"), "\n", ""), " ", ""), "\n", "")
' DE.conf
' WM.conf
' Win_theme.conf
' gtk2Theme.conf
' gtk3Theme.conf
' gtkFont.conf
' gtkIcons.conf


End

Expand Down
88 changes: 65 additions & 23 deletions src/i-nex/.src/Finfosys.form
Original file line number Diff line number Diff line change
Expand Up @@ -1047,80 +1047,80 @@
Picture = Picture["icon:/16/info"]
}
{ Label4 Label
Move(7,7,301,28)
Move(7,7,301,21)
#Translate = False
Font = Font["Bold,8"]
Font = Font["Bold,9"]
Text = "Label4"
Border = Border.Plain
}
{ Label135 Label
Move(7,35,301,28)
Move(7,28,301,21)
#Translate = False
Font = Font["Bold,8"]
Font = Font["Bold,9"]
Text = "Label135"
Border = Border.Plain
}
{ Label136 Label
Move(7,196,231,21)
Move(7,280,455,21)
#Translate = False
Font = Font["Bold,8"]
Font = Font["Bold,9"]
Text = "Label136"
Border = Border.Plain
}
{ Label137 Label
Move(7,217,231,21)
Move(7,301,455,21)
#Translate = False
Font = Font["Bold,8"]
Font = Font["Bold,9"]
Text = "Label137"
Border = Border.Plain
}
{ Label138 Label
Move(7,238,231,21)
Move(7,322,455,21)
#Translate = False
Font = Font["Bold,8"]
Font = Font["Bold,9"]
Text = "Label138"
Border = Border.Plain
}
{ Label139 Label
Move(7,259,231,21)
Move(7,343,455,21)
#Translate = False
Font = Font["Bold,8"]
Font = Font["Bold,9"]
Text = "Label139"
Border = Border.Plain
}
{ Label140 Label
Move(7,280,231,21)
Move(7,196,455,21)
#Translate = False
Font = Font["Bold,8"]
Font = Font["Bold,9"]
Text = "Label140"
Border = Border.Plain
}
{ Label141 Label
Move(7,301,231,21)
Move(7,217,455,21)
#Translate = False
Font = Font["Bold,8"]
Font = Font["Bold,9"]
Text = "Label141"
Border = Border.Plain
}
{ Label142 Label
Move(7,322,231,21)
Move(7,238,455,21)
#Translate = False
Font = Font["Bold,8"]
Font = Font["Bold,9"]
Text = "Label142"
Border = Border.Plain
}
{ Label143 Label
Move(7,385,455,21)
#Translate = False
Visible = False
Font = Font["Bold,8"]
Font = Font["Bold,9"]
Text = "Label143"
Border = Border.Plain
}
{ Label144 Label
Move(7,343,231,21)
Move(7,259,455,21)
#Translate = False
Font = Font["Bold,8"]
Font = Font["Bold,9"]
Text = "Label144"
Border = Border.Plain
}
Expand All @@ -1129,12 +1129,54 @@
Stretch = True
}
{ Label145 Label
Move(7,364,231,21)
Move(7,364,455,21)
#Translate = False
Font = Font["Bold,8"]
Font = Font["Bold,9"]
Text = "Label145"
Border = Border.Plain
}
{ Label37 Label
Move(7,49,301,21)
Font = Font["Bold,9"]
Text = ("Label37")
Border = Border.Plain
}
{ Label60 Label
Move(7,70,301,21)
Font = Font["Bold,9"]
Text = ("Label60")
Border = Border.Plain
}
{ Label61 Label
Move(7,91,301,21)
Font = Font["Bold,9"]
Text = ("Label61")
Border = Border.Plain
}
{ Label62 Label
Move(7,112,301,21)
Font = Font["Bold,9"]
Text = ("Label62")
Border = Border.Plain
}
{ Label63 Label
Move(7,133,301,21)
Font = Font["Bold,9"]
Text = ("Label63")
Border = Border.Plain
}
{ Label147 Label
Move(7,175,301,21)
Font = Font["Bold,9"]
Text = ("Label147")
Border = Border.Plain
}
{ Label148 Label
Move(7,154,301,21)
Font = Font["Bold,9"]
Text = ("Label148")
Border = Border.Plain
}
Index = 6
Text = ("Kernel")
{ Frame22 Frame
Expand Down
40 changes: 40 additions & 0 deletions src/i-nex/.src/MInit.module
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
' Gambas module file

Public Sub _init()

If Exist("~/.i-nex") Then
Print "i-nex in home folder is exist"
Print "Try to remove files"
Shell "rm ~/.i-nex/detectdist" Wait
Shell "rm ~/.i-nex/detectde" Wait
Shell "rm ~/.i-nex/detectgtk" Wait
Shell "rm ~/.i-nex/detectwm" Wait
Shell "rm ~/.i-nex/detectwmtheme" Wait
Shell "rm ~/.i-nex/report-ng.sh" Wait
Else
Print "i-nex in home folder not exist"
Shell "mkdir -p ~/.i-nex/" Wait
Print "i-nex in home folder created"
Endif
Print "Copy nedded files"
Print "Copy detectdist"
Copy "Data/detectdist" To User.Home &/ ".i-nex/detectdist"
Print "Copy detectde"
Copy "Data/detectde" To User.Home &/ ".i-nex/detectde"
Print "Copy detectgtk"
Copy "Data/detectgtk" To User.Home &/ ".i-nex/detectgtk"
Print "Copy detectwm"
Copy "Data/detectwm" To User.Home &/ ".i-nex/detectwm"
Print "Copy detectwmtheme"
Copy "Data/detectwmtheme" To User.Home &/ ".i-nex/detectwmtheme"
Print "Copy report-ng.sh"
Copy "Data/report-ng.sh" To User.Home &/ ".i-nex/report-ng.sh"
Print "Execute copied files"
Shell "/bin/bash ~/.i-nex/detectwm" Wait
Shell "/bin/bash ~/.i-nex/detectdist" Wait
Shell "/bin/bash ~/.i-nex/detectde" Wait
Shell "/bin/bash ~/.i-nex/detectgtk" Wait
Shell "/bin/bash ~/.i-nex/detectwmtheme" Wait
Shell "/bin/bash ~/.i-nex/report-ng.sh" Wait

End
70 changes: 41 additions & 29 deletions src/i-nex/.src/Reports/MDRIVES_REPORT.module
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,48 @@ Public Report As Collection
Public DATA_RETURN As String
Public Sub refresh()
Report = [("0"): ("=======================================================" & Finfosys.ComboBox4.Text & "/" & Finfosys.ComboBox3.Text & "=================================================================="),
("1"): (Finfosys.Label17.Text),
("2"): (Finfosys.Label41.Text),
("3"): (Finfosys.Label16.Text),
("4"): (Finfosys.Label42.Text),
("5"): (Finfosys.Label26.Text),
("6"): (Finfosys.TextBox48.Text),
("7"): (Finfosys.Label27.Text),
("8"): (Finfosys.TextBox52.Text),
("9"): (Finfosys.Label40.Text),
("10"): (Finfosys.TextBox53.Text),
("11"): (Finfosys.Label38.Text),
("12"): (Finfosys.Label43.Text),
("13"): (Finfosys.Label39.Text),
("14"): (Finfosys.Label44.Text),
("15"): (Finfosys.Label46.Text),
("16"): (Finfosys.Label47.Text),
("17"): (Finfosys.Label45.Text),
("18"): (Finfosys.Label50.Text),
("19"): (Finfosys.Label52.Text),
("20"): (Finfosys.Label51.Text),
("21"): (Finfosys.Label53.Text),
("22"): (Finfosys.Label49.Text),
("23"): (Finfosys.Label55.Text),
("24"): (Finfosys.Label54.Text),
("25"): (Finfosys.Label56.Text),
("26"): (Finfosys.Label57.Text),
("27"): (Finfosys.Label58.Text),
("28"): (Finfosys.Label59.Text)]
("1"): (Finfosys.Label17.Text),
("2"): (Finfosys.Label41.Text),
("3"): (Finfosys.Label16.Text),
("4"): (Finfosys.Label42.Text),
("5"): (Finfosys.Label26.Text),
("6"): (Finfosys.TextBox48.Text),
("7"): (Finfosys.Label27.Text),
("8"): (Finfosys.TextBox52.Text),
("9"): (Finfosys.Label40.Text),
("10"): (Finfosys.TextBox53.Text),
("11"): (Finfosys.Label38.Text),
("12"): (Finfosys.Label43.Text),
("13"): (Finfosys.Label39.Text),
("14"): (Finfosys.Label44.Text),
("15"): (Finfosys.Label46.Text),
("16"): (Finfosys.Label47.Text),
("17"): (Finfosys.Label45.Text),
("18"): (Finfosys.Label50.Text),
("19"): (Finfosys.Label52.Text),
("20"): (Finfosys.Label51.Text),
("21"): (Finfosys.Label53.Text),
("22"): (Finfosys.Label49.Text),
("23"): (Finfosys.Label55.Text),
("24"): (Finfosys.Label54.Text),
("25"): (Finfosys.Label56.Text),
("26"): (Finfosys.Label57.Text),
("27"): (Finfosys.Label58.Text),
("28"): (Finfosys.Label59.Text),
("29"): (Finfosys.Label126.Text),
("30"): (Finfosys.Label127.Text)]
End

' ,
' ("31"): (Finfosys.Label128.Text),
' ("32"): (Finfosys.Label129.Text),
' ("33"): (Finfosys.Label130.Text),
' ("34"): (Finfosys.Label131.Text),
' ("35"): (Finfosys.Label132.Text),
' ("36"): (Finfosys.Label133.Text),
' ("37"): (Finfosys.Label134.Text),
' ("38"): (Finfosys.Label123.Text),
' ("39"): (Finfosys.Label124.Text),
' ("40"): (Finfosys.Label125.Text)
Public Sub _inits()
Dim All, All2, repcount As Integer
DATA_RETURN = Null
Expand Down

0 comments on commit c3e4132

Please sign in to comment.