From 43f26cd8ff6748c5847860f39d1d56a08b95721f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Fri, 8 May 2015 17:40:28 +0000 Subject: [PATCH] [CONFIGURATION] * NEW: gb.qt5 component. [EXAMPLES] * BUG: Fix WebBrowser example. [INTERPRETER] * NEW: Fix compilation of EXEC and SHELL for older bytecode versions. [GB.DB.FORM] * NEW: Display the busy mouse cursor while loading SQL data. [GB.QT4] * NEW: Support for QT5. [GB.QT5] * NEW: Initial version of the QT5 component. Not everything is working. There is no Embedder and TrayIcon controls. git-svn-id: svn://localhost/gambas/trunk@7062 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- Makefile.am | 1 + app/examples/Games/Invaders/.icon.png | Bin 3936 -> 3156 bytes app/examples/Games/Invaders/.project | 4 +- app/examples/Games/Pong/.icon.png | Bin 3906 -> 3130 bytes app/examples/Games/Pong/.project | 3 +- app/examples/Networking/WebBrowser/.icon.png | Bin 4460 -> 3676 bytes app/examples/Networking/WebBrowser/.project | 12 +- .../Networking/WebBrowser/.src/FBrowser.class | 8 ++ .../Networking/WebBrowser/.src/FBrowser.form | 63 +++++++---- .../Networking/WebBrowser/.src/FDownload.form | 43 ++++--- .../WebBrowser/{konqueror.png => icon.png} | Bin app/src/gambas-farm-server/.project | 4 +- comp/src/gb.db.form/.src/DataTable.class | 71 +++++++----- comp/src/gb.desktop/.settings | 6 +- comp/src/gb.gui.base/.project | 2 +- comp/src/gb.gui.base/.src/Test/FMain.form | 28 +++++ comp/src/gb.gui.base/.startup | 2 +- configure.ac | 1 + gb.qt4/src/CCheckBox.cpp | 2 +- gb.qt4/src/CClipboard.cpp | 2 + gb.qt4/src/CDialog.cpp | 8 +- gb.qt4/src/CDrawingArea.cpp | 107 ++++++++++++------ gb.qt4/src/CDrawingArea.h | 11 +- gb.qt4/src/CRadioButton.cpp | 2 +- gb.qt4/src/CScreen.cpp | 9 +- gb.qt4/src/CScrollView.cpp | 2 +- gb.qt4/src/CStyle.cpp | 7 +- gb.qt4/src/CTextBox.cpp | 10 +- gb.qt4/src/CWindow.cpp | 57 +++++++--- gb.qt4/src/CWindow.h | 5 + gb.qt4/src/cpaint_impl.cpp | 2 + gb.qt4/src/cprinter.cpp | 8 +- gb.qt4/src/gb.qt.h | 4 + gb.qt4/src/main.cpp | 26 ++++- gb.qt4/src/main.h | 80 ++++++------- gb.qt4/src/systemtrayicon.h | 2 +- gb.qt5/AUTHORS | 0 gb.qt5/COPYING | 1 + gb.qt5/ChangeLog | 0 gb.qt5/INSTALL | 1 + gb.qt5/Makefile.am | 3 + gb.qt5/NEWS | 0 gb.qt5/README | 0 gb.qt5/acinclude.m4 | 1 + gb.qt5/component.am | 1 + gb.qt5/configure.ac | 45 ++++++++ gb.qt5/depcomp | 1 + gb.qt5/gambas.h | 1 + gb.qt5/gb.draw.h | 1 + gb.qt5/gb.eval.h | 1 + gb.qt5/gb.geom.h | 1 + gb.qt5/gb.gl.h | 1 + gb.qt5/gb.image.h | 1 + gb.qt5/gb.paint.h | 1 + gb.qt5/gb.qt.am | 6 + gb.qt5/gb_common.h | 1 + gb.qt5/m4 | 1 + gb.qt5/missing | 1 + gb.qt5/reconf | 1 + gb.qt5/share | 1 + gb.qt5/src/CButton.cpp | 1 + gb.qt5/src/CButton.h | 1 + gb.qt5/src/CCheckBox.cpp | 1 + gb.qt5/src/CCheckBox.h | 1 + gb.qt5/src/CClipboard.cpp | 1 + gb.qt5/src/CClipboard.h | 1 + gb.qt5/src/CColor.cpp | 1 + gb.qt5/src/CColor.h | 1 + gb.qt5/src/CConst.cpp | 1 + gb.qt5/src/CConst.h | 1 + gb.qt5/src/CContainer.cpp | 1 + gb.qt5/src/CContainer.h | 1 + gb.qt5/src/CDialog.cpp | 1 + gb.qt5/src/CDialog.h | 1 + gb.qt5/src/CDraw.cpp | 1 + gb.qt5/src/CDraw.h | 1 + gb.qt5/src/CDrawingArea.cpp | 1 + gb.qt5/src/CDrawingArea.h | 1 + gb.qt5/src/CEmbedder.cpp | 1 + gb.qt5/src/CEmbedder.h | 1 + gb.qt5/src/CFont.cpp | 1 + gb.qt5/src/CFont.h | 1 + gb.qt5/src/CFrame.cpp | 1 + gb.qt5/src/CFrame.h | 1 + gb.qt5/src/CImage.cpp | 1 + gb.qt5/src/CImage.h | 1 + gb.qt5/src/CKey.cpp | 1 + gb.qt5/src/CKey.h | 1 + gb.qt5/src/CLabel.cpp | 1 + gb.qt5/src/CLabel.h | 1 + gb.qt5/src/CMenu.cpp | 1 + gb.qt5/src/CMenu.h | 1 + gb.qt5/src/CMessage.cpp | 1 + gb.qt5/src/CMessage.h | 1 + gb.qt5/src/CMouse.cpp | 1 + gb.qt5/src/CMouse.h | 1 + gb.qt5/src/CMovieBox.cpp | 1 + gb.qt5/src/CMovieBox.h | 1 + gb.qt5/src/CPanel.cpp | 1 + gb.qt5/src/CPanel.h | 1 + gb.qt5/src/CPicture.cpp | 1 + gb.qt5/src/CPicture.h | 1 + gb.qt5/src/CPictureBox.cpp | 1 + gb.qt5/src/CPictureBox.h | 1 + gb.qt5/src/CRadioButton.cpp | 1 + gb.qt5/src/CRadioButton.h | 1 + gb.qt5/src/CScreen.cpp | 1 + gb.qt5/src/CScreen.h | 1 + gb.qt5/src/CScrollBar.cpp | 1 + gb.qt5/src/CScrollBar.h | 1 + gb.qt5/src/CScrollView.cpp | 1 + gb.qt5/src/CScrollView.h | 1 + gb.qt5/src/CSlider.cpp | 1 + gb.qt5/src/CSlider.h | 1 + gb.qt5/src/CSpinBox.cpp | 1 + gb.qt5/src/CSpinBox.h | 1 + gb.qt5/src/CStyle.cpp | 1 + gb.qt5/src/CStyle.h | 1 + gb.qt5/src/CTabStrip.cpp | 1 + gb.qt5/src/CTabStrip.h | 1 + gb.qt5/src/CTextArea.cpp | 1 + gb.qt5/src/CTextArea.h | 1 + gb.qt5/src/CTextBox.cpp | 1 + gb.qt5/src/CTextBox.h | 1 + gb.qt5/src/CTrayIcon.cpp | 1 + gb.qt5/src/CTrayIcon.h | 1 + gb.qt5/src/CWatch.cpp | 1 + gb.qt5/src/CWatch.h | 1 + gb.qt5/src/CWatcher.cpp | 1 + gb.qt5/src/CWatcher.h | 1 + gb.qt5/src/CWidget.cpp | 1 + gb.qt5/src/CWidget.h | 1 + gb.qt5/src/CWindow.cpp | 1 + gb.qt5/src/CWindow.h | 1 + gb.qt5/src/Makefile.am | 56 +++++++++ gb.qt5/src/cpaint_impl.cpp | 1 + gb.qt5/src/cpaint_impl.h | 1 + gb.qt5/src/cprinter.cpp | 1 + gb.qt5/src/cprinter.h | 1 + gb.qt5/src/csvgimage.cpp | 1 + gb.qt5/src/csvgimage.h | 1 + gb.qt5/src/ext/CDial.cpp | 1 + gb.qt5/src/ext/CDial.h | 1 + gb.qt5/src/ext/CEditor.cpp | 1 + gb.qt5/src/ext/CEditor.h | 1 + gb.qt5/src/ext/CLCDNumber.cpp | 1 + gb.qt5/src/ext/CLCDNumber.h | 1 + gb.qt5/src/ext/CTextEdit.cpp | 1 + gb.qt5/src/ext/CTextEdit.h | 1 + gb.qt5/src/ext/Makefile.am | 20 ++++ gb.qt5/src/ext/garray.cpp | 1 + gb.qt5/src/ext/garray.h | 1 + gb.qt5/src/ext/gb.qt5.ext.component | 4 + gb.qt5/src/ext/gdocument.cpp | 1 + gb.qt5/src/ext/gdocument.h | 1 + gb.qt5/src/ext/gstring.cpp | 1 + gb.qt5/src/ext/gstring.h | 1 + gb.qt5/src/ext/gview.cpp | 1 + gb.qt5/src/ext/gview.h | 1 + gb.qt5/src/ext/main.cpp | 1 + gb.qt5/src/ext/main.h | 1 + gb.qt5/src/gb.qt.h | 1 + gb.qt5/src/gb.qt5.component | 6 + gb.qt5/src/main.cpp | 1 + gb.qt5/src/main.h | 1 + gb.qt5/src/opengl/CGLarea.cpp | 1 + gb.qt5/src/opengl/CGLarea.h | 1 + gb.qt5/src/opengl/Makefile.am | 14 +++ gb.qt5/src/opengl/gb.qt5.opengl.component | 6 + gb.qt5/src/opengl/main.cpp | 1 + gb.qt5/src/opengl/main.h | 1 + gb.qt5/src/systemtrayicon.cpp | 1 + gb.qt5/src/systemtrayicon.h | 1 + gb.qt5/src/trayicon.xpm | 1 + gb.qt5/src/webkit/Makefile.am | 19 ++++ gb.qt5/src/webkit/ccookiejar.cpp | 1 + gb.qt5/src/webkit/ccookiejar.h | 1 + gb.qt5/src/webkit/control/webview.png | Bin 0 -> 1556 bytes gb.qt5/src/webkit/cwebdownload.cpp | 1 + gb.qt5/src/webkit/cwebdownload.h | 1 + gb.qt5/src/webkit/cwebelement.cpp | 1 + gb.qt5/src/webkit/cwebelement.h | 1 + gb.qt5/src/webkit/cwebframe.cpp | 1 + gb.qt5/src/webkit/cwebframe.h | 1 + gb.qt5/src/webkit/cwebhittest.cpp | 1 + gb.qt5/src/webkit/cwebhittest.h | 1 + gb.qt5/src/webkit/cwebsettings.cpp | 1 + gb.qt5/src/webkit/cwebsettings.h | 1 + gb.qt5/src/webkit/cwebview.cpp | 1 + gb.qt5/src/webkit/cwebview.h | 1 + gb.qt5/src/webkit/gb.qt5.webkit.component | 10 ++ gb.qt5/src/webkit/main.cpp | 1 + gb.qt5/src/webkit/main.h | 1 + gb.qt5/src/x11.c | 1 + gb.qt5/src/x11.h | 1 + main/gbc/gbc_trans_expr.c | 16 ++- main/share/gb_common.h | 16 +-- main/share/gb_list_temp.h | 16 +-- 198 files changed, 748 insertions(+), 224 deletions(-) rename app/examples/Networking/WebBrowser/{konqueror.png => icon.png} (100%) create mode 100644 gb.qt5/AUTHORS create mode 120000 gb.qt5/COPYING create mode 100644 gb.qt5/ChangeLog create mode 120000 gb.qt5/INSTALL create mode 100644 gb.qt5/Makefile.am create mode 100644 gb.qt5/NEWS create mode 100644 gb.qt5/README create mode 120000 gb.qt5/acinclude.m4 create mode 120000 gb.qt5/component.am create mode 100644 gb.qt5/configure.ac create mode 120000 gb.qt5/depcomp create mode 120000 gb.qt5/gambas.h create mode 120000 gb.qt5/gb.draw.h create mode 120000 gb.qt5/gb.eval.h create mode 120000 gb.qt5/gb.geom.h create mode 120000 gb.qt5/gb.gl.h create mode 120000 gb.qt5/gb.image.h create mode 120000 gb.qt5/gb.paint.h create mode 100644 gb.qt5/gb.qt.am create mode 120000 gb.qt5/gb_common.h create mode 120000 gb.qt5/m4 create mode 120000 gb.qt5/missing create mode 120000 gb.qt5/reconf create mode 120000 gb.qt5/share create mode 120000 gb.qt5/src/CButton.cpp create mode 120000 gb.qt5/src/CButton.h create mode 120000 gb.qt5/src/CCheckBox.cpp create mode 120000 gb.qt5/src/CCheckBox.h create mode 120000 gb.qt5/src/CClipboard.cpp create mode 120000 gb.qt5/src/CClipboard.h create mode 120000 gb.qt5/src/CColor.cpp create mode 120000 gb.qt5/src/CColor.h create mode 120000 gb.qt5/src/CConst.cpp create mode 120000 gb.qt5/src/CConst.h create mode 120000 gb.qt5/src/CContainer.cpp create mode 120000 gb.qt5/src/CContainer.h create mode 120000 gb.qt5/src/CDialog.cpp create mode 120000 gb.qt5/src/CDialog.h create mode 120000 gb.qt5/src/CDraw.cpp create mode 120000 gb.qt5/src/CDraw.h create mode 120000 gb.qt5/src/CDrawingArea.cpp create mode 120000 gb.qt5/src/CDrawingArea.h create mode 120000 gb.qt5/src/CEmbedder.cpp create mode 120000 gb.qt5/src/CEmbedder.h create mode 120000 gb.qt5/src/CFont.cpp create mode 120000 gb.qt5/src/CFont.h create mode 120000 gb.qt5/src/CFrame.cpp create mode 120000 gb.qt5/src/CFrame.h create mode 120000 gb.qt5/src/CImage.cpp create mode 120000 gb.qt5/src/CImage.h create mode 120000 gb.qt5/src/CKey.cpp create mode 120000 gb.qt5/src/CKey.h create mode 120000 gb.qt5/src/CLabel.cpp create mode 120000 gb.qt5/src/CLabel.h create mode 120000 gb.qt5/src/CMenu.cpp create mode 120000 gb.qt5/src/CMenu.h create mode 120000 gb.qt5/src/CMessage.cpp create mode 120000 gb.qt5/src/CMessage.h create mode 120000 gb.qt5/src/CMouse.cpp create mode 120000 gb.qt5/src/CMouse.h create mode 120000 gb.qt5/src/CMovieBox.cpp create mode 120000 gb.qt5/src/CMovieBox.h create mode 120000 gb.qt5/src/CPanel.cpp create mode 120000 gb.qt5/src/CPanel.h create mode 120000 gb.qt5/src/CPicture.cpp create mode 120000 gb.qt5/src/CPicture.h create mode 120000 gb.qt5/src/CPictureBox.cpp create mode 120000 gb.qt5/src/CPictureBox.h create mode 120000 gb.qt5/src/CRadioButton.cpp create mode 120000 gb.qt5/src/CRadioButton.h create mode 120000 gb.qt5/src/CScreen.cpp create mode 120000 gb.qt5/src/CScreen.h create mode 120000 gb.qt5/src/CScrollBar.cpp create mode 120000 gb.qt5/src/CScrollBar.h create mode 120000 gb.qt5/src/CScrollView.cpp create mode 120000 gb.qt5/src/CScrollView.h create mode 120000 gb.qt5/src/CSlider.cpp create mode 120000 gb.qt5/src/CSlider.h create mode 120000 gb.qt5/src/CSpinBox.cpp create mode 120000 gb.qt5/src/CSpinBox.h create mode 120000 gb.qt5/src/CStyle.cpp create mode 120000 gb.qt5/src/CStyle.h create mode 120000 gb.qt5/src/CTabStrip.cpp create mode 120000 gb.qt5/src/CTabStrip.h create mode 120000 gb.qt5/src/CTextArea.cpp create mode 120000 gb.qt5/src/CTextArea.h create mode 120000 gb.qt5/src/CTextBox.cpp create mode 120000 gb.qt5/src/CTextBox.h create mode 120000 gb.qt5/src/CTrayIcon.cpp create mode 120000 gb.qt5/src/CTrayIcon.h create mode 120000 gb.qt5/src/CWatch.cpp create mode 120000 gb.qt5/src/CWatch.h create mode 120000 gb.qt5/src/CWatcher.cpp create mode 120000 gb.qt5/src/CWatcher.h create mode 120000 gb.qt5/src/CWidget.cpp create mode 120000 gb.qt5/src/CWidget.h create mode 120000 gb.qt5/src/CWindow.cpp create mode 120000 gb.qt5/src/CWindow.h create mode 100644 gb.qt5/src/Makefile.am create mode 120000 gb.qt5/src/cpaint_impl.cpp create mode 120000 gb.qt5/src/cpaint_impl.h create mode 120000 gb.qt5/src/cprinter.cpp create mode 120000 gb.qt5/src/cprinter.h create mode 120000 gb.qt5/src/csvgimage.cpp create mode 120000 gb.qt5/src/csvgimage.h create mode 120000 gb.qt5/src/ext/CDial.cpp create mode 120000 gb.qt5/src/ext/CDial.h create mode 120000 gb.qt5/src/ext/CEditor.cpp create mode 120000 gb.qt5/src/ext/CEditor.h create mode 120000 gb.qt5/src/ext/CLCDNumber.cpp create mode 120000 gb.qt5/src/ext/CLCDNumber.h create mode 120000 gb.qt5/src/ext/CTextEdit.cpp create mode 120000 gb.qt5/src/ext/CTextEdit.h create mode 100644 gb.qt5/src/ext/Makefile.am create mode 120000 gb.qt5/src/ext/garray.cpp create mode 120000 gb.qt5/src/ext/garray.h create mode 100644 gb.qt5/src/ext/gb.qt5.ext.component create mode 120000 gb.qt5/src/ext/gdocument.cpp create mode 120000 gb.qt5/src/ext/gdocument.h create mode 120000 gb.qt5/src/ext/gstring.cpp create mode 120000 gb.qt5/src/ext/gstring.h create mode 120000 gb.qt5/src/ext/gview.cpp create mode 120000 gb.qt5/src/ext/gview.h create mode 120000 gb.qt5/src/ext/main.cpp create mode 120000 gb.qt5/src/ext/main.h create mode 120000 gb.qt5/src/gb.qt.h create mode 100644 gb.qt5/src/gb.qt5.component create mode 120000 gb.qt5/src/main.cpp create mode 120000 gb.qt5/src/main.h create mode 120000 gb.qt5/src/opengl/CGLarea.cpp create mode 120000 gb.qt5/src/opengl/CGLarea.h create mode 100644 gb.qt5/src/opengl/Makefile.am create mode 100644 gb.qt5/src/opengl/gb.qt5.opengl.component create mode 120000 gb.qt5/src/opengl/main.cpp create mode 120000 gb.qt5/src/opengl/main.h create mode 120000 gb.qt5/src/systemtrayicon.cpp create mode 120000 gb.qt5/src/systemtrayicon.h create mode 120000 gb.qt5/src/trayicon.xpm create mode 100644 gb.qt5/src/webkit/Makefile.am create mode 120000 gb.qt5/src/webkit/ccookiejar.cpp create mode 120000 gb.qt5/src/webkit/ccookiejar.h create mode 100644 gb.qt5/src/webkit/control/webview.png create mode 120000 gb.qt5/src/webkit/cwebdownload.cpp create mode 120000 gb.qt5/src/webkit/cwebdownload.h create mode 120000 gb.qt5/src/webkit/cwebelement.cpp create mode 120000 gb.qt5/src/webkit/cwebelement.h create mode 120000 gb.qt5/src/webkit/cwebframe.cpp create mode 120000 gb.qt5/src/webkit/cwebframe.h create mode 120000 gb.qt5/src/webkit/cwebhittest.cpp create mode 120000 gb.qt5/src/webkit/cwebhittest.h create mode 120000 gb.qt5/src/webkit/cwebsettings.cpp create mode 120000 gb.qt5/src/webkit/cwebsettings.h create mode 120000 gb.qt5/src/webkit/cwebview.cpp create mode 120000 gb.qt5/src/webkit/cwebview.h create mode 100644 gb.qt5/src/webkit/gb.qt5.webkit.component create mode 120000 gb.qt5/src/webkit/main.cpp create mode 120000 gb.qt5/src/webkit/main.h create mode 120000 gb.qt5/src/x11.c create mode 120000 gb.qt5/src/x11.h diff --git a/Makefile.am b/Makefile.am index 0bf5a878e..2f3a6df4d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ SUBDIRS = \ @v4l_dir@ \ @crypt_dir@ \ @qt4_dir@ \ + @qt5_dir@ \ @gtk_dir@ \ @gtk3_dir@ \ @opengl_dir@ \ diff --git a/app/examples/Games/Invaders/.icon.png b/app/examples/Games/Invaders/.icon.png index 913bcef4dc3d77e06e37a876276bc2e18596ffe8..2dd85828c67e3fa0551704ad5dbb75ce7705d6ad 100644 GIT binary patch delta 3115 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 LNkvXXu0mjfI240P diff --git a/app/examples/Games/Invaders/.project b/app/examples/Games/Invaders/.project index df3a66004..c3a15c64c 100644 --- a/app/examples/Games/Invaders/.project +++ b/app/examples/Games/Invaders/.project @@ -1,8 +1,7 @@ # Gambas Project File 3.0 -# Compiled with Gambas 3.5.90 +# Compiled with Gambas 3.7.90 Title=Invaders Startup=MMain -UseTerminal=1 Icon=invaders.png Version=3.6.2 Component=gb.ncurses @@ -10,4 +9,5 @@ Description="Variant of space invaders using gb.ncurses. Inspired by http://www. Authors="(C) 2013 Tobias Boege " Environment="LINES=24\nCOLUMNS=80" TabSize=2 +Language=fr Packager=1 diff --git a/app/examples/Games/Pong/.icon.png b/app/examples/Games/Pong/.icon.png index 9d902bf529bfb2d90d5292af4542fce5e69bed01..9a37d4c6497f713759804c51ae0b2ba5d44e020e 100644 GIT binary patch delta 3089 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⁡ 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 diff --git a/app/examples/Games/Pong/.project b/app/examples/Games/Pong/.project index 5c62c5634..c8fe6809a 100644 --- a/app/examples/Games/Pong/.project +++ b/app/examples/Games/Pong/.project @@ -1,5 +1,5 @@ # Gambas Project File 3.0 -# Compiled with Gambas 3.5.90 +# Compiled with Gambas 3.7.90 Title=Pong Startup=MMain UseTerminal=1 @@ -8,6 +8,7 @@ Version=3.6.2 Component=gb.ncurses Description="The Pong game as a gb.ncurses example." Authors="(C) 2013 Tobias Boege " +Environment="LINES=25\nCOLUMNS=80" TabSize=2 Translate=1 Language=en_GB diff --git a/app/examples/Networking/WebBrowser/.icon.png b/app/examples/Networking/WebBrowser/.icon.png index 4c0b5664f6c814f2b17d75443b9325b5420af48c..30dfd4bd4308e4f134f4092f841cce432af8f82a 100644 GIT binary patch delta 3639 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 $aVal.Count Then Return - - If $rData Then - $rData.MoveTo(Index - $iDataIndex) - If $rData.Available Then Return $rData - Endif - - ' 154,32 e + 10 - '$iDataIndex = Max(0, ((Index - (LIMIT_INC \ 2)) \ LIMIT_INC) * LIMIT_INC) - $iDataIndex = Max(0, Index - (LIMIT_INC \ 2)) - - aSort = GetSortKeys() - - If $iDataIndex = 0 Then - hReq = $DB.SQL.Select(aCol).From($sTable).Where($sFilter).OrderBy(aSort) Else - hReq = $DB.SQL.Select(aCol).From($sTable).Where($sFilter).Where(Common.MakeNextWhere(aSort, $aVal[$iDataIndex - 1])).OrderBy(aSort) - Endif - $rData = $DB.Limit(LIMIT_INC).Exec(hReq.Get()) - 'hReq = Request().Where($sFilter).Where(Common.MakeNextWhere($aKey, $aVal[$iDataIndex])) - '$rData = DB.Limit(LIMIT_INC).Edit($sTable, hReq.Get(DB)) - - $rData.MoveTo(Index - $iDataIndex) + LoadUntil(Index) + + If Index >= $aVal.Count Then Return + + If $rData Then + $rData.MoveTo(Index - $iDataIndex) + If $rData.Available Then Return $rData + Endif + + Inc Application.Busy + + '$iDataIndex = Max(0, ((Index - (LIMIT_INC \ 2)) \ LIMIT_INC) * LIMIT_INC) + $iDataIndex = Max(0, Index - (LIMIT_INC \ 2)) + + aSort = GetSortKeys() + + If $iDataIndex = 0 Then + hReq = $DB.SQL.Select(aCol).From($sTable).Where($sFilter).OrderBy(aSort) + Else + hReq = $DB.SQL.Select(aCol).From($sTable).Where($sFilter).Where(Common.MakeNextWhere(aSort, $aVal[$iDataIndex - 1])).OrderBy(aSort) + Endif + $rData = $DB.Limit(LIMIT_INC).Exec(hReq.Get()) + + 'hReq = Request().Where($sFilter).Where(Common.MakeNextWhere($aKey, $aVal[$iDataIndex])) + '$rData = DB.Limit(LIMIT_INC).Edit($sTable, hReq.Get(DB)) + + $rData.MoveTo(Index - $iDataIndex) + + Dec Application.Busy + + Endif Return $rData - + End Private Function Keys_Read() As String[] diff --git a/comp/src/gb.desktop/.settings b/comp/src/gb.desktop/.settings index c6b209b20..d94848588 100644 --- a/comp/src/gb.desktop/.settings +++ b/comp/src/gb.desktop/.settings @@ -17,11 +17,11 @@ Path="gb.desktop.gambas" LastCommit="[GB.DESKTOP]\n* BUG: Change the Mime loading code so it not fail on the first readed glob2 file\n and read all the available files.\n---- Cette ligne et les suivantes seront ignorées ----\n\nM .project\nM .settings\nM .src/DesktopMime.class\nM .src/Tests/Form11.form\nA .src/Tests/Module1.module\nM .startup" [OpenFile] -File[1]=".src/Desktop.class:589.0" -Active=2 +File[1]=".src/Desktop.class:84.13" +Active=3 File[2]=".src/_Desktop_Passwords.class:71.46" Count=15 -File[3]=".src/Main.module:120.62" +File[3]=".src/Main.module:10.62" File[4]="xdg-utils/xdg-open:343.37" File[5]=".src/DesktopMime.class:107.2" File[6]=".src/DesktopFile.class:462.0" diff --git a/comp/src/gb.gui.base/.project b/comp/src/gb.gui.base/.project index b457dc5ea..a8a075fb1 100644 --- a/comp/src/gb.gui.base/.project +++ b/comp/src/gb.gui.base/.project @@ -1,7 +1,7 @@ # Gambas Project File 3.0 # Compiled with Gambas 3.7.90 Title=gb.gui.base -Startup=FTestCombo +Startup=FMain Version=3.7.90 VersionFile=1 Component=gb.image diff --git a/comp/src/gb.gui.base/.src/Test/FMain.form b/comp/src/gb.gui.base/.src/Test/FMain.form index 4f7b5532b..1646063e6 100644 --- a/comp/src/gb.gui.base/.src/Test/FMain.form +++ b/comp/src/gb.gui.base/.src/Test/FMain.form @@ -10,6 +10,21 @@ Text = ("Button1") } } + { HBox2 HBox + MoveScaled(2,7,73,4) + { CheckBox1 CheckBox + MoveScaled(1,1,20,3) + Action = "test" + } + { CheckBox2 CheckBox + MoveScaled(22,1,20,3) + Action = "check" + } + { ToggleButton1 ToggleButton + MoveScaled(42,0,19,4) + Action = "test" + } + } { HSplit1 HSplit MoveScaled(4,12,68,40) Expand = True @@ -28,3 +43,16 @@ } } } + +# Gambas Action File 3.0 + +{ Actions + { Action check + Text = "" + Picture = "$CheckBox" + } + { Action test + Text = "" + Picture = "$CheckBox" + } +} diff --git a/comp/src/gb.gui.base/.startup b/comp/src/gb.gui.base/.startup index cbdba0d03..47ab8153d 100644 --- a/comp/src/gb.gui.base/.startup +++ b/comp/src/gb.gui.base/.startup @@ -1,4 +1,4 @@ -FTestCombo +FMain gb.gui.base 0 0 diff --git a/configure.ac b/configure.ac index 57d9bd000..613354262 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,7 @@ GB_CONFIG_SUBDIRS(xml, gb.xml) GB_CONFIG_SUBDIRS(v4l, gb.v4l) GB_CONFIG_SUBDIRS(crypt, gb.crypt) GB_CONFIG_SUBDIRS(qt4, gb.qt4) +GB_CONFIG_SUBDIRS(qt5, gb.qt5) GB_CONFIG_SUBDIRS(gtk, gb.gtk) GB_CONFIG_SUBDIRS(gtk3, gb.gtk3) GB_CONFIG_SUBDIRS(opengl, gb.opengl) diff --git a/gb.qt4/src/CCheckBox.cpp b/gb.qt4/src/CCheckBox.cpp index a550916d8..e164900fd 100644 --- a/gb.qt4/src/CCheckBox.cpp +++ b/gb.qt4/src/CCheckBox.cpp @@ -56,7 +56,7 @@ void MyCheckBox::adjust(bool force) a = _autoResize; _autoResize = false; hint = sizeHint(); - CWIDGET_resize(THIS, hint.width(), QMAX(hint.height(), height())); + CWIDGET_resize(THIS, hint.width(), qMax(hint.height(), height())); _autoResize = a; } diff --git a/gb.qt4/src/CClipboard.cpp b/gb.qt4/src/CClipboard.cpp index e21ef1ca6..c7c74d0ef 100644 --- a/gb.qt4/src/CClipboard.cpp +++ b/gb.qt4/src/CClipboard.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -37,6 +38,7 @@ #include #include #include +#include #include "CWidget.h" #include "CImage.h" diff --git a/gb.qt4/src/CDialog.cpp b/gb.qt4/src/CDialog.cpp index 3b61609fe..47247d9e4 100644 --- a/gb.qt4/src/CDialog.cpp +++ b/gb.qt4/src/CDialog.cpp @@ -162,7 +162,7 @@ static QString my_getOpenFileName() { QFileDialog dialog(qApp->activeWindow(), dialog_title, dialog_path, get_filter()); - dialog.setMode(QFileDialog::ExistingFile); + dialog.setFileMode(QFileDialog::ExistingFile); dialog.setOption(QFileDialog::DontUseNativeDialog); dialog.setFilter(dialog_show_hidden ? (dialog.filter() | QDir::Hidden | QDir::System) : (dialog.filter() & ~(QDir::Hidden | QDir::System))); @@ -176,7 +176,7 @@ static QStringList my_getOpenFileNames() { QFileDialog dialog(qApp->activeWindow(), dialog_title, dialog_path, get_filter()); - dialog.setMode(QFileDialog::ExistingFiles); + dialog.setFileMode(QFileDialog::ExistingFiles); dialog.setOption(QFileDialog::DontUseNativeDialog); dialog.setFilter(dialog_show_hidden ? (dialog.filter() | QDir::Hidden | QDir::System) : (dialog.filter() & ~(QDir::Hidden | QDir::System))); @@ -205,7 +205,7 @@ static QString my_getSaveFileName() dialog.selectFile(file); dialog.setAcceptMode(QFileDialog::AcceptSave); - dialog.setMode(QFileDialog::AnyFile); + dialog.setFileMode(QFileDialog::AnyFile); dialog.setOption(QFileDialog::DontUseNativeDialog); dialog.setFilter(dialog_show_hidden ? (dialog.filter() | QDir::Hidden | QDir::System) : (dialog.filter() & ~(QDir::Hidden | QDir::System))); @@ -219,7 +219,7 @@ static QString my_getExistingDirectory() { QFileDialog dialog(qApp->activeWindow(), dialog_title, dialog_path); - dialog.setMode(QFileDialog::Directory); + dialog.setFileMode(QFileDialog::Directory); dialog.setOption(QFileDialog::DontUseNativeDialog); if (dialog.exec() == QDialog::Accepted) diff --git a/gb.qt4/src/CDrawingArea.cpp b/gb.qt4/src/CDrawingArea.cpp index 2d7018ac4..c1eda6cf5 100644 --- a/gb.qt4/src/CDrawingArea.cpp +++ b/gb.qt4/src/CDrawingArea.cpp @@ -37,6 +37,7 @@ #include "CColor.h" #include "CDrawingArea.h" +#ifndef QT5 #ifndef NO_X_WINDOW #include #include @@ -45,6 +46,7 @@ #ifdef FontChange #undef FontChange #endif +#endif DECLARE_EVENT(EVENT_Draw); DECLARE_EVENT(EVENT_Font); @@ -60,7 +62,9 @@ MyDrawingArea::MyDrawingArea(QWidget *parent) : MyContainer(parent) { drawn = 0; cache = 0; +#ifndef QT5 _background = (Qt::HANDLE)0; +#endif _frozen = false; _event_mask = 0; _set_background = true; @@ -86,6 +90,7 @@ MyDrawingArea::~MyDrawingArea() void MyDrawingArea::setVisible(bool visible) { MyContainer::setVisible(visible); +#ifndef QT5 if (_cached) { if (visible) @@ -93,6 +98,7 @@ void MyDrawingArea::setVisible(bool visible) else parentWidget()->update(); } +#endif } void MyDrawingArea::setAllowFocus(bool f) @@ -114,7 +120,8 @@ void MyDrawingArea::setFrozen(bool f) if (f == _frozen) return; - #ifndef NO_X_WINDOW +#ifndef QT5 +#ifndef NO_X_WINDOW XWindowAttributes attr; if (f) @@ -133,17 +140,15 @@ void MyDrawingArea::setFrozen(bool f) //qDebug("unfrozen"); } XFlush(QX11Info::display()); - #endif +#endif +#endif _frozen = f; } static void cleanup_drawing(intptr_t _object) { - //if (WIDGET->isPaint()) - PAINT_end(); - //else - // DRAW_end(); + PAINT_end(); } void MyDrawingArea::redraw(QRect &r, bool frame) @@ -210,13 +215,18 @@ void MyDrawingArea::redraw(QRect &r, bool frame) void MyDrawingArea::createBackground(int w, int h) { void *_object = CWidget::get(this); - QX11Info xinfo = x11Info(); QPixmap p; +#ifndef QT5 + QX11Info xinfo = x11Info(); Qt::HANDLE old = _background; - //GC gc; - +#endif + +#ifndef QT5 _background = (Qt::HANDLE)XCreatePixmap(QX11Info::display(), RootWindow(QX11Info::display(), xinfo.screen()), w, h, xinfo.depth()); _background_pixmap = QPixmap::fromX11Pixmap(_background, QPixmap::ExplicitlyShared); +#else + _background_pixmap = QPixmap(w, h); +#endif _background_w = w; _background_h = h; @@ -235,33 +245,42 @@ void MyDrawingArea::createBackground(int w, int h) _background_pixmap.fill(CCOLOR_make(CWIDGET_get_real_background((CWIDGET *)THIS))); //qDebug("XSetWindowBackgroundPixmap: %08X %08X", (int)winId(), (int)_background); +#ifndef QT5 XSetWindowBackgroundPixmap(QX11Info::display(), winId(), _background); XClearArea(QX11Info::display(), winId(), 0, 0, 0, 0, True); - _cached = true; - if (old) XFreePixmap(QX11Info::display(), (Pixmap)old); XFlush(QX11Info::display()); +#else + update(); +#endif + + _cached = true; } void MyDrawingArea::deleteBackground() { - if (_cached && _background) + if (hasCacheBackground()) { +#ifndef QT5 //qDebug("XSetWindowBackgroundPixmap: %08X None", (int)winId()); XSetWindowBackgroundPixmap(QX11Info::display(), winId(), None); XFreePixmap(QX11Info::display(), (Pixmap)_background); XFlush(QX11Info::display()); - _cached = false; _background = 0; +#else + _background_pixmap = QPixmap(); +#endif + _cached = false; + _background_w = _background_h = 0; } } QPixmap *MyDrawingArea::getBackgroundPixmap() { - if (!_cached || !_background) + if (!hasCacheBackground()) return NULL; else return &_background_pixmap; @@ -271,7 +290,8 @@ void MyDrawingArea::paintEvent(QPaintEvent *event) { if (_cached) { - #ifndef NO_X_WINDOW +#ifndef QT5 +#ifndef NO_X_WINDOW if (_set_background) { //qDebug("XSetWindowBackgroundPixmap: %08X %08X (paint)", (int)winId(), (int)_background); @@ -279,9 +299,14 @@ void MyDrawingArea::paintEvent(QPaintEvent *event) XFlush(QX11Info::display()); _set_background = false; } - #endif +#endif +#endif QPainter p(this); + +#ifdef QT5 + p.drawPixmap(0, 0, _background_pixmap); +#endif if (frameWidth()) { @@ -299,7 +324,7 @@ void MyDrawingArea::paintEvent(QPaintEvent *event) //QPainter paint( this ); QRect r; - r = event->rect().intersect(contentsRect()); + r = event->rect().intersected(contentsRect()); if (r.isValid()) { /*if (!isTransparent()) @@ -322,33 +347,27 @@ void MyDrawingArea::paintEvent(QPaintEvent *event) void MyDrawingArea::setBackground() { +#ifndef QT5 if (_cached) { - #ifdef NO_X_WINDOW - setErasePixmap(*_background); - #else - //if (isVisible()) - // XSetWindowBackgroundPixmap(QX11Info::display(), winId(), _background->handle()); - //else - //_set_background = true; XSetWindowBackgroundPixmap(QX11Info::display(), winId(), _background); XFlush(QX11Info::display()); refreshBackground(); - #endif } +#endif } void MyDrawingArea::refreshBackground() { if (_cached) { - #ifdef NO_X_WINDOW - update(); - #else +#ifndef QT5 int fw = frameWidth(); XClearArea(QX11Info::display(), winId(), fw, fw, width() - fw * 2, height() - fw * 2, False); XFlush(QX11Info::display()); - #endif +#else + update(); +#endif } } @@ -367,8 +386,12 @@ void MyDrawingArea::clearBackground() } else { +#ifndef QT5 XClearArea(QX11Info::display(), winId(), 0, 0, 0, 0, True); XFlush(QX11Info::display()); +#else + update(); +#endif } } @@ -380,7 +403,10 @@ void MyDrawingArea::resizeEvent(QResizeEvent *e) void MyDrawingArea::updateBackground() { - int wb, hb, w, h; + int w, h; +#ifndef QT5 + int wb, hb; +#endif if (drawn) { @@ -390,15 +416,16 @@ void MyDrawingArea::updateBackground() if (_cached) { - w = QMAX(width(), 1); - h = QMAX(height(), 1); + w = qMax(width(), 1); + h = qMax(height(), 1); if (w != _background_w || h != _background_h) { +#ifndef QT5 Qt::HANDLE old = _background; - wb = QMIN(w, _background_w); - hb = QMIN(h, _background_h); + wb = qMin(w, _background_w); + hb = qMin(h, _background_h); _background = 0; createBackground(w, h); @@ -408,6 +435,13 @@ void MyDrawingArea::updateBackground() XFreeGC(QX11Info::display(), gc); XFreePixmap(QX11Info::display(), old); +#else + QPixmap old = _background_pixmap; + createBackground(w, h); + QPainter p(&_background_pixmap); + p.drawPixmap(0, 0, old); + p.end(); +#endif setBackground(); } @@ -444,7 +478,8 @@ void MyDrawingArea::updateCache() setBackgroundMode(Qt::NoBackground); #else //XClearArea(QX11Info::display(), winId(), 0, 0, 0, 0, True); - repaint(); + //repaint(); + update(); #endif } @@ -465,7 +500,7 @@ void MyDrawingArea::setPalette(const QPalette &pal) if (_cached) return; MyContainer::setPalette(pal); - repaint(); + update(); } void MyDrawingArea::updateNoBackground() diff --git a/gb.qt4/src/CDrawingArea.h b/gb.qt4/src/CDrawingArea.h index b8d4fa2d1..c9b00d6af 100644 --- a/gb.qt4/src/CDrawingArea.h +++ b/gb.qt4/src/CDrawingArea.h @@ -73,11 +73,11 @@ public: void updateCache(); void setCached(bool); bool isCached() const { return _cached; } - //QPixmap *getCache(void) { return cache; } - //void refreshCache(void) { if (cache) setBackgroundPixmap(*cache); } void clearBackground(); +#ifndef QT5 Qt::HANDLE background() const { return _background; } +#endif void refreshBackground(); void updateBackground(); @@ -97,6 +97,11 @@ public: bool inDrawEvent() const { return _in_draw_event; } void createBackground(int w, int h); +#ifndef QT5 + bool hasCacheBackground() const { return _cached && _background; } +#else + bool hasCacheBackground() const { return _cached && !_background_pixmap.isNull(); } +#endif void deleteBackground(); QPixmap *getBackgroundPixmap(); @@ -121,7 +126,9 @@ protected: private: QPixmap _background_pixmap; +#ifndef QT5 Qt::HANDLE _background; +#endif int _background_w, _background_h; bool _frozen; bool _merge; diff --git a/gb.qt4/src/CRadioButton.cpp b/gb.qt4/src/CRadioButton.cpp index c8ad86f25..dbc44e777 100644 --- a/gb.qt4/src/CRadioButton.cpp +++ b/gb.qt4/src/CRadioButton.cpp @@ -59,7 +59,7 @@ void MyRadioButton::adjust(bool force) a = _autoResize; _autoResize = false; hint = sizeHint(); - CWIDGET_resize(THIS, hint.width(), QMAX(hint.height(), height())); + CWIDGET_resize(THIS, hint.width(), qMax(hint.height(), height())); _autoResize = a; } diff --git a/gb.qt4/src/CScreen.cpp b/gb.qt4/src/CScreen.cpp index e380865cd..f62f4ef8b 100644 --- a/gb.qt4/src/CScreen.cpp +++ b/gb.qt4/src/CScreen.cpp @@ -244,6 +244,12 @@ END_PROPERTY BEGIN_PROPERTY(Application_Embedder) +#ifdef QT5 + if (READ_PROPERTY) + GB.ReturnInteger(0); + else + GB.Deprecated("gb.qt5", "Application.Embedder", NULL); +#else if (READ_PROPERTY) GB.ReturnInteger(CWINDOW_Embedder); else @@ -257,8 +263,9 @@ BEGIN_PROPERTY(Application_Embedder) CWINDOW_Embedder = VPROP(GB_INTEGER); } -END_PROPERTY +#endif +END_PROPERTY BEGIN_PROPERTY(Application_Theme) diff --git a/gb.qt4/src/CScrollView.cpp b/gb.qt4/src/CScrollView.cpp index 6f5e6493f..f9472a7be 100644 --- a/gb.qt4/src/CScrollView.cpp +++ b/gb.qt4/src/CScrollView.cpp @@ -126,7 +126,7 @@ void MyContents::autoResize(void) #endif if (sw->getScrollbar()) - sbsize = qApp->style()->pixelMetric(QStyle::PM_ScrollBarExtent) + QMAX(0, qApp->style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarSpacing)); + sbsize = qApp->style()->pixelMetric(QStyle::PM_ScrollBarExtent) + qMax(0, qApp->style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarSpacing)); else sbsize = 0; diff --git a/gb.qt4/src/CStyle.cpp b/gb.qt4/src/CStyle.cpp index f3517e4e9..73c4b610e 100644 --- a/gb.qt4/src/CStyle.cpp +++ b/gb.qt4/src/CStyle.cpp @@ -275,7 +275,7 @@ END_PROPERTY BEGIN_PROPERTY(Style_ScrollbarSpacing) - GB.ReturnInteger(QMAX(0, qApp->style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarSpacing))); + GB.ReturnInteger(qMax(0, qApp->style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarSpacing))); END_PROPERTY @@ -305,6 +305,11 @@ BEGIN_PROPERTY(Style_Name) len -= 5; if (len >= 3 && strncmp(&name[len - 2], "::", 2) == 0) len -= 2; + if (name[0] == 'Q' && isupper(name[1])) + { + len--; + name++; + } GB.ReturnNewString(name, len); diff --git a/gb.qt4/src/CTextBox.cpp b/gb.qt4/src/CTextBox.cpp index eb2de8c2e..54b2abdce 100644 --- a/gb.qt4/src/CTextBox.cpp +++ b/gb.qt4/src/CTextBox.cpp @@ -340,7 +340,7 @@ static void raise_click_event(void *_object) static int combo_get_current_item(void *_object) { COMBOBOX->sort(); - return COMBOBOX->count() == 0 ? -1 : COMBOBOX->currentItem(); + return COMBOBOX->count() == 0 ? -1 : COMBOBOX->currentIndex(); } static void combo_set_current_item(void *_object, int item) @@ -350,7 +350,7 @@ static void combo_set_current_item(void *_object, int item) if (item != combo_get_current_item(THIS)) { if (item < COMBOBOX->count()) - COMBOBOX->setCurrentItem(item); + COMBOBOX->setCurrentIndex(item); } if (item >= 0 && !COMBOBOX->signalsBlocked()) @@ -362,7 +362,7 @@ static int combo_find_item(void *_object, const QString& s) COMBOBOX->sort(); for (int i = 0; i < (int)COMBOBOX->count(); i++) { - if (COMBOBOX->text(i) == s) + if (COMBOBOX->itemText(i) == s) return i; } @@ -435,7 +435,7 @@ static void combo_get_list(void *_object, GB_ARRAY array) COMBOBOX->sort(); for (i = 0; i < COMBOBOX->count(); i++) { - *((char **)GB.Array.Get(array, i)) = NEW_STRING(COMBOBOX->text(i)); + *((char **)GB.Array.Get(array, i)) = NEW_STRING(COMBOBOX->itemText(i)); } } @@ -452,7 +452,7 @@ static void combo_set_list(void *_object, GB_ARRAY array) { for (i = 0; i < GB.Array.Count(array); i++) { - COMBOBOX->insertItem(TO_QSTRING(*((char **)GB.Array.Get(array, i)))); + COMBOBOX->insertItem(i, TO_QSTRING(*((char **)GB.Array.Get(array, i)))); } } diff --git a/gb.qt4/src/CWindow.cpp b/gb.qt4/src/CWindow.cpp index 150e3421e..5eb2c0a2c 100644 --- a/gb.qt4/src/CWindow.cpp +++ b/gb.qt4/src/CWindow.cpp @@ -51,9 +51,11 @@ #include "main.h" #ifndef NO_X_WINDOW +#ifndef QT5 #include #include #endif +#endif #include "gambas.h" @@ -107,9 +109,11 @@ CWINDOW *CWINDOW_Current = 0; CWINDOW *CWINDOW_LastActive = 0; CWINDOW *CWINDOW_Active = 0; +#ifndef QT5 int CWINDOW_Embedder = 0; bool CWINDOW_Embedded = false; static int CWINDOW_EmbedState = 0; +#endif #ifndef NO_X_WINDOW void CWINDOW_change_property(QWidget *w, Atom property, bool set) @@ -338,16 +342,19 @@ BEGIN_METHOD(Window_new, GB_OBJECT parent) MyMainWindow *win = 0; MyContainer *container; - #ifndef NO_X_WINDOW +#ifndef NO_X_WINDOW +#ifndef QT5 QX11EmbedWidget *client = 0; - #endif +#endif +#endif const char *name = GB.GetClassName(THIS); //THIS->widget.flag.fillBackground = true; if (MISSING(parent) || !VARG(parent)) { - #ifndef NO_X_WINDOW +#ifndef NO_X_WINDOW +#ifndef QT5 if (CWINDOW_Embedder && !CWINDOW_Embedded) { client = new QX11EmbedWidget; @@ -360,7 +367,8 @@ BEGIN_METHOD(Window_new, GB_OBJECT parent) THIS->xembed = true; } else - #endif +#endif +#endif { //win = new MyMainWindow(CWINDOW_Main ? (MyMainWindow *)QWIDGET(CWINDOW_Main) : 0, name); win = new MyMainWindow(0, name); @@ -420,7 +428,8 @@ BEGIN_METHOD(Window_new, GB_OBJECT parent) }*/ } - #ifndef NO_X_WINDOW +#ifndef NO_X_WINDOW +#ifndef QT5 if (THIS->xembed) { CWINDOW_Embedded = true; @@ -452,7 +461,8 @@ BEGIN_METHOD(Window_new, GB_OBJECT parent) GB.Error("Embedding has failed"); } } - #endif +#endif +#endif #if 1 if (THIS->embedded && !THIS->xembed) @@ -674,10 +684,12 @@ BEGIN_METHOD_VOID(Window_Show) { CWIDGET_set_visible((CWIDGET *)THIS, true); CWIDGET_check_visibility((CWIDGET *)THIS); - #ifndef NO_X_WINDOW - if (THIS->xembed) - XEMBED->show(); - #endif +#ifndef NO_X_WINDOW +#ifndef QT5 + if (THIS->xembed) + XEMBED->show(); +#endif +#endif post_show_event(THIS); } else @@ -2117,10 +2129,12 @@ void MyMainWindow::resizeEvent(QResizeEvent *e) CCONTAINER_arrange(THIS); } - #ifndef NO_X_WINDOW - if (THIS->xembed) - XEMBED->resize(THIS->w, THIS->h); - #endif +#ifndef NO_X_WINDOW +#ifndef QT5 + if (THIS->xembed) + XEMBED->resize(THIS->w, THIS->h); +#endif +#endif //qDebug("resizeEvent %ld %ld isHidden:%s shown:%s ", THIS->w, THIS->h, isHidden() ? "1" : "0", shown ? "1" : "0"); //qDebug("THIS->h = %ld THIS->container->height() = %ld height() = %ld", THIS->h, THIS->container->height(), height()); @@ -2738,7 +2752,19 @@ bool CWindow::eventFilter(QObject *o, QEvent *e) return QObject::eventFilter(o, e); // standard event processing } +#ifdef QT5 +void CWindow::error(void) +{ +} +void CWindow::embedded(void) +{ +} + +void CWindow::closed(void) +{ +} +#else void CWindow::error(void) { //CWINDOW *_object = (CWINDOW *)CWidget::getReal((QObject *)sender()); @@ -2760,6 +2786,7 @@ void CWindow::closed(void) //CWIDGET_destroy(CWidget::getReal((QObject *)sender())); delete sender(); } +#endif void CWindow::destroy(void) { @@ -2772,9 +2799,11 @@ void CWindow::destroy(void) CWindow::removeTopLevel(THIS); } +#ifndef QT5 CWINDOW_EmbedState = EMBED_WAIT; CWINDOW_Embedded = false; CWINDOW_Embedder = 0; +#endif } void CWindow::insertTopLevel(CWINDOW *_object) diff --git a/gb.qt4/src/CWindow.h b/gb.qt4/src/CWindow.h index ceb86a32f..107042ce1 100644 --- a/gb.qt4/src/CWindow.h +++ b/gb.qt4/src/CWindow.h @@ -111,15 +111,20 @@ extern int CWINDOW_MainDesktop; extern CWINDOW *CWINDOW_Current; extern CWINDOW *CWINDOW_Active; extern CWINDOW *CWINDOW_LastActive; +#ifndef QT5 extern int CWINDOW_Embedder; extern bool CWINDOW_Embedded; +#endif #else #define THIS ((CWINDOW *)_object) #define WIDGET ((QWidget *)(((CWIDGET *)_object)->widget)) #define WINDOW ((MyMainWindow *)WIDGET) + +#ifndef QT5 #define XEMBED ((QX11EmbedWidget *)(WIDGET->parent())) +#endif #endif diff --git a/gb.qt4/src/cpaint_impl.cpp b/gb.qt4/src/cpaint_impl.cpp index 146374487..1c8fb1f4a 100644 --- a/gb.qt4/src/cpaint_impl.cpp +++ b/gb.qt4/src/cpaint_impl.cpp @@ -113,8 +113,10 @@ static bool init_painting(GB_PAINT *d, QPaintDevice *device) EXTRA(d)->painter = new QPainter(device); } +#ifndef QT5 MyPaintEngine *engine = (MyPaintEngine *)device->paintEngine(); engine->patchFeatures(); +#endif //EXTRA(d)->path = NULL; //EXTRA(d)->clip = NULL; diff --git a/gb.qt4/src/cprinter.cpp b/gb.qt4/src/cprinter.cpp index 1598afdc9..0fff1b076 100644 --- a/gb.qt4/src/cprinter.cpp +++ b/gb.qt4/src/cprinter.cpp @@ -218,7 +218,7 @@ END_PROPERTY BEGIN_PROPERTY(Printer_Name) if (READ_PROPERTY) - GB.ReturnNewZeroString(PRINTER->printerName()); + RETURN_NEW_STRING(PRINTER->printerName()); else PRINTER->setPrinterName(QSTRING_PROP()); @@ -425,7 +425,7 @@ END_PROPERTY BEGIN_PROPERTY(Printer_OutputFile) if (READ_PROPERTY) - GB.ReturnNewZeroString(PRINTER->outputFileName()); + RETURN_NEW_STRING(PRINTER->outputFileName()); else PRINTER->setOutputFileName(TO_QSTRING(GB.FileName(PSTRING(), PLENGTH()))); @@ -438,7 +438,7 @@ BEGIN_PROPERTY(Printer_Default) if (info.isNull()) GB.ReturnNull(); else - GB.ReturnNewZeroString(info.printerName()); + RETURN_NEW_STRING(info.printerName()); END_PROPERTY @@ -449,7 +449,7 @@ BEGIN_PROPERTY(Printer_List) GB.Array.New(&array, GB_T_STRING, list.length()); for (int i = 0; i < list.length(); i++) - *((char **)GB.Array.Get(array, i)) = GB.NewZeroString(list.at(i).printerName()); + *((char **)GB.Array.Get(array, i)) = NEW_STRING(list.at(i).printerName()); GB.ReturnObject(array); diff --git a/gb.qt4/src/gb.qt.h b/gb.qt4/src/gb.qt.h index 0885bb96e..bcd7fca0a 100644 --- a/gb.qt4/src/gb.qt.h +++ b/gb.qt4/src/gb.qt.h @@ -46,6 +46,10 @@ #define QT_INTERFACE_VERSION 1 +#if QT_VERSION >= 0x050000 +#define QT5 1 +#endif + #define TO_QSTRING(_str) (QString::fromUtf8((const char *)(_str))) #ifdef DO_NOT_USE_QT_INTERFACE diff --git a/gb.qt4/src/main.cpp b/gb.qt4/src/main.cpp index c24a5d313..fa0f2c148 100644 --- a/gb.qt4/src/main.cpp +++ b/gb.qt4/src/main.cpp @@ -97,8 +97,10 @@ #ifndef NO_X_WINDOW #include +#ifndef QT5 #include "CEmbedder.h" #include "CTrayIcon.h" +#endif #include "x11.h" #endif @@ -553,6 +555,7 @@ static void x11_set_event_filter(void (*filter)(XEvent *)) _x11_event_filter = filter; } +#ifndef QT5 bool MyApplication::x11EventFilter(XEvent *e) { // Workaround for input methods that void the key code of KeyRelease eventFilter @@ -568,6 +571,8 @@ bool MyApplication::x11EventFilter(XEvent *e) } #endif +#endif + /** MyTimer ****************************************************************/ MyTimer::MyTimer(GB_TIMER *t) : QObject(0) @@ -637,7 +642,11 @@ static bool must_quit(void) #if DEBUG_WINDOW qDebug("must_quit: Window = %d Watch = %d in_event_loop = %d", CWindow::count, CWatch::count, in_event_loop); #endif +#ifdef QT5 + return CWINDOW_must_quit() && CWatch::count == 0 && in_event_loop && MAIN_in_message_box == 0; +#else return CWINDOW_must_quit() && CWatch::count == 0 && in_event_loop && MAIN_in_message_box == 0 && TRAYICON_count == 0; +#endif } static void check_quit_now(intptr_t param) @@ -648,10 +657,12 @@ static void check_quit_now(intptr_t param) { if (QApplication::instance()) { - #ifndef NO_X_WINDOW +#ifndef NO_X_WINDOW +#ifndef QT5 CTRAYICON_close_all(); qApp->syncX(); - #endif +#endif +#endif qApp->exit(); exit_called = true; } @@ -1053,9 +1064,12 @@ GB_DESC *GB_CLASSES[] EXPORT = CSliderDesc, CSpinBoxDesc, CMovieBoxDesc, CScrollBarDesc, CWindowMenusDesc, CWindowControlsDesc, CWindowDesc, CWindowsDesc, CFormDesc, CDialogDesc, - #ifndef NO_X_WINDOW - CEmbedderDesc, CTrayIconDesc, CTrayIconsDesc, - #endif +#ifndef NO_X_WINDOW +#ifndef QT5 + CEmbedderDesc, + CTrayIconDesc, CTrayIconsDesc, +#endif +#endif CWatcherDesc, PrinterDesc, SvgImageDesc, @@ -1256,7 +1270,9 @@ void EXPORT GB_SIGNAL(int signal, void *param) case GB_SIGNAL_DEBUG_FORWARD: //while (qApp->activePopupWidget()) // delete qApp->activePopupWidget(); +#ifndef QT5 qApp->syncX(); +#endif break; case GB_SIGNAL_DEBUG_CONTINUE: diff --git a/gb.qt4/src/main.h b/gb.qt4/src/main.h index 4ef98fb4b..97b474797 100644 --- a/gb.qt4/src/main.h +++ b/gb.qt4/src/main.h @@ -1,29 +1,30 @@ /*************************************************************************** - main.h + main.h - (c) 2000-2013 Benoît Minisini + (c) 2000-2013 Benoît Minisini - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - MA 02110-1301, USA. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301, USA. ***************************************************************************/ #ifndef __MAIN_H #define __MAIN_H +#include "gb_common.h" #include "gambas.h" #include @@ -72,62 +73,61 @@ extern GB_CLASS CLASS_TextArea; class MyPostCheck: public QObject { - Q_OBJECT + Q_OBJECT public: - static bool in_check; + static bool in_check; public slots: - void check(void); + void check(void); }; class MyApplication: public QApplication { - Q_OBJECT + Q_OBJECT public: - MyApplication(int &argc, char **argv); - #ifndef NO_X_WINDOW - virtual bool x11EventFilter(XEvent *e); - #endif - virtual bool eventFilter(QObject *o, QEvent *e); - //virtual bool notify(QObject *o, QEvent *e); - - static void setEventFilter(bool set); - - static bool isTooltipEnabled() { return !_tooltip_disable; } - static void setTooltipEnabled(bool b); - + MyApplication(int &argc, char **argv); +#ifndef QT5 + virtual bool x11EventFilter(XEvent *e); +#endif + virtual bool eventFilter(QObject *o, QEvent *e); + //virtual bool notify(QObject *o, QEvent *e); + + static void setEventFilter(bool set); + + static bool isTooltipEnabled() { return !_tooltip_disable; } + static void setTooltipEnabled(bool b); + static void initClipboard(); - - static QEventLoop *eventLoop; - + + static QEventLoop *eventLoop; public slots: - + void linkDestroyed(QObject *); void clipboardHasChanged(); void commitDataRequested(QSessionManager &); - + private: - static bool _tooltip_disable; - static int _event_filter; + static bool _tooltip_disable; + static int _event_filter; }; class MyTimer : public QObject { public: - MyTimer(GB_TIMER *timer); - ~MyTimer(); + MyTimer(GB_TIMER *timer); + ~MyTimer(); void clearTimer() { timer = 0; } protected: - void timerEvent(QTimerEvent *); + void timerEvent(QTimerEvent *); private: diff --git a/gb.qt4/src/systemtrayicon.h b/gb.qt4/src/systemtrayicon.h index 28207e783..8ed96d001 100644 --- a/gb.qt4/src/systemtrayicon.h +++ b/gb.qt4/src/systemtrayicon.h @@ -80,7 +80,7 @@ // We mean it. // -#include "systemtrayicon.h" +//#include "systemtrayicon.h" //#include "private/qobject_p.h" #include diff --git a/gb.qt5/AUTHORS b/gb.qt5/AUTHORS new file mode 100644 index 000000000..e69de29bb diff --git a/gb.qt5/COPYING b/gb.qt5/COPYING new file mode 120000 index 000000000..012065c85 --- /dev/null +++ b/gb.qt5/COPYING @@ -0,0 +1 @@ +../COPYING \ No newline at end of file diff --git a/gb.qt5/ChangeLog b/gb.qt5/ChangeLog new file mode 100644 index 000000000..e69de29bb diff --git a/gb.qt5/INSTALL b/gb.qt5/INSTALL new file mode 120000 index 000000000..99d491b4f --- /dev/null +++ b/gb.qt5/INSTALL @@ -0,0 +1 @@ +../INSTALL \ No newline at end of file diff --git a/gb.qt5/Makefile.am b/gb.qt5/Makefile.am new file mode 100644 index 000000000..11b5fd4c8 --- /dev/null +++ b/gb.qt5/Makefile.am @@ -0,0 +1,3 @@ +ACLOCAL_AMFLAGS = -I m4 --install +SUBDIRS = @QT5_DIR@ +EXTRA_DIST = reconf share gb*.h gambas.h diff --git a/gb.qt5/NEWS b/gb.qt5/NEWS new file mode 100644 index 000000000..e69de29bb diff --git a/gb.qt5/README b/gb.qt5/README new file mode 100644 index 000000000..e69de29bb diff --git a/gb.qt5/acinclude.m4 b/gb.qt5/acinclude.m4 new file mode 120000 index 000000000..d84c32a31 --- /dev/null +++ b/gb.qt5/acinclude.m4 @@ -0,0 +1 @@ +../acinclude.m4 \ No newline at end of file diff --git a/gb.qt5/component.am b/gb.qt5/component.am new file mode 120000 index 000000000..2f0eee34f --- /dev/null +++ b/gb.qt5/component.am @@ -0,0 +1 @@ +../component.am \ No newline at end of file diff --git a/gb.qt5/configure.ac b/gb.qt5/configure.ac new file mode 100644 index 000000000..669ebc68f --- /dev/null +++ b/gb.qt5/configure.ac @@ -0,0 +1,45 @@ +dnl ---- configure.ac for gb.qt5 + +m4_include([../version.m4]) +AC_INIT(gambas3-gb-qt5, GB_VERSION, GB_MAIL, [], GB_URL) +AC_CONFIG_MACRO_DIR([m4]) + +GB_INIT(gb.qt5) +AC_PROG_LIBTOOL + +GB_CHECK_XWINDOW +AM_CONDITIONAL(XWINDOW, test x"$have_x" = xyes) + +GB_COMPONENT_PKG_CONFIG( + qt5, QT5, gb.qt5, [src], + 'Qt5Core >= 5.3.0' Qt5Gui Qt5Widgets Qt5Svg Qt5PrintSupport Qt5X11Extras +) + +## GB_COMPONENT_PKG_CONFIG( +## qt5ext, QT5EXT, gb.qt5.ext, [ext], +## 'Qt5Core >= 5.3.0' Qt5Gui Qt5Widgets +## ) + +## GB_COMPONENT_PKG_CONFIG( +## qt5webkit, QT5WEBKIT, gb.qt5.webkit, [webkit], +## 'Qt5Core >= 5.3.0' Qt5Gui Qt5Widgets Qt5Network Qt5Xml Qt5WebKit Qt5WebKitWidgets Qt5PrintSupport +## ) + +## GB_COMPONENT_PKG_CONFIG( +## qtopengl, QTOPENGL, gb.qt5.opengl, [opengl], +## 'Qt5Core >= 5.3.0' Qt5Gui Qt5Widgets Qt5OpenGL +## ) + +MOC=`pkg-config --variable=host_bins Qt5Core`/moc +AC_SUBST(MOC) + +AC_OUTPUT( \ +Makefile \ +src/Makefile \ +) + +## src/ext/Makefile \ +## src/webkit/Makefile \ +## src/opengl/Makefile \ + +GB_PRINT_MESSAGES diff --git a/gb.qt5/depcomp b/gb.qt5/depcomp new file mode 120000 index 000000000..7ef7de62b --- /dev/null +++ b/gb.qt5/depcomp @@ -0,0 +1 @@ +../depcomp \ No newline at end of file diff --git a/gb.qt5/gambas.h b/gb.qt5/gambas.h new file mode 120000 index 000000000..03677ecd0 --- /dev/null +++ b/gb.qt5/gambas.h @@ -0,0 +1 @@ +../main/share/gambas.h \ No newline at end of file diff --git a/gb.qt5/gb.draw.h b/gb.qt5/gb.draw.h new file mode 120000 index 000000000..82ba07786 --- /dev/null +++ b/gb.qt5/gb.draw.h @@ -0,0 +1 @@ +../main/lib/draw/gb.draw.h \ No newline at end of file diff --git a/gb.qt5/gb.eval.h b/gb.qt5/gb.eval.h new file mode 120000 index 000000000..33d332f06 --- /dev/null +++ b/gb.qt5/gb.eval.h @@ -0,0 +1 @@ +../main/lib/eval/gb.eval.h \ No newline at end of file diff --git a/gb.qt5/gb.geom.h b/gb.qt5/gb.geom.h new file mode 120000 index 000000000..abc5659ee --- /dev/null +++ b/gb.qt5/gb.geom.h @@ -0,0 +1 @@ +../main/lib/geom/gb.geom.h \ No newline at end of file diff --git a/gb.qt5/gb.gl.h b/gb.qt5/gb.gl.h new file mode 120000 index 000000000..ff28a7265 --- /dev/null +++ b/gb.qt5/gb.gl.h @@ -0,0 +1 @@ +../gb.opengl/src/gb.gl.h \ No newline at end of file diff --git a/gb.qt5/gb.image.h b/gb.qt5/gb.image.h new file mode 120000 index 000000000..c8c09bcc9 --- /dev/null +++ b/gb.qt5/gb.image.h @@ -0,0 +1 @@ +../main/lib/image/gb.image.h \ No newline at end of file diff --git a/gb.qt5/gb.paint.h b/gb.qt5/gb.paint.h new file mode 120000 index 000000000..a516fe05c --- /dev/null +++ b/gb.qt5/gb.paint.h @@ -0,0 +1 @@ +../main/lib/draw/gb.paint.h \ No newline at end of file diff --git a/gb.qt5/gb.qt.am b/gb.qt5/gb.qt.am new file mode 100644 index 000000000..a475f7912 --- /dev/null +++ b/gb.qt5/gb.qt.am @@ -0,0 +1,6 @@ +CLEANFILES = *_moc.cpp + +.h_moc.cpp: + $(MOC) -o $@ $< + +SUFFIXES = .h _moc.cpp \ No newline at end of file diff --git a/gb.qt5/gb_common.h b/gb.qt5/gb_common.h new file mode 120000 index 000000000..707d79da6 --- /dev/null +++ b/gb.qt5/gb_common.h @@ -0,0 +1 @@ +../main/share/gb_common.h \ No newline at end of file diff --git a/gb.qt5/m4 b/gb.qt5/m4 new file mode 120000 index 000000000..7d49a2a4b --- /dev/null +++ b/gb.qt5/m4 @@ -0,0 +1 @@ +../m4 \ No newline at end of file diff --git a/gb.qt5/missing b/gb.qt5/missing new file mode 120000 index 000000000..f3ade9ba1 --- /dev/null +++ b/gb.qt5/missing @@ -0,0 +1 @@ +../missing \ No newline at end of file diff --git a/gb.qt5/reconf b/gb.qt5/reconf new file mode 120000 index 000000000..48a376da6 --- /dev/null +++ b/gb.qt5/reconf @@ -0,0 +1 @@ +../reconf \ No newline at end of file diff --git a/gb.qt5/share b/gb.qt5/share new file mode 120000 index 000000000..638490a48 --- /dev/null +++ b/gb.qt5/share @@ -0,0 +1 @@ +../gb.qt4/share \ No newline at end of file diff --git a/gb.qt5/src/CButton.cpp b/gb.qt5/src/CButton.cpp new file mode 120000 index 000000000..edde59553 --- /dev/null +++ b/gb.qt5/src/CButton.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CButton.cpp \ No newline at end of file diff --git a/gb.qt5/src/CButton.h b/gb.qt5/src/CButton.h new file mode 120000 index 000000000..cd3da8da9 --- /dev/null +++ b/gb.qt5/src/CButton.h @@ -0,0 +1 @@ +../../gb.qt4/src/CButton.h \ No newline at end of file diff --git a/gb.qt5/src/CCheckBox.cpp b/gb.qt5/src/CCheckBox.cpp new file mode 120000 index 000000000..7b3905ec5 --- /dev/null +++ b/gb.qt5/src/CCheckBox.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CCheckBox.cpp \ No newline at end of file diff --git a/gb.qt5/src/CCheckBox.h b/gb.qt5/src/CCheckBox.h new file mode 120000 index 000000000..681844c2a --- /dev/null +++ b/gb.qt5/src/CCheckBox.h @@ -0,0 +1 @@ +../../gb.qt4/src/CCheckBox.h \ No newline at end of file diff --git a/gb.qt5/src/CClipboard.cpp b/gb.qt5/src/CClipboard.cpp new file mode 120000 index 000000000..467a48974 --- /dev/null +++ b/gb.qt5/src/CClipboard.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CClipboard.cpp \ No newline at end of file diff --git a/gb.qt5/src/CClipboard.h b/gb.qt5/src/CClipboard.h new file mode 120000 index 000000000..1f21021ea --- /dev/null +++ b/gb.qt5/src/CClipboard.h @@ -0,0 +1 @@ +../../gb.qt4/src/CClipboard.h \ No newline at end of file diff --git a/gb.qt5/src/CColor.cpp b/gb.qt5/src/CColor.cpp new file mode 120000 index 000000000..5b5d22c19 --- /dev/null +++ b/gb.qt5/src/CColor.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CColor.cpp \ No newline at end of file diff --git a/gb.qt5/src/CColor.h b/gb.qt5/src/CColor.h new file mode 120000 index 000000000..f78de3730 --- /dev/null +++ b/gb.qt5/src/CColor.h @@ -0,0 +1 @@ +../../gb.qt4/src/CColor.h \ No newline at end of file diff --git a/gb.qt5/src/CConst.cpp b/gb.qt5/src/CConst.cpp new file mode 120000 index 000000000..9b497bd3b --- /dev/null +++ b/gb.qt5/src/CConst.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CConst.cpp \ No newline at end of file diff --git a/gb.qt5/src/CConst.h b/gb.qt5/src/CConst.h new file mode 120000 index 000000000..494860043 --- /dev/null +++ b/gb.qt5/src/CConst.h @@ -0,0 +1 @@ +../../gb.qt4/src/CConst.h \ No newline at end of file diff --git a/gb.qt5/src/CContainer.cpp b/gb.qt5/src/CContainer.cpp new file mode 120000 index 000000000..147be167b --- /dev/null +++ b/gb.qt5/src/CContainer.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CContainer.cpp \ No newline at end of file diff --git a/gb.qt5/src/CContainer.h b/gb.qt5/src/CContainer.h new file mode 120000 index 000000000..b65b26606 --- /dev/null +++ b/gb.qt5/src/CContainer.h @@ -0,0 +1 @@ +../../gb.qt4/src/CContainer.h \ No newline at end of file diff --git a/gb.qt5/src/CDialog.cpp b/gb.qt5/src/CDialog.cpp new file mode 120000 index 000000000..bd7f78dcf --- /dev/null +++ b/gb.qt5/src/CDialog.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CDialog.cpp \ No newline at end of file diff --git a/gb.qt5/src/CDialog.h b/gb.qt5/src/CDialog.h new file mode 120000 index 000000000..f49264bf4 --- /dev/null +++ b/gb.qt5/src/CDialog.h @@ -0,0 +1 @@ +../../gb.qt4/src/CDialog.h \ No newline at end of file diff --git a/gb.qt5/src/CDraw.cpp b/gb.qt5/src/CDraw.cpp new file mode 120000 index 000000000..9f5bfa3cd --- /dev/null +++ b/gb.qt5/src/CDraw.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CDraw.cpp \ No newline at end of file diff --git a/gb.qt5/src/CDraw.h b/gb.qt5/src/CDraw.h new file mode 120000 index 000000000..f1c191580 --- /dev/null +++ b/gb.qt5/src/CDraw.h @@ -0,0 +1 @@ +../../gb.qt4/src/CDraw.h \ No newline at end of file diff --git a/gb.qt5/src/CDrawingArea.cpp b/gb.qt5/src/CDrawingArea.cpp new file mode 120000 index 000000000..ac971bd6a --- /dev/null +++ b/gb.qt5/src/CDrawingArea.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CDrawingArea.cpp \ No newline at end of file diff --git a/gb.qt5/src/CDrawingArea.h b/gb.qt5/src/CDrawingArea.h new file mode 120000 index 000000000..833d414d9 --- /dev/null +++ b/gb.qt5/src/CDrawingArea.h @@ -0,0 +1 @@ +../../gb.qt4/src/CDrawingArea.h \ No newline at end of file diff --git a/gb.qt5/src/CEmbedder.cpp b/gb.qt5/src/CEmbedder.cpp new file mode 120000 index 000000000..ba9c054ca --- /dev/null +++ b/gb.qt5/src/CEmbedder.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CEmbedder.cpp \ No newline at end of file diff --git a/gb.qt5/src/CEmbedder.h b/gb.qt5/src/CEmbedder.h new file mode 120000 index 000000000..eab360645 --- /dev/null +++ b/gb.qt5/src/CEmbedder.h @@ -0,0 +1 @@ +../../gb.qt4/src/CEmbedder.h \ No newline at end of file diff --git a/gb.qt5/src/CFont.cpp b/gb.qt5/src/CFont.cpp new file mode 120000 index 000000000..a55857bff --- /dev/null +++ b/gb.qt5/src/CFont.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CFont.cpp \ No newline at end of file diff --git a/gb.qt5/src/CFont.h b/gb.qt5/src/CFont.h new file mode 120000 index 000000000..8a5df5ae2 --- /dev/null +++ b/gb.qt5/src/CFont.h @@ -0,0 +1 @@ +../../gb.qt4/src/CFont.h \ No newline at end of file diff --git a/gb.qt5/src/CFrame.cpp b/gb.qt5/src/CFrame.cpp new file mode 120000 index 000000000..37de5ef44 --- /dev/null +++ b/gb.qt5/src/CFrame.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CFrame.cpp \ No newline at end of file diff --git a/gb.qt5/src/CFrame.h b/gb.qt5/src/CFrame.h new file mode 120000 index 000000000..313947582 --- /dev/null +++ b/gb.qt5/src/CFrame.h @@ -0,0 +1 @@ +../../gb.qt4/src/CFrame.h \ No newline at end of file diff --git a/gb.qt5/src/CImage.cpp b/gb.qt5/src/CImage.cpp new file mode 120000 index 000000000..a0845ff7a --- /dev/null +++ b/gb.qt5/src/CImage.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CImage.cpp \ No newline at end of file diff --git a/gb.qt5/src/CImage.h b/gb.qt5/src/CImage.h new file mode 120000 index 000000000..4cf3932c6 --- /dev/null +++ b/gb.qt5/src/CImage.h @@ -0,0 +1 @@ +../../gb.qt4/src/CImage.h \ No newline at end of file diff --git a/gb.qt5/src/CKey.cpp b/gb.qt5/src/CKey.cpp new file mode 120000 index 000000000..bc762ca78 --- /dev/null +++ b/gb.qt5/src/CKey.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CKey.cpp \ No newline at end of file diff --git a/gb.qt5/src/CKey.h b/gb.qt5/src/CKey.h new file mode 120000 index 000000000..52a533bb7 --- /dev/null +++ b/gb.qt5/src/CKey.h @@ -0,0 +1 @@ +../../gb.qt4/src/CKey.h \ No newline at end of file diff --git a/gb.qt5/src/CLabel.cpp b/gb.qt5/src/CLabel.cpp new file mode 120000 index 000000000..36ce1627c --- /dev/null +++ b/gb.qt5/src/CLabel.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CLabel.cpp \ No newline at end of file diff --git a/gb.qt5/src/CLabel.h b/gb.qt5/src/CLabel.h new file mode 120000 index 000000000..5812f6294 --- /dev/null +++ b/gb.qt5/src/CLabel.h @@ -0,0 +1 @@ +../../gb.qt4/src/CLabel.h \ No newline at end of file diff --git a/gb.qt5/src/CMenu.cpp b/gb.qt5/src/CMenu.cpp new file mode 120000 index 000000000..ee26dbde8 --- /dev/null +++ b/gb.qt5/src/CMenu.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CMenu.cpp \ No newline at end of file diff --git a/gb.qt5/src/CMenu.h b/gb.qt5/src/CMenu.h new file mode 120000 index 000000000..2a70ae266 --- /dev/null +++ b/gb.qt5/src/CMenu.h @@ -0,0 +1 @@ +../../gb.qt4/src/CMenu.h \ No newline at end of file diff --git a/gb.qt5/src/CMessage.cpp b/gb.qt5/src/CMessage.cpp new file mode 120000 index 000000000..293fa570f --- /dev/null +++ b/gb.qt5/src/CMessage.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CMessage.cpp \ No newline at end of file diff --git a/gb.qt5/src/CMessage.h b/gb.qt5/src/CMessage.h new file mode 120000 index 000000000..073384288 --- /dev/null +++ b/gb.qt5/src/CMessage.h @@ -0,0 +1 @@ +../../gb.qt4/src/CMessage.h \ No newline at end of file diff --git a/gb.qt5/src/CMouse.cpp b/gb.qt5/src/CMouse.cpp new file mode 120000 index 000000000..1b1028825 --- /dev/null +++ b/gb.qt5/src/CMouse.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CMouse.cpp \ No newline at end of file diff --git a/gb.qt5/src/CMouse.h b/gb.qt5/src/CMouse.h new file mode 120000 index 000000000..23047135c --- /dev/null +++ b/gb.qt5/src/CMouse.h @@ -0,0 +1 @@ +../../gb.qt4/src/CMouse.h \ No newline at end of file diff --git a/gb.qt5/src/CMovieBox.cpp b/gb.qt5/src/CMovieBox.cpp new file mode 120000 index 000000000..2a8b2241d --- /dev/null +++ b/gb.qt5/src/CMovieBox.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CMovieBox.cpp \ No newline at end of file diff --git a/gb.qt5/src/CMovieBox.h b/gb.qt5/src/CMovieBox.h new file mode 120000 index 000000000..6596b1602 --- /dev/null +++ b/gb.qt5/src/CMovieBox.h @@ -0,0 +1 @@ +../../gb.qt4/src/CMovieBox.h \ No newline at end of file diff --git a/gb.qt5/src/CPanel.cpp b/gb.qt5/src/CPanel.cpp new file mode 120000 index 000000000..65e453c79 --- /dev/null +++ b/gb.qt5/src/CPanel.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CPanel.cpp \ No newline at end of file diff --git a/gb.qt5/src/CPanel.h b/gb.qt5/src/CPanel.h new file mode 120000 index 000000000..40eaad65d --- /dev/null +++ b/gb.qt5/src/CPanel.h @@ -0,0 +1 @@ +../../gb.qt4/src/CPanel.h \ No newline at end of file diff --git a/gb.qt5/src/CPicture.cpp b/gb.qt5/src/CPicture.cpp new file mode 120000 index 000000000..16533dbd2 --- /dev/null +++ b/gb.qt5/src/CPicture.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CPicture.cpp \ No newline at end of file diff --git a/gb.qt5/src/CPicture.h b/gb.qt5/src/CPicture.h new file mode 120000 index 000000000..2e73612ee --- /dev/null +++ b/gb.qt5/src/CPicture.h @@ -0,0 +1 @@ +../../gb.qt4/src/CPicture.h \ No newline at end of file diff --git a/gb.qt5/src/CPictureBox.cpp b/gb.qt5/src/CPictureBox.cpp new file mode 120000 index 000000000..47e5e5bd5 --- /dev/null +++ b/gb.qt5/src/CPictureBox.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CPictureBox.cpp \ No newline at end of file diff --git a/gb.qt5/src/CPictureBox.h b/gb.qt5/src/CPictureBox.h new file mode 120000 index 000000000..1e3f5e0d5 --- /dev/null +++ b/gb.qt5/src/CPictureBox.h @@ -0,0 +1 @@ +../../gb.qt4/src/CPictureBox.h \ No newline at end of file diff --git a/gb.qt5/src/CRadioButton.cpp b/gb.qt5/src/CRadioButton.cpp new file mode 120000 index 000000000..a33824014 --- /dev/null +++ b/gb.qt5/src/CRadioButton.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CRadioButton.cpp \ No newline at end of file diff --git a/gb.qt5/src/CRadioButton.h b/gb.qt5/src/CRadioButton.h new file mode 120000 index 000000000..89361f82d --- /dev/null +++ b/gb.qt5/src/CRadioButton.h @@ -0,0 +1 @@ +../../gb.qt4/src/CRadioButton.h \ No newline at end of file diff --git a/gb.qt5/src/CScreen.cpp b/gb.qt5/src/CScreen.cpp new file mode 120000 index 000000000..eab9f0807 --- /dev/null +++ b/gb.qt5/src/CScreen.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CScreen.cpp \ No newline at end of file diff --git a/gb.qt5/src/CScreen.h b/gb.qt5/src/CScreen.h new file mode 120000 index 000000000..0de19f1eb --- /dev/null +++ b/gb.qt5/src/CScreen.h @@ -0,0 +1 @@ +../../gb.qt4/src/CScreen.h \ No newline at end of file diff --git a/gb.qt5/src/CScrollBar.cpp b/gb.qt5/src/CScrollBar.cpp new file mode 120000 index 000000000..649da75ba --- /dev/null +++ b/gb.qt5/src/CScrollBar.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CScrollBar.cpp \ No newline at end of file diff --git a/gb.qt5/src/CScrollBar.h b/gb.qt5/src/CScrollBar.h new file mode 120000 index 000000000..2648c351a --- /dev/null +++ b/gb.qt5/src/CScrollBar.h @@ -0,0 +1 @@ +../../gb.qt4/src/CScrollBar.h \ No newline at end of file diff --git a/gb.qt5/src/CScrollView.cpp b/gb.qt5/src/CScrollView.cpp new file mode 120000 index 000000000..ba86254a5 --- /dev/null +++ b/gb.qt5/src/CScrollView.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CScrollView.cpp \ No newline at end of file diff --git a/gb.qt5/src/CScrollView.h b/gb.qt5/src/CScrollView.h new file mode 120000 index 000000000..20019f683 --- /dev/null +++ b/gb.qt5/src/CScrollView.h @@ -0,0 +1 @@ +../../gb.qt4/src/CScrollView.h \ No newline at end of file diff --git a/gb.qt5/src/CSlider.cpp b/gb.qt5/src/CSlider.cpp new file mode 120000 index 000000000..9d9ca5ea4 --- /dev/null +++ b/gb.qt5/src/CSlider.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CSlider.cpp \ No newline at end of file diff --git a/gb.qt5/src/CSlider.h b/gb.qt5/src/CSlider.h new file mode 120000 index 000000000..06bff2788 --- /dev/null +++ b/gb.qt5/src/CSlider.h @@ -0,0 +1 @@ +../../gb.qt4/src/CSlider.h \ No newline at end of file diff --git a/gb.qt5/src/CSpinBox.cpp b/gb.qt5/src/CSpinBox.cpp new file mode 120000 index 000000000..834f23a20 --- /dev/null +++ b/gb.qt5/src/CSpinBox.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CSpinBox.cpp \ No newline at end of file diff --git a/gb.qt5/src/CSpinBox.h b/gb.qt5/src/CSpinBox.h new file mode 120000 index 000000000..3f57fb4ef --- /dev/null +++ b/gb.qt5/src/CSpinBox.h @@ -0,0 +1 @@ +../../gb.qt4/src/CSpinBox.h \ No newline at end of file diff --git a/gb.qt5/src/CStyle.cpp b/gb.qt5/src/CStyle.cpp new file mode 120000 index 000000000..dd2e6d6a7 --- /dev/null +++ b/gb.qt5/src/CStyle.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CStyle.cpp \ No newline at end of file diff --git a/gb.qt5/src/CStyle.h b/gb.qt5/src/CStyle.h new file mode 120000 index 000000000..2c4565c37 --- /dev/null +++ b/gb.qt5/src/CStyle.h @@ -0,0 +1 @@ +../../gb.qt4/src/CStyle.h \ No newline at end of file diff --git a/gb.qt5/src/CTabStrip.cpp b/gb.qt5/src/CTabStrip.cpp new file mode 120000 index 000000000..7ad3c567a --- /dev/null +++ b/gb.qt5/src/CTabStrip.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CTabStrip.cpp \ No newline at end of file diff --git a/gb.qt5/src/CTabStrip.h b/gb.qt5/src/CTabStrip.h new file mode 120000 index 000000000..a90b45899 --- /dev/null +++ b/gb.qt5/src/CTabStrip.h @@ -0,0 +1 @@ +../../gb.qt4/src/CTabStrip.h \ No newline at end of file diff --git a/gb.qt5/src/CTextArea.cpp b/gb.qt5/src/CTextArea.cpp new file mode 120000 index 000000000..0e1762e17 --- /dev/null +++ b/gb.qt5/src/CTextArea.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CTextArea.cpp \ No newline at end of file diff --git a/gb.qt5/src/CTextArea.h b/gb.qt5/src/CTextArea.h new file mode 120000 index 000000000..0bbccc6a8 --- /dev/null +++ b/gb.qt5/src/CTextArea.h @@ -0,0 +1 @@ +../../gb.qt4/src/CTextArea.h \ No newline at end of file diff --git a/gb.qt5/src/CTextBox.cpp b/gb.qt5/src/CTextBox.cpp new file mode 120000 index 000000000..1a71c9195 --- /dev/null +++ b/gb.qt5/src/CTextBox.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CTextBox.cpp \ No newline at end of file diff --git a/gb.qt5/src/CTextBox.h b/gb.qt5/src/CTextBox.h new file mode 120000 index 000000000..a39a4c8f7 --- /dev/null +++ b/gb.qt5/src/CTextBox.h @@ -0,0 +1 @@ +../../gb.qt4/src/CTextBox.h \ No newline at end of file diff --git a/gb.qt5/src/CTrayIcon.cpp b/gb.qt5/src/CTrayIcon.cpp new file mode 120000 index 000000000..309111ac4 --- /dev/null +++ b/gb.qt5/src/CTrayIcon.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CTrayIcon.cpp \ No newline at end of file diff --git a/gb.qt5/src/CTrayIcon.h b/gb.qt5/src/CTrayIcon.h new file mode 120000 index 000000000..3d765cb68 --- /dev/null +++ b/gb.qt5/src/CTrayIcon.h @@ -0,0 +1 @@ +../../gb.qt4/src/CTrayIcon.h \ No newline at end of file diff --git a/gb.qt5/src/CWatch.cpp b/gb.qt5/src/CWatch.cpp new file mode 120000 index 000000000..8f71615d3 --- /dev/null +++ b/gb.qt5/src/CWatch.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CWatch.cpp \ No newline at end of file diff --git a/gb.qt5/src/CWatch.h b/gb.qt5/src/CWatch.h new file mode 120000 index 000000000..1d432e66b --- /dev/null +++ b/gb.qt5/src/CWatch.h @@ -0,0 +1 @@ +../../gb.qt4/src/CWatch.h \ No newline at end of file diff --git a/gb.qt5/src/CWatcher.cpp b/gb.qt5/src/CWatcher.cpp new file mode 120000 index 000000000..2333e2fef --- /dev/null +++ b/gb.qt5/src/CWatcher.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CWatcher.cpp \ No newline at end of file diff --git a/gb.qt5/src/CWatcher.h b/gb.qt5/src/CWatcher.h new file mode 120000 index 000000000..eb51173e8 --- /dev/null +++ b/gb.qt5/src/CWatcher.h @@ -0,0 +1 @@ +../../gb.qt4/src/CWatcher.h \ No newline at end of file diff --git a/gb.qt5/src/CWidget.cpp b/gb.qt5/src/CWidget.cpp new file mode 120000 index 000000000..f7eb671b2 --- /dev/null +++ b/gb.qt5/src/CWidget.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CWidget.cpp \ No newline at end of file diff --git a/gb.qt5/src/CWidget.h b/gb.qt5/src/CWidget.h new file mode 120000 index 000000000..224b6ce29 --- /dev/null +++ b/gb.qt5/src/CWidget.h @@ -0,0 +1 @@ +../../gb.qt4/src/CWidget.h \ No newline at end of file diff --git a/gb.qt5/src/CWindow.cpp b/gb.qt5/src/CWindow.cpp new file mode 120000 index 000000000..7f8071c63 --- /dev/null +++ b/gb.qt5/src/CWindow.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/CWindow.cpp \ No newline at end of file diff --git a/gb.qt5/src/CWindow.h b/gb.qt5/src/CWindow.h new file mode 120000 index 000000000..1124e0ffd --- /dev/null +++ b/gb.qt5/src/CWindow.h @@ -0,0 +1 @@ +../../gb.qt4/src/CWindow.h \ No newline at end of file diff --git a/gb.qt5/src/Makefile.am b/gb.qt5/src/Makefile.am new file mode 100644 index 000000000..5f4c3b6cf --- /dev/null +++ b/gb.qt5/src/Makefile.am @@ -0,0 +1,56 @@ +COMPONENT = gb.qt5 +include $(top_srcdir)/component.am +include $(top_srcdir)/gb.qt.am + +## SUBDIRS = . @QT5EXT_DIR@ @QT5WEBKIT_DIR@ @QT5OPENGL_DIR@ +## EXTRA_DIST = trayicon.xpm + +gblib_LTLIBRARIES = gb.qt5.la + +gb_qt5_la_LIBADD = @THREAD_LIB@ @QT5_LIB@ +gb_qt5_la_LDFLAGS = -module @LD_FLAGS@ @QT5_LDFLAGS@ +gb_qt5_la_CXXFLAGS = @THREAD_INC@ -DGB_QT_COMPONENT $(AM_CXXFLAGS) +gb_qt5_la_CPPFLAGS = @QT5_INC@ -I$(top_srcdir)/share/ + +gb_qt5_la_SOURCES = \ + x11.h x11.c \ + gb.qt.h main.h main_moc.cpp main.cpp \ + CFont.h CFont.cpp \ + CScreen.h CScreen.cpp \ + CStyle.h CStyle.cpp \ + CWidget.h CWidget_moc.cpp CWidget.cpp \ + CWindow.h CWindow_moc.cpp CWindow.cpp \ + CButton.h CButton_moc.cpp CButton.cpp \ + CContainer.h CContainer_moc.cpp CContainer.cpp \ + CLabel.h CLabel_moc.cpp CLabel.cpp \ + CTextBox.h CTextBox_moc.cpp CTextBox.cpp \ + CPictureBox.h CPictureBox_moc.cpp CPictureBox.cpp \ + CMenu.h CMenu_moc.cpp CMenu.cpp \ + CMouse.h CMouse_moc.cpp CMouse.cpp \ + CKey.h CKey_moc.cpp CKey.cpp \ + CColor.h CColor_moc.cpp CColor.cpp \ + CConst.h CConst.cpp \ + CCheckBox.h CCheckBox_moc.cpp CCheckBox.cpp \ + CFrame.h CFrame_moc.cpp CFrame.cpp \ + CPanel.h CPanel_moc.cpp CPanel.cpp \ + CRadioButton.h CRadioButton_moc.cpp CRadioButton.cpp \ + CTextArea.h CTextArea_moc.cpp CTextArea.cpp \ + CTabStrip.h CTabStrip_moc.cpp CTabStrip.cpp \ + CDialog.h CDialog_moc.cpp CDialog.cpp \ + CPicture.h CPicture_moc.cpp CPicture.cpp \ + CImage.h CImage_moc.cpp CImage.cpp \ + CClipboard.h CClipboard_moc.cpp CClipboard.cpp \ + CDraw.h CDraw.cpp \ + cpaint_impl.h cpaint_impl.cpp \ + CWatch.h CWatch_moc.cpp CWatch.cpp \ + CScrollView.h CScrollView_moc.cpp CScrollView.cpp \ + CDrawingArea.h CDrawingArea_moc.cpp CDrawingArea.cpp \ + CMessage.h CMessage_moc.cpp CMessage.cpp \ + CSlider.h CSlider_moc.cpp CSlider.cpp \ + CScrollBar.h CScrollBar_moc.cpp CScrollBar.cpp \ + CMovieBox.h CMovieBox_moc.cpp CMovieBox.cpp \ + CSpinBox.h CSpinBox_moc.cpp CSpinBox.cpp \ + CWatcher.h CWatcher_moc.cpp CWatcher.cpp \ + cprinter.h cprinter_moc.cpp cprinter.cpp \ + csvgimage.h csvgimage_moc.cpp csvgimage.cpp + diff --git a/gb.qt5/src/cpaint_impl.cpp b/gb.qt5/src/cpaint_impl.cpp new file mode 120000 index 000000000..52abf3ae1 --- /dev/null +++ b/gb.qt5/src/cpaint_impl.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/cpaint_impl.cpp \ No newline at end of file diff --git a/gb.qt5/src/cpaint_impl.h b/gb.qt5/src/cpaint_impl.h new file mode 120000 index 000000000..323384338 --- /dev/null +++ b/gb.qt5/src/cpaint_impl.h @@ -0,0 +1 @@ +../../gb.qt4/src/cpaint_impl.h \ No newline at end of file diff --git a/gb.qt5/src/cprinter.cpp b/gb.qt5/src/cprinter.cpp new file mode 120000 index 000000000..993405985 --- /dev/null +++ b/gb.qt5/src/cprinter.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/cprinter.cpp \ No newline at end of file diff --git a/gb.qt5/src/cprinter.h b/gb.qt5/src/cprinter.h new file mode 120000 index 000000000..8c4a778d7 --- /dev/null +++ b/gb.qt5/src/cprinter.h @@ -0,0 +1 @@ +../../gb.qt4/src/cprinter.h \ No newline at end of file diff --git a/gb.qt5/src/csvgimage.cpp b/gb.qt5/src/csvgimage.cpp new file mode 120000 index 000000000..57a2c5a25 --- /dev/null +++ b/gb.qt5/src/csvgimage.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/csvgimage.cpp \ No newline at end of file diff --git a/gb.qt5/src/csvgimage.h b/gb.qt5/src/csvgimage.h new file mode 120000 index 000000000..6dddd772a --- /dev/null +++ b/gb.qt5/src/csvgimage.h @@ -0,0 +1 @@ +../../gb.qt4/src/csvgimage.h \ No newline at end of file diff --git a/gb.qt5/src/ext/CDial.cpp b/gb.qt5/src/ext/CDial.cpp new file mode 120000 index 000000000..a2e816fac --- /dev/null +++ b/gb.qt5/src/ext/CDial.cpp @@ -0,0 +1 @@ +../../../gb.qt4/src/ext/CDial.cpp \ No newline at end of file diff --git a/gb.qt5/src/ext/CDial.h b/gb.qt5/src/ext/CDial.h new file mode 120000 index 000000000..e9982c630 --- /dev/null +++ b/gb.qt5/src/ext/CDial.h @@ -0,0 +1 @@ +../../../gb.qt4/src/ext/CDial.h \ No newline at end of file diff --git a/gb.qt5/src/ext/CEditor.cpp b/gb.qt5/src/ext/CEditor.cpp new file mode 120000 index 000000000..0f9e2f1a1 --- /dev/null +++ b/gb.qt5/src/ext/CEditor.cpp @@ -0,0 +1 @@ +../../../gb.qt4/src/ext/CEditor.cpp \ No newline at end of file diff --git a/gb.qt5/src/ext/CEditor.h b/gb.qt5/src/ext/CEditor.h new file mode 120000 index 000000000..df60a7f98 --- /dev/null +++ b/gb.qt5/src/ext/CEditor.h @@ -0,0 +1 @@ +../../../gb.qt4/src/ext/CEditor.h \ No newline at end of file diff --git a/gb.qt5/src/ext/CLCDNumber.cpp b/gb.qt5/src/ext/CLCDNumber.cpp new file mode 120000 index 000000000..fbf45409b --- /dev/null +++ b/gb.qt5/src/ext/CLCDNumber.cpp @@ -0,0 +1 @@ +../../../gb.qt4/src/ext/CLCDNumber.cpp \ No newline at end of file diff --git a/gb.qt5/src/ext/CLCDNumber.h b/gb.qt5/src/ext/CLCDNumber.h new file mode 120000 index 000000000..d4a7dc789 --- /dev/null +++ b/gb.qt5/src/ext/CLCDNumber.h @@ -0,0 +1 @@ +../../../gb.qt4/src/ext/CLCDNumber.h \ No newline at end of file diff --git a/gb.qt5/src/ext/CTextEdit.cpp b/gb.qt5/src/ext/CTextEdit.cpp new file mode 120000 index 000000000..adb780612 --- /dev/null +++ b/gb.qt5/src/ext/CTextEdit.cpp @@ -0,0 +1 @@ +../../../gb.qt4/src/ext/CTextEdit.cpp \ No newline at end of file diff --git a/gb.qt5/src/ext/CTextEdit.h b/gb.qt5/src/ext/CTextEdit.h new file mode 120000 index 000000000..bc66b6fe3 --- /dev/null +++ b/gb.qt5/src/ext/CTextEdit.h @@ -0,0 +1 @@ +../../../gb.qt4/src/ext/CTextEdit.h \ No newline at end of file diff --git a/gb.qt5/src/ext/Makefile.am b/gb.qt5/src/ext/Makefile.am new file mode 100644 index 000000000..431647de7 --- /dev/null +++ b/gb.qt5/src/ext/Makefile.am @@ -0,0 +1,20 @@ +COMPONENT = gb.qt5.ext +include $(top_srcdir)/component.am +include $(top_srcdir)/gb.qt.am + +gblib_LTLIBRARIES = gb.qt5.ext.la + +gb_qt5_ext_la_LIBADD = @QT5EXT_LIB@ +gb_qt5_ext_la_LDFLAGS = -module @LD_FLAGS@ @QT5EXT_LDFLAGS@ +gb_qt5_ext_la_CPPFLAGS = @QT5EXT_INC@ -I$(top_srcdir)/share -I$(top_srcdir)/src/share + +gb_qt5_ext_la_SOURCES = \ + main.h main.cpp \ + CLCDNumber.h CLCDNumber_moc.cpp CLCDNumber.cpp \ + CDial.h CDial_moc.cpp CDial.cpp \ + garray.h garray.cpp \ + gstring.h gstring.cpp \ + gdocument.h gdocument.cpp \ + gview.h gview_moc.cpp gview.cpp \ + CEditor.h CEditor_moc.cpp CEditor.cpp \ + CTextEdit.h CTextEdit_moc.cpp CTextEdit.cpp diff --git a/gb.qt5/src/ext/garray.cpp b/gb.qt5/src/ext/garray.cpp new file mode 120000 index 000000000..736f2fd51 --- /dev/null +++ b/gb.qt5/src/ext/garray.cpp @@ -0,0 +1 @@ +../../../gb.qt4/src/ext/garray.cpp \ No newline at end of file diff --git a/gb.qt5/src/ext/garray.h b/gb.qt5/src/ext/garray.h new file mode 120000 index 000000000..bde1837c5 --- /dev/null +++ b/gb.qt5/src/ext/garray.h @@ -0,0 +1 @@ +../../../gb.qt4/src/ext/garray.h \ No newline at end of file diff --git a/gb.qt5/src/ext/gb.qt5.ext.component b/gb.qt5/src/ext/gb.qt5.ext.component new file mode 100644 index 000000000..01b2bb041 --- /dev/null +++ b/gb.qt5/src/ext/gb.qt5.ext.component @@ -0,0 +1,4 @@ +[Component] +Key=gb.qt5.ext +Author=Nigel Gerrard,Benoît Minisini +Require=gb.qt5 diff --git a/gb.qt5/src/ext/gdocument.cpp b/gb.qt5/src/ext/gdocument.cpp new file mode 120000 index 000000000..a4e72b1d8 --- /dev/null +++ b/gb.qt5/src/ext/gdocument.cpp @@ -0,0 +1 @@ +../../../gb.qt4/src/ext/gdocument.cpp \ No newline at end of file diff --git a/gb.qt5/src/ext/gdocument.h b/gb.qt5/src/ext/gdocument.h new file mode 120000 index 000000000..403e4f55e --- /dev/null +++ b/gb.qt5/src/ext/gdocument.h @@ -0,0 +1 @@ +../../../gb.qt4/src/ext/gdocument.h \ No newline at end of file diff --git a/gb.qt5/src/ext/gstring.cpp b/gb.qt5/src/ext/gstring.cpp new file mode 120000 index 000000000..a0547e26b --- /dev/null +++ b/gb.qt5/src/ext/gstring.cpp @@ -0,0 +1 @@ +../../../gb.qt4/src/ext/gstring.cpp \ No newline at end of file diff --git a/gb.qt5/src/ext/gstring.h b/gb.qt5/src/ext/gstring.h new file mode 120000 index 000000000..29a070208 --- /dev/null +++ b/gb.qt5/src/ext/gstring.h @@ -0,0 +1 @@ +../../../gb.qt4/src/ext/gstring.h \ No newline at end of file diff --git a/gb.qt5/src/ext/gview.cpp b/gb.qt5/src/ext/gview.cpp new file mode 120000 index 000000000..7de61dd99 --- /dev/null +++ b/gb.qt5/src/ext/gview.cpp @@ -0,0 +1 @@ +../../../gb.qt4/src/ext/gview.cpp \ No newline at end of file diff --git a/gb.qt5/src/ext/gview.h b/gb.qt5/src/ext/gview.h new file mode 120000 index 000000000..aee494b78 --- /dev/null +++ b/gb.qt5/src/ext/gview.h @@ -0,0 +1 @@ +../../../gb.qt4/src/ext/gview.h \ No newline at end of file diff --git a/gb.qt5/src/ext/main.cpp b/gb.qt5/src/ext/main.cpp new file mode 120000 index 000000000..5fa7222cd --- /dev/null +++ b/gb.qt5/src/ext/main.cpp @@ -0,0 +1 @@ +../../../gb.qt4/src/ext/main.cpp \ No newline at end of file diff --git a/gb.qt5/src/ext/main.h b/gb.qt5/src/ext/main.h new file mode 120000 index 000000000..5b009ce69 --- /dev/null +++ b/gb.qt5/src/ext/main.h @@ -0,0 +1 @@ +../../../gb.qt4/src/ext/main.h \ No newline at end of file diff --git a/gb.qt5/src/gb.qt.h b/gb.qt5/src/gb.qt.h new file mode 120000 index 000000000..ef5a2ece2 --- /dev/null +++ b/gb.qt5/src/gb.qt.h @@ -0,0 +1 @@ +../../gb.qt4/src/gb.qt.h \ No newline at end of file diff --git a/gb.qt5/src/gb.qt5.component b/gb.qt5/src/gb.qt5.component new file mode 100644 index 000000000..a07eb6002 --- /dev/null +++ b/gb.qt5/src/gb.qt5.component @@ -0,0 +1,6 @@ +[Component] +Key=gb.qt4 +Author=Benoît Minisini +Implements=Form,EventLoop,ImageIO +Requires=gb.image +Type=Form diff --git a/gb.qt5/src/main.cpp b/gb.qt5/src/main.cpp new file mode 120000 index 000000000..71d429db8 --- /dev/null +++ b/gb.qt5/src/main.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/main.cpp \ No newline at end of file diff --git a/gb.qt5/src/main.h b/gb.qt5/src/main.h new file mode 120000 index 000000000..6a1f638d4 --- /dev/null +++ b/gb.qt5/src/main.h @@ -0,0 +1 @@ +../../gb.qt4/src/main.h \ No newline at end of file diff --git a/gb.qt5/src/opengl/CGLarea.cpp b/gb.qt5/src/opengl/CGLarea.cpp new file mode 120000 index 000000000..5041dd436 --- /dev/null +++ b/gb.qt5/src/opengl/CGLarea.cpp @@ -0,0 +1 @@ +../../../gb.qt4/src/opengl/CGLarea.cpp \ No newline at end of file diff --git a/gb.qt5/src/opengl/CGLarea.h b/gb.qt5/src/opengl/CGLarea.h new file mode 120000 index 000000000..0e2270944 --- /dev/null +++ b/gb.qt5/src/opengl/CGLarea.h @@ -0,0 +1 @@ +../../../gb.qt4/src/opengl/CGLarea.h \ No newline at end of file diff --git a/gb.qt5/src/opengl/Makefile.am b/gb.qt5/src/opengl/Makefile.am new file mode 100644 index 000000000..6abc732c1 --- /dev/null +++ b/gb.qt5/src/opengl/Makefile.am @@ -0,0 +1,14 @@ +COMPONENT = gb.qt5.opengl +include $(top_srcdir)/component.am +include $(top_srcdir)/gb.qt.am + +gblib_LTLIBRARIES = gb.qt5.opengl.la + +gb_qt5_opengl_la_LIBADD = @QT5_LIB@ @QT5OPENGL_LIB@ +gb_qt5_opengl_la_LDFLAGS = -module @LD_FLAGS@ @QT5_LDFLAGS@ @QT5OPENGL_LDFLAGS@ +gb_qt5_opengl_la_CPPFLAGS = @QT_INC@ @QT5OPENGL_INC@ + +gb_qt5_opengl_la_SOURCES = \ + main.h main.cpp \ + CGLarea.h CGLarea_moc.cpp CGLarea.cpp + diff --git a/gb.qt5/src/opengl/gb.qt5.opengl.component b/gb.qt5/src/opengl/gb.qt5.opengl.component new file mode 100644 index 000000000..cba9aa622 --- /dev/null +++ b/gb.qt5/src/opengl/gb.qt5.opengl.component @@ -0,0 +1,6 @@ +[Component] +Author=Laurent Carlier,Benoît Minisini +Require=gb.qt5,gb.opengl +Type=Form +Implement=OpenGLViewer +State=Stable diff --git a/gb.qt5/src/opengl/main.cpp b/gb.qt5/src/opengl/main.cpp new file mode 120000 index 000000000..dac082740 --- /dev/null +++ b/gb.qt5/src/opengl/main.cpp @@ -0,0 +1 @@ +../../../gb.qt4/src/opengl/main.cpp \ No newline at end of file diff --git a/gb.qt5/src/opengl/main.h b/gb.qt5/src/opengl/main.h new file mode 120000 index 000000000..e7fcdfa5c --- /dev/null +++ b/gb.qt5/src/opengl/main.h @@ -0,0 +1 @@ +../../../gb.qt4/src/opengl/main.h \ No newline at end of file diff --git a/gb.qt5/src/systemtrayicon.cpp b/gb.qt5/src/systemtrayicon.cpp new file mode 120000 index 000000000..dc738b0ea --- /dev/null +++ b/gb.qt5/src/systemtrayicon.cpp @@ -0,0 +1 @@ +../../gb.qt4/src/systemtrayicon.cpp \ No newline at end of file diff --git a/gb.qt5/src/systemtrayicon.h b/gb.qt5/src/systemtrayicon.h new file mode 120000 index 000000000..a676040ce --- /dev/null +++ b/gb.qt5/src/systemtrayicon.h @@ -0,0 +1 @@ +../../gb.qt4/src/systemtrayicon.h \ No newline at end of file diff --git a/gb.qt5/src/trayicon.xpm b/gb.qt5/src/trayicon.xpm new file mode 120000 index 000000000..065f8f447 --- /dev/null +++ b/gb.qt5/src/trayicon.xpm @@ -0,0 +1 @@ +../../gb.qt4/src/trayicon.xpm \ No newline at end of file diff --git a/gb.qt5/src/webkit/Makefile.am b/gb.qt5/src/webkit/Makefile.am new file mode 100644 index 000000000..c5c90de4c --- /dev/null +++ b/gb.qt5/src/webkit/Makefile.am @@ -0,0 +1,19 @@ +COMPONENT = gb.qt5.webkit +include $(top_srcdir)/component.am +include $(top_srcdir)/gb.qt.am + +gblib_LTLIBRARIES = gb.qt5.webkit.la + +gb_qt5_webkit_la_LIBADD = @QT5WEBKIT_LIB@ +gb_qt5_webkit_la_LDFLAGS = -module @LD_FLAGS@ @QT5WEBKIT_LDFLAGS@ +gb_qt5_webkit_la_CPPFLAGS = @QT5WEBKIT_INC@-I$(top_srcdir)/share -I$(top_srcdir)/src/share + +gb_qt5_webkit_la_SOURCES = \ + main.h main.cpp \ + cwebsettings.h cwebsettings.cpp \ + cwebframe.h cwebframe.cpp cwebframe_moc.cpp \ + cwebelement.h cwebelement.cpp \ + cwebview.h cwebview.cpp cwebview_moc.cpp \ + ccookiejar.h ccookiejar.cpp ccookiejar_moc.cpp \ + cwebhittest.h cwebhittest.cpp \ + cwebdownload.h cwebdownload.cpp cwebdownload_moc.cpp diff --git a/gb.qt5/src/webkit/ccookiejar.cpp b/gb.qt5/src/webkit/ccookiejar.cpp new file mode 120000 index 000000000..b5ea8b4ff --- /dev/null +++ b/gb.qt5/src/webkit/ccookiejar.cpp @@ -0,0 +1 @@ +../../../gb.qt4/src/webkit/ccookiejar.cpp \ No newline at end of file diff --git a/gb.qt5/src/webkit/ccookiejar.h b/gb.qt5/src/webkit/ccookiejar.h new file mode 120000 index 000000000..93f3e1085 --- /dev/null +++ b/gb.qt5/src/webkit/ccookiejar.h @@ -0,0 +1 @@ +../../../gb.qt4/src/webkit/ccookiejar.h \ No newline at end of file diff --git a/gb.qt5/src/webkit/control/webview.png b/gb.qt5/src/webkit/control/webview.png new file mode 100644 index 0000000000000000000000000000000000000000..86cadfb011cd3475e73671a0dd295e86b0632c2d GIT binary patch literal 1556 zcmV+v2J88WP)sOoh(2!pQi-fMl@zoor? zOI*2fMe_*51h{&F4Q{X1QK>W{ zoubwVQCi^^GQ9lOIxoCE$ zAx#OUMA#bFy4pPXw_(9C_W`k`nq&QF@5wNyV)t*e z?)Zd;!Cny4=xT6GI$9Gcm^eDh;N!#in7sDarQQMlc72)E%?8y*hwWOxemw*!kfy|S zE&7Tn>dkbtzSHREA2t@z%ZG0T!3`NPxe;v%x>_ z><}wW7$x{&7t4}t)mp6YHh6rz#FJBfSQ!Ug8|hj|+d|kThGUX1xQq?uv2BBU>-FA0 zqI#=?FeE!(NXKc@i50h2_PMoEWw1X-tCQfQY)VBF!?C#E?9!!!j3r6{9TU^F$rsW@ zN)yJ4b{O{#ka8`mUWl7@$z~m{zrV%d@iL=_a1qlEdD8r1~OeQ}J2>hjK3oy}I46+b3r8fe=_ z%9sQJNrJQ_I!S2O+tl}b(n*J$Yxdp)hbKxHLSPw^C{~!JWOYB_>YJld>5qrns?E#cu>;qYgXwYcyLSQh{Sz zWE{!4vrqK?0_AdsA6}eAcVm)nLL5e{Y&HoyF+(MnFxJEh62LGe19^w@#}Dz`sSz}S zt!kU3(*>oFT65uAdWgUte^G^T0t{ExrR*)I%GFf@*1frh267H_ZB zX+|-J3l_sUlfIOJ-|pZwe1y_iu8mZhiK4^LpFc-`e;%z5Fpi}ZXszk%&+)ULp5@y! z{gk7CiJZ+;In7|oAa6_3wxFxv!&->vcW|Y^HYCyyIWgq&t1HhieS8D}A;iHfnGhdA zRQmF~@RP4H`|<+6du54@-3Aq6*7{R;wSfDzfL1%A?ggwaY%vtHxbTfhesKOcmA>4k zGo?ZZl+rkk!*|ZlaQfsJuU=o}`g;%f= 0x03070000) + { + if (id == RS_EXEC || id == RS_SHELL) + CODE_dup(); + } JOB->current = left; TRANS_reference(); @@ -805,10 +808,13 @@ bool TRANS_affectation(bool dup) JOB->current = after; - if (id == RS_EXEC || id == RS_SHELL) + if (COMPILE_version >= 0x03070000) { - TRANS_subr(TS_SUBR_CHECK_EXEC, 1); - CODE_drop(); + if (id == RS_EXEC || id == RS_SHELL) + { + TRANS_subr(TS_SUBR_CHECK_EXEC, 1); + CODE_drop(); + } } return TRUE; diff --git a/main/share/gb_common.h b/main/share/gb_common.h index cf1b751e3..5c31fa3e1 100644 --- a/main/share/gb_common.h +++ b/main/share/gb_common.h @@ -108,15 +108,15 @@ #endif -#if !defined(__cplusplus) +#ifndef FALSE + enum + { + FALSE = 0, + TRUE = 1 + }; +#endif - #ifndef FALSE - enum - { - FALSE = 0, - TRUE = 1 - }; - #endif +#if !defined(__cplusplus) #define bool char diff --git a/main/share/gb_list_temp.h b/main/share/gb_list_temp.h index 2d8687a12..797c0c72d 100644 --- a/main/share/gb_list_temp.h +++ b/main/share/gb_list_temp.h @@ -39,8 +39,8 @@ void LIST_insert(void *p_first, void *node, LIST *list) if (*first == NULL) { *first = node; - TO_LIST(node)->prev = node; - TO_LIST(node)->next = NULL; + list->prev = node; + list->next = NULL; return; } @@ -48,8 +48,8 @@ void LIST_insert(void *p_first, void *node, LIST *list) TO_LIST(last)->next = node; - TO_LIST(node)->prev = last; - TO_LIST(node)->next = NULL; + list->prev = last; + list->next = NULL; TO_LIST(*first)->prev = node; } @@ -60,8 +60,8 @@ void LIST_remove(void *p_first, void *node, LIST *list) void **first = (void **)p_first; void *next, *prev, *last; - next = TO_LIST(node)->next; - prev = TO_LIST(node)->prev; + next = list->next; + prev = list->prev; if (*first == node) { @@ -84,7 +84,7 @@ void LIST_remove(void *p_first, void *node, LIST *list) TO_LIST(next)->prev = prev; } - TO_LIST(node)->prev = NULL; - TO_LIST(node)->next = NULL; + list->prev = NULL; + list->next = NULL; }