From 46835002c7170f44bb9d047e685534f1302d5579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Sun, 26 Oct 2014 22:58:57 +0000 Subject: [PATCH] [FARM SERVER] * NEW: Take the database connection properties from the configuration file. git-svn-id: svn://localhost/gambas/trunk@6583 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- app/src/gambas-farm-server/.src/MMain.module | 6 ++++-- examples/examples/Control/LCDLabel/.icon.png | Bin 4270 -> 3486 bytes examples/examples/Control/LCDLabel/.project | 3 ++- examples/examples/Control/LCDLabel/.startup | 2 +- examples/examples/Games/Concent/.project | 6 +++--- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/src/gambas-farm-server/.src/MMain.module b/app/src/gambas-farm-server/.src/MMain.module index ebad60027..c056cc4c2 100644 --- a/app/src/gambas-farm-server/.src/MMain.module +++ b/app/src/gambas-farm-server/.src/MMain.module @@ -97,7 +97,9 @@ Private Sub OpenDatabase() If $hConn Then Return $hConn = New Connection - $hConn.Type = "postgresql" + $hConn.Type = Settings["/Database/Type"] + $hConn.User = Settings["/Database/User"] + $hConn.Password = Settings["/Database/Password"] $hConn.Name = "gambas3_farm" $hConn.Open DB.Current = $hConn @@ -109,7 +111,7 @@ Private Sub InitDatabase() Dim hConn As New Connection Dim hTable As Table - hConn.Type = "postgresql" + hConn.Type = Settings["/Database/Type"] hConn.Open Try hConn.Databases.Add("gambas3_farm") hConn.Close diff --git a/examples/examples/Control/LCDLabel/.icon.png b/examples/examples/Control/LCDLabel/.icon.png index b7050e87384ad76a787cbf78d8eab19639b5fa8f..7366131bf21f6e4a4b31ebc8de23cb102244cf71 100644 GIT binary patch delta 3447 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 Z{vUi(R?|O-BrgB}002ovPDHLkV1h@Nq$L0V delta 4238 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 diff --git a/examples/examples/Control/LCDLabel/.project b/examples/examples/Control/LCDLabel/.project index 7921f02c0..38bcdabc5 100644 --- a/examples/examples/Control/LCDLabel/.project +++ b/examples/examples/Control/LCDLabel/.project @@ -3,7 +3,8 @@ Title=PeriodicTimer Startup=FMain Icon=lcdlabel.png -Version=3.6.0 +Version=3.6.90 +VersionFile=1 Component=gb.image Component=gb.gui Component=gb.form diff --git a/examples/examples/Control/LCDLabel/.startup b/examples/examples/Control/LCDLabel/.startup index 3069c0084..e682e61ce 100644 --- a/examples/examples/Control/LCDLabel/.startup +++ b/examples/examples/Control/LCDLabel/.startup @@ -2,7 +2,7 @@ FMain PeriodicTimer 0 0 -3.6.0 +3.6.90 gb.image gb.gui diff --git a/examples/examples/Games/Concent/.project b/examples/examples/Games/Concent/.project index 7419d679e..98c275cde 100644 --- a/examples/examples/Games/Concent/.project +++ b/examples/examples/Games/Concent/.project @@ -1,9 +1,9 @@ # Gambas Project File 3.0 -# Compiled with Gambas 3.5.90 +# Compiled with Gambas 3.6.90 Title=Concéntrese Geográfico Startup=principal Icon=imagenes/logo.png -Version=3.6.0 +Version=3.6.90 VersionFile=1 Component=gb.image Component=gb.gui @@ -14,10 +14,10 @@ Authors="Jairo Alonso Badillo Bedoya" TabSize=2 Translate=1 Language=fr -ExecPath=/home/jbadbe/Desktop/concent Maintainer=benoit Vendor=Princeton Address=benoit@localhost License=General Public Licence Packager=1 Systems=redhat +Tags=Example,Game,Sound,Spanish