main: Fix widget settings directory path to clear

Since biolabgh-3772 the `environ.widget_settings_dir` is no longer the
authoritative directory path.

Change the application name to 'Orange' to preserve historical
directory layout (the application name is used as the path component
in the settings path).

Author: ales-erjavec

Orange/canvas/config.py

@@ -30,7 +30,7 @@ class Config(config.Config):
     Orange application configuration
     """
     OrganizationDomain = "biolab.si"
-    ApplicationName = "Orange Canvas"
+    ApplicationName = "Orange"
     ApplicationVersion = Orange.__version__
 
     @staticmethod
@@ -203,12 +203,11 @@ def log_dir():
     return logdir
 
 
-def widget_settings_dir():
+def widget_settings_dir(versioned=True):
     """
     Return the widget settings directory.
     """
-    from Orange.misc import environ
-    return environ.widget_settings_dir()
+    return config.widget_settings_dir(versioned)
 
 
 def widgets_entry_points():

Orange/misc/environ.py

@@ -9,16 +9,10 @@
 
 where DATA_HOME is a platform dependent application directory
 (:ref:`data_dir_base`) and VERSION is Orange.__version__ string.
-
-``canvas`` subdirectory is reserved for settings/preferences stored
-by Orange Canvas
-``widget`` subdirectory is reserved for settings/preferences stored
-by OWWidget
-
 """
-
 import os
 import sys
+import warnings
 
 import Orange
 
@@ -65,7 +59,13 @@ def widget_settings_dir(versioned=True):
 
     This a subdirectory of ``data_dir(versioned)`` named "widgets"
     """
-    return os.path.join(data_dir(versioned=versioned), "widgets")
+    warnings.warn(
+        f"'{__name__}.widget_settings_dir' is deprecated. "
+        "Use 'Orange.widgets.settings.widget_settings_dir'",
+        DeprecationWarning, stacklevel=2
+    )
+    from Orange.canvas import config
+    return config.widget_settings_dir(versioned)
 
 
 def cache_dir(*args):