[CONFIGURATION]

* BUG: Fix the gb.qt4 configure.ac file so that it works with stupid 
  pkg-config configuration files.

[DEVELOPMENT ENVIRONMENT]
* NEW: An option to define the terminal emulator used by the IDE.
* NEW: Some unused icons were removed from the project.
* BUG: The project tree does not steal the focus anymore after a project 
  compilation.

[GB.NET.SMTP]
* BUG: Fix the UTF-8 encoding of mail subjects having a '?' character 
  inside.

[GB.QT4]
* BUG: Fix the global event filter so that setting Application.Tooltip to 
  False does not interfer with the global key event handler.


git-svn-id: svn://localhost/gambas/trunk@2174 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2009-07-26 12:38:20 +00:00
parent 9f51810617
commit e8e807ee2b
44 changed files with 187 additions and 88 deletions

View file

@ -1,5 +1,5 @@
# Gambas Project File 3.0
# Compiled with Gambas 2.99.0 (r2121)
# Compiled with Gambas 2.99.0 (r2172)
Startup=MMain
UseTerminal=1
Icon=html.png

View file

@ -24,9 +24,13 @@ SearchComment=False
SearchString=True
[OpenFile]
Active=1
File[1]="/home/benoit/gambas/3.0/trunk/app/src/MakeWebSite/news/2009-07-22.html:4.57"
Count=1
File[1]="/home/benoit/gambas/3.0/trunk/app/src/MakeWebSite/news/2009-07-22.html:4.32"
Active=2
File[2]="/home/benoit/gambas/3.0/trunk/app/src/MakeWebSite/news/2009-07-26.html:12.70"
File[3]="/home/benoit/gambas/3.0/trunk/app/src/MakeWebSite/.src/MMain.module:16.13"
File[4]="/home/benoit/gambas/3.0/trunk/app/src/MakeWebSite/news/fr/2009-07-26.html:11.93"
File[5]="/home/benoit/gambas/3.0/trunk/app/src/MakeWebSite/news/fr/2009-06-27.html:11.0"
Count=5
[Watches]
Count=0

View file

@ -8,7 +8,7 @@ Private $aLanguages As String[] = ["en:C", "fr:fr_FR.UTF-8", "es:es_ES.UTF-8"]
Sub InitVar()
Dim aStable As String[] = ["2.14.0", "2.13.1", "2.12.0", "2.11.1"]
Dim aStable As String[] = ["2.15.0", "2.14.0", "2.13.1", "2.12.0"]
'DIM aDev AS String[] = ["92", "91", "90", "51"]
$cVar["STABLE_VERSION"] = aStable[0]

View file

@ -28,7 +28,7 @@ The way to do that depends on your distribution.</p>
<b><i>Gambas</i></b> source package on your machine. For example,
you can use <tt>wget</tt> in the terminal:</p>
<pre>[linux@home ~]$ wget http://gambas.sourceforge.net/gambas-2.14.0.tar.bz2
<pre>[linux@home ~]$ wget http://gambas.sourceforge.net/gambas-2.15.0.tar.bz2
</pre>
<p>Then, you must unpack the downloaded archive in a well chosen place.
@ -36,18 +36,18 @@ For example, in your home directory.</p>
<pre>[linux@home ~] cd ~
[linux@home ~]$ bunzip2 gambas-2.14.0.tar.bz2
[linux@home ~]$ bunzip2 gambas-2.15.0.tar.bz2
[linux@home ~]$ tar xf gambas-2.14.0.tar
[linux@home ~]$ tar xf gambas-2.15.0.tar
[linux@home ~]$ ls
... gambas-2.14.0 ...
... gambas-2.15.0 ...
</pre>
<p>A <i>gambas</i> directory has been created with the contents of the
archive. Enter it&nbsp;!</p>
<pre>[linux@home ~]$ cd gambas-2.14.0
<pre>[linux@home ~]$ cd gambas-2.15.0
</pre>
<p>Then you can launch the compilation of the sources with the two following
@ -58,7 +58,7 @@ system in order to adapt the compilation process. It is a script located in
the source directory, so you could be obliged to add "./" before the command
name to launch it.</p>
<pre>[linux@home gambas-2.14.0]$ ./configure
<pre>[linux@home gambas-2.15.0]$ ./configure
...
</pre>
@ -85,7 +85,7 @@ following options to <i>configure</i>&nbsp;:</p>
<p>For example&nbsp;:</p>
<pre>[linux@home gambas-2.14.0]$ ./configure --disable-db-component
<pre>[linux@home gambas-2.15.0]$ ./configure --disable-db-component
</pre>
<p>Note that if you forgot to install a development package, the components that
@ -95,7 +95,7 @@ output of the <tt>configure</tt> command.</p>
<p>When <tt>configure</tt> ends without any error, you can launch the compilation
with <tt>make</tt>.</p>
<pre>[linux@home gambas-2.14.0]$ make
<pre>[linux@home gambas-2.15.0]$ make
...
</pre>
@ -109,7 +109,7 @@ to you to go to the mailing-list to carefully expose your problem with
<i><b>Gambas</b></i>. To do that, you must be <i>root</i>. So we are going
to use the <i>su</i> command&nbsp;:</p>
<pre>[linux@home gambas-2.14.0]$ su -c "make install"
<pre>[linux@home gambas-2.15.0]$ su -c "make install"
Password:
...
</pre>
@ -122,7 +122,7 @@ Read the <tt>INSTALL</tt> file in the source directory for more details.</p>
<p>For example, to install <b><i>Gambas</i></b> under <tt>/usr</tt>, just
type the following:</p>
<pre>[linux@home gambas-2.14.0]$ ./configure --prefix=/usr
<pre>[linux@home gambas-2.15.0]$ ./configure --prefix=/usr
</pre>
<p>Note that symbolic links are created in the <tt>/usr/bin</tt> folder so that
@ -134,7 +134,7 @@ symbolic links are not created.</p>
<p>Once everything is done, you can launch the development environment.</p>
<pre>[linux@home gambas-2.14.0]$ gambas
<pre>[linux@home gambas-2.15.0]$ gambas
</pre>
<p>Or for the development version:</p>

View file

@ -80,29 +80,29 @@ $ ./reconf-all
</tr>
<tr class="dark">
<td><a href="http://prdownloads.sourceforge.net/gambas/gambas2-2.15.0.tar.bz2?download">gambas2-2.15.0.tar.bz2</a></td>
<td>2.15.0</td>
<td>tar.bz2</td>
</tr>
<tr>
<td><a href="http://prdownloads.sourceforge.net/gambas/gambas2-2.14.0.tar.bz2?download">gambas2-2.14.0.tar.bz2</a></td>
<td>2.14.0</td>
<td>tar.bz2</td>
</tr>
<tr>
<tr class="dark">
<td><a href="http://prdownloads.sourceforge.net/gambas/gambas2-2.13.1.tar.bz2?download">gambas2-2.13.1.tar.bz2</a></td>
<td>2.13.1</td>
<td>tar.bz2</td>
</tr>
<tr class="dark">
<tr>
<td><a href="http://prdownloads.sourceforge.net/gambas/gambas2-2.12.0.tar.bz2?download">gambas2-2.12.0.tar.bz2</a></td>
<td>2.12.0</td>
<td>tar.bz2</td>
</tr>
<tr>
<td><a href="http://prdownloads.sourceforge.net/gambas/gambas2-2.11.1.tar.bz2?download">gambas2-2.11.1.tar.bz2</a></td>
<td>2.11.1</td>
<td>tar.bz2</td>
</tr>
</table>
<h3>{How to compile and install Gambas}</h3>

View file

@ -19,7 +19,7 @@
<img src="top-right-corner.png" class="top-right-corner">
</div>
<div style="padding:0px 8px;margin:0px;color:white;">
<b>{Last stable version is}<br><a href="download.html"><font size="+1">2.14.0</font></a>
<b>{Last stable version is}<br><a href="download.html"><font size="+1">2.15.0</font></a>
(<a href="changelog2.html"><b>Changelog</b></a>)</b>
</div>
<div class="bottom-corner">
@ -64,6 +64,29 @@
</div>
<div class="news-title">
<img src="top-left-corner.png" class="top-left-corner">
<img src="top-right-corner.png" class="top-right-corner">
<div style="height:4px;"></div>
<div><b>26 jul 2009 - Release of Gambas 2.15</b></div>
</div>
<div class="news">
<table class="none" width="100%"><tr><td class="none">
<p>The main changes of this release are:
<ul>
<li>A big bug was fixed in the interpreter that made it crash randomly on some systems.
<li>String to number conversion was fixed, especially when converting Long numbers.
<li>The Firebird driver is compiled correctly now.
<li>The SQLite 3 driver now correctly returns the default value of fields.
<li>Raising or lowering controls now works correctly in the GTK+ component.
<li>The SMTP component now strictly follows RFC 2047 when sending mails with subjects encoded in UTF-8.
<li>The Xml.ToString() method was fixed in the XML component.
</ul>
<p>See the <a href="changelog2.html">ChangeLog</a> for other bug fixes.
</td></tr></table>
</div>
<div class="space"></div>
<div class="news-title">
<img src="top-left-corner.png" class="top-left-corner">
<img src="top-right-corner.png" class="top-right-corner">
@ -79,27 +102,6 @@ As many pages of this web site were actually stored in the wiki, they are not ac
</td></tr></table>
</div>
<div class="space"></div>
<div class="news-title">
<img src="top-left-corner.png" class="top-left-corner">
<img src="top-right-corner.png" class="top-right-corner">
<div style="height:4px;"></div>
<div><b>27 jun 2009 - Release of Gambas 2.14</b></div>
</div>
<div class="news">
<table class="none" width="100%"><tr><td class="none">
<p>The main changes of this release are:
<ul>
<li>All database drivers became components so that they can be an explicit project dependency.
<li>File watch management routines were fixed in the interpreter, in gb.qt and gb.gtk.
<li>Static variables are correctly inherited now.
<li>Focus and clipboard management in gb.qt were fixed.
<li>A lot of gb.gtk bugs was fixed too.
</ul>
<p>See the <a href="changelog2.html">ChangeLog</a> for the other bug fixes.
</td></tr></table>
</div>
<div class="space"></div>
<a href="news.html">{Older News...}</a>

View file

@ -10,6 +10,29 @@
<div class="title">{News Archive}</div>
<div class="space"></div>
<div class="news-title">
<img src="top-left-corner.png" class="top-left-corner">
<img src="top-right-corner.png" class="top-right-corner">
<div style="height:4px;"></div>
<div><b>26 jul 2009 - Release of Gambas 2.15</b></div>
</div>
<div class="news">
<table class="none" width="100%"><tr><td class="none">
<p>The main changes of this release are:
<ul>
<li>A big bug was fixed in the interpreter that made it crash randomly on some systems.
<li>String to number conversion was fixed, especially when converting Long numbers.
<li>The Firebird driver is compiled correctly now.
<li>The SQLite 3 driver now correctly returns the default value of fields.
<li>Raising or lowering controls now works correctly in the GTK+ component.
<li>The SMTP component now strictly follows RFC 2047 when sending mails with subjects encoded in UTF-8.
<li>The Xml.ToString() method was fixed in the XML component.
</ul>
<p>See the <a href="changelog2.html">ChangeLog</a> for other bug fixes.
</td></tr></table>
</div>
<div class="space"></div>
<div class="news-title">
<img src="top-left-corner.png" class="top-left-corner">
<img src="top-right-corner.png" class="top-right-corner">

Binary file not shown.

Before

Width:  |  Height:  |  Size: 282 B

After

Width:  |  Height:  |  Size: 282 B

View file

@ -0,0 +1,13 @@
Release of Gambas 2.15
<p>The main changes of this release are:
<ul>
<li>A big bug was fixed in the interpreter that made it crash randomly on some systems.
<li>String to number conversion was fixed, especially when converting Long numbers.
<li>The Firebird driver is compiled correctly now.
<li>The SQLite 3 driver now correctly returns the default value of fields.
<li>Raising or lowering controls now works correctly in the GTK+ component.
<li>The SMTP component now strictly follows RFC 2047 when sending mails with subjects encoded in UTF-8.
<li>The Xml.ToString() method was fixed in the XML component.
</ul>
<p>See the <a href="changelog2.html">ChangeLog</a> for other bug fixes.

View file

@ -0,0 +1,13 @@
Publication de Gambas 2.15
<p>Les changements principaux dans cette version sont les suivants :
<ul>
<li>Un bug important a été corrigé dans l'interpréteur qui le faisait planter de manière aléatoire sur certains systèmes.
<li>La conversion des chaînes de caractères en nombres a été corrigée, tout particulièrement dans le cas des entiers de type Long.
<li>Le pilote Firebird est compilé correctement désormais.
<li>Le pilote SQLite 3 retourne correctement la valeur par défaut des champs maintenant.
<li>Mettre les contrôles en avant-plan ou en arrière-plan fonctionne correctement maintenant dans le composant GTK+.
<li>Le composant SMTP respecte maintenant la RFC 2047 de manière stricte lorsqu'il s'agit d'encoder les sujets de mail en UTF-8.
<li>La méthode Xml.ToString() a été corrigée dans le composant XML.
</ul>
<p>Se reporter au <a href="changelog2.html">ChangeLog</a> pour les autres corrections de bugs.

View file

@ -726,21 +726,27 @@ Private Sub Start(sCmd As String)
sTitle = Project.Name & " (" & ("Output terminal") & ")"
Select Case Desktop.Type
sProg = Settings["/Terminal"]
Case "KDE", "KDE4"
sProg = "konsole"
Case "GNOME"
sProg = "gnome-terminal"
Case "XFCE"
sProg = "Terminal"
If Not sProg Then
Select Case Desktop.Type
Default
sProg = "xterm"
End Select
Case "KDE", "KDE4"
sProg = "konsole"
Case "GNOME"
sProg = "gnome-terminal"
Case "XFCE"
sProg = "Terminal"
Default
sProg = "xterm"
End Select
Endif
If Project.CheckProgram(sProg) Then
sProg = "xterm"
@ -758,6 +764,7 @@ Private Sub Start(sCmd As String)
aExec.Insert(["konsole", "--nofork", "--caption", sTitle, "--hold", "--name", Project.Name & "-output", "-e"], 0)
Case "gnome-terminal"
' gnome terminal cannot hold at end
aExec = ["gnome-terminal", "--hide-menubar", "--title=" & sTitle, "-e", aExec.Join(" ")]
Case "Terminal"

View file

@ -4,7 +4,7 @@
MoveScaled(3,6,82,72)
Background = Color.TextBackground
Text = ("About Gambas...")
Icon = Picture["img/16/logo.png"]
Icon = Picture["img/logo/logo-32-head.png"]
Resizable = False
{ TabStrip1 TabStrip
MoveScaled(1,18,80,48)

View file

@ -1120,10 +1120,10 @@ Private Sub RefreshMenu()
GetCurrent
If $sKey = Project.KEY_CONNECTION Or If Project.IsConnectionPath($sKey) Then
Project.SetCurrentPopup(mnuDatabase)
If tvwProject.HasFocus Then Project.SetCurrentPopup(mnuDatabase)
mnuDatabase_Show
Else
Project.SetCurrentPopup(mnuPopup)
If tvwProject.HasFocus Then Project.SetCurrentPopup(mnuPopup)
mnuPopup_Show
Endif

View file

@ -3,7 +3,7 @@
{ Form Form
MoveScaled(0,0,134,86)
Text = ("")
Icon = Picture["img/logo/logo-32.png"]
Icon = Picture["img/logo/logo-32-head.png"]
Arrangement = Arrange.Vertical
{ mnuFile Menu
Text = ("&File")
@ -279,11 +279,6 @@
Text = ("&Update all forms")
Picture = Picture["icon:/small/refresh"]
}
{ mnuDatabaseManager Menu
Action = "database-manager"
Text = ("&Database manager...")
Picture = Picture["img/16/database-manager.png"]
}
{ Menu20 Menu
Text = ("")
}
@ -908,11 +903,6 @@
Shortcut = "Ctrl+X"
Picture = "icon:/small/cut"
}
{ Action database-manager
Text = "&Database manager..."
Shortcut = ""
Picture = "img/16/database-manager.png"
}
{ Action delete
Text = "&Delete..."
Shortcut = "Del"

View file

@ -3,6 +3,7 @@
Static Private $aTheme As String[] = ["amethyst", "amber", "emerald", "ruby", "sapphire", "visual", "obsidian", "quest", "quick"]
Static Private $aThemeName As String[] = [("Amethyst"), ("Amber"), ("Emerald"), ("Ruby"), ("Sapphire"), ("Visual"), ("Obsidian"), ("Quest"), ("Quick")]
Static Private $aBrowser As String[] = ["konqueror", "firefox", "epiphany", "seamonkey", "opera"]
Static Private $aTerminal As String[] = ["konsole", "gnome-terminal", "Terminal", "xterm"]
Private $cLast As Collection
Private $cCurrent As Collection
@ -55,6 +56,7 @@ Public Sub _new()
cmbTheme.Add(("Select a theme"), 0)
cmbIconTheme.List = [("Desktop"), "Gnome", "KDE", "KDE4"]
cmbBrowser.List = [("(Default)"), "Konqueror", "Firefox", "Epiphany", "SeaMonkey", "Opera"]
cmbTerminal.List = [("(Default)"), "Konsole", "Gnome Terminal", "XFCE Terminal", "XTerm"]
$cLast = MTheme.ReadSettings(Settings, "/Highlight", True)
$cCurrent = MTheme.Copy($cLast)
@ -81,6 +83,7 @@ Public Sub _new()
ReadConfig
cmbIconTheme.Index = ["gnome", "kde"].Find(Settings["/Theme"]) + 1
cmbBrowser.Index = $aBrowser.Find(Settings["/Browser"]) + 1
cmbTerminal.Index = $aTerminal.Find(Settings["/Terminal"]) + 1
$bNoChange = False
For iInd = 0 To MTheme.ColorKeys.Max
@ -316,7 +319,7 @@ End
Public Sub cmbBrowser_Click()
If cmbBrowser.Index > 0 Then
Settings["/Browser"] = LCase(cmbBrowser.Text)
Settings["/Browser"] = $aBrowser[cmbBrowser.Index - 1]
Else
Settings["/Browser"] = ""
Endif
@ -325,6 +328,16 @@ Public Sub cmbBrowser_Click()
End
Public Sub cmbTerminal_Click()
If cmbTerminal.Index > 0 Then
Settings["/Terminal"] = $aTerminal[cmbTerminal.Index - 1]
Else
Settings["/Terminal"] = ""
Endif
End
' PUBLIC SUB cmbImageEditor_Click()
'
' IF cmbImageEditor.Index > 0 THEN

View file

@ -1,7 +1,7 @@
# Gambas Form File 3.0
{ Form Form
MoveScaled(0,0,75,77)
MoveScaled(0,0,75,82)
Action = "option"
Text = ("Preferences")
Icon = Picture["icon:/small/options"]
@ -32,7 +32,7 @@
}
}
{ TabStrip1 TabStrip
MoveScaled(1,1,73,70)
MoveScaled(1,1,73,75)
Arrangement = Arrange.Vertical
Spacing = True
Margin = True
@ -228,6 +228,22 @@
List = []
}
}
{ HBox2 HBox
MoveScaled(2,65,69,4)
Spacing = True
Indent = True
{ Label4 Label
MoveScaled(0,0,47,4)
Text = ("Terminal")
}
{ cmbTerminal ComboBox
MoveScaled(48,0,17,4)
Expand = True
Text = ("")
ReadOnly = True
List = []
}
}
Index = 1
Text = ("Editor")
{ Label9 Label
@ -407,7 +423,7 @@
Index = 0
}
{ btnClose Button
MoveScaled(59,72,15,4)
MoveScaled(59,77,15,4)
Text = ("Close")
Default = True
Cancel = True

View file

@ -5,7 +5,7 @@
Background = Color.TextBackground
Foreground = Color.TextForeground
Text = ("Welcome to Gambas 3")
Icon = Picture["img/logo/logo-32.png"]
Icon = Picture["img/logo/logo-32-head.png"]
Arrangement = Arrange.Vertical
Spacing = True
Margin = True

View file

@ -477,6 +477,11 @@ Private Function CloseProject() As Boolean
If Not hForm.Closed Then
If Not hForm.Path Then
Debug "hForm.Path = NULL ?"
Stop
Endif
Inc nOpen
If hForm = ActiveForm Then Config["/OpenFile/Active"] = nOpen
@ -489,7 +494,7 @@ Private Function CloseProject() As Boolean
If sState Then sState = ":" & sState
Config["/OpenFile/File[" & CStr(nOpen) & "]"] = hForm.Path & sState
If aFold Then Config["/OpenFile/Fold[" & CStr(nOpen) & "]"] = aFold
If aFold And If aFold.Count Then Config["/OpenFile/Fold[" & CStr(nOpen) & "]"] = aFold
Endif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 891 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 985 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 457 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1,021 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1,015 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 865 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 733 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 702 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 708 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 769 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 970 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 692 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 758 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 670 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

View file

@ -3,7 +3,7 @@ gblib_DATA = $(COMPONENT).component
install-data-hook:
@$(INSTALL) -d $(DESTDIR)$(gbdatadir)/info
@if test -d $(COMPONENT); then \
@if test -d $(COMPONENT) && test -e $(COMPONENT)/.project ; then \
echo; \
echo "Compiling the $(COMPONENT) project..."; \
( \
@ -15,7 +15,6 @@ install-data-hook:
$(INSTALL) $(COMPONENT).gambas $(DESTDIR)$(gblibdir); \
) \
fi
@echo;
@echo "Installing the $(COMPONENT) control icons if needed...";
@if test -d control; then \
$(INSTALL) -d $(DESTDIR)$(gbdatadir)/control; \
@ -27,7 +26,6 @@ install-data-hook:
$(INSTALL) -d $(DESTDIR)$(gbdatadir)/control/$(COMPONENT); \
$(INSTALL) $(COMPONENT)/.hidden/control/*.png $(DESTDIR)$(gbdatadir)/control/$(COMPONENT); \
fi
@echo
@echo "Creating the information files for $(COMPONENT) component..."
@$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT)
@echo

View file

@ -219,7 +219,11 @@ Public Sub tabBrowser_Click()
CreateView()
Else
hView = GetView()
Me.Title = hView.Title & " - Gambas WebKit"
If hView.Title Then
Me.Title = hView.Title & " - Gambas WebKit"
Else
Me.Title = "Gambas WebKit"
Endif
tabBrowser.Text = hView.Title
Me.Icon = hView.Icon
tabBrowser.Picture = hView.Icon

View file

@ -252,7 +252,7 @@ int libsmtp_int_send_quoted_header (const char *header, char *libsmtp_int_data,
if (libsmtp_int_char == 32)
libsmtp_int_char = '_';
else if (libsmtp_int_char < 33 || libsmtp_int_char > 126 || libsmtp_int_char == '_' || libsmtp_int_char == 61)
else if (libsmtp_int_char < 33 || libsmtp_int_char > 126 || libsmtp_int_char == '_' || libsmtp_int_char == '=' || libsmtp_int_char == '?')
len = sprintf(libsmtp_int_obuffer, "=%02X", libsmtp_int_char);

View file

@ -38,7 +38,7 @@ GB_COMPONENT_PKG_CONFIG(
QTWEBKIT,
[QT4 webkit component],
[webkit],
QtCore ">= 4.3.4" QtGui QtWebKit
QtCore ">= 4.3.4" QtGui QtNetwork QtDBus QtXml QtWebKit
)
GB_COMPONENT(
@ -55,7 +55,7 @@ GB_COMPONENT_PKG_CONFIG(
QTOPENGL,
[QT4 OpenGL],
[opengl],
QtOpenGL ">= 4.3.4"
QtCore ">= 4.3.4" QtGui QtOpenGL
)
MOC=`pkg-config --variable=moc_location QtCore`

View file

@ -126,6 +126,7 @@ int MAIN_x11_last_key_code = 0;
static bool in_event_loop = false;
static int _no_destroy = 0;
static QTranslator *qt = NULL;
static bool _application_keypress = false;
static GB_FUNCTION _application_keypress_func;
static QWidget *_mouseGrabber = 0;
static QWidget *_keyboardGrabber = 0;
@ -315,7 +316,10 @@ static bool QT_EventFilter(QEvent *e)
{
QKeyEvent *kevent = (QKeyEvent *)e;
bool cancel;
if (!_application_keypress)
return false;
CKEY_clear(true);
GB.FreeString(&CKEY_info.text);
@ -554,7 +558,10 @@ static void QT_Init(void)
MAIN_update_scale();
if (GB.GetFunction(&_application_keypress_func, GB.FindClass(GB.Application.Startup()), "Application_KeyPress", "", "") == 0)
{
_application_keypress = true;
MyApplication::setEventFilter(true);
}
qApp->installEventFilter(&CWidget::manager);

View file

@ -771,6 +771,7 @@ GB_VALUE *GB_Call(GB_FUNCTION *_func, int nparam, int release)
if (!func || !func->desc)
GB_Error("Unknown function call");
//TEMP.type = GB_T_NULL;
else
{
stop_event = GAMBAS_StopEvent;

View file

@ -877,7 +877,10 @@ void DEBUG_main(boolean error)
// A null string command means an I/O error
if (len == 0)
abort();
{
fprintf(stderr, "warning: debugger I/O error\n");
exit(1);
}
if (len > 0 && cmd[len - 1] == '\n')
{