From 2991d747b03e1e8b3c696ad2d9a7d4482b514d7c Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 16 Jul 2012 14:23:08 +0000 Subject: [PATCH] 2012-07-16 16:20 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbide/projectpropertiesex.ui ! HBMK2 -> hbmk2 to be consistent with everywhere else * contrib/hbqt/hbmk2_qt.hb ! fixed misleading RTE subsystem * include/hbver.ch + added HB_VERSION_MAX_ to denote the highest valid paramater. Please note that the valid values start at 0 --- harbour/ChangeLog | 12 ++++++++++++ harbour/contrib/hbide/projectpropertiesex.ui | 6 +++--- harbour/contrib/hbqt/hbmk2_qt.hb | 2 +- harbour/include/hbver.ch | 1 + 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0b0bd4900e..76007c0ea7 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,18 @@ The license applies to all entries newer than 2009-04-28. */ +2012-07-16 16:20 UTC+0200 Viktor Szakats (harbour syenar.net) + * contrib/hbide/projectpropertiesex.ui + ! HBMK2 -> hbmk2 to be consistent with everywhere else + + * contrib/hbqt/hbmk2_qt.hb + ! fixed misleading RTE subsystem + + * include/hbver.ch + + added HB_VERSION_MAX_ to denote the highest valid + paramater. Please note that the valid values start + at 0 + 2012-07-16 12:39 UTC+0200 Viktor Szakats (harbour syenar.net) * src/3rd/png/Makefile * src/3rd/png/* diff --git a/harbour/contrib/hbide/projectpropertiesex.ui b/harbour/contrib/hbide/projectpropertiesex.ui index ac316d0b5f..54eae036f1 100644 --- a/harbour/contrib/hbide/projectpropertiesex.ui +++ b/harbour/contrib/hbide/projectpropertiesex.ui @@ -219,7 +219,7 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Working folder will be used to host HBMK2 compliant </span><span style=" font-size:8pt; font-weight:600;">&lt;Output Name&gt;</span><span style=" font-size:8pt;"> plus </span><span style=" font-size:8pt; font-weight:600;">&lt;hbp&gt;</span><span style=" font-size:8pt;"> and will be designated as current folder when </span><span style=" font-size:8pt; font-weight:600;">HBMK2</span><span style=" font-size:8pt;"> will be invoked.</span></p></body></html> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Working folder will be used to host hbmk2 compliant </span><span style=" font-size:8pt; font-weight:600;">&lt;Output Name&gt;</span><span style=" font-size:8pt;"> plus </span><span style=" font-size:8pt; font-weight:600;">&lt;hbp&gt;</span><span style=" font-size:8pt;"> and will be designated as current folder when </span><span style=" font-size:8pt; font-weight:600;">hbmk2</span><span style=" font-size:8pt;"> will be invoked.</span></p></body></html> @@ -294,7 +294,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">You can include hereunder any type of file which can be edited via plain text editor. One file per line. You can use meta-keys to define your source paths to make your projects location independant. </span></p> <p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> <p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">NOTE:</span></p> -<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Only .prg .c .cpp .rc .res files will be supplied to the HBMK2. All other files will be made visible for editing in &lt;Project Tree&gt;.</span></p></body></html> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Only .prg .c .cpp .rc .res files will be supplied to the hbmk2. All other files will be made visible for editing in &lt;Project Tree&gt;.</span></p></body></html> @@ -407,7 +407,7 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Here you can view in real-time the resultant &lt;hbp&gt; output which will be supplied to HBMK2. This view may give you insight about your source layout and many other facts.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Here you can view in real-time the resultant &lt;hbp&gt; output which will be supplied to hbmk2. This view may give you insight about your source layout and many other facts.</span></p> <p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> <p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt; font-weight:600; text-decoration: underline;">Enjoy</span></p></body></html> diff --git a/harbour/contrib/hbqt/hbmk2_qt.hb b/harbour/contrib/hbqt/hbmk2_qt.hb index 45676223bf..2df4019cf8 100644 --- a/harbour/contrib/hbqt/hbmk2_qt.hb +++ b/harbour/contrib/hbqt/hbmk2_qt.hb @@ -960,7 +960,7 @@ STATIC FUNCTION hbqtui_pullTranslate( cCmd ) oError := ErrorNew() oError:severity := ES_ERROR oError:genCode := EG_ARG - oError:subSystem := "HBMK2" + oError:subSystem := "HBMK2_PLUGIN_HBQT" oError:subCode := 1001 oError:canRetry := .F. oError:canDefault := .F. diff --git a/harbour/include/hbver.ch b/harbour/include/hbver.ch index 8d9244df7a..3e2a535464 100644 --- a/harbour/include/hbver.ch +++ b/harbour/include/hbver.ch @@ -83,6 +83,7 @@ #define HB_VERSION_PLATFORM 21 #define HB_VERSION_CPU 24 #define HB_VERSION_COMPILER_CPP 25 +#define HB_VERSION_MAX_ 26 /* hb_version( HB_VERSION_ENDIANNESS ) return values. */ #define HB_VERSION_ENDIAN_LITTLE 1