Remove gambas3-gb-settings dependency. Add Main.module, Settings.clas…

…s, _Settings_Keys.class
i-nex · Nov 6, 2013 · 10a5cc0 · 10a5cc0
1 parent f7c3c6f
commit 10a5cc0
Show file tree

Hide file tree

Showing 13 changed files with 943 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -99,7 +99,6 @@ self:
 	install -m 0775 usr/lib/gambas3/gb.gui.so inex/usr/lib/gambas3/
 	install -m 0775 usr/lib/gambas3/gb.image.so inex/usr/lib/gambas3/
 	install -m 0775 usr/lib/gambas3/gb.qt4.so inex/usr/lib/gambas3/
-	install -m 0775 usr/lib/gambas3/gb.settings.gambas inex/usr/lib/gambas3/
 	install -m 0775 install-self inex/install-self 
 	install -m 0775 install-self-inex inex/install-self-inex
 	chmod +x inex/install-self

diff --git a/build-selfexecutable b/build-selfexecutable
@@ -12,7 +12,7 @@ GB3_GB_DESKTOP=$(cat ./index.html | egrep gambas3-gb-desktop_ | egrep saucy | eg
 
 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)
+#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)
 
 GB3_GB_FORM_STOCK=$(cat ./index.html | egrep gambas3-gb-form-stock_ | egrep saucy | egrep all.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)
 
@@ -29,7 +29,7 @@ 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_SETTINGS"
+#wget -c "$URL_DOWN$GB3_GB_SETTINGS"
 wget -c "$URL_DOWN$GB3_GB_FORM_STOCK"
 wget -c "$URL_DOWN$GB3_RUNTIME"
 wget -c "$URL_DOWN$GB3_GB_GUI"
@@ -41,7 +41,7 @@ echo $GB3_GB_GTK
 echo $GB3_GB_FORM
 echo $GB3_GB_DESKTOP
 echo $GB3_GB_FORM_DIALOG
-echo $GB3_GB_SETTINGS
+#echo $GB3_GB_SETTINGS
 echo $GB3_GB_FORM_STOCK
 echo $GB3_RUNTIME
 echo $GB3_GB_GUI
@@ -63,9 +63,9 @@ 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
+#ar x $GB3_GB_SETTINGS
+#tar -zxvf data.tar.gz -C ./
+#rm data.tar.gz control.tar.gz debian-binary
 ar x $GB3_GB_FORM_STOCK
 tar -zxvf data.tar.gz -C ./
 rm data.tar.gz control.tar.gz debian-binary

diff --git a/debian/control b/debian/control
@@ -17,8 +17,6 @@ Build-Depends: debhelper (>= 7),
   gambas3-gb-desktop (<< 3.99.0), 
   gambas3-gb-form-dialog (>= 3.0.90), 
   gambas3-gb-form-dialog (<< 3.99.0), 
-  gambas3-gb-settings (>= 3.0.90), 
-  gambas3-gb-settings (<< 3.99.0),
   gambas3-gb-form-stock (>= 3.4.0),
   dpkg (>= 1.15), grep (>= 2.5),
   mount (>= 2.17),
@@ -51,8 +49,6 @@ Depends: gambas3-runtime (>= 3.4.0),
   gambas3-gb-desktop (<< 3.99.0), 
   gambas3-gb-form-dialog (>= 3.0.90), 
   gambas3-gb-form-dialog (<< 3.99.0), 
-  gambas3-gb-settings (>= 3.0.90), 
-  gambas3-gb-settings (<< 3.99.0),
   gambas3-gb-form-stock (>= 3.4.0),
   dpkg (>= 1.15), grep (>= 2.5),
   mount (>= 2.17),

diff --git a/install-self-inex b/install-self-inex
@@ -54,4 +54,3 @@ bindir="/usr/bin/"
 	install -m 0775 usr/lib/gambas3/gb.gui.so /usr/lib/gambas3/
 	install -m 0775 usr/lib/gambas3/gb.image.so /usr/lib/gambas3/
 	install -m 0775 usr/lib/gambas3/gb.qt4.so /usr/lib/gambas3/
-	install -m 0775 usr/lib/gambas3/gb.settings.gambas /usr/lib/gambas3/
diff --git a/src/i-nex/.lang/Main.pot b/src/i-nex/.lang/Main.pot
@@ -0,0 +1,16 @@
+# /home/michal/Baazar/git-i-nex/src/i-nex/.src/Main.module
+# 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"
+
diff --git a/src/i-nex/.lang/Settings.pot b/src/i-nex/.lang/Settings.pot
@@ -0,0 +1,16 @@
+# /home/michal/Baazar/git-i-nex/src/i-nex/.src/Settings.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"
+
diff --git a/src/i-nex/.lang/_Settings_Keys.pot b/src/i-nex/.lang/_Settings_Keys.pot
@@ -0,0 +1,16 @@
+# /home/michal/Baazar/git-i-nex/src/i-nex/.src/_Settings_Keys.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"
+
diff --git a/src/i-nex/.project b/src/i-nex/.project
@@ -10,7 +10,6 @@ Component=gb.qt4
 Component=gb.form
 Component=gb.desktop
 Component=gb.form.dialog
-Component=gb.settings
 Authors="eloaders"
 TabSize=1
 Translate=1

diff --git a/src/i-nex/.settings b/src/i-nex/.settings
@@ -58,9 +58,12 @@ File[34]=".src/FUdisks.form"
 File[35]=".src/FUdisks.class:49.51"
 File[36]=".src/FCpudb.module:29.33"
 File[37]=".src/JSON.module:18.2"
-Active=38
 File[38]=".src/JSONCollection.class:16.48"
-Count=38
+File[39]=".src/Settings.class:464.34"
+Active=40
+File[40]=".src/Main.module:7.29"
+File[41]=".src/_Settings_Keys.class:50.0"
+Count=41
 
 [Watches]
 Count=0