From 94ad70494f02de64ff3cd2054f4f626716ba537b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Sat, 7 Oct 2023 20:53:11 -0300 Subject: [PATCH 01/13] Changed permissions on github-download-count.py.x --- bin/python/github-download-count.py | 0 mrv2/po/es.po | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 bin/python/github-download-count.py 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/mrv2/po/es.po b/mrv2/po/es.po index d83201ac6..d44549c5d 100644 --- a/mrv2/po/es.po +++ b/mrv2/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: mrv2 v0.7.7\n" "Report-Msgid-Bugs-To: ggarra13@gmail.com\n" -"POT-Creation-Date: 2023-10-07 20:02-0300\n" +"POT-Creation-Date: 2023-10-07 20:10-0300\n" "PO-Revision-Date: 2023-02-11 13:42-0300\n" "Last-Translator: Gonzalo Garramuño \n" "Language-Team: Spanish \n" From 05b78d6f059c90438c4a1160995bca787a3be2a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Sat, 7 Oct 2023 20:54:26 -0300 Subject: [PATCH 02/13] Fixed pre-commit script. --- .githooks/pre-commit | 2 +- bin/python/github-download-count.py | 0 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 bin/python/github-download-count.py diff --git a/.githooks/pre-commit b/.githooks/pre-commit index 04af88dd2..6d728fe73 100755 --- a/.githooks/pre-commit +++ b/.githooks/pre-commit @@ -13,7 +13,7 @@ do fi else echo "Skipping formatting of $FILE" - if [[ $FILE == *.sh || $FILE == .py || $FILE == .rb || + if [[ $FILE == *.sh || $FILE == *.py || $FILE == *.rb || $FILE == *pre-commit ]]; then if [[ -e $FILE ]]; then chmod 0755 $FILE diff --git a/bin/python/github-download-count.py b/bin/python/github-download-count.py old mode 100755 new mode 100644 From 5be161aeaed67049574894fec1712eb4a59e74ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Sat, 7 Oct 2023 20:56:47 -0300 Subject: [PATCH 03/13] Changed permissions. --- .githooks/pre-commit | 4 +++- bin/python/github-download-count.py | 0 2 files changed, 3 insertions(+), 1 deletion(-) mode change 100644 => 100755 bin/python/github-download-count.py diff --git a/.githooks/pre-commit b/.githooks/pre-commit index 6d728fe73..d430e4bcc 100755 --- a/.githooks/pre-commit +++ b/.githooks/pre-commit @@ -16,13 +16,15 @@ do if [[ $FILE == *.sh || $FILE == *.py || $FILE == *.rb || $FILE == *pre-commit ]]; then if [[ -e $FILE ]]; then + echo "Changing $FILE permissions to 0755" chmod 0755 $FILE fi else if [[ -d $FILE ]]; then chmod 0755 $FILE elif [[ -e $FILE ]]; then - chmod 0644 $FILE + echo "Changing $FILE permissions to 0644" + chmod 0644 $FILE fi fi fi diff --git a/bin/python/github-download-count.py b/bin/python/github-download-count.py old mode 100644 new mode 100755 From 2d6dc9ac982f9d6b6ebd270800825b40e32a5699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Sat, 7 Oct 2023 21:12:03 -0300 Subject: [PATCH 04/13] Fixed upload script. --- bin/upload_sourceforge.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/bin/upload_sourceforge.sh b/bin/upload_sourceforge.sh index 54acb3499..4fb024ca0 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......" @@ -243,15 +242,24 @@ IFS=$'\n' # Convert the variable into an array file_array=($files) +# Create an array to store the files to upload +files_to_upload=() + # Iterate over the array of filenames for src in "${file_array[@]}"; do dest=`echo $src | sed -e "s/v$mrv2_VERSION/beta/"` - upload_file $src $dest + files_to_upload+=("$src $dest") done # Reset IFS to its default value (space, tab, newline) IFS=$' \t\n' +# Upload all files from the list +for file_pair in "${files_to_upload[@]}"; do + file_src_dest=($file_pair) + upload_file "${file_src_dest[0]}" "${file_src_dest[1]}" +done + # Go back to root directory cd .. From 1cb257c49b19573a36fb459ec4ffb4f8e2a4929b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Sun, 8 Oct 2023 05:33:02 -0300 Subject: [PATCH 05/13] Removed useless variable. --- bin/upload_sourceforge.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/bin/upload_sourceforge.sh b/bin/upload_sourceforge.sh index 86b831ea3..4a4c49450 100755 --- a/bin/upload_sourceforge.sh +++ b/bin/upload_sourceforge.sh @@ -240,9 +240,6 @@ IFS=$'\n' # Convert the variable into an array file_array=($files) -# Create an array to store the files to upload -files_to_upload=() - # Iterate over the array of filenames for src in "${file_array[@]}"; do dest=`echo $src | sed -e "s/v$mrv2_VERSION/beta/"` From f35ba28615e9ada03883dc6be32ba5f9369d0e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Sun, 8 Oct 2023 09:45:29 -0300 Subject: [PATCH 06/13] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit eab4c63aaa5f6945e7daf6ef285995ee8c1fcf95 Author: Gonzalo Garramuño Date: Sun Oct 8 09:44:51 2023 -0300 Bumped version. commit 6a418cc82c7e357a87573bc827fa498c5147ef7a Author: Gonzalo Garramuño Date: Sun Oct 8 09:43:08 2023 -0300 CD to a directory if entering one as a filename. commit fb8ce1bcec54f479385a5330e44fea00a6503b94 Author: Gonzalo Garramuño Date: Sun Oct 8 09:36:41 2023 -0300 File chooser fix. --- cmake/version.cmake | 4 +- mrv2/docs/HISTORY.md | 9 +++- mrv2/lib/mrvFLU/Flu_File_Chooser.cpp | 71 ++++++++++++---------------- mrv2/po/es.po | 2 +- mrv2/python/demos/fltk/arc.py | 2 - 5 files changed, 42 insertions(+), 46 deletions(-) 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/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/lib/mrvFLU/Flu_File_Chooser.cpp b/mrv2/lib/mrvFLU/Flu_File_Chooser.cpp index 0a2cbbf90..ce09d85d9 100644 --- a/mrv2/lib/mrvFLU/Flu_File_Chooser.cpp +++ b/mrv2/lib/mrvFLU/Flu_File_Chooser.cpp @@ -138,33 +138,32 @@ std::string Flu_File_Chooser::renameErrTxt = "Unable to rename '%s' to '%s'"; #define DEFAULT_ENTRY_WIDTH 235 -Fl_Pixmap up_folder_img((char* const*)big_folder_up_xpm), - trash((char* const*)trash_xpm), - new_folder((char* const*)big_folder_new_xpm), - reload((char* const*)reload_xpm), preview_img((char* const*)monalisa_xpm), - file_list_img((char* const*)filelist_xpm), - file_listwide_img((char* const*)filelistwide_xpm), - fileDetails((char* const*)filedetails_xpm), - add_to_favorite_folder((char* const*)folder_favorite_xpm), - home((char* const*)bighome_xpm), favorites((char* const*)bigfavorites_xpm), - desktop((char* const*)desktop_xpm), - folder_closed((char* const*)folder_closed_xpm), - default_file((char* const*)textdoc_xpm), - my_computer((char* const*)my_computer_xpm), - computer((char* const*)computer_xpm), - disk_drive((char* const*)disk_drive_xpm), - cd_drive((char* const*)cd_drive_xpm), - floppy_drive((char* const*)floppy_drive_xpm), - removable_drive((char* const*)removable_drive_xpm), - ram_drive((char* const*)ram_drive_xpm), - network_drive((char* const*)network_drive_xpm), - documents((char* const*)filled_folder_xpm), - littlehome((char* const*)home_xpm), - little_favorites((char* const*)mini_folder_favorites_xpm), - little_desktop((char* const*)mini_desktop_xpm), - bigdocuments((char* const*)bigdocuments_xpm), - bigtemporary((char* const*)bigtemporary_xpm), reel((char* const*)reel_xpm), - picture((char* const*)image_xpm), music((char* const*)music_xpm); +Fl_Pixmap up_folder_img((char*const*)big_folder_up_xpm), + trash((char*const*)trash_xpm), new_folder((char*const*)big_folder_new_xpm), + reload((char*const*)reload_xpm), preview_img((char*const*)monalisa_xpm), + file_list_img((char*const*)filelist_xpm), + file_listwide_img((char*const*)filelistwide_xpm), + fileDetails((char*const*)filedetails_xpm), + add_to_favorite_folder((char*const*)folder_favorite_xpm), + home((char*const*)bighome_xpm), favorites((char*const*)bigfavorites_xpm), + desktop((char*const*)desktop_xpm), + folder_closed((char*const*)folder_closed_xpm), + default_file((char*const*)textdoc_xpm), + my_computer((char*const*)my_computer_xpm), + computer((char*const*)computer_xpm), + disk_drive((char*const*)disk_drive_xpm), + cd_drive((char*const*)cd_drive_xpm), + floppy_drive((char*const*)floppy_drive_xpm), + removable_drive((char*const*)removable_drive_xpm), + ram_drive((char*const*)ram_drive_xpm), + network_drive((char*const*)network_drive_xpm), + documents((char*const*)filled_folder_xpm), + littlehome((char*const*)home_xpm), + little_favorites((char*const*)mini_folder_favorites_xpm), + little_desktop((char*const*)mini_desktop_xpm), + bigdocuments((char*const*)bigdocuments_xpm), + bigtemporary((char*const*)bigtemporary_xpm), reel((char*const*)reel_xpm), + picture((char*const*)image_xpm), music((char*const*)music_xpm); #define streq(a, b) (strcmp(a, b) == 0) @@ -1832,23 +1831,15 @@ void Flu_File_Chooser::okCB() } else { - if (strlen(filename.value()) != 0) + const char* file = filename.value(); + if (strlen(file) != 0) { - if (_isProbablyAPattern(filename.value())) + if (mrv::is_directory(file)) { - cd(filename.value()); + cd(file); + filename.value(""); return; } -#ifdef _WIN32 - if (filename.value()[1] == ':') -#else - if (filename.value()[0] == '/') -#endif - if (fl_filename_isdir(filename.value())) - { - filename.value(""); - return; - } Fl_Group* g = getEntryGroup(); Entry* e = nullptr; diff --git a/mrv2/po/es.po b/mrv2/po/es.po index d83201ac6..d44549c5d 100644 --- a/mrv2/po/es.po +++ b/mrv2/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: mrv2 v0.7.7\n" "Report-Msgid-Bugs-To: ggarra13@gmail.com\n" -"POT-Creation-Date: 2023-10-07 20:02-0300\n" +"POT-Creation-Date: 2023-10-07 20:10-0300\n" "PO-Revision-Date: 2023-02-11 13:42-0300\n" "Last-Translator: Gonzalo Garramuño \n" "Language-Team: Spanish \n" diff --git a/mrv2/python/demos/fltk/arc.py b/mrv2/python/demos/fltk/arc.py index b0207247b..aabf63028 100644 --- a/mrv2/python/demos/fltk/arc.py +++ b/mrv2/python/demos/fltk/arc.py @@ -108,8 +108,6 @@ def slider_cb(ptr, v): window.end() -#window.show(len(sys.argv),sys.argv) -#window.show() window.show() d.redraw() From 9b9d7fbf458699c84942102bc8644ca9792bf6d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Sun, 8 Oct 2023 12:10:41 -0300 Subject: [PATCH 07/13] Updated tlRender. --- tlRender | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tlRender b/tlRender index 6e260118b..870f18b1b 160000 --- a/tlRender +++ b/tlRender @@ -1 +1 @@ -Subproject commit 6e260118b3326c8e29991f5fd4dd3ff5f8992184 +Subproject commit 870f18b1b74b12c4048e1d9921d36ce1f405e731 From d5ee12fce01973109265973b84abc300aa788fbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Sun, 8 Oct 2023 12:24:30 -0300 Subject: [PATCH 08/13] Fixed deprecate Fl_Preferences. --- mrv2/lib/mrvFl/mrvPreferences.cpp | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/mrv2/lib/mrvFl/mrvPreferences.cpp b/mrv2/lib/mrvFl/mrvPreferences.cpp index 356951f56..6954e503e 100644 --- a/mrv2/lib/mrvFl/mrvPreferences.cpp +++ b/mrv2/lib/mrvFl/mrvPreferences.cpp @@ -130,7 +130,8 @@ namespace mrv LOG_INFO(msg); - Fl_Preferences base(prefspath().c_str(), "filmaura", "mrv2"); + Fl_Preferences base( + prefspath().c_str(), "filmaura", "mrv2", Fl_Preferences::C_LOCALE); base.get("version", version, 7); @@ -689,7 +690,8 @@ namespace mrv char key[256]; Fl_Preferences path_mapping( - prefspath().c_str(), "filmaura", "mrv2.paths"); + prefspath().c_str(), "filmaura", "mrv2.paths", + Fl_Preferences::C_LOCALE); num = path_mapping.entries(); for (int i = 0; i < num; ++i) { @@ -912,7 +914,10 @@ namespace mrv visible = 1; settingsObject->setValue("gui/DockGroup/Visible", visible); - Fl_Preferences base(prefspath().c_str(), "filmaura", "mrv2"); + Fl_Preferences base( + prefspath().c_str(), "filmaura", "mrv2", + (Fl_Preferences::Root)( + (int)Fl_Preferences::C_LOCALE | (int)Fl_Preferences::CLEAR)); base.set("version", 7); Fl_Preferences fltk_settings(base, "settings"); @@ -1233,7 +1238,9 @@ namespace mrv char key[256]; Fl_Preferences path_mapping( - prefspath().c_str(), "filmaura", "mrv2.paths"); + prefspath().c_str(), "filmaura", "mrv2.paths", + (Fl_Preferences::Root)( + (int)Fl_Preferences::C_LOCALE | (int)Fl_Preferences::CLEAR)); path_mapping.clear(); for (int i = 2; i <= uiPrefs->PathMappings->size(); ++i) { @@ -1281,7 +1288,10 @@ namespace mrv { Fl_Preferences keys( - prefspath().c_str(), "filmaura", hotkeys_file.c_str()); + prefspath().c_str(), "filmaura", hotkeys_file.c_str(), + (Fl_Preferences::Root)( + (int)Fl_Preferences::C_LOCALE | + (int)Fl_Preferences::CLEAR)); save_hotkeys(keys); msg = tl::string::Format( @@ -1711,7 +1721,8 @@ namespace mrv } } - Fl_Preferences base(prefspath().c_str(), "filmaura", "mrv2"); + Fl_Preferences base( + prefspath().c_str(), "filmaura", "mrv2", Fl_Preferences::C_LOCALE); Fl_Preferences gui(base, "ui"); gui.set("single_instance", uiPrefs->uiPrefsSingleInstance->value()); gui.set( From 4e0eb40e68dbbdd587c0c8e609ae8754b40dd5fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Sun, 8 Oct 2023 13:17:31 -0300 Subject: [PATCH 09/13] Updated docs. --- docs/sphinx/en/python_api/pyFLTK.rst | 17 +++ docs/sphinx/es/python_api/pyFLTK.rst | 18 +++ mrv2/docs/en/.buildinfo | 2 +- .../en/_sources/python_api/pyFLTK.rst.txt | 17 +++ mrv2/docs/en/genindex.html | 12 +- mrv2/docs/en/index.html | 1 + mrv2/docs/en/objects.inv | Bin 2450 -> 2477 bytes mrv2/docs/en/python_api/annotations.html | 1 + mrv2/docs/en/python_api/cmd.html | 15 ++ mrv2/docs/en/python_api/image.html | 1 + mrv2/docs/en/python_api/index.html | 4 + mrv2/docs/en/python_api/io.html | 1 + mrv2/docs/en/python_api/math.html | 1 + mrv2/docs/en/python_api/media.html | 1 + mrv2/docs/en/python_api/mrv2.html | 1 + mrv2/docs/en/python_api/playlist.html | 1 + mrv2/docs/en/python_api/plug-ins-system.html | 5 +- mrv2/docs/en/python_api/plug-ins.html | 1 + mrv2/docs/en/python_api/pyFLTK.html | 140 ++++++++++++++++++ mrv2/docs/en/python_api/settings.html | 5 +- mrv2/docs/en/python_api/timeline.html | 1 + mrv2/docs/en/python_api/usd.html | 1 + mrv2/docs/en/searchindex.js | 2 +- mrv2/docs/es/.buildinfo | 2 +- .../es/_sources/python_api/pyFLTK.rst.txt | 18 +++ mrv2/docs/es/genindex.html | 8 +- mrv2/docs/es/index.html | 1 + mrv2/docs/es/objects.inv | Bin 2437 -> 2464 bytes mrv2/docs/es/python_api/annotations.html | 1 + mrv2/docs/es/python_api/cmd.html | 15 ++ mrv2/docs/es/python_api/image.html | 1 + mrv2/docs/es/python_api/index.html | 4 + mrv2/docs/es/python_api/math.html | 1 + mrv2/docs/es/python_api/media.html | 1 + mrv2/docs/es/python_api/mrv2.html | 1 + mrv2/docs/es/python_api/playlist.html | 1 + mrv2/docs/es/python_api/plug-ins.html | 5 +- mrv2/docs/es/python_api/pyFLTK.html | 140 ++++++++++++++++++ mrv2/docs/es/python_api/settings.html | 5 +- .../es/python_api/sistema-de-plugins.html | 1 + mrv2/docs/es/python_api/timeline.html | 1 + mrv2/docs/es/python_api/usd.html | 1 + mrv2/docs/es/searchindex.js | 2 +- 43 files changed, 439 insertions(+), 18 deletions(-) create mode 100644 docs/sphinx/en/python_api/pyFLTK.rst create mode 100644 docs/sphinx/es/python_api/pyFLTK.rst create mode 100644 mrv2/docs/en/_sources/python_api/pyFLTK.rst.txt create mode 100644 mrv2/docs/en/python_api/pyFLTK.html create mode 100644 mrv2/docs/es/_sources/python_api/pyFLTK.rst.txt create mode 100644 mrv2/docs/es/python_api/pyFLTK.html 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/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)
    • - - + - +
    • renderOptions() (in module mrv2.usd)
    • renderWidth (mrv2.usd.RenderOptions attribute)
    • rescaled_to() (mrv2.RationalTime method) +
      • +
    • rootPath() (in module mrv2.cmd)
    • rotateX (mrv2.image.EnvironmentMapOptions attribute)
      • diff --git a/mrv2/docs/en/index.html b/mrv2/docs/en/index.html index 0a421c271..61f2acb61 100644 --- a/mrv2/docs/en/index.html +++ b/mrv2/docs/en/index.html @@ -104,6 +104,7 @@

      Table of Contentsplaylist module
    • plugin module
    • Plug-in System
      • +
    • pyFLTK
    • settings module
    • timeline module
    • usd module
      • diff --git a/mrv2/docs/en/objects.inv b/mrv2/docs/en/objects.inv index cfde1fb087bab72a106fb2dd3af4fe981955117f..1b84039ba92ffd7ae1bd1073eb387d64485f0899 100644 GIT binary patch delta 2387 zcmV-Z39R;#6Ri`FbAOvlcH=e{hUZ!Z`=qC49#x~vWLG)yX}e0tb~(vN2O=*eoFV}R z0A;I2*+ws-SJ6A^l>`rxA|-$l0QJNc34A{;EHk2$; zjlZvCTDlQc`JG9<`e$-A(>HH%2@jBCq|mHHoF_lp$zvo%O@EH*=c3>s6pn;oc-08- zl~^FL2^Gj1#(;=tTtTP=CZ8Meh{!rvp`^49Wh<3EkgX#eSC?qFLfO|)UPzBeIcDeeeJxyu5zbq)4eN@IrFoTYsBFbGUj=rA25SVP__$TKfVbd98(g& zerl?fX$?t__IM} zV99CTFnzf!7_F9EASMM#z7*K2r<|?1#3U;lj<><;TC`xYC-W!?4jCnRoQAFumyfzv zU$g6EG!OO(=F+cQRN}aXlQMe|WzSMJWUv|m#6b4X3x7&Vy$qEg)o7@Mppl(N3Pg4t zsc?ag)2hUD8`(0AY>*(QJ`bnc^9HXTNmo!%1|g+Mbd3oQLZy{e4S5(#i9n$R_X8rR z$uO6$UhRT}`cV|#{6|rXOvqq7kcq5KfeGdt2=gf>0+@UdMHpTI1d?g<#FOgNbt9Y4YFIFXFCFS5Q zuxF2m8Ceh%2-XtvBWm za!H>1VsafHSRjR(JOS@^Ena91-b~G);N3pZ2Y+OgiV%*YErc+O54Ry$peqOH+`9=m zh?}T~jjL^M%=0D%K3?LHlR9@150Av}zdVP-5AAN)6MK@gGthS*!V7-s4^zCrxN@61 zNB;HQdYh_;L)SE?6YUe7Nt&1S23?nOws$PP2MP!1%|_0=P;!5emXw82-Acf5D0Yfo zF@Ls%Sg=S3`_&@QZyJkQ>9rDTR8=TO0Fz(kvVS*D z;hw(62+&5v+8`xDjd}}WVgPQ6n{na#~tuEvECjpm&Z&oe|&klp->b!!*X5Z z#Z%|O2X&l!&{Q4fvHdxsttfg_PJg;!R83+Y#1q<{TAfT&hp$mwZF)i_e?@~T>o$r| zgEw~Iz(Ap*sA^ab+#0C!4c9T%tJ*_vYiyy4$FX)Jo${h1nSLr3_98u{wCt z{>bX2c{keFkJktMA&5y1Zz1IMog#q;vC7;avVCRs(8l!G`qL?Pdh$9KPpj4hR}-JB zW1=N?mymkJHQWFZ)A6}JYLD$i9i)e3%Wl<~L0D5~B_MVkMotDgoB$_-9o%ez85b|W zreEZ`dD#`?@adp~2@;!^K7YO(fwvfg<Ph(r`}&*;553YiEdCmu|0ppMP3G)qW3Q_xxDq zm}h|U`9}VUlemTrCJ`Dcz$3CI^2cL*Wm=WM`ly)45))@cMVD@G)IL>B=1=fv10;jF z`Vh>~zsGWC=%l1QMz0xFZ=!a7diU+;TmhyiG_v%?;KQr{3pzZ~3KjLrCKkqL^O1Jw zj|bcx^b|h+wl7Sh`+vGGj8=2PwQP@9#Bv@db4yvI%HT_iPyzTFLyJ2SiO096T6je@ zsTBC!hzMT9l-`A}htpyHYq&E|TqfCvdX?~jq1TClq-RIaqx#Z;O>eHxAaw+I32#_T zZHdnj$}#_XgR%`=?*!b?W-_MhEWv?WB4o@vta}x**M8g-A%Dj7)o(bTj4(P!i3_v_ z?XNIjvBUPacU3#A7dQU=8i+Z+;v)aKL@Owhs~?l@uFjX}V=9?bFN@4qAdruNh67vX zG~?eNWIMbzCAT-PI;~&Kb@F7cXM2;RrqUl+^Ba`1gF_-{qALHtzy8e=nX6HuGy0_E zA2a>kPJuFT8GqSl*#GKW^1K19D{I}R%;W=Z@ln0I>Jp4$4`z@s-l~y~J9Lz9QrmxB z$qRio8|a=WaG~4upj_+cFGE*Od?1qy5i_jK#v#TIp)UA1QCW^b6Nzj`_iyhKlg)x3 z_J+f>kvry#yAe!XByCHjtp{fZ$IA|`KY31crekx>Ie)YR?oSyKlg)yw&gY=J52{QL zJ!bm@3p+pBswaJBn~vGnI&}uy-lW~>yH&3Ejti(xh_$)ewlp`BCw*@uy1Tu9{+CNj zC$?tk-!sd`&H<11eMz7BxL*BE(5^FDN+f;eV;!})uuF79bfU5xfy={j!SXbGXYO9f zyTb>A1Ak)KX3U#=ro1PUzK{>%tRJr2qiA26x_PDZ>Yn*UUM9aZI3K8-ni+@&26>~9QoY-7c7YWL8Xs{yW~Gaax=Yb&CDC(n(b3?u1|zX5Q% F4^DP_k*)v$ delta 2360 zcmV-83CH%W6Ot2Ya?8s9{ihr6M(=SEAK`1y9g5h-| zz?Wi)#5R;5YZwC}o^b`C6qtNz#3Le`V1|;?Iuu)}>VeogLUDD8_G^@V3&jhm@hGM3 za1Qhy?STa|(6aFz_RiKWvvpNF-5B$(K-SDJhTI?ypOF#I6Z!!&$OL8k0PM#%0fb{p z0jZPD*BvTx+`vhi1BsGnB?mH?jR0aG?SJ!%l#(w)B}g_JN+D>Z@koM5 z(~%5UFr1bp#%$!sG;%G-2p369R_CV zZ=|oifPXD$U=blyXglSuxNT6y9=;7L$TgVaDH@Wg7vuI%n0kt=%3aONB73u{AS)>c zcY{6l6tpNyZyc>^#2^s%rS7%tgU&HmK~f+Z$PP0~DjA$UpgNF5uB~;1Uck6^n>t7S{oQ$ss%Iyc z*U^P`zhjCPWxYi=rF6cIweW!92ztAfju1-j52Ph!VW`eAJNBr~q1Oy=wt~o+Ac90K zr+*pZB7y=4T9**h6B#lCixGh%(XQ+xNQ7L;2Ek9~LoZtx!_#bFiIJkn(QS=0mZ*f? zl|-sAW7m<1(?Z;qxDMiSx*)Hiv$CWGm0|onkj>;Cyf5pPGW=ZyzvZHqUrWQ_isVei z0Px4v8UMT@Bd;;JCS9}6@eZqH)F1yJ+J9?yUhL~@j<=d`aduTxdTu53`hfHb?h`Hr zuox_l0;lpf!NopE31cE0#}hga4Z$fIt%9NiF|P(Xj$<n>#RgRsiXp({H@WPMW4NcUF$A;`v41j1 zicldQ`URBN5E@we7SU!JHnTkq)@fcMcfcsS>q+z(OBh8PJL~DkzZa*GcMLv-Jv>2; zBEp?xM%?u)nn{}VwW#0Z_5Fj-UmRCqYbju7}= zn1$XbJ%I;btycpS`l1Bd?}AfUf5rQ>J`^; z3q(w(%lfcAwvIZ856O|;sXc?Rq0UM`>?RC3nRjpoIGKCk#uk`y@d9l6AlHqTrWgmG z&HxiB1`&4eT6xIu+wA8cOMq1MtnpoH5un*KFq4m2hRS>9VJ= zc$qPS9oo*Hu5_`BC@LTg_hgWkDlpkNGtRnld++NBMmczcsbQkcX zq}@iZ8C54ydq2MW_I6c(C<+?c`f_kjDnNn`9w~)NLS+*RkaWtPOi)0yGYzQTQZ!u_bM|b$_|5Bngl*#<3q4m*3`=)b14JzF`(hVRyoc1k4M#xpH0i{ z%X!E3t9eeI%=7FZlH^qU18IJTQW`iUf+ni-|NZB`cp_^xDs@KhwES(RuhA4J1DB9} zg~P8-CC^*XynnLSZOKf2;1(U#`*~Mj1bZ-(gwa-wbl#z(eN)>0>snswr`dq_OoK~3 zrbq2sZ=(!VIdNYl8A8moHXElHJBYgE<3v?C1)5A`JM?gRmzZi6_^~w{myOi1Sl*4m z)P}Y%0f$Mjk6J6<4T(b}D0Qb8LiK%9RD}Up2pu77`#zIfA{f31dKMK{8 zzOs$S#I;VILD-wLk-nQ{&i7nEb%w01)sCfknLO!tGfQ;lU>gN*NniO?xIUb-^NiL5 zNniPtN39U-6x}?Vs46GG)$zw|G3g)7+qrx@v~CWFW!o{{yff`RnewIlnr8i+#KZBer<3*U^zFv4^`pk6Ha`<0luZ;8|=BAyDc;vznO>GQTOb~!PMdI zufkOIo*PzW4g#teAcxP$&2 z>^!GVt8-a{I$a!ZXXwIo4SxC0zjL5T7rPHx7%>#U)Xs)WltYD9ki&}sk8Q3vE$u!U e^E80#6iWx#l(ijEzmw-iP==9I$NvDctJ3)t(2!gJ diff --git a/mrv2/docs/en/python_api/annotations.html b/mrv2/docs/en/python_api/annotations.html index 7b74d1c35..ec99a5860 100644 --- a/mrv2/docs/en/python_api/annotations.html +++ b/mrv2/docs/en/python_api/annotations.html @@ -61,6 +61,7 @@
    • playlist module
    • plugin module
    • Plug-in System
      • +
    • pyFLTK
    • settings module
    • timeline module
    • usd module
      • diff --git a/mrv2/docs/en/python_api/cmd.html b/mrv2/docs/en/python_api/cmd.html index 04be601d6..763f9a3f5 100644 --- a/mrv2/docs/en/python_api/cmd.html +++ b/mrv2/docs/en/python_api/cmd.html @@ -62,6 +62,8 @@
    • lutOptions()
    • oepnSession()
    • open()
      • +
    • prefsPath()
      • +
    • rootPath()
    • save()
    • savePDF()
    • saveSession()
      • @@ -87,6 +89,7 @@
    • playlist module
    • plugin module
    • Plug-in System
      • +
    • pyFLTK
    • settings module
    • timeline module
    • usd module
      • @@ -195,6 +198,18 @@

      Open file with optional audio.

      +
      +
      +mrv2.cmd.prefsPath() → str
      +

      Return the path to preferences of mrv2.

      +
      + +
      +
      +mrv2.cmd.rootPath() → str
      +

      Return the root path to the insallation of mrv2.

      +
      +
      mrv2.cmd.save(file: str, options: mrv2.io.SaveOptions = <mrv2.io.SaveOptions  annotations=False ffmpegProfile=None exrCompression=ZIP zipCompressionLevel=4 dwaCompressionLevel=45>) → None
      diff --git a/mrv2/docs/en/python_api/image.html b/mrv2/docs/en/python_api/image.html index c77658335..430ef3310 100644 --- a/mrv2/docs/en/python_api/image.html +++ b/mrv2/docs/en/python_api/image.html @@ -142,6 +142,7 @@
    • playlist module
    • plugin module
    • Plug-in System
      • +
    • pyFLTK
    • settings module
    • timeline module
    • usd module
      • diff --git a/mrv2/docs/en/python_api/index.html b/mrv2/docs/en/python_api/index.html index e1819067e..90570490f 100644 --- a/mrv2/docs/en/python_api/index.html +++ b/mrv2/docs/en/python_api/index.html @@ -58,6 +58,7 @@
    • playlist module
    • plugin module
    • Plug-in System
      • +
    • pyFLTK
    • settings module
    • timeline module
    • usd module
      • @@ -110,6 +111,8 @@
    • lutOptions()
    • oepnSession()
    • open()
      • +
    • prefsPath()
      • +
    • rootPath()
    • save()
    • savePDF()
    • saveSession()
      • @@ -209,6 +212,7 @@
    • Plug-ins

    +
  • pyFLTK
  • settings module
    • +
  • pyFLTK
  • settings module
  • timeline module
  • usd module
    • @@ -132,7 +133,7 @@

    Plug-ins