Skip to content

Commit

Permalink
Remove gambas3-gb-form-dialog dependency. I-Nex no more need gambas3-…
Browse files Browse the repository at this point in the history
…gb-form-dialog.

Add:
	Dialog.class
	FDirDialog.classFDirDialog.form
	FFileDialog.class
	FFileDialog.form
	FInputDate.class
	FInputDate.form
	Finfosys.class
	As: gambas3-gb-form-dialog
  • Loading branch information
eloaders committed Nov 6, 2013
1 parent 90b1438 commit 9b955fc
Show file tree
Hide file tree
Showing 20 changed files with 474 additions and 21 deletions.
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ self:
install -m 0775 usr/lib/gambas3/gb.desktop.so inex/usr/lib/gambas3/
install -m 0775 usr/lib/gambas3/gb.draw.so inex/usr/lib/gambas3/
install -m 0775 usr/lib/gambas3/gb.eval.so inex/usr/lib/gambas3/
install -m 0775 usr/lib/gambas3/gb.form.dialog.gambas inex/usr/lib/gambas3/
install -m 0775 usr/lib/gambas3/gb.form.gambas inex/usr/lib/gambas3/
install -m 0775 usr/lib/gambas3/gb.form.stock.gambas inex/usr/lib/gambas3/
install -m 0775 usr/lib/gambas3/gb.geom.so inex/usr/lib/gambas3/
Expand Down
12 changes: 6 additions & 6 deletions build-selfexecutable
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ GB3_GB_FORM=$(cat ./index.html | egrep gambas3-gb-form_ | egrep saucy | egrep al

GB3_GB_DESKTOP=$(cat ./index.html | egrep gambas3-gb-desktop_ | egrep saucy | egrep $ARCHITECTURE.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)

GB3_GB_FORM_DIALOG=$(cat ./index.html | egrep gambas3-gb-form-dialog_ | egrep saucy | egrep all.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)
#GB3_GB_FORM_DIALOG=$(cat ./index.html | egrep gambas3-gb-form-dialog_ | egrep saucy | egrep all.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)

#GB3_GB_SETTINGS=$(cat ./index.html | egrep gambas3-gb-settings_ | egrep saucy | egrep all.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)

Expand All @@ -28,7 +28,7 @@ wget -c "$URL_DOWN$GB3_GB_IMAGE"
wget -c "$URL_DOWN$GB3_GB_GTK"
wget -c "$URL_DOWN$GB3_GB_FORM"
wget -c "$URL_DOWN$GB3_GB_DESKTOP"
wget -c "$URL_DOWN$GB3_GB_FORM_DIALOG"
#wget -c "$URL_DOWN$GB3_GB_FORM_DIALOG"
#wget -c "$URL_DOWN$GB3_GB_SETTINGS"
wget -c "$URL_DOWN$GB3_GB_FORM_STOCK"
wget -c "$URL_DOWN$GB3_RUNTIME"
Expand All @@ -40,7 +40,7 @@ echo $GB3_GB_IMAGE
echo $GB3_GB_GTK
echo $GB3_GB_FORM
echo $GB3_GB_DESKTOP
echo $GB3_GB_FORM_DIALOG
#echo $GB3_GB_FORM_DIALOG
#echo $GB3_GB_SETTINGS
echo $GB3_GB_FORM_STOCK
echo $GB3_RUNTIME
Expand All @@ -60,9 +60,9 @@ rm data.tar.gz control.tar.gz debian-binary
ar x $GB3_GB_DESKTOP
tar -zxvf data.tar.gz -C ./
rm data.tar.gz control.tar.gz debian-binary
ar x $GB3_GB_FORM_DIALOG
tar -zxvf data.tar.gz -C ./
rm data.tar.gz control.tar.gz debian-binary
#ar x $GB3_GB_FORM_DIALOG
#tar -zxvf data.tar.gz -C ./
#rm data.tar.gz control.tar.gz debian-binary
#ar x $GB3_GB_SETTINGS
#tar -zxvf data.tar.gz -C ./
#rm data.tar.gz control.tar.gz debian-binary
Expand Down
6 changes: 1 addition & 5 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ Build-Depends: debhelper (>= 7),
gambas3-gb-form (<< 3.99.0),
gambas3-gb-desktop (>= 3.0.90),
gambas3-gb-desktop (<< 3.99.0),
gambas3-gb-form-dialog (>= 3.0.90),
gambas3-gb-form-dialog (<< 3.99.0),
gambas3-gb-form-stock (>= 3.4.0),
dpkg (>= 1.15), grep (>= 2.5),
mount (>= 2.17),
Expand Down Expand Up @@ -46,9 +44,7 @@ Depends: gambas3-runtime (>= 3.4.0),
gambas3-gb-form (>= 3.0.90),
gambas3-gb-form (<< 3.99.0),
gambas3-gb-desktop (>= 3.0.90),
gambas3-gb-desktop (<< 3.99.0),
gambas3-gb-form-dialog (>= 3.0.90),
gambas3-gb-form-dialog (<< 3.99.0),
gambas3-gb-desktop (<< 3.99.0),
gambas3-gb-form-stock (>= 3.4.0),
dpkg (>= 1.15), grep (>= 2.5),
mount (>= 2.17),
Expand Down
1 change: 0 additions & 1 deletion install-self-inex
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ bindir="/usr/bin/"
install -m 0775 usr/lib/gambas3/gb.desktop.so /usr/lib/gambas3/
install -m 0775 usr/lib/gambas3/gb.draw.so /usr/lib/gambas3/
install -m 0775 usr/lib/gambas3/gb.eval.so /usr/lib/gambas3/
install -m 0775 usr/lib/gambas3/gb.form.dialog.gambas /usr/lib/gambas3/
install -m 0775 usr/lib/gambas3/gb.form.gambas /usr/lib/gambas3/
install -m 0775 usr/lib/gambas3/gb.form.stock.gambas /usr/lib/gambas3/
install -m 0775 usr/lib/gambas3/gb.geom.so /usr/lib/gambas3/
Expand Down
28 changes: 24 additions & 4 deletions src/i-nex/.lang/.pot
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,30 @@ msgstr ""
msgid "I-Nex GUI for DF"
msgstr ""

#: FDirDialog.form:32 FInputDate.form:41
msgid "OK"
msgstr ""

#: FDirDialog.form:38 FFileDialog.class:92 FInputDate.form:47
#: ScreenShot.form:34
msgid "Cancel"
msgstr ""

#: FFileDialog.form:22
msgid "Automatic extension"
msgstr ""

#: FFileDialog.class:92
msgid ""
"This file already exists.\n"
"\n"
"Do you want to overwrite it?"
msgstr ""

#: FFileDialog.class:92
msgid "&Overwrite"
msgstr ""

#: FModules.form:14
msgid "Modules information"
msgstr ""
Expand Down Expand Up @@ -748,10 +772,6 @@ msgstr ""
msgid "Save"
msgstr ""

#: ScreenShot.form:34
msgid "Cancel"
msgstr ""

#: ScreenShot.form:41
msgid "File name:"
msgstr ""
Expand Down
16 changes: 16 additions & 0 deletions src/i-nex/.lang/Dialog.pot
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# /home/michal/Baazar/git-i-nex/src/i-nex/.src/Dialog.class
# Generated by Gambas compiler

# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

24 changes: 24 additions & 0 deletions src/i-nex/.lang/FDirDialog.pot
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# /home/michal/Baazar/git-i-nex/src/i-nex/.src/FDirDialog.class
# Generated by Gambas compiler

# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

#: FDirDialog.form:32
msgid "OK"
msgstr ""

#: FDirDialog.form:38
msgid "Cancel"
msgstr ""

32 changes: 32 additions & 0 deletions src/i-nex/.lang/FFileDialog.pot
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# /home/michal/Baazar/git-i-nex/src/i-nex/.src/FFileDialog.class
# Generated by Gambas compiler

# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

#: FFileDialog.form:22
msgid "Automatic extension"
msgstr ""

#: FFileDialog.class:92
msgid "This file already exists.\n\nDo you want to overwrite it?"
msgstr ""

#: FFileDialog.class:92
msgid "&Overwrite"
msgstr ""

#: FFileDialog.class:92
msgid "Cancel"
msgstr ""

24 changes: 24 additions & 0 deletions src/i-nex/.lang/FInputDate.pot
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# /home/michal/Baazar/git-i-nex/src/i-nex/.src/FInputDate.class
# Generated by Gambas compiler

# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

#: FInputDate.form:41
msgid "OK"
msgstr ""

#: FInputDate.form:47
msgid "Cancel"
msgstr ""

1 change: 0 additions & 1 deletion src/i-nex/.project
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ Component=gb.image
Component=gb.qt4
Component=gb.form
Component=gb.desktop
Component=gb.form.dialog
Authors="eloaders"
TabSize=1
Translate=1
Expand Down
2 changes: 1 addition & 1 deletion src/i-nex/.settings
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ File[23]="Data/report-ng.sh:27.44"
File[24]=".src/Distribution_Detect.module:13.20"
File[25]=".src/FFlags.module:71.6"
Active=26
File[26]=".src/Finfosys.class:12.67"
File[26]=".src/Finfosys.class:12.36"
File[27]=".src/FDF.form"
File[28]=".src/FDF.class:28.69"
File[29]=".src/FNET_R_T.form"
Expand Down
64 changes: 64 additions & 0 deletions src/i-nex/.src/Dialog.class
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
' Gambas class file

Export

Static Property Read Paths As String[]
Static Property {Date} As Date
Static Property AutoExt As Boolean

Static Public Function OpenFile(Optional Multi As Boolean) As Boolean

Return FFileDialog.OpenFile(Multi)

End

Static Public Function SaveFile() As Boolean

Return FFileDialog.SaveFile()

End

Static Public Function SelectDirectory() As Boolean

Return FDirDialog.SelectDirectory()

End


Static Private Function Paths_Read() As String[]

Return FFileDialog.Paths

End


Static Public Function SelectDate() As Boolean

Return FInputDate.SelectDate()

End


Static Private Function Date_Read() As Date

Return FInputDate.Date

End

Static Private Sub Date_Write(Value As Date)

FInputDate.Date = Value

End

Static Private Function AutoExt_Read() As Boolean

Return FFileDialog.AutoExt

End

Static Private Sub AutoExt_Write(Value As Boolean)

FFileDialog.AutoExt = Value

End
50 changes: 50 additions & 0 deletions src/i-nex/.src/FDirDialog.class
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
' Gambas class file

Public Sub SelectDirectory() As Boolean

Return Not Me.ShowModal()

End

Public Sub Form_Open()

' DEBUG "Dialog.Title:";; Dialog.Title
' DEBUG "Dialog.Path:";; Dialog.Path

Me.Title = Dialog.Title
dchChoose.Root = "/"
dchChoose.ShowHidden = Dialog.ShowHidden
If Not Dialog.Path Then
dchChoose.SelectedPath = "~"
Else
dchChoose.SelectedPath = Dialog.Path
Endif

If Component.IsLoaded("gb.settings") Then Settings.Read(Me, "gb.form.dialog/FDirDialog")

End

Public Sub btnOK_Click()

Dialog.Path = dchChoose.SelectedPath
Me.Close(True)

End

Public Sub btnCancel_Click()

Me.Close

End

Public Sub dchChoose_Activate()

btnOK.Value = True

End

Public Sub Form_Close()

If Component.IsLoaded("gb.settings") Then Settings.Write(Me, "gb.form.dialog/FDirDialog")

End
30 changes: 30 additions & 0 deletions src/i-nex/.src/FDirDialog.form
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Gambas Form File 3.0

{ Form Form
MoveScaled(0,0,64,52)
Arrangement = Arrange.Vertical
Spacing = True
Margin = True
{ dchChoose DirChooser
MoveScaled(2,1,56,36)
Expand = True
}
{ HBox1 HBox
MoveScaled(1,43,56,4)
Spacing = True
{ Panel1 Panel
MoveScaled(3,0,4,4)
Expand = True
}
{ btnOK Button
MoveScaled(22,0,16,4)
Text = ("OK")
Default = True
}
{ btnCancel Button
MoveScaled(39,0,16,4)
Text = ("Cancel")
Cancel = True
}
}
}

0 comments on commit 9b955fc

Please sign in to comment.