[DEVELOPMENT ENVIRONMENT]

* BUG: Fix initial focus of welcome dialog.

[INTERPRETER]
* BUG: Release standard i/o File objects before cleaning up the classes, to 
  avoid an incorrect "circular reference" message.

[GB.GTK]
* NEW: Link to the pthread library explicitly.
* NEW: WAIT inside a keybord handler does not raise an error anymore. It 
  just print a warning message and does nothing.

[GB.GTK3]
* NEW: Link to the pthread library explicitly.
* NEW: WAIT inside a keybord handler does not raise an error anymore. It 
  just print a warning message and does nothing.

[GB.UTIL]
* NEW: Date.EasterDay returns the Easter day of a specific year.

[GB.QT4]
* NEW: Link to the pthread library explicitly.
* NEW: WAIT inside a keybord handler does not raise an error anymore. It 
  just print a warning message and does nothing.

[GB.QT4.EXT]
* NEW: Editor.Font property now can take any font in the IDE.


git-svn-id: svn://localhost/gambas/trunk@6754 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2014-12-20 15:24:00 +00:00
parent 5971ad99d6
commit 4faa9876bf
29 changed files with 225 additions and 295 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

View file

@ -1,19 +1,19 @@
# Gambas Project File 3.0 # Gambas Project File 3.0
# Compiled with Gambas 3.5.90 # Compiled with Gambas 3.6.90
Title=HTML highlighting with the editor control Title=HTML highlighting with the editor control
Startup=FEditor Startup=FEditor
Icon=editor.png Icon=editor.png
Version=3.6.2 Version=1.0.0
VersionFile=1
Component=gb.image Component=gb.image
Component=gb.qt4 Component=gb.qt4
Component=gb.qt4.ext Component=gb.qt4.ext
Description="This example shows how to use the Editor control with custom highlighting." Description="Syntax highlighting example\n\nThis example shows how to use the Editor control with custom highlighting."
TabSize=2 TabSize=2
Translate=1 Translate=1
Language=fr Language=fr
Maintainer=benoit Maintainer=benoit
Vendor=Princeton Vendor=Example
Address=benoit@localhost Address=benoit@localhost
License=General Public Licence License=General Public Licence
Packager=1 Packager=1
Screenshot=2014-12-17.png

View file

@ -8,19 +8,21 @@ Public Sub Form_Open()
$bIgnore = True $bIgnore = True
Editor1.Text = File.Load("download.html") Editor1.Text = File.Load("download.html")
VSplit1.Layout = [1, 0]
Editor1.Flags[Editor.HighlightBraces] = True Editor1.Flags[Editor.HighlightBraces] = True
Editor1.Styles[Highlight.Operator].Color = Color.DarkGreen Editor1.Styles[Highlight.Operator].Color = Color.DarkGreen
Editor1.Styles[Highlight.Operator].Bold = True Editor1.Styles[Highlight.Operator].Bold = True
Editor1.Styles[Highlight.String].Color = Color.DarkRed Editor1.Styles[Highlight.String].Color = Color.DarkRed
Editor1.Flags[Editor.ShowLineNumbers] = True Editor1.Flags[Editor.ShowLineNumbers] = True
Editor1.Flags[Editor.NoFolding] = True
Editor1.Flags[Editor.ShowCurrentLine] = True
Editor2.Flags[Editor.HighlightBraces] = True Editor2.Flags[Editor.HighlightBraces] = True
Editor2.Styles[Highlight.Operator].Color = Color.DarkGreen Editor2.Styles[Highlight.Operator].Color = Color.DarkGreen
Editor2.Styles[Highlight.Operator].Bold = True Editor2.Styles[Highlight.Operator].Bold = True
Editor2.Styles[Highlight.String].Color = Color.DarkRed Editor2.Styles[Highlight.String].Color = Color.DarkRed
VSplit1.Layout = [1, 0]
mnuImmediately_Click mnuImmediately_Click
End End

View file

@ -22,16 +22,14 @@
} }
} }
{ VSplit1 VSplit { VSplit1 VSplit
MoveScaled(1,1,48,48) MoveScaled(7,8,48,48)
{ Editor1 Editor { Editor1 Editor
MoveScaled(3,2,43,16) MoveScaled(3,2,43,16)
Font = Font["Bitstream Vera Sans Mono"] Border = False
Background = Color.LightBackground
Highlight = Highlight.Custom Highlight = Highlight.Custom
} }
{ Editor2 Editor { Editor2 Editor
MoveScaled(2,22,43,15) MoveScaled(2,22,43,15)
Visible = False
Highlight = Highlight.Custom Highlight = Highlight.Custom
} }
} }

View file

@ -1,270 +1,155 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<link rel="stylesheet" href="style.css">
<body> <html xmlns="http://www.w3.org/1999/xhtml">
<table border=0 bordercolor=#43C7FF cellspacing=0 cellpadding=6 width=100%> <head>
<tr bgcolor=#D0E8FF><td><font size=+2><b> <meta http-equiv="content-type" content="text/html; charset=utf-8">
Download <link rel="stylesheet" href="/wiki/style.css">
</b></font></td></tr></table> <link rel="icon" href="/wiki/logo.png" type="image/png">
<title>Gambas Documentation - /</title>
</head>
<h3><img src="warning.png" align=center>&nbsp;READ THE <body >
<a href="http://www.binara.com/gambas-wiki/bin/view/Gambas/WebSiteImportantNotes">IMPORTANT NOTES</a>
FIRST.</h3>
<!--<h3>And do it each time you download a new version&nbsp;!</h3>-->
<p>Now files are downloaded from the SourceForge FTP servers.</p>
<table class="none" width="100%"> <form name="form" method="post" enctype="multipart/form-data">
<tr><td valign="top" class="none">
<h3>Stable version source packages<br>(<a href="changelog.html">ChangeLog</a>)</h3>
<table border=0 bordercolor=#43C7FF cellspacing=0 cellpadding=6 valign=top> <div class="header">
<div class="header-inside">
<tr bgcolor=#D0E8FF> <div class="header-bar">
<th width=240 align=left>Package</th> <div class="up">
<th align=left>Version</th> <a href="/wiki"><img src="/wiki/up.png"></a>
<th width=100 align=left>Format</th> </div>
</tr> <div class="title">
</div>
<select id="lang" name="lang" onchange="document.form.submit();">
<option value="ar">ar</option>
<option value="ca">ca</option>
<option value="cs">cs</option>
<option value="de">de</option>
<option value="en" selected>en</option>
<option value="eo">eo</option>
<option value="es">es</option>
<option value="fa">fa</option>
<option value="fr">fr</option>
<option value="hu">hu</option>
<option value="id">id</option>
<option value="it">it</option>
<option value="ja">ja</option>
<option value="ko">ko</option>
<option value="mk">mk</option>
<option value="nl">nl</option>
<option value="pl">pl</option>
<option value="pt">pt</option>
<option value="pt_BR">pt_BR</option>
<option value="ru">ru</option>
<option value="sq">sq</option>
<option value="tr">tr</option>
<option value="vi">vi</option>
<option value="zh">zh</option>
<option value="zh_TW">zh_TW</option>
</select>
</div>
</div>
</div>
<tr bgcolor=#E0F0FF> <div class="page">
<td><a href="http://prdownloads.sourceforge.net/gambas/gambas-1.0.10.tar.bz2?download">gambas-1.0.10.tar.bz2</a></td>
<td>1.0.10</td>
<td>tar.bz2</td>
</tr>
<tr bgcolor=#D0E8FF>
<td><a href="http://prdownloads.sourceforge.net/gambas/gambas-1.0.9.tar.bz2?download">gambas-1.0.9.tar.bz2</a></td>
<td>1.0.9</td>
<td>tar.bz2</td>
</tr>
<tr bgcolor=#E0F0FF>
<td><a href="http://prdownloads.sourceforge.net/gambas/gambas-1.0.8.tar.bz2?download">gambas-1.0.8.tar.bz2</a></td>
<td>1.0.8</td>
<td>tar.bz2</td>
</tr>
<tr bgcolor=#D0E8FF>
<td><a href="http://prdownloads.sourceforge.net/gambas/gambas-1.0.7.tar.bz2?download">gambas-1.0.7.tar.bz2</a></td>
<td>1.0.7</td>
<td>tar.bz2</td>
</tr>
<h1>Gambas Documentation</h1>
<p><img src="/wiki/logo3.png?v" style="position:fixed;top:200px;left:32px;border:solid 8px #DF6B00;border-radius:160px;padding:2px;box-shadow:0 0 8px gray;background:white;z-index:-100;opacity:0.8;"></p>
<p><style>
DIV.page { background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAAGXRFWHRDb21tZW50AENyZWF0ZWQgd2l0aCBHSU1QV4EOFwAAAB5JREFUOMtj/P///xkGCgATA4Vg1IBRA0YNGCwGAACdVwPpxW0OmQAAAABJRU5ErkJggg==); }
</style></p>
<table class="no-border">
<tr><td>
<a href="/wiki/readme">README</a>&nbsp;&nbsp;&nbsp;
</td><td>
<a href="/wiki/license">Wiki License</a>&nbsp;&nbsp;&nbsp;
</td><td>
<a href="/wiki/doc/wiki">Wiki syntax</a>&nbsp;&nbsp;&nbsp;
</td><td>
<a href="/wiki/translate">To Do</a>&nbsp;&nbsp;&nbsp;
</td><td>
<a href="/wiki/changes">Last Changes</a>&nbsp;&nbsp;&nbsp;
</td><td>
<a href="http://gambas.sourceforge.net/" target="_blank">Gambas Web Site</a>
</td></tr>
</table> </table>
<h2>Language Reference</h2>
<p><table class="no-border full"><tr><td width="50%">
<a href="/wiki/lang">Language Index</a> <br>
<a href="/wiki/cat">Language Overviews</a> <br>
<a href="/wiki/comp/gb">Native Classes</a> <br>
<a href="/wiki/comp">Components</a> <br>
</td><td width="50%">
<a href="/wiki/error">Error Messages</a> <br>
<a href="/wiki/def">Lexicon</a> <br>
<a href="/wiki/doc/object-model">The Gambas Object Model</a>
</td></tr></table></p>
<h2>Documents</h2>
<p>Here is a list of <a href="/wiki/doc">documents</a> that may help you.</p>
<p><table class="no-border full"><tr><td width="50%">
<a href="/wiki/doc/release">Release Notes</a> <br>
<a href="/wiki/install">Compilation & Installation</a> <br>
<a href="/wiki/doc/faq">Frequently Asked Questions</a> <br>
<a href="/wiki/ide">Development Environment Documentation</a> <br>
<a href="/wiki/doc/gb2togb3">Porting from Gambas 2 to Gambas 3</a> <br>
<a href="/wiki/doc/benchmark">Some Little Benchmarks</a>
</td><td width="50%">
<a href="/wiki/doc/diffvb">Differences From Visual Basic</a> <br>
<a href="/wiki/howto">How To...</a> <br>
<a href="/wiki/tutorial">Tutorials</a> <em>Not finished</em>. <br>
<a href="/wiki/app">Application Repository</a> <br>
<a href="/wiki/snippets">Code Snippets</a>
</td></tr></table></p>
<h2>Developers</h2>
<p>This is the <a href="/wiki/dev">documentation</a> for component developers.</p>
<p><table class="no-border full"><tr><td width="50%">
<a href="/wiki/dev/gambas">How To Program Components In Gambas</a> <br>
<a href="/wiki/dev/overview">How To Program Components In C/C++</a> <br>
<a href="/wiki/dev/api">Gambas Programming Interface</a>
</td><td width="50%">
<a href="/wiki/dev/gambas_components">Additional Gambas Components</a> <br>
<a href="/wiki/howto/svn">How To Deal With Subversion</a>
</td></tr></table></p>
<h2>Translators</h2>
<p><table class="no-border full"><tr><td width="50%">
<a href="/wiki/howto/translate">How To Translate A Gambas Project</a>
</td><td width="50%">
<a href="/wiki/howto/svn">How To Deal With Subversion</a>
</td></tr></table></p>
<h2>Packagers</h2>
<p><a href="/wiki/howto/package">How To Package Gambas</a></p>
<p><div align="center" style="font-style:italic;font-size:80%;margin-top:4em;">
This documentation is based on a Wiki written in Gambas. <br>
If you want to modify some pages, you must <a href="/wiki/~register">register</a>. <br>
Once done, you must learn the <a href="/wiki/doc/wiki">wiki syntax</a>.</p>
<p>The documentation is under the <a href="http://creativecommons.org/licenses/by-sa/3.0/" target="_blank">Creative Commons Attribution-ShareAlike (CC-BY-SA) 3.0</a> license.
</div></p>
<p></p>
<script type="text/javascript">
document.getElementById('login').focus();
</script>
</td><td valign="top" class="none"> <div align="center">
&nbsp; <div class="login"><div>
</td><td valign="top" class="none"> <div class="label-login" align="left">Login&nbsp;</div>
<input type="text" name="login" id="login" maxlength="16">
<div class="label-login" align="left">Password&nbsp;</div>
<input type="password" name="password" id="password" maxlength="16">
<div class="command"><input type="submit" id="ok" value="OK"></div>
<div class="command"><input type="submit" id="register" name="register" value="Register"></div>
</div></div>
</div>
<h3>Development version source packages<br>(<a href="changelog2.html">ChangeLog</a>)</h3> </div>
<table border=0 bordercolor=#43C7FF cellspacing=0 cellpadding=6 valign=top> </form>
<tr bgcolor=#D0E8FF>
<th width=240 align=left>Package</th>
<th align=left>Version</th>
<th width=100 align=left>Format</th>
</tr>
<tr bgcolor=#E0F0FF>
<td><a href="http://prdownloads.sourceforge.net/gambas/gambas2-1.9.17.tar.bz2?download">gambas2-1.9.17.tar.bz2</a></td>
<td>1.9.17</td>
<td>tar.bz2</td>
</tr>
<tr bgcolor=#D0E8FF>
<td><a href="http://prdownloads.sourceforge.net/gambas/gambas2-1.9.16.tar.bz2?download">gambas2-1.9.16.tar.bz2</a></td>
<td>1.9.16</td>
<td>tar.bz2</td>
</tr>
<tr bgcolor=#E0F0FF>
<td><a href="http://prdownloads.sourceforge.net/gambas/gambas2-1.9.15.tar.bz2?download">gambas2-1.9.15.tar.bz2</a></td>
<td>1.9.15</td>
<td>tar.bz2</td>
</tr>
<tr bgcolor=#D0E8FF>
<td><a href="http://prdownloads.sourceforge.net/gambas/gambas2-1.9.14.tar.bz2?download">gambas2-1.9.14.tar.bz2</a></td>
<td>1.9.14</td>
<td>tar.bz2</td>
</tr>
</table>
</td></td>
</table>
<!--
<h3>Mirrors sites</h3>
<p>There is a mirror download site made by <a href="mailto:dc@infomaniak.ch">David Campillo</a>
at <a href="http://www.gcieng.ch/gambas" target="_blank">http://www.gcieng.ch/gambas</a></p>
-->
<!--<h3>My binary packages :-)</h3>
<p>Since <b><i>Gambas</i></b> 0.95, I started to make
<a href="RPM/MandrivaLinux/RPMS/i586/"><b><i>Gambas</i></b> binary packages for <i>MandrivaLinux</i></a>.
<p>The <tt>.spec</tt> file needed to rebuild the packages is located at the same place.
<p>I made them because all other Linux distributions must follow the same package naming and
organization. Otherwise, the IDE wizard for making packages will not work, and distributing
<b><i>Gambas</i></b> applications won't be as easy as making them!
<p>These packages are not necessarily the last version.-->
<h3>Binary packages for the stable version</h3>
<p><b>NOTE:</b> I didn't make the following packages, as I do not have the time and
the knowledge to make them.
So, if you have problems with them, contact their respective authors!</p>
<table border=0 bordercolor=#43C7FF cellspacing=0 cellpadding=6 valign=top>
<tr bgcolor=#D0E8FF>
<th>Distribution</th>
<th>Package</th>
</tr>
<tr bgcolor=#E0F0FF>
<td valign="top">Debian</td>
<td>
<i>Debian</i> packages for <tt>Sarge/Sid</tt> are made by
<a href="mailto:jredrejo@edu.juntaextremadura.net">José L. Redrejo</a>.
<p>
To install them a new line is necessary to be added to the
<tt>/etc/apt/sources.list</tt> file and you can use <tt>apt-get</tt> later.
<pre>deb http://www.linex.org/sources/linex/debian/ cl gambas</pre>
Or just download the packages from
<a href="http://www.linex.org/sources/linex/debian/dists/cl/gambas/binary-i386/" target="_blank">
http://www.linex.org/sources/linex/debian/dists/cl/gambas/binary-i386/</a>
</td>
</tr>
<tr bgcolor=#D0E8FF>
<td valign="top">Fedora</td>
<td>
<b><i>Gambas</i></b> is maintained in 'Fedora Extras'.
You can install it easily by using the following command:
<pre>yum install gambas</pre>
</td>
</tr>
<tr bgcolor=#E0F0FF>
<td valign="top">Gentoo</td>
<td>
<b><i>Gambas</i></b> is in the portage tree. The ebuilds are maintained by
Marius Mauch. So a simple <tt>emerge gambas</tt> is sufficient to install it.
</td>
</tr>
<tr bgcolor=#D0E8FF>
<td valign="top">Linex</td>
<td>
You will find packages of <b><i>Gambas</i></b> for Linex at
<a href="http://www.linex.org" target="_blank">www.linex.org</a>
</td>
</tr>
<tr bgcolor=#E0F0FF>
<td valign="top">Mandriva</td>
<td>
It seems that the binary packages of the stable version made by <i>Mandriva</i> are now correct.<br>
<p>
Go to <a href="http://www.kudla.org" target="_blank">www.kudla.org</a> to download binary
packages of the stable and development versions.
They are made by <a href="sourceforge-raindog2@kudla.org">Rob Kudla</a>.
</td>
</tr>
<tr bgcolor=#D0E8FF>
<td valign="top">QiLinux</td>
<td>
You will find the binary packages at
<pre><a href="ftp://ftp.qilinux.it/pub/QiLinux/devel-contrib/RPMS/i586" target="_blank">ftp://ftp.qilinux.it/pub/QiLinux/devel-contrib/RPMS/i586</a></pre>
</td>
</tr>
<tr bgcolor=#E0F0FF>
<td valign="top">Slackware</td>
<td>
You will find packages of <b><i>Gambas</i></b> for Slackware 10 at
<a href="http://www.linuxpackages.net" target="_blank">www.linuxpackages.net</a>
</td>
</tr>
<tr bgcolor=#D0E8FF>
<td valign="top">SuSE</td>
<td>
The binary packages made by <i>SuSE</i> do not follow the specifications.<br>
<b>DO NOT USE THEM!</b>
<p>
Instead, use the packages made by <a href="mailto:gbv@oxixares.com">Guillermo Ballester Valor</a>.
<p>
You can download source and binary packages for all recent versions of SuSE at:
<pre><a href="ftp://ftp.gwdg.de/pub/linux/misc/suser-gbv/rpms/" target="_blank">ftp://ftp.gwdg.de/pub/linux/misc/suser-gbv/rpms/</a></pre>
</td>
</tr>
</table>
<!--
<h3>Documentation (obsolete)</h3>
<p>The (not completely) updated documention is on the
<a href="http://www.binara.com/gambas-wiki/bin/view/Gambas/WebHome">Wiki Encyclopaedia</a>
now.</p>
<table border=0 bordercolor=#43C7FF cellspacing=0 cellpadding=6 valign=top>
<tr bgcolor=#D0E8FF>
<th width=240 align=left>Package</th>
<th align=left>Version</th>
<th align=left>Language</th>
<th width=100 align=left>Format</th>
<th align=left>Size</th>
</tr>
<tr>
<td><a href="gambas-language-encyclopaedia-0.57.pdf.tar.gz">
<b><i>Gambas</b></i> language encyclopaedia</a></td>
<td>0.57</td>
<td>English</td>
<td>PDF</td>
<td>393&nbsp;K</td>
</tr>
<tr>
<td><a href="gambas-language-encyclopaedia-0.57.sxw">
<b><i>Gambas</b></i> language encyclopaedia</a></td>
<td>0.57</td>
<td>English</td>
<td>OpenOffice</td>
<td>44&nbsp;K</td>
</tr>
<tr>
<td><a href="gambas-language-encyclopaedia-0.50-es.sxw">
<b><i>Gambas</b></i> language encyclopaedia</a></td>
<td>0.50</td>
<td>Spanish</td>
<td>OpenOffice</td>
<td>49&nbsp;K</td>
</tr>
</table>
<p>-->
</body> </body>
</html> </html>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

View file

@ -12,4 +12,6 @@ Component=gb.net
Component=gb.net.curl Component=gb.net.curl
Component=gb.map Component=gb.map
TabSize=2 TabSize=2
Language=en
Vendor=Example
Packager=1 Packager=1

View file

@ -1,10 +1,9 @@
# Gambas Project File 3.0 # Gambas Project File 3.0
# Compiled with Gambas 3.3.0 # Compiled with Gambas 3.6.90
Title=ReportExample Title=ReportExample
Startup=FMain Startup=FMain
Profiling=1
Icon=.hidden/report.png Icon=.hidden/report.png
Version=3.6.2 Version=3.6.90
VersionFile=1 VersionFile=1
Component=gb.image Component=gb.image
Component=gb.gui Component=gb.gui

View file

@ -9,12 +9,12 @@ Geometry=[0,0,210,281]
[OpenFile] [OpenFile]
File[1]=".src/FMain.form" File[1]=".src/FMain.form"
Active=2 Active=6
File[2]=".src/Report1.report" File[2]=".src/Report1.report"
File[3]=".src/FMain.class:37.2" File[3]=".src/FMain.class:37.2"
File[4]=".src/Report1.class:22.11" File[4]=".src/Report1.class:22.11"
File[5]=".src/Report2.report" File[5]=".src/Report2.report"
File[6]=".src/Report3.class:30.0" File[6]=".src/Report3.class:12.16"
File[7]=".src/Report3.report" File[7]=".src/Report3.report"
Count=7 Count=7

View file

@ -2,7 +2,7 @@ FMain
ReportExample ReportExample
0 0
0 0
3.2.90 3.6.90
gb.image gb.image
gb.gui gb.gui

View file

@ -348,8 +348,9 @@ Public Sub Main()
FHelpBrowser.Load FHelpBrowser.Load
FHelpShortcut.Load FHelpShortcut.Load
FMain.Show
RefreshActivate RefreshActivate
FMain.Show
FWelcome.SetFocus
Dec Application.Busy Dec Application.Busy

View file

@ -87,8 +87,6 @@ Public Sub Form_Open()
$hWelcome = New CWelcome(dwgWelcome) $hWelcome = New CWelcome(dwgWelcome)
txtFilter.SetFocus
End End
@ -424,3 +422,13 @@ Public Sub panList_Arrange()
$hExample.SetArrangement(iArr) $hExample.SetArrangement(iArr)
End End
Public Sub Form_Activate()
If $iRecent = LIST_EXAMPLE Then
txtFilterExample.SetFocus
Else
txtFilter.SetFocus
Endif
End

View file

@ -305,7 +305,7 @@ End
Public Sub Form_Open() Public Sub Form_Open()
RefreshColor RefreshColor
txtHexa.SetFocus 'txtHexa.SetFocus
End End

View file

@ -38,7 +38,7 @@ Public Sub Form_Open()
$bNoRefresh = False $bNoRefresh = False
RefreshFamily RefreshFamily
btnRelative_Click UpdateRelative
txtSize_Change txtSize_Change
End End
@ -290,7 +290,7 @@ Public Sub lstFamily_DblClick()
End End
Public Sub btnRelative_Click() Private Sub UpdateRelative()
Object.Lock(txtSize) Object.Lock(txtSize)
Object.Lock(sldSize) Object.Lock(sldSize)
@ -311,8 +311,13 @@ Public Sub btnRelative_Click()
Object.Unlock(txtSize) Object.Unlock(txtSize)
Object.Unlock(sldSize) Object.Unlock(sldSize)
txtSize_Change txtSize_Change
End
Public Sub btnRelative_Click()
UpdateRelative
txtSize.SetFocus txtSize.SetFocus
End End

View file

@ -1,5 +1,5 @@
# Gambas Project File 3.0 # Gambas Project File 3.0
# Compiled with Gambas 3.6.0 # Compiled with Gambas 3.6.90
Title=Report designer Title=Report designer
Startup=OutputReport2 Startup=OutputReport2
Icon=printer1.png Icon=printer1.png

View file

@ -32,6 +32,10 @@ FromUnixTime
M M
d d
(UnixTime)l (UnixTime)l
EasterDay
M
d
(Year)i
#File #File
C C

View file

@ -13,3 +13,23 @@ Public Sub FromUnixTime(UnixTime As Long) As Date
Return DateAdd(Date(1970, 1, 1), UnixTime, gb.Second) Return DateAdd(Date(1970, 1, 1), UnixTime, gb.Second)
End End
' Gregorian algorithm by Aloysius Lilius And Christophorus Clavius.
' Valid For any year since 1583.
Public Sub EasterDay(Year As Integer) As Date
Dim A, B, C, D, E, F, G As Integer
A = Year Mod 19 + 1
B = Year Div 100 + 1
C = (3 * B) Div 4 - 12
D = (8 * B + 5) Div 25 - 5
E = (Year * 5) Div 4 - 10 - C
F = ((11 * A + 20 + D - C) Mod 30 + 30) Mod 30
If F = 24 Or (F = 25 And A > 11) Then F = F + 1
G = 44 - F
If G < 21 Then G = G + 30
Return DateAdd(Date(Year, 3, 1), gb.Day, G + 7 - (E + G) Mod 7 - 1)
End

View file

@ -2,6 +2,10 @@
Public Sub Main() Public Sub Main()
Print String.RemoveDiacritics("bébé") Dim I As Integer
For I = 2014 To 2030
Print I;; Date.Eastern(I)
Next
End End

View file

@ -5,9 +5,9 @@ SUBDIRS = . @GTKOPENGL_DIR@
gblib_LTLIBRARIES = gb.gtk.la gblib_LTLIBRARIES = gb.gtk.la
gb_gtk_la_LIBADD = @GTK_LIB@ gb_gtk_la_LIBADD = @THREAD_LIB@ @GTK_LIB@
gb_gtk_la_LDFLAGS = -module @LD_FLAGS@ @GTK_LDFLAGS@ gb_gtk_la_LDFLAGS = -module @LD_FLAGS@ @GTK_LDFLAGS@
gb_gtk_la_CPPFLAGS = @GTK_INC@ -I$(top_srcdir)/share gb_gtk_la_CPPFLAGS = @THREAD_INC@ @GTK_INC@ -I$(top_srcdir)/share
gb_gtk_la_SOURCES = \ gb_gtk_la_SOURCES = \
gmemory.h gmemory.cpp gtag.h ggambastag.h gshare.h \ gmemory.h gmemory.cpp gtag.h ggambastag.h gshare.h \

View file

@ -493,7 +493,11 @@ static void my_wait(int duration)
{ {
if (gKey::valid()) if (gKey::valid())
{ {
GB.Error("Cannot use WAIT inside a keyboard event handler"); #ifdef GTK3
fprintf(stderr, "gb.gtk3: WAIT inside a keyboard event handler is ignored\n");
#else
fprintf(stderr, "gb.gtk: WAIT inside a keyboard event handler is ignored\n");
#endif
return; return;
} }

View file

@ -307,13 +307,10 @@ static void CCURL_post_curl(intptr_t data)
int post=1; int post=1;
void *_object; void *_object;
char *tmp; char *tmp;
struct timespec mywait;
do do
{ {
mywait.tv_sec=0; usleep(1000);
mywait.tv_nsec=1000000;
nanosleep(&mywait,NULL);
} }
while(CURLM_CALL_MULTI_PERFORM == curl_multi_perform(CCURL_multicurl,&nread)); while(CURLM_CALL_MULTI_PERFORM == curl_multi_perform(CCURL_multicurl,&nread));

View file

@ -3,9 +3,9 @@ include $(top_srcdir)/component.am
gblib_LTLIBRARIES = gb.net.curl.la gblib_LTLIBRARIES = gb.net.curl.la
gb_net_curl_la_LIBADD = @CURL_LIB@ gb_net_curl_la_LIBADD = @THREAD_LIB@ @CURL_LIB@
gb_net_curl_la_LDFLAGS = -module @LD_FLAGS@ @CURL_LDFLAGS@ gb_net_curl_la_LDFLAGS = -module @LD_FLAGS@ @CURL_LDFLAGS@
gb_net_curl_la_CPPFLAGS = @CURL_INC@ gb_net_curl_la_CPPFLAGS = @THREAD_INC@ @CURL_INC@
gb_net_curl_la_SOURCES = \ gb_net_curl_la_SOURCES = \
gbcurl.h gbcurl.c \ gbcurl.h gbcurl.c \

View file

@ -42,7 +42,7 @@
#define CCOMBOBOX_PROPERTIES "*,Action,ReadOnly,List,Text,Password,MaxLength,Sorted,Border=True" #define CCOMBOBOX_PROPERTIES "*,Action,ReadOnly,List,Text,Password,MaxLength,Sorted,Border=True"
#define CDIAL_PROPERTIES "*,MinValue=0,MaxValue=100,Step=1,PageStep=10,Wrap,Mark=True" #define CDIAL_PROPERTIES "*,MinValue=0,MaxValue=100,Step=1,PageStep=10,Wrap,Mark=True"
#define CDRAWINGAREA_PROPERTIES "*," CARRANGEMENT_PROPERTIES ",Border{Border.*},Cached,Focus,NoBackground,Tablet" #define CDRAWINGAREA_PROPERTIES "*," CARRANGEMENT_PROPERTIES ",Border{Border.*},Cached,Focus,NoBackground,Tablet"
#define CEDITOR_PROPERTIES "*,Font{Font:Fixed},Border=True,ScrollBar{Scroll.*}=Both,Highlight{Highlight.None;Custom;Gambas;HTML;CSS;WebPage;Diff;JavaScript;SQL}=None,ReadOnly=False,TabSize{Range:1;16}=2" #define CEDITOR_PROPERTIES "*,Font,Border=True,ScrollBar{Scroll.*}=Both,Highlight{Highlight.None;Custom;Gambas;HTML;CSS;WebPage;Diff;JavaScript;SQL}=None,ReadOnly=False,TabSize{Range:1;16}=2"
#define CFRAME_PROPERTIES "*," CARRANGEMENT_PROPERTIES ",Text" #define CFRAME_PROPERTIES "*," CARRANGEMENT_PROPERTIES ",Text"
#define CHBOX_PROPERTIES "*,AutoResize," CPADDING_PROPERTIES ",Invert" #define CHBOX_PROPERTIES "*,AutoResize," CPADDING_PROPERTIES ",Invert"
#define CLABEL_PROPERTIES "*,Padding{Range:0;63},AutoResize,Text,Alignment{Align.*}=Normal,Border{Border.*},Transparent" #define CLABEL_PROPERTIES "*,Padding{Range:0;63},AutoResize,Text,Alignment{Align.*}=Normal,Border{Border.*},Transparent"

View file

@ -1220,6 +1220,7 @@ static void set_focus(void *_object)
if (win->opened && QWIDGET(win)->isVisible()) if (win->opened && QWIDGET(win)->isVisible())
{ {
//qDebug("set focus on %s for %s", THIS->name, ((CWIDGET *)win)->name);
WIDGET->setFocus(); WIDGET->setFocus();
} }
else if ((CWIDGET *)win != THIS) else if ((CWIDGET *)win != THIS)

View file

@ -7,9 +7,9 @@ EXTRA_DIST = trayicon.xpm
gblib_LTLIBRARIES = gb.qt4.la gblib_LTLIBRARIES = gb.qt4.la
gb_qt4_la_LIBADD = @QT_LIB@ gb_qt4_la_LIBADD = @THREAD_LIB@ @QT_LIB@
gb_qt4_la_LDFLAGS = -module @LD_FLAGS@ @QT_LDFLAGS@ gb_qt4_la_LDFLAGS = -module @LD_FLAGS@ @QT_LDFLAGS@
gb_qt4_la_CXXFLAGS = -DGB_QT_COMPONENT $(AM_CXXFLAGS) gb_qt4_la_CXXFLAGS = @THREAD_INC@ -DGB_QT_COMPONENT $(AM_CXXFLAGS)
gb_qt4_la_CPPFLAGS = -DQT3_SUPPORT @QT_INC@ -I$(top_srcdir)/share/ gb_qt4_la_CPPFLAGS = -DQT3_SUPPORT @QT_INC@ -I$(top_srcdir)/share/
gb_qt4_la_SOURCES = \ gb_qt4_la_SOURCES = \

View file

@ -844,7 +844,7 @@ static void hook_wait(int duration)
{ {
if (CKEY_is_valid()) if (CKEY_is_valid())
{ {
GB.Error("Cannot use WAIT inside a keyboard event handler"); fprintf(stderr, "gb.qt4: warning: WAIT inside a keyboard event handler is ignored\n");
return; return;
} }
MAIN_in_wait++; MAIN_in_wait++;

View file

@ -126,12 +126,12 @@ static void main_exit(bool silent)
EXTERN_release(); EXTERN_release();
STREAM_exit(); STREAM_exit();
OBJECT_exit(); OBJECT_exit();
CFILE_exit();
CLASS_clean_up(silent); CLASS_clean_up(silent);
SUBR_exit(); SUBR_exit();
DEBUG_exit(); DEBUG_exit();
CFILE_exit();
WATCH_exit(); WATCH_exit();
#if USE_PROFILE #if USE_PROFILE
PROFILE_exit(); PROFILE_exit();