diff --git a/MainMenuCommon.xml b/MainMenuCommon.xml index 4b7fd1c..8e4f040 100644 --- a/MainMenuCommon.xml +++ b/MainMenuCommon.xml @@ -48,10 +48,10 @@ import qlibutils; qlibutils.open_hda_dirs()]]> - - + + +import qlibutils; qlibutils.open_dir(env="HOUDINI_USER_PREF_DIR")]]> diff --git a/gallery/qLib--TOP--value_selector.gal b/gallery/qLib--TOP--value_selector.gal index eb801c9..376f09a 100644 Binary files a/gallery/qLib--TOP--value_selector.gal and b/gallery/qLib--TOP--value_selector.gal differ diff --git a/help/qlib/mainmenu/index.txt b/help/qlib/mainmenu/index.txt index 0589b0d..e42219d 100644 --- a/help/qlib/mainmenu/index.txt +++ b/help/qlib/mainmenu/index.txt @@ -62,7 +62,7 @@ Open in File Browser: Opens the folder(s) that contain the definitions of the currently selected HDAs or complied plug-in DSOs (DLLs). - $HIH: User Config Files...: + $HOUDINI_USER_PREF_DIR: User Config Files...: Opens the user's preferences folder (usually called _houdiniXX.X_). diff --git a/houdini.env_linux b/houdini.env_linux index 2266d4e..a8f2e6b 100644 --- a/houdini.env_linux +++ b/houdini.env_linux @@ -7,9 +7,9 @@ # # QLIB variable should point to the downloaded and extracted qLib package -# ($HIH is the $HOME/houdiniXX.X folder) +# ($HOUDINI_USER_PREF_DIR is the $HOME/houdiniXX.X folder) # -QLIB=$HIH/qLib-dev +QLIB=$HOUDINI_USER_PREF_DIR/qLib-dev QOTL=$QLIB/otls HOUDINI_OTLSCAN_PATH = $QOTL/base:$QOTL/future:$QOTL/experimental:$HOUDINI_OTLSCAN_PATH:& diff --git a/houdini.env_windows b/houdini.env_windows index a8eb7c1..1d689df 100644 --- a/houdini.env_windows +++ b/houdini.env_windows @@ -1,15 +1,15 @@ # houdini.env # =========== # -# example snippet (linux) +# example snippet (windows) # # # # QLIB variable should point to the downloaded and extracted qLib package -# ($HIH is the $HOME/houdiniXX.X folder) +# ($HOUDINI_USER_PREF_DIR is the $HOME/houdiniXX.X folder) # -QLIB=$HIH/qLib-dev +QLIB=$HOUDINI_USER_PREF_DIR/qLib-dev QOTL=$QLIB/otls HOUDINI_OTLSCAN_PATH = $QOTL/base;$QOTL/future;$QOTL/experimental;$HOUDINI_OTLSCAN_PATH;& diff --git a/otls/experimental/switch_by_string_ql_SOP.otl b/otls/experimental/switch_by_string_ql_SOP.otl index 7e47192..4f4bce3 100644 Binary files a/otls/experimental/switch_by_string_ql_SOP.otl and b/otls/experimental/switch_by_string_ql_SOP.otl differ diff --git a/qLib_package_linux.json b/qLib_package.json similarity index 88% rename from qLib_package_linux.json rename to qLib_package.json index eec3390..fab1e97 100644 --- a/qLib_package_linux.json +++ b/qLib_package.json @@ -5,7 +5,7 @@ "env": [ { - "QLIB": "$HIH/qLib-master" + "QLIB": "$HOUDINI_USER_PREF_DIR/qLib-master" }, { "QOTL": "$QLIB/otls" diff --git a/qLib_package_windows.json b/qLib_package_windows.json deleted file mode 100644 index f0243ec..0000000 --- a/qLib_package_windows.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "recommends": "houdini_version >= '17.5.321'", - - "env": [ - { - "QLIB": "$HIH/qLib-master" - }, - { - "QOTL": "$QLIB/otls" - }, - { - "HOUDINI_OTLSCAN_PATH": "$QOTL/base;$QOTL/future;$QOTL/experimental;$HOUDINI_OTLSCAN_PATH" - } - ], - - "path": "$QLIB" -} - diff --git a/scripts/python/qlibutils.py b/scripts/python/qlibutils.py index 647a023..5057397 100644 --- a/scripts/python/qlibutils.py +++ b/scripts/python/qlibutils.py @@ -243,7 +243,7 @@ def do_crash_recovery(calledFromUI=False): sel = hou.ui.selectFromList(files, exclusive=True, title="Crash Recovery", - message="Select .hip File to Recover") + message="Select .hip File to Recover\n(from: %s)" % tmpdir) recovered = False if len(sel) > 0: