Skip to content

Commit

Permalink
Add option to remember last save directory. All window close using Fo…
Browse files Browse the repository at this point in the history
…rm_Close()
  • Loading branch information
eloaders committed Dec 23, 2013
1 parent 15e5363 commit 20a571d
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 28 deletions.
15 changes: 6 additions & 9 deletions src/i-nex/.settings
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[Bookmarks]
Distribution_Detect=[]

[Breakpoints]
Count=0

Expand Down Expand Up @@ -31,12 +28,13 @@ File[4]=".src/About.class:73.3"
File[5]=".src/battery.module:70.77"
File[6]=".src/Disk_Drives.module:33.0"
File[7]=".src/ScreenShot.form"
File[8]=".src/ScreenShot.class:20.21"
Active=8
File[8]=".src/ScreenShot.class:38.45"
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:153.31"
File[13]=".src/FReport_Gen.class:165.3"
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 @@ -46,10 +44,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:5.36"
Active=23
File[23]=".src/Distribution_Detect.module:23.47"
File[24]=".src/FFlags.module:90.19"
File[25]=".src/Finfosys.class:661.0"
File[25]=".src/Finfosys.class:236.109"
File[26]=".src/FDF.form"
File[27]=".src/FDF.class:28.69"
File[28]=".src/FNET_R_T.form"
Expand All @@ -69,7 +66,7 @@ File[41]=".src/FFileDialog.form"
File[42]=".src/Dialog.class:0.0"
File[43]=".src/Mdecode.module:7.0"
File[44]=".src/Reports/MCPU_REPORT.module:48.53"
File[45]=".src/Reports/MMOBO_REPORT.module:12.7"
File[45]=".src/Reports/MMOBO_REPORT.module:20.60"
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"
Expand All @@ -78,7 +75,7 @@ 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"
File[54]=".src/MInit.module:32.41"
File[54]=".src/MInit.module:14.34"
Count=54

[Watches]
Expand Down
19 changes: 14 additions & 5 deletions src/i-nex/.src/FReport_Gen.class
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
' Gambas class file

Public Sub Form_Open()
ButtonBox1.Text = Desktop.Path & "/report.txt"
If Exist("~/.i-nex/lastsave") Then
ButtonBox1.Text = File.Load("" & User.Home & "/.i-nex/lastsave")
Else
ButtonBox1.Text = Desktop.Path & "/report.txt"
Endif

ComboBox1.Add("pastebin.com")
ComboBox1.Add("cxg.de")
Expand Down Expand Up @@ -115,8 +119,7 @@ If CheckBox11.Value = True Then
Endif

If CheckBox13.value = True And CheckBox11.Value = False Then
Me.Close
Finfosys.Show
Form_Close()
Endif
End

Expand All @@ -132,8 +135,7 @@ End

Public Sub Button2_Click()

Me.Close
Finfosys.Show
Form_Close()

End

Expand All @@ -155,3 +157,10 @@ Public Sub Button4_Click()
Endif

End

Public Sub Form_Close()
File.Save("" & User.Home & "/.i-nex/lastsave", ButtonBox1.Text)
Me.Close
Finfosys.Show

End
2 changes: 1 addition & 1 deletion src/i-nex/.src/Finfosys.form
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@
Border = Border.Plain
}
{ Label103 Label
Move(98,56,252,21)
Move(7,56,343,21)
#Translate = False
Font = Font["Bold"]
Text = "Label103"
Expand Down
24 changes: 17 additions & 7 deletions src/i-nex/.src/Reports/MMOBO_REPORT.module
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,23 @@

Public DATA_RETURN As String
Public Report As Collection = [("0"): ("========================================================================================================================="),
("1"): ("________________Motherboard________________"),
("2"): ("Manufacturer: " & Finfosys.TextBox23.Text),
("3"): ("Model: " & Finfosys.TextBox24.Text),
("4"): ("___________________Bios____________________"),
("5"): ("Manufacturer: " & Finfosys.TextBox25.Text),
("6"): ("Date: " & Finfosys.TextBox27.Text),
("7"): ("Version: " & Finfosys.TextBox26.Text)]
("1"): ("___________________Board___________________"),
("2"): (Finfosys.TextLabel1.Text),
("3"): (Finfosys.TextLabel2.Text),
("4"): (Finfosys.TextLabel3.Text),
("5"): (Finfosys.TextLabel4.Text),
("6"): ("___________________Bios____________________"),
("7"): (Finfosys.TextLabel5.Text),
("8"): (Finfosys.TextLabel6.Text),
("9"): (Finfosys.TextLabel14.Text),
("10"): ("_________________Chassis__________________"),
("11"): (Finfosys.TextLabel8.Text),
("12"): (Finfosys.TextLabel9.Text),
("13"): (Finfosys.TextLabel10.Text),
("14"): (Finfosys.TextLabel11.Text),
("15"): ("_________________Product__________________"),
("14"): (Finfosys.TextLabel12.Text),
("14"): (Finfosys.TextLabel13.Text)]
Public Sub _inits()
Dim All As Integer
DATA_RETURN = Null
Expand Down
12 changes: 6 additions & 6 deletions src/i-nex/.src/ScreenShot.class
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ Public Sub Form_Open()
If Not Exist(User.Home & "/.i-nex") Then
Mkdir User.Home & "/.i-nex"
Endif
If Exist(User.Home & "/.i-nex/lastsave") Then
ButtonBox1.Text = File.Load("" & User.Home & "/.i-nex/lastsave")
If Exist(User.Home & "/.i-nex/lastsaveg") Then
ButtonBox1.Text = File.Load("" & User.Home & "/.i-nex/lastsaveg")
Else
ButtonBox1.Text = Desktop.Path
Endif
Expand Down Expand Up @@ -36,10 +36,9 @@ End
Public Sub Button1_Click()

ScreenShotM.save(ButtonBox1.Text, TextBox1.Text, ComboBox1.Text, SliderBox1.Value)
File.Save("" & User.Home & "/.i-nex/lastsave", ButtonBox1.Text)
File.Save("" & User.Home & "/.i-nex/lastsaveg", ButtonBox1.Text)

Me.Close
Finfosys.Show
Form_Close()
End

Public Sub ButtonBox1_Click()
Expand All @@ -52,6 +51,7 @@ End

Public Sub Form_Close()

File.Save("" & User.Home & "/.i-nex/lastsaveg", ButtonBox1.Text)
Me.Close
Finfosys.Show

Expand All @@ -67,4 +67,4 @@ Public Sub ComboBox1_Click()
SliderBox1.Value = 70
Endif

End
End

0 comments on commit 20a571d

Please sign in to comment.