Skip to content

Commit

Permalink
Blender LDraw Render - update WhatsThis help #416
Browse files Browse the repository at this point in the history
  • Loading branch information
trevorsandy committed May 12, 2023
1 parent 42adc99 commit f13df7c
Show file tree
Hide file tree
Showing 14 changed files with 66 additions and 29 deletions.
2 changes: 1 addition & 1 deletion builds/linux/obs/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Last Update: July 19, 2020
# Copyright (C) 2017 - 2023 by Trevor SANDY
pkgname=lpub3d
pkgver=2.4.6.3371
pkgver=2.4.6.3372
pkgrel=1
pkgdesc="An LDraw Building Instruction Editor"
url="https://github.com/trevorsandy/lpub3d.git"
Expand Down
2 changes: 1 addition & 1 deletion builds/linux/obs/alldeps/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Last Update: July 19, 2020
# Copyright (C) 2017 - 2023 by Trevor SANDY
pkgname=lpub3d
pkgver=2.4.6.3371
pkgver=2.4.6.3372
pkgrel=1
pkgdesc="An LDraw Building Instruction Editor"
url="https://github.com/trevorsandy/lpub3d.git"
Expand Down
6 changes: 3 additions & 3 deletions builds/linux/obs/alldeps/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
lpub3d (2.4.6.3371) debian; urgency=medium
lpub3d (2.4.6.3372) debian; urgency=medium

* LPub3D version 2.4.6.260.3371_20230512 for Linux
* LPub3D version 2.4.6.261.3372_20230512 for Linux

-- Trevor SANDY <trevor.sandy@gmail.com> Fri, 12 May 2023 06:01:21 +0200
-- Trevor SANDY <trevor.sandy@gmail.com> Fri, 12 May 2023 06:01:46 +0200
2 changes: 1 addition & 1 deletion builds/linux/obs/alldeps/debian/lpub3d.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Format: 1.0
Source: lpub3d
Binary: lpub3d
Architecture: any
Version: 2.4.6.3371
Version: 2.4.6.3372
Maintainer: Trevor SANDY <trevor.sandy@gmail.com>
Homepage: https://trevorsandy.github.io/lpub3d/
Standards-Version: 3.9.7
Expand Down
4 changes: 2 additions & 2 deletions builds/linux/obs/alldeps/lpub3d.spec
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ BuildRequires: fdupes
Summary: An LDraw Building Instruction Editor
Name: lpub3d
Icon: lpub3d.xpm
Version: 2.4.6.3371
Version: 2.4.6.3372
Release: <B_CNT>%{?dist}
URL: https://trevorsandy.github.io/lpub3d
Vendor: Trevor SANDY
Expand Down Expand Up @@ -797,7 +797,7 @@ update-desktop-database || true
%endif

%changelog
* Fri May 12 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3371
* Fri May 12 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3372
- LPub3D 2.4.4 enhancements and fixes - see RELEASE_NOTES for details

* Tue May 31 2022 - trevor dot sandy at gmail dot com 2.4.4.2670
Expand Down
6 changes: 3 additions & 3 deletions builds/linux/obs/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
lpub3d (2.4.6.3371) debian; urgency=medium
lpub3d (2.4.6.3372) debian; urgency=medium

* LPub3D version 2.4.6.260.3371_20230512 for Linux
* LPub3D version 2.4.6.261.3372_20230512 for Linux

-- Trevor SANDY <trevor.sandy@gmail.com> Fri, 12 May 2023 06:01:22 +0200
-- Trevor SANDY <trevor.sandy@gmail.com> Fri, 12 May 2023 06:01:47 +0200
2 changes: 1 addition & 1 deletion builds/linux/obs/debian/lpub3d.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Format: 1.0
Source: lpub3d
Binary: lpub3d
Architecture: any
Version: 2.4.6.3371
Version: 2.4.6.3372
Maintainer: Trevor SANDY <trevor.sandy@gmail.com>
Homepage: https://trevorsandy.github.io/lpub3d/
Standards-Version: 3.9.7
Expand Down
4 changes: 2 additions & 2 deletions builds/linux/obs/lpub3d.spec
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ BuildRequires: fdupes
Summary: An LDraw Building Instruction Editor
Name: lpub3d
Icon: lpub3d.xpm
Version: 2.4.6.3371
Version: 2.4.6.3372
Release: 1%{?dist}
URL: https://trevorsandy.github.io/lpub3d
Vendor: Trevor SANDY
Expand Down Expand Up @@ -313,7 +313,7 @@ update-desktop-database || true
%endif

%changelog
* Fri May 12 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3371
* Fri May 12 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3372
- LPub3D 2.4.4 enhancements and fixes - see RELEASE_NOTES for details

* Tue May 31 2022 - trevor dot sandy at gmail dot com 2.4.4.2670
Expand Down
2 changes: 1 addition & 1 deletion builds/utilities/version.info
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2 4 6 260 3371 60213eb05
2 4 6 261 3372 42adc9959
6 changes: 3 additions & 3 deletions gitversion.pri
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ equals(GIT_DIR, undefined) {

# Check if we do not have a valid version number (i.e. no version tag found)
isEmpty(GIT_VERSION) {
GIT_REVISION = 260
GIT_REVISION = 261
GIT_SHA = $$system($$GIT_BASE_COMMAND rev-parse --short HEAD 2> $$NULL_DEVICE)
GIT_COMMIT = $$system($$GIT_BASE_COMMAND rev-list --count HEAD 2> $$NULL_DEVICE)
GIT_VERSION = v$${VERSION}-$${GIT_REVISION}-$${GIT_SHA}
Expand Down Expand Up @@ -69,7 +69,7 @@ equals(GIT_DIR, undefined) {
# Get commit count
GIT_COMMIT = $$system($$GIT_BASE_COMMAND rev-list --count HEAD 2> $$NULL_DEVICE)
isEmpty(GIT_COMMIT) {
GIT_COMMIT = 3371
GIT_COMMIT = 3372
message("~~~ ERROR! GIT_COMMIT NOT DEFINED, USING $$GIT_COMMIT ~~~")
}

Expand Down Expand Up @@ -117,7 +117,7 @@ if (equals(USE_GIT_VER_FILE, true)|equals(USE_VERSION_INFO_VAR, true)) {
GIT_VERSION = $$cat($$GIT_VER_FILE, lines)
} else {
message("~~~ ERROR! $$GIT_DIR_ENV VERSION_INFO FILE $$GIT_VER_FILE NOT FOUND ~~~")
GIT_VERSION = $${VERSION}.260.3371.60213eb05
GIT_VERSION = $${VERSION}.261.3372.42adc9959
message("~~~ GIT_DIR [$$GIT_DIR_ENV, USING VERSION] $$GIT_VERSION ~~~")
GIT_VERSION ~= s/\./" "
}
Expand Down
51 changes: 44 additions & 7 deletions mainApp/commonmenus.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1885,6 +1885,15 @@ void CommonMenus::setWhatsThis()
" covers and final model or assembly displays.\n\n"
" - LDGLite: %1 legacy renderer written in 'c' offering\n"
" fast image rendering ideal for proofing.\n\n"
" - Blender: %1 addon module to enable LDraw import,\n"
" export and image rendering using Blender 2.80 or\n"
" later.\n"
" The Blender LDraw addon is not configured by default.\n"
" To enable, you must install Blender and 2.80 or later\n"
" and set the Blender path to trigger the %1 automated\n"
" addon configuration.\n"
" Once configured, you can use this dialog to cutomize\n"
" your Blender LDraw import, and image render settings.\n\n"
" The Renderers tab also present the preferred renderer,\n"
" projection and render process timeout settings.\n"
" Additonally, LSynth options for configurable parts are\n"
Expand Down Expand Up @@ -4079,12 +4088,40 @@ void CommonMenus::setWhatsThis()
)
},
// WT_DIALOG_BLENDER_RENDER_SETTINGS
{
QObject::tr(
" Configure the Blender single image render\n"
" settings.\n"
" Use the individual setting's tooltip to see\n"
" setting description.%1\n")
{ //-------------------------------------------------------//
QObject::tr(
" You can configure the Blender LDraw addon settings.\n"
" - Blender Executable: set Blender path. On entry,\n"
" %1 will automatically apply the setting and\n"
" attempt the configure the LDraw addon.\n"
" - %1 Blender LDraw Addon: you can update the LDraw\n"
" addon which will downlod the latest addon or apply\n"
" the current addon if the version is the same or newer\n"
" than the online version.\n"
" You can view the standard output log for the update.\n\n"
" - Enabled Addon Modules: check the desired import module.\n"
" The LDraw Import TN import module is the long-standing\n"
" Blender LDraw import addon, while the LDraw Import MM\n"
" addon was recently introduced. The latter addon also\n"
" offer LDraw export functionality.\n"
" The %1 3D Image Render addon is mandatory but if\n"
" no import module is enabled, none of the modules\n"
" will be enabled in Blender so it will not be possible\n"
" to perform an LDraw model import or render.\n\n"
" - LDraw Import Addon Paths: addon paths are specific\n"
" to the enabled addon import module.\n"
" - LDraw Import Addon Settings: addon settings are\n"
" specific to the enabled addon import module.\n"
" - Apply: apply the addon path and setting preferences.\n"
" - Show/Hide Paths: show or hide the addon paths\n"
" display box.\n"
" - Reset: reset the addon path and setting preferences\n"
" to the system defult values.\n\n"
" You can see the specific description of each setting\n"
" if you hover over the setting to display its tooltip.\n"
" Use the dialogue window scroll bar to access the\n"
" complete selection of addon settings.%2\n")
.arg(QLatin1String(VER_PRODUCTNAME_STR))
.arg(
#ifdef QT_DEBUG_MODE
QLatin1String("\n\n WT_DIALOG_BLENDER_RENDER_SETTINGS")
Expand Down Expand Up @@ -5193,7 +5230,7 @@ void CommonMenus::setWhatsThis()
QObject::tr(
" Configure %1 preferred renderer, projection and\n"
" image processing timeout settings:\n\n"
" - Preferred Renderer:"
" - Preferred Renderer:\n"
" * POVRay: %1 ray tracing renderer offering feature\n"
" rich, photo-realistic rendering ideal for document\n"
" covers and final model or assembly displays.\n\n"
Expand Down
2 changes: 1 addition & 1 deletion mainApp/docs/README.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LPub3D 2.4.6.260.3371 (12 05 2023 06:01:22)
LPub3D 2.4.6.261.3372 (12 05 2023 06:01:47)

Features, enhancements, fixes and changes
------------
Expand Down
2 changes: 1 addition & 1 deletion mainApp/docs/RELEASE_NOTES.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<table class="tg">
<tr>
<th class="tg-0pky">
<h4><a id="LPub3D_0"></a>LPub3D 2.4.6.260.3371 (12 05 2023 06:01:22)</h4>
<h4><a id="LPub3D_0"></a>LPub3D 2.4.6.261.3372 (12 05 2023 06:01:47)</h4>
<hr>
<p>
<span class="tg-1pky">LPub3D Official release.</span><br>
Expand Down
4 changes: 2 additions & 2 deletions mainApp/extras/LPub3D_Npp_UDL.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
;;
;; Author......: Trevor SANDY
;; Name........: LPub3D_Npp_UDL.xml
;; Version.....: 2.4.6.260.3371
;; Last Update.: Fri, 12 May 2023 06:01:22 +0200
;; Version.....: 2.4.6.261.3372
;; Last Update.: Fri, 12 May 2023 06:01:47 +0200
;; License.....: GPLv3
;; Homepage....: https://trevorsandy.github.io/lpub3d
;; Copyright (C) 2021 - 2023 by Trevor SANDY
Expand Down

0 comments on commit f13df7c

Please sign in to comment.