Validation Cerbero Fixes

src/i-nex/.project

@@ -10,7 +10,7 @@ Component=gb.form
 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"
+Environment="LANG=C\nLC_ALL=C\nLIBOVERLAY_SCROLLBAR=0\nAPPMENU_DISPLAY_BOTH=1\nSHELL=/bin/bash\nPATH=/usr/lib/lightdm/lightdm:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"
 TabSize=1
 ControlPublic=1
 ModulePublic=1

src/i-nex/.settings

@@ -1,5 +1,6 @@
 [Bookmarks]
 CFlags=[9]
+Finfosys=[]
 
 [Breakpoints]
 Count=0
@@ -27,7 +28,7 @@ SearchString=True
 File[1]=".src/Finfosys.form"
 File[2]=".src/Global.class:204.27"
 File[3]=".src/About.form"
-File[4]=".src/About.class:26.46"
+File[4]=".src/About.class:92.97"
 File[5]=".src/battery.module:15.70"
 File[6]=".src/Disk_Drives.module:19.29"
 File[7]=".src/ScreenShot.form"
@@ -46,9 +47,10 @@ File[19]=".src/FModules.class:15.70"
 File[20]=".src/Input_Devices.module:15.70"
 File[21]=".src/Network.module:15.70"
 File[22]="Data/report-ng.sh:5.3"
-File[23]=".src/Distribution_Detect.module:65.43"
+File[23]=".src/Distribution_Detect.module:96.10"
 File[24]=".src/FFlags.module:19.14"
-File[25]=".src/Finfosys.class:823.26"
+Active=25
+File[25]=".src/Finfosys.class:900.29"
 File[26]=".src/FDF.form"
 File[27]=".src/FDF.class:15.70"
 File[28]=".src/FNET_R_T.form"
@@ -88,10 +90,9 @@ File[61]=".src/FDIMM.form"
 File[62]=".src/FDIMM.class:15.70"
 File[63]=".src/Reports/FCPUID_REPORT.module:28.92"
 File[64]=".src/MCPUSAGE.module:9.65"
-Active=65
-File[65]=".src/Reports/VALIDATE.module:120.13"
+File[65]=".src/Reports/VALIDATE.module:144.155"
 File[66]=".src/FValidate.form"
-File[67]=".src/FValidate.class:37.19"
+File[67]=".src/FValidate.class:16.1"
 Count=67
 
 [Watches]

src/i-nex/.src/FValidate.class

@@ -5,8 +5,8 @@ Public Sub Form_Open()
   If Settings["Window/X"] = Null Then
      Me.Center
   Else
-     Try Me.X = (Settings["Window/X", Me.X] - 45)
-     Try Me.Y = (Settings["Window/Y", Me.Y] + 200)
+     Try Me.X = Settings["Window/X", Me.X]
+     Try Me.Y = Settings["Window/Y", Me.Y]
   Endif
   Try TextBox1.Text = Settings["Cerbero/USERNAME"]
   Try TextBox2.Text = Settings["Cerbero/API"]
@@ -22,20 +22,10 @@ Public Sub Button2_Click()
 
  Settings["Cerbero/USERNAME"] = TextBox1.Text
  Settings["Cerbero/API"] = TextBox2.Text
- TextBox3.Text = VALIDATE.SendReportToServer(User.Home & "/.i-nex/VALID", "Validate", "http://i-nex.pl/", TextBox1.Text, TextBox2.Text)
 End
 
 Public Sub Button1_Click()
 
- Desktop.Open(TextBox3.Text)
-
-End
-
-Public Sub Button4_Click()
- Dim all As Integer
- Dim i As Integer
- Inc i
-   Print Last.Value
-
+ Desktop.Open("http://i-nex.pl/inex.r?signup")
 
 End

src/i-nex/.src/FValidate.form

@@ -1,44 +1,53 @@
 # Gambas Form File 3.0
 
 { Form Form
-  MoveScaled(0,0,86,18)
+  MoveScaled(0,0,68,38)
+  Text = ("Options")
   Resizable = False
-  { TextBox1 TextBox
-    MoveScaled(16,1,69,4)
-  }
-  { TextBox2 TextBox
-    MoveScaled(16,5,69,4)
-  }
-  { Label1 Label
-    MoveScaled(1,1,15,4)
+  { Frame1 Frame
+    MoveScaled(0,0,68,21)
     Font = Font["Bold,8"]
-    Text = ("Username:")
+    Text = ("Cerbero")
+    { TextBox2 TextBox
+      MoveScaled(1,15,66,4)
+    }
+    { TextBox1 TextBox
+      MoveScaled(1,7,66,4)
+    }
+    { Label1 Label
+      MoveScaled(1,3,15,4)
+      Font = Font["Bold,8"]
+      Text = ("Username:")
+    }
+    { Label2 Label
+      MoveScaled(1,11,15,4)
+      Font = Font["Bold,8"]
+      Text = ("Private API Key:")
+    }
   }
-  { Label2 Label
-    MoveScaled(1,5,15,4)
-    Font = Font["Bold,8"]
-    Text = ("Private API Key:")
+  { Button2 Button
+    MoveScaled(43,34,16,4)
+    Text = ("Save")
+    Picture = Picture["AppIcons/dialog-ok.png"]
   }
-  { TextBox3 TextBox
-    MoveScaled(16,9,65,4)
+  { TextLabel1 TextLabel
+    MoveScaled(1,22,66,6)
+    Font = Font["Bold,9"]
+    Text = ("To obtain a user name and a private key. You need to register to I-Nex Cebrero")
+    Alignment = Align.Center
   }
   { Button1 Button
-    MoveScaled(81,9,4,4)
+    MoveScaled(23,29,22,4)
+    Font = Font["8"]
+    Text = ("Register on Cerbero")
     Picture = Picture["AppIcons/applications-internet.png"]
   }
-  { Button2 Button
-    MoveScaled(69,13,16,4)
-    Text = ("Send")
-    Picture = Picture["AppIcons/dialog-ok.png"]
-  }
-  { Label3 Label
-    MoveScaled(1,9,15,4)
-    Font = Font["Bold,8"]
-    Text = ("Link:")
-  }
   { Button3 Button
-    MoveScaled(58,13,11,4)
-    Text = ("Close")
+    MoveScaled(59,34,9,4)
+    #Translate = False
+    Font = Font["8,Bold"]
+    ToolTip = "Close this program"
+    Text = "Close"
     Picture = Picture["AppIcons/application-exit2.png"]
   }
 }

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

@@ -716,13 +716,6 @@ Public Sub Button6_Click()
 
 End
 
-Public Sub Button13_Click()
-
- Desktop.Open("http://i-nex.linux.pl/board/")
- Logs("Reporting bug to http://tuxportal.pl/forum/", Logger.Info)
-
-End
-
 Public Sub ComboBox2_Click()
  nets.get_informations_about_net_interface()
  TextBox56.Text = nets.subsystem_device
@@ -915,7 +908,13 @@ Public Sub Form_Close()
 End
 
 Public Sub Button17_Click()
+ Dim URL As String
  VALIDATE._inits()
- FValidate.Show
+ URL = VALIDATE.SendReportToServer(User.Home & "/.i-nex/VALID", "Validate", "http://i-nex.pl/", Settings["Cerbero/USERNAME"], Settings["Cerbero/API"])
+ Clipboard.Copy(URL)
+ Desktop.Open(URL)
+End
 
+Public Sub Button13_Click()
+FValidate.Show
 End

src/i-nex/.src/Finfosys.form

@@ -76,8 +76,8 @@
     Move(28,511,28,28)
     #Translate = False
     Font = Font["8"]
-    ToolTip = "You found a bug in I-Nex?\nPlease click this button and write in forum about bug which you have found."
-    Picture = Picture["AppIcons/mail-mark-important.png"]
+    ToolTip = "Options"
+    Picture = Picture["icon:/16/options"]
   }
   { TabStrip1 TabStrip
     Move(0,0,476,511)
@@ -2471,8 +2471,13 @@
     Font = Font["8,Bold"]
     Text = ("Show modules")
   }
-  { Button17 Button
+  { !Button17 Button
     Move(210,511,112,28)
+    #Public = True
+    Font = Font["Bold,8"]
+    Background = &H00BA8B&
+    ToolTip = ("Publish data online")
     Text = ("Validate")
+    Picture = Picture["icon:/16/new"]
   }
 }