Merged work (qLab#1440, qLab#1460, qLab#1462, qLab#1461)

johnnyquest · Sep 20, 2024 · 941b3c0 · 941b3c0
2 parents f4cbbb1 + 20c8ced
commit 941b3c0
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 29 deletions.
diff --git a/MainMenuCommon.xml b/MainMenuCommon.xml
@@ -48,10 +48,10 @@ import qlibutils; qlibutils.open_hda_dirs()]]>
 
 			<separatorItem />
 
-			<scriptItem id="h.ql_browse_HIH_root">
-				<label>$HIH: User Config Files...</label>
+			<scriptItem id="h.ql_browse_user_pref_dir">
+				<label>$HOUDINI_USER_PREF_DIR: User Config Files...</label>
 				<scriptCode><![CDATA[
-import qlibutils; qlibutils.open_dir(env="HIH")]]>
+import qlibutils; qlibutils.open_dir(env="HOUDINI_USER_PREF_DIR")]]>
 				</scriptCode>
 			</scriptItem>
 

diff --git a/gallery/qLib--TOP--value_selector.gal b/gallery/qLib--TOP--value_selector.gal
diff --git 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
@@ -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
@@ -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
diff --git a/qLib_package_linux.json → qLib_package.json b/qLib_package_linux.json → 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
diff --git 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: