diff --git a/bin/python/github-download-count.py b/bin/python/github-download-count.py old mode 100644 new mode 100755 diff --git a/bin/upload_sourceforge.sh b/bin/upload_sourceforge.sh index 673d961f1..4a4c49450 100755 --- a/bin/upload_sourceforge.sh +++ b/bin/upload_sourceforge.sh @@ -3,7 +3,6 @@ # mrv2 # Copyright Contributors to the mrv2 Project. All rights reserved. -#!/usr/bin/env bash echo "RUNNING upload_sourceforge.sh......" diff --git a/cmake/Modules/BuildFLTK.cmake b/cmake/Modules/BuildFLTK.cmake index 286492f12..26e825232 100644 --- a/cmake/Modules/BuildFLTK.cmake +++ b/cmake/Modules/BuildFLTK.cmake @@ -6,12 +6,7 @@ include( ExternalProject ) #set( FLTK_TAG master ) # Stable TAG -if (NOT APPLE) - #set( FLTK_TAG master ) - set( FLTK_TAG f6690a974245407c5d266dcb688db694e51a3bb4 ) -else() - set( FLTK_TAG c2cce9cba86dcc208c9396af994010cd49484988 ) -endif() +set( FLTK_TAG f6690a974245407c5d266dcb688db694e51a3bb4 ) set( FLTK_BUILD_SHARED_LIBS OFF ) diff --git a/cmake/version.cmake b/cmake/version.cmake index 43290c81a..2519b4c19 100644 --- a/cmake/version.cmake +++ b/cmake/version.cmake @@ -4,8 +4,8 @@ set( mrv2_VERSION_MAJOR 0 ) -set( mrv2_VERSION_MINOR 7 ) -set( mrv2_VERSION_PATCH 9 ) +set( mrv2_VERSION_MINOR 8 ) +set( mrv2_VERSION_PATCH 0 ) set( mrv2_VERSION "${mrv2_VERSION_MAJOR}.${mrv2_VERSION_MINOR}.${mrv2_VERSION_PATCH}" ) diff --git a/docs/sphinx/en/python_api/pyFLTK.rst b/docs/sphinx/en/python_api/pyFLTK.rst new file mode 100644 index 000000000..12fce2246 --- /dev/null +++ b/docs/sphinx/en/python_api/pyFLTK.rst @@ -0,0 +1,17 @@ +###### +pyFLTK +###### + +mrv2 supports FLTK in python through the pyFLTK module. You can import it like:: + + from fltk14 import * + +Once with it, you can create new windows, buttons, and any sort of other widgets the pyFLTK supports. For some demos, look into:: + + python/demos/fltk + +For information about FLTK and pyFLTK (albeit the older 1.3), go to: + +https://fltk.gitlab.io/fltk/ + +https://pyfltk.sourceforge.io/docs/CH0_Preface.html diff --git a/docs/sphinx/es/python_api/pyFLTK.rst b/docs/sphinx/es/python_api/pyFLTK.rst new file mode 100644 index 000000000..513becdf0 --- /dev/null +++ b/docs/sphinx/es/python_api/pyFLTK.rst @@ -0,0 +1,18 @@ +###### +pyFLTK +###### + + +mrv2 supporta FLTK en python a través del módulo pyFLTK. Puede importarlo así:: + + from fltk14 import * + +Una vez cargado, puede crear nuevas ventanas, botones, y cualquier otra clase de widgets que pyFLTK supporta. Para algunos demos, mire en:: + + python/demos/fltk + +Para información acerca de FLTK y pyFLTK (aunque la versión anterior 1.3), vaya a: + +https://fltk.gitlab.io/fltk/ + +https://pyfltk.sourceforge.io/docs/CH0_Preface.html diff --git a/mrv2/docs/HISTORY.md b/mrv2/docs/HISTORY.md index 4db9759d1..d25449561 100644 --- a/mrv2/docs/HISTORY.md +++ b/mrv2/docs/HISTORY.md @@ -1,3 +1,10 @@ +v0.8.0 +====== + +- Fixed mrv2's file requester not selecting files with [] in them. +- Fixed mrv2's file requester not changing directories if you had typed the + full name of the directory in the filename field and pressed Enter, + v0.7.9 ====== @@ -53,7 +60,7 @@ Preferences->User Interface->Single Instance. * Fixed a problem with the embedded python (pybind11) locating the system Python installation instead of the local one instead. This created havok on my Ubuntu 22.04 when there was an upgrade. * Made parsing of -D options like -D TLRENDER_USD=OFF work with or without a space. * Got rid of compiling the slow Gettext on macOS, replacing it with - get + a prebuilt dylib. * Made the build system automatically release beta versions of the software after each successful compilation. You can now download the latest beta binaries from: https://sourceforge.net/projects/mrv2/files/beta/ diff --git a/mrv2/docs/en/.buildinfo b/mrv2/docs/en/.buildinfo index af8d38c4d..5e1161cd0 100644 --- a/mrv2/docs/en/.buildinfo +++ b/mrv2/docs/en/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: 51e5f22bbed3cbbc46353e2ef2f3ffac +config: 09a18046b99087f44fea6ffec12e384f tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/mrv2/docs/en/_sources/python_api/pyFLTK.rst.txt b/mrv2/docs/en/_sources/python_api/pyFLTK.rst.txt new file mode 100644 index 000000000..12fce2246 --- /dev/null +++ b/mrv2/docs/en/_sources/python_api/pyFLTK.rst.txt @@ -0,0 +1,17 @@ +###### +pyFLTK +###### + +mrv2 supports FLTK in python through the pyFLTK module. You can import it like:: + + from fltk14 import * + +Once with it, you can create new windows, buttons, and any sort of other widgets the pyFLTK supports. For some demos, look into:: + + python/demos/fltk + +For information about FLTK and pyFLTK (albeit the older 1.3), go to: + +https://fltk.gitlab.io/fltk/ + +https://pyfltk.sourceforge.io/docs/CH0_Preface.html diff --git a/mrv2/docs/en/genindex.html b/mrv2/docs/en/genindex.html index ba2583f3d..956deda43 100644 --- a/mrv2/docs/en/genindex.html +++ b/mrv2/docs/en/genindex.html @@ -599,13 +599,15 @@

P

  • playback (mrv2.FileMedia attribute)
    • - - + - + +
  • pyFLTK
  • settings module
    • +
  • pyFLTK
  • settings module
  • timeline module
  • usd module
    • @@ -132,7 +133,7 @@

    Plug-ins