Ignore:
Timestamp:
02/06/12 22:14:43 (2 years ago)
Author:
anze <anze.staric@…>
Branch:
default
Message:

OrangeQt documentation builds without adding orngdir to path.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Orange/OrangeWidgets/OWBaseWidget.py

    r9671 r9873  
    44# A General Orange Widget, from which all the Orange Widgets are derived 
    55# 
    6 import orngEnviron 
     6from Orange.misc import environ 
     7from Orange.orng.orngEnviron import directoryNames as old_directory_names 
    78from PyQt4.QtCore import * 
    89from PyQt4.QtGui import * 
     
    2021 
    2122from OWContexts import * 
    22 import sys, time, random, user, os, os.path, cPickle, copy, orngMisc 
     23import sys, time, random, user, os, os.path, cPickle, copy 
    2324import orange 
    24 import orngDebugging 
     25from Orange import misc 
     26from Orange.misc import debugging 
    2527from string import * 
    2628from orngSignalManager import * 
     
    147149 
    148150        # directories are better defined this way, otherwise .ini files get written in many places 
    149         self.__dict__.update(orngEnviron.directoryNames) 
     151        self.__dict__.update(old_directory_names) 
    150152        try: 
    151153            self.__dict__["thisWidgetDir"] = os.path.dirname(sys.modules[self.__class__.__module__].__file__) 
     
    848850    def getWidgetStateIcons(cls): 
    849851        if not hasattr(cls, "_cached__widget_state_icons"): 
    850             iconsDir = os.path.join(orngEnviron.canvasDir, "icons") 
    851             QDir.addSearchPath("canvasIcons",os.path.join(orngEnviron.canvasDir, "icons/")) 
     852            iconsDir = os.path.join(environ.canvas_install_dir, "icons") 
     853            QDir.addSearchPath("canvasIcons",os.path.join(environ.canvas_install_dir, 
     854                "icons/")) 
    852855            info = QPixmap("canvasIcons:information.png") 
    853856            warning = QPixmap("canvasIcons:warning.png") 
Note: See TracChangeset for help on using the changeset viewer.