From: <ve...@us...> - 2008-03-12 21:25:03
|
Revision: 773 http://luma.svn.sourceforge.net/luma/?rev=773&view=rev Author: vegarwe Date: 2008-03-12 14:25:00 -0700 (Wed, 12 Mar 2008) Log Message: ----------- Next fase in Qt4 migration: grep "from\ qt\ import\ \*" . -r \ |grep -v \.svn |cut -d: -f1 \ |xargs sed -i "s/from\ qt\ import\ \*/from PyQt4.QtGui import */" Modified Paths: -------------- trunk/luma/lib/luma/base/gui/AboutDialog.py trunk/luma/lib/luma/base/gui/BaseSelector.py trunk/luma/lib/luma/base/gui/BaseSelectorDesign.py trunk/luma/lib/luma/base/gui/CertificateDialogDesign.py trunk/luma/lib/luma/base/gui/ImprovedServerDialog.py trunk/luma/lib/luma/base/gui/ImprovedServerDialogDesign.py trunk/luma/lib/luma/base/gui/LanguageDialog.py trunk/luma/lib/luma/base/gui/LanguageDialogDesign.py trunk/luma/lib/luma/base/gui/MainWin.py trunk/luma/lib/luma/base/gui/MainWinDesign.py trunk/luma/lib/luma/base/gui/PluginLoaderGui.py trunk/luma/lib/luma/base/gui/PluginLoaderGuiDesign.py trunk/luma/lib/luma/base/gui/ServerDialog.py trunk/luma/lib/luma/base/gui/ServerDialogDesign.py trunk/luma/lib/luma/base/gui/UnknownCertDialog.py trunk/luma/lib/luma/base/gui/UnknownCertDialogDesign.py trunk/luma/lib/luma/base/utils/__init__.py trunk/luma/lib/luma/base/utils/backend/DateHelper.py trunk/luma/lib/luma/base/utils/backend/templateutils.py trunk/luma/lib/luma/base/utils/gui/AddAttributeWizard.py trunk/luma/lib/luma/base/utils/gui/AddAttributeWizardDesign.py trunk/luma/lib/luma/base/utils/gui/AdvancedObjectWidget.py trunk/luma/lib/luma/base/utils/gui/BrowserDialog.py trunk/luma/lib/luma/base/utils/gui/BrowserWidget.py trunk/luma/lib/luma/base/utils/gui/DeleteDialog.py trunk/luma/lib/luma/base/utils/gui/DeleteDialogDesign.py trunk/luma/lib/luma/base/utils/gui/ExportDialog.py trunk/luma/lib/luma/base/utils/gui/ExportDialogDesign.py trunk/luma/lib/luma/base/utils/gui/FilterWizard.py trunk/luma/lib/luma/base/utils/gui/FilterWizardDesign.py trunk/luma/lib/luma/base/utils/gui/LoggerWidget.py trunk/luma/lib/luma/base/utils/gui/LoggerWidgetDesign.py trunk/luma/lib/luma/base/utils/gui/LumaEntryBrowser.py trunk/luma/lib/luma/base/utils/gui/LumaEntryBrowserDesign.py trunk/luma/lib/luma/base/utils/gui/LumaErrorDialog.py trunk/luma/lib/luma/base/utils/gui/LumaErrorDialogDesign.py trunk/luma/lib/luma/base/utils/gui/LumaWarningDialog.py trunk/luma/lib/luma/base/utils/gui/MailDialog.py trunk/luma/lib/luma/base/utils/gui/MailDialogDesign.py trunk/luma/lib/luma/base/utils/gui/PasswordDialog.py trunk/luma/lib/luma/base/utils/gui/PasswordDialogDesign.py trunk/luma/lib/luma/base/utils/gui/PluginInformation.py trunk/luma/lib/luma/base/utils/gui/PromptPasswordDialog.py trunk/luma/lib/luma/base/utils/gui/SearchForm.py trunk/luma/lib/luma/base/utils/gui/SearchFormDesign.py trunk/luma/lib/luma/base/utils/gui/SearchResultView.py trunk/luma/lib/luma/base/utils/gui/SearchResultViewDesign.py trunk/luma/lib/luma/base/utils/gui/editors/BinaryEditor.py trunk/luma/lib/luma/base/utils/gui/editors/BinaryEditorDesign.py trunk/luma/lib/luma/base/utils/gui/editors/PasswordEditor.py trunk/luma/lib/luma/base/utils/gui/editors/PasswordEditorDesign.py trunk/luma/lib/luma/base/utils/gui/editors/RdnEditor.py trunk/luma/lib/luma/base/utils/gui/editors/RdnEditorDesign.py trunk/luma/lib/luma/base/utils/gui/editors/StandardEditor.py trunk/luma/lib/luma/base/utils/gui/editors/StandardEditorDesign.py trunk/luma/lib/luma/luma.py trunk/luma/lib/luma/plugins/addressbook/AddressbookSettings.py trunk/luma/lib/luma/plugins/addressbook/AddressbookSettingsDesign.py trunk/luma/lib/luma/plugins/addressbook/AddressbookView.py trunk/luma/lib/luma/plugins/addressbook/AddressbookWidget.py trunk/luma/lib/luma/plugins/addressbook/AddressbookWidgetDesign.py trunk/luma/lib/luma/plugins/addressbook/CategoryEditDialog.py trunk/luma/lib/luma/plugins/addressbook/CategoryEditDialogDesign.py trunk/luma/lib/luma/plugins/addressbook/ContactWizard.py trunk/luma/lib/luma/plugins/addressbook/ContactWizardDesign.py trunk/luma/lib/luma/plugins/addressbook/NameDialog.py trunk/luma/lib/luma/plugins/addressbook/NewCategoryDialog.py trunk/luma/lib/luma/plugins/addressbook/__init__.py trunk/luma/lib/luma/plugins/addressbook/addressbook_plugin.py trunk/luma/lib/luma/plugins/admin_utils/AdminPanel.py trunk/luma/lib/luma/plugins/admin_utils/AdminPanelDesign.py trunk/luma/lib/luma/plugins/admin_utils/__init__.py trunk/luma/lib/luma/plugins/admin_utils/admin_utilities_plugin.py trunk/luma/lib/luma/plugins/browser_plugin/BrowserView.py trunk/luma/lib/luma/plugins/browser_plugin/__init__.py trunk/luma/lib/luma/plugins/browser_plugin/browser_plugin.py trunk/luma/lib/luma/plugins/config_create/ConfigError.py trunk/luma/lib/luma/plugins/config_create/ConfigPanel.py trunk/luma/lib/luma/plugins/config_create/ConfigPanelDesign.py trunk/luma/lib/luma/plugins/config_create/config_create_plugin.py trunk/luma/lib/luma/plugins/mass_creation_plugin/MassCreation.py trunk/luma/lib/luma/plugins/mass_creation_plugin/MassCreationDesign.py trunk/luma/lib/luma/plugins/mass_creation_plugin/__init__.py trunk/luma/lib/luma/plugins/mass_creation_plugin/massive_users_plugin.py trunk/luma/lib/luma/plugins/schemabrowser/SchemaView.py trunk/luma/lib/luma/plugins/schemabrowser/SchemaViewDesign.py trunk/luma/lib/luma/plugins/schemabrowser/SearchView.py trunk/luma/lib/luma/plugins/schemabrowser/__init__.py trunk/luma/lib/luma/plugins/schemabrowser/schemabrowser.py trunk/luma/lib/luma/plugins/search_plugin/SearchView.py trunk/luma/lib/luma/plugins/search_plugin/__init__.py trunk/luma/lib/luma/plugins/search_plugin/search_plugin.py trunk/luma/lib/luma/plugins/template_plugin/AddAttributeDialog.py trunk/luma/lib/luma/plugins/template_plugin/AddAttributeDialogDesign.py trunk/luma/lib/luma/plugins/template_plugin/AddObjectClassDialog.py trunk/luma/lib/luma/plugins/template_plugin/AddObjectClassDialogDesign.py trunk/luma/lib/luma/plugins/template_plugin/AddTemplateDialog.py trunk/luma/lib/luma/plugins/template_plugin/AddTemplateDialogDesign.py trunk/luma/lib/luma/plugins/template_plugin/ClassDeleteDialog.py trunk/luma/lib/luma/plugins/template_plugin/TemplateWidget.py trunk/luma/lib/luma/plugins/template_plugin/TemplateWidgetDesign.py trunk/luma/lib/luma/plugins/template_plugin/__init__.py trunk/luma/lib/luma/plugins/template_plugin/template_plugin.py trunk/luma/lib/luma/plugins/usermanagement/AccountWizard.py trunk/luma/lib/luma/plugins/usermanagement/AccountWizardDesign.py trunk/luma/lib/luma/plugins/usermanagement/GroupDialog.py trunk/luma/lib/luma/plugins/usermanagement/GroupDialogDesign.py trunk/luma/lib/luma/plugins/usermanagement/NameDialog.py trunk/luma/lib/luma/plugins/usermanagement/Usermanagement.py trunk/luma/lib/luma/plugins/usermanagement/UsermanagementWidget.py trunk/luma/lib/luma/plugins/usermanagement/UsermanagementWidgetDesign.py trunk/luma/lib/luma/plugins/usermanagement/__init__.py trunk/luma/lib/luma/plugins/usermanagement/usermanagement_plugin.py Modified: trunk/luma/lib/luma/base/gui/AboutDialog.py =================================================================== --- trunk/luma/lib/luma/base/gui/AboutDialog.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/gui/AboutDialog.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class AboutDialog(QDialog): Modified: trunk/luma/lib/luma/base/gui/BaseSelector.py =================================================================== --- trunk/luma/lib/luma/base/gui/BaseSelector.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/gui/BaseSelector.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * from base.gui.BaseSelectorDesign import BaseSelectorDesign from base.utils.gui.LumaErrorDialog import LumaErrorDialog Modified: trunk/luma/lib/luma/base/gui/BaseSelectorDesign.py =================================================================== --- trunk/luma/lib/luma/base/gui/BaseSelectorDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/gui/BaseSelectorDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * image0_data = \ "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ Modified: trunk/luma/lib/luma/base/gui/CertificateDialogDesign.py =================================================================== --- trunk/luma/lib/luma/base/gui/CertificateDialogDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/gui/CertificateDialogDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class CertificateDialogDesign(QWidget): Modified: trunk/luma/lib/luma/base/gui/ImprovedServerDialog.py =================================================================== --- trunk/luma/lib/luma/base/gui/ImprovedServerDialog.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/gui/ImprovedServerDialog.py 2008-03-12 21:25:00 UTC (rev 773) @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from qt import * +from PyQt4.QtGui import * import os import copy Modified: trunk/luma/lib/luma/base/gui/ImprovedServerDialogDesign.py =================================================================== --- trunk/luma/lib/luma/base/gui/ImprovedServerDialogDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/gui/ImprovedServerDialogDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * image0_data = \ "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ Modified: trunk/luma/lib/luma/base/gui/LanguageDialog.py =================================================================== --- trunk/luma/lib/luma/base/gui/LanguageDialog.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/gui/LanguageDialog.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ ########################################################################### -from qt import * +from PyQt4.QtGui import * from os import listdir import os.path Modified: trunk/luma/lib/luma/base/gui/LanguageDialogDesign.py =================================================================== --- trunk/luma/lib/luma/base/gui/LanguageDialogDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/gui/LanguageDialogDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class LanguageDialogDesign(QDialog): Modified: trunk/luma/lib/luma/base/gui/MainWin.py =================================================================== --- trunk/luma/lib/luma/base/gui/MainWin.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/gui/MainWin.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ ########################################################################### -from qt import * +from PyQt4.QtGui import * import os import os.path Modified: trunk/luma/lib/luma/base/gui/MainWinDesign.py =================================================================== --- trunk/luma/lib/luma/base/gui/MainWinDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/gui/MainWinDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * image0_data = \ "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ Modified: trunk/luma/lib/luma/base/gui/PluginLoaderGui.py =================================================================== --- trunk/luma/lib/luma/base/gui/PluginLoaderGui.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/gui/PluginLoaderGui.py 2008-03-12 21:25:00 UTC (rev 773) @@ -11,7 +11,7 @@ from base.gui.PluginLoaderGuiDesign import PluginLoaderGuiDesign import environment -from qt import * +from PyQt4.QtGui import * import copy import os.path import os Modified: trunk/luma/lib/luma/base/gui/PluginLoaderGuiDesign.py =================================================================== --- trunk/luma/lib/luma/base/gui/PluginLoaderGuiDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/gui/PluginLoaderGuiDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class PluginLoaderGuiDesign(QDialog): Modified: trunk/luma/lib/luma/base/gui/ServerDialog.py =================================================================== --- trunk/luma/lib/luma/base/gui/ServerDialog.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/gui/ServerDialog.py 2008-03-12 21:25:00 UTC (rev 773) @@ -12,7 +12,7 @@ import ldap import copy -from qt import * +from PyQt4.QtGui import * from base.gui.ServerDialogDesign import ServerDialogDesign Modified: trunk/luma/lib/luma/base/gui/ServerDialogDesign.py =================================================================== --- trunk/luma/lib/luma/base/gui/ServerDialogDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/gui/ServerDialogDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class ServerDialogDesign(QDialog): Modified: trunk/luma/lib/luma/base/gui/UnknownCertDialog.py =================================================================== --- trunk/luma/lib/luma/base/gui/UnknownCertDialog.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/gui/UnknownCertDialog.py 2008-03-12 21:25:00 UTC (rev 773) @@ -1,5 +1,5 @@ import sys -from qt import * +from PyQt4.QtGui import * from base.gui.UnknownCertDialogDesign import UnknownCertDialogDesign from base.gui.CertificateDialogDesign import CertificateDialogDesign Modified: trunk/luma/lib/luma/base/gui/UnknownCertDialogDesign.py =================================================================== --- trunk/luma/lib/luma/base/gui/UnknownCertDialogDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/gui/UnknownCertDialogDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class UnknownCertDialogDesign(QDialog): Modified: trunk/luma/lib/luma/base/utils/__init__.py =================================================================== --- trunk/luma/lib/luma/base/utils/__init__.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/__init__.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import re import base64 Modified: trunk/luma/lib/luma/base/utils/backend/DateHelper.py =================================================================== --- trunk/luma/lib/luma/base/utils/backend/DateHelper.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/backend/DateHelper.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * class DateHelper(object): """A class for doing some date calculations. Modified: trunk/luma/lib/luma/base/utils/backend/templateutils.py =================================================================== --- trunk/luma/lib/luma/base/utils/backend/templateutils.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/backend/templateutils.py 2008-03-12 21:25:00 UTC (rev 773) @@ -12,7 +12,7 @@ import os.path from PyQt4.QtXml import * -from qt import * +from PyQt4.QtGui import * from copy import deepcopy from base.backend.SmartDataObject import SmartDataObject Modified: trunk/luma/lib/luma/base/utils/gui/AddAttributeWizard.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/AddAttributeWizard.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/AddAttributeWizard.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path from sets import Set import copy Modified: trunk/luma/lib/luma/base/utils/gui/AddAttributeWizardDesign.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/AddAttributeWizardDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/AddAttributeWizardDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class AddAttributeWizardDesign(QWizard): Modified: trunk/luma/lib/luma/base/utils/gui/AdvancedObjectWidget.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/AdvancedObjectWidget.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/AdvancedObjectWidget.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import ldap import os import copy Modified: trunk/luma/lib/luma/base/utils/gui/BrowserDialog.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/BrowserDialog.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/BrowserDialog.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ ########################################################################### import ldap -from qt import * +from PyQt4.QtGui import * from base.utils.gui.BrowserWidget import BrowserWidget class BrowserDialog(QDialog): Modified: trunk/luma/lib/luma/base/utils/gui/BrowserWidget.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/BrowserWidget.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/BrowserWidget.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * from copy import deepcopy import ldap import os.path Modified: trunk/luma/lib/luma/base/utils/gui/DeleteDialog.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/DeleteDialog.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/DeleteDialog.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path from base.utils.gui.DeleteDialogDesign import DeleteDialogDesign Modified: trunk/luma/lib/luma/base/utils/gui/DeleteDialogDesign.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/DeleteDialogDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/DeleteDialogDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class DeleteDialogDesign(QDialog): Modified: trunk/luma/lib/luma/base/utils/gui/ExportDialog.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/ExportDialog.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/ExportDialog.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os import os.path import dsml Modified: trunk/luma/lib/luma/base/utils/gui/ExportDialogDesign.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/ExportDialogDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/ExportDialogDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class ExportDialogDesign(QDialog): Modified: trunk/luma/lib/luma/base/utils/gui/FilterWizard.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/FilterWizard.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/FilterWizard.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path from base.utils.gui.FilterWizardDesign import FilterWizardDesign Modified: trunk/luma/lib/luma/base/utils/gui/FilterWizardDesign.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/FilterWizardDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/FilterWizardDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class FilterWizardDesign(QDialog): Modified: trunk/luma/lib/luma/base/utils/gui/LoggerWidget.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/LoggerWidget.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/LoggerWidget.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * from ConfigParser import * import os.path Modified: trunk/luma/lib/luma/base/utils/gui/LoggerWidgetDesign.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/LoggerWidgetDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/LoggerWidgetDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * image0_data = \ "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ Modified: trunk/luma/lib/luma/base/utils/gui/LumaEntryBrowser.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/LumaEntryBrowser.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/LumaEntryBrowser.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ ########################################################################### -from qt import * +from PyQt4.QtGui import * from copy import deepcopy import os.path import ldap Modified: trunk/luma/lib/luma/base/utils/gui/LumaEntryBrowserDesign.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/LumaEntryBrowserDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/LumaEntryBrowserDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class LumaEntryBrowserDesign(QWidget): Modified: trunk/luma/lib/luma/base/utils/gui/LumaErrorDialog.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/LumaErrorDialog.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/LumaErrorDialog.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path from base.utils.gui.LumaErrorDialogDesign import LumaErrorDialogDesign Modified: trunk/luma/lib/luma/base/utils/gui/LumaErrorDialogDesign.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/LumaErrorDialogDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/LumaErrorDialogDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class LumaErrorDialogDesign(QDialog): Modified: trunk/luma/lib/luma/base/utils/gui/LumaWarningDialog.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/LumaWarningDialog.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/LumaWarningDialog.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path from base.utils.gui.LumaErrorDialogDesign import LumaErrorDialogDesign Modified: trunk/luma/lib/luma/base/utils/gui/MailDialog.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/MailDialog.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/MailDialog.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path import environment Modified: trunk/luma/lib/luma/base/utils/gui/MailDialogDesign.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/MailDialogDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/MailDialogDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class MailDialogDesign(QDialog): Modified: trunk/luma/lib/luma/base/utils/gui/PasswordDialog.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/PasswordDialog.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/PasswordDialog.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path from base.utils.gui.PasswordDialogDesign import PasswordDialogDesign Modified: trunk/luma/lib/luma/base/utils/gui/PasswordDialogDesign.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/PasswordDialogDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/PasswordDialogDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class PasswordDialogDesign(QDialog): Modified: trunk/luma/lib/luma/base/utils/gui/PluginInformation.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/PluginInformation.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/PluginInformation.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class PluginInformation(QDialog): Modified: trunk/luma/lib/luma/base/utils/gui/PromptPasswordDialog.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/PromptPasswordDialog.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/PromptPasswordDialog.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # WARNING! All changes made in this file will be lost! -from qt import * +from PyQt4.QtGui import * class PromptPasswordDialog(QDialog): Modified: trunk/luma/lib/luma/base/utils/gui/SearchForm.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/SearchForm.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/SearchForm.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import ldap import re import os.path Modified: trunk/luma/lib/luma/base/utils/gui/SearchFormDesign.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/SearchFormDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/SearchFormDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class SearchFormDesign(QWidget): Modified: trunk/luma/lib/luma/base/utils/gui/SearchResultView.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/SearchResultView.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/SearchResultView.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ ########################################################################### import ldap -from qt import * +from PyQt4.QtGui import * import base64 import re import os.path Modified: trunk/luma/lib/luma/base/utils/gui/SearchResultViewDesign.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/SearchResultViewDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/SearchResultViewDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class SearchResultViewDesign(QWidget): Modified: trunk/luma/lib/luma/base/utils/gui/editors/BinaryEditor.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/editors/BinaryEditor.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/editors/BinaryEditor.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os from base.utils.gui.editors.BinaryEditorDesign import BinaryEditorDesign Modified: trunk/luma/lib/luma/base/utils/gui/editors/BinaryEditorDesign.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/editors/BinaryEditorDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/editors/BinaryEditorDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class BinaryEditorDesign(QDialog): Modified: trunk/luma/lib/luma/base/utils/gui/editors/PasswordEditor.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/editors/PasswordEditor.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/editors/PasswordEditor.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path from base.utils.gui.editors.PasswordEditorDesign import PasswordEditorDesign Modified: trunk/luma/lib/luma/base/utils/gui/editors/PasswordEditorDesign.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/editors/PasswordEditorDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/editors/PasswordEditorDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class PasswordEditorDesign(QDialog): Modified: trunk/luma/lib/luma/base/utils/gui/editors/RdnEditor.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/editors/RdnEditor.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/editors/RdnEditor.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * from base.utils.gui.editors.RdnEditorDesign import RdnEditorDesign from base.backend.SmartDataObject import SmartDataObject import environment Modified: trunk/luma/lib/luma/base/utils/gui/editors/RdnEditorDesign.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/editors/RdnEditorDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/editors/RdnEditorDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class RdnEditorDesign(QDialog): Modified: trunk/luma/lib/luma/base/utils/gui/editors/StandardEditor.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/editors/StandardEditor.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/editors/StandardEditor.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * from base.utils.gui.editors.StandardEditorDesign import StandardEditorDesign from base.backend.SmartDataObject import SmartDataObject import environment Modified: trunk/luma/lib/luma/base/utils/gui/editors/StandardEditorDesign.py =================================================================== --- trunk/luma/lib/luma/base/utils/gui/editors/StandardEditorDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/base/utils/gui/editors/StandardEditorDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class StandardEditorDesign(QDialog): Modified: trunk/luma/lib/luma/luma.py =================================================================== --- trunk/luma/lib/luma/luma.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/luma.py 2008-03-12 21:25:00 UTC (rev 773) @@ -15,7 +15,7 @@ import threading import time import StringIO -from qt import * +from PyQt4.QtGui import * import environment from base.gui.MainWin import MainWin Modified: trunk/luma/lib/luma/plugins/addressbook/AddressbookSettings.py =================================================================== --- trunk/luma/lib/luma/plugins/addressbook/AddressbookSettings.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/addressbook/AddressbookSettings.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ ########################################################################### -from qt import * +from PyQt4.QtGui import * from ConfigParser import * import os.path Modified: trunk/luma/lib/luma/plugins/addressbook/AddressbookSettingsDesign.py =================================================================== --- trunk/luma/lib/luma/plugins/addressbook/AddressbookSettingsDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/addressbook/AddressbookSettingsDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class AddressbookSettingsDesign(QWidget): Modified: trunk/luma/lib/luma/plugins/addressbook/AddressbookView.py =================================================================== --- trunk/luma/lib/luma/plugins/addressbook/AddressbookView.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/addressbook/AddressbookView.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path import environment Modified: trunk/luma/lib/luma/plugins/addressbook/AddressbookWidget.py =================================================================== --- trunk/luma/lib/luma/plugins/addressbook/AddressbookWidget.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/addressbook/AddressbookWidget.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path import ldap import copy Modified: trunk/luma/lib/luma/plugins/addressbook/AddressbookWidgetDesign.py =================================================================== --- trunk/luma/lib/luma/plugins/addressbook/AddressbookWidgetDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/addressbook/AddressbookWidgetDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class AddressbookWidgetDesign(QWidget): Modified: trunk/luma/lib/luma/plugins/addressbook/CategoryEditDialog.py =================================================================== --- trunk/luma/lib/luma/plugins/addressbook/CategoryEditDialog.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/addressbook/CategoryEditDialog.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ ########################################################################### -from qt import * +from PyQt4.QtGui import * from string import strip from plugins.addressbook.CategoryEditDialogDesign import CategoryEditDialogDesign Modified: trunk/luma/lib/luma/plugins/addressbook/CategoryEditDialogDesign.py =================================================================== --- trunk/luma/lib/luma/plugins/addressbook/CategoryEditDialogDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/addressbook/CategoryEditDialogDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class CategoryEditDialogDesign(QDialog): Modified: trunk/luma/lib/luma/plugins/addressbook/ContactWizard.py =================================================================== --- trunk/luma/lib/luma/plugins/addressbook/ContactWizard.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/addressbook/ContactWizard.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path import ldap from string import strip Modified: trunk/luma/lib/luma/plugins/addressbook/ContactWizardDesign.py =================================================================== --- trunk/luma/lib/luma/plugins/addressbook/ContactWizardDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/addressbook/ContactWizardDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class ContactWizardDesign(QWizard): Modified: trunk/luma/lib/luma/plugins/addressbook/NameDialog.py =================================================================== --- trunk/luma/lib/luma/plugins/addressbook/NameDialog.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/addressbook/NameDialog.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class NameDialog(QDialog): Modified: trunk/luma/lib/luma/plugins/addressbook/NewCategoryDialog.py =================================================================== --- trunk/luma/lib/luma/plugins/addressbook/NewCategoryDialog.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/addressbook/NewCategoryDialog.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class NewCategoryDialog(QDialog): Modified: trunk/luma/lib/luma/plugins/addressbook/__init__.py =================================================================== --- trunk/luma/lib/luma/plugins/addressbook/__init__.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/addressbook/__init__.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path lumaPlugin = True Modified: trunk/luma/lib/luma/plugins/addressbook/addressbook_plugin.py =================================================================== --- trunk/luma/lib/luma/plugins/addressbook/addressbook_plugin.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/addressbook/addressbook_plugin.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path from plugins.addressbook.AddressbookView import AddressbookView Modified: trunk/luma/lib/luma/plugins/admin_utils/AdminPanel.py =================================================================== --- trunk/luma/lib/luma/plugins/admin_utils/AdminPanel.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/admin_utils/AdminPanel.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path import os from sets import Set Modified: trunk/luma/lib/luma/plugins/admin_utils/AdminPanelDesign.py =================================================================== --- trunk/luma/lib/luma/plugins/admin_utils/AdminPanelDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/admin_utils/AdminPanelDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class AdminPanelDesign(QWidget): Modified: trunk/luma/lib/luma/plugins/admin_utils/__init__.py =================================================================== --- trunk/luma/lib/luma/plugins/admin_utils/__init__.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/admin_utils/__init__.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path lumaPlugin = True Modified: trunk/luma/lib/luma/plugins/admin_utils/admin_utilities_plugin.py =================================================================== --- trunk/luma/lib/luma/plugins/admin_utils/admin_utilities_plugin.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/admin_utils/admin_utilities_plugin.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path from plugins.admin_utils.AdminPanel import AdminPanel Modified: trunk/luma/lib/luma/plugins/browser_plugin/BrowserView.py =================================================================== --- trunk/luma/lib/luma/plugins/browser_plugin/BrowserView.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/browser_plugin/BrowserView.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ ########################################################################### -from qt import * +from PyQt4.QtGui import * from base.utils.gui.BrowserWidget import BrowserWidget from base.utils.gui.AdvancedObjectWidget import AdvancedObjectWidget Modified: trunk/luma/lib/luma/plugins/browser_plugin/__init__.py =================================================================== --- trunk/luma/lib/luma/plugins/browser_plugin/__init__.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/browser_plugin/__init__.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path lumaPlugin = True Modified: trunk/luma/lib/luma/plugins/browser_plugin/browser_plugin.py =================================================================== --- trunk/luma/lib/luma/plugins/browser_plugin/browser_plugin.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/browser_plugin/browser_plugin.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path from plugins.browser_plugin.BrowserView import BrowserView Modified: trunk/luma/lib/luma/plugins/config_create/ConfigError.py =================================================================== --- trunk/luma/lib/luma/plugins/config_create/ConfigError.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/config_create/ConfigError.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * image0_data = \ "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ Modified: trunk/luma/lib/luma/plugins/config_create/ConfigPanel.py =================================================================== --- trunk/luma/lib/luma/plugins/config_create/ConfigPanel.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/config_create/ConfigPanel.py 2008-03-12 21:25:00 UTC (rev 773) @@ -13,7 +13,7 @@ from os import listdir import os.path -from qt import * +from PyQt4.QtGui import * from plugins.config_create.ConfigPanelDesign import ConfigPanelDesign from plugins.config_create.ConfigError import ConfigError Modified: trunk/luma/lib/luma/plugins/config_create/ConfigPanelDesign.py =================================================================== --- trunk/luma/lib/luma/plugins/config_create/ConfigPanelDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/config_create/ConfigPanelDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * image0_data = \ "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ Modified: trunk/luma/lib/luma/plugins/config_create/config_create_plugin.py =================================================================== --- trunk/luma/lib/luma/plugins/config_create/config_create_plugin.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/config_create/config_create_plugin.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path from plugins.config_create.ConfigPanel import ConfigPanel Modified: trunk/luma/lib/luma/plugins/mass_creation_plugin/MassCreation.py =================================================================== --- trunk/luma/lib/luma/plugins/mass_creation_plugin/MassCreation.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/mass_creation_plugin/MassCreation.py 2008-03-12 21:25:00 UTC (rev 773) @@ -11,7 +11,7 @@ import ldap import os.path -from qt import * +from PyQt4.QtGui import * import environment from plugins.mass_creation_plugin.MassCreationDesign import MassCreationDesign Modified: trunk/luma/lib/luma/plugins/mass_creation_plugin/MassCreationDesign.py =================================================================== --- trunk/luma/lib/luma/plugins/mass_creation_plugin/MassCreationDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/mass_creation_plugin/MassCreationDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * image0_data = \ "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ Modified: trunk/luma/lib/luma/plugins/mass_creation_plugin/__init__.py =================================================================== --- trunk/luma/lib/luma/plugins/mass_creation_plugin/__init__.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/mass_creation_plugin/__init__.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path lumaPlugin = True Modified: trunk/luma/lib/luma/plugins/mass_creation_plugin/massive_users_plugin.py =================================================================== --- trunk/luma/lib/luma/plugins/mass_creation_plugin/massive_users_plugin.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/mass_creation_plugin/massive_users_plugin.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path from plugins.mass_creation_plugin.MassCreation import MassCreation Modified: trunk/luma/lib/luma/plugins/schemabrowser/SchemaView.py =================================================================== --- trunk/luma/lib/luma/plugins/schemabrowser/SchemaView.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/schemabrowser/SchemaView.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path import environment Modified: trunk/luma/lib/luma/plugins/schemabrowser/SchemaViewDesign.py =================================================================== --- trunk/luma/lib/luma/plugins/schemabrowser/SchemaViewDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/schemabrowser/SchemaViewDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class SchemaViewDesign(QWidget): Modified: trunk/luma/lib/luma/plugins/schemabrowser/SearchView.py =================================================================== --- trunk/luma/lib/luma/plugins/schemabrowser/SearchView.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/schemabrowser/SearchView.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * from base.utils.gui.SearchForm import SearchForm from base.utils.gui.SearchResultView import SearchResultView Modified: trunk/luma/lib/luma/plugins/schemabrowser/__init__.py =================================================================== --- trunk/luma/lib/luma/plugins/schemabrowser/__init__.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/schemabrowser/__init__.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path lumaPlugin = True Modified: trunk/luma/lib/luma/plugins/schemabrowser/schemabrowser.py =================================================================== --- trunk/luma/lib/luma/plugins/schemabrowser/schemabrowser.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/schemabrowser/schemabrowser.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path from plugins.schemabrowser.SchemaView import SchemaView Modified: trunk/luma/lib/luma/plugins/search_plugin/SearchView.py =================================================================== --- trunk/luma/lib/luma/plugins/search_plugin/SearchView.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/search_plugin/SearchView.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * from base.utils.gui.SearchForm import SearchForm from base.utils.gui.SearchResultView import SearchResultView Modified: trunk/luma/lib/luma/plugins/search_plugin/__init__.py =================================================================== --- trunk/luma/lib/luma/plugins/search_plugin/__init__.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/search_plugin/__init__.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path lumaPlugin = True Modified: trunk/luma/lib/luma/plugins/search_plugin/search_plugin.py =================================================================== --- trunk/luma/lib/luma/plugins/search_plugin/search_plugin.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/search_plugin/search_plugin.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path from plugins.search_plugin.SearchView import SearchView Modified: trunk/luma/lib/luma/plugins/template_plugin/AddAttributeDialog.py =================================================================== --- trunk/luma/lib/luma/plugins/template_plugin/AddAttributeDialog.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/template_plugin/AddAttributeDialog.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path from plugins.template_plugin.AddAttributeDialogDesign import AddAttributeDialogDesign Modified: trunk/luma/lib/luma/plugins/template_plugin/AddAttributeDialogDesign.py =================================================================== --- trunk/luma/lib/luma/plugins/template_plugin/AddAttributeDialogDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/template_plugin/AddAttributeDialogDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * image0_data = \ "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ Modified: trunk/luma/lib/luma/plugins/template_plugin/AddObjectClassDialog.py =================================================================== --- trunk/luma/lib/luma/plugins/template_plugin/AddObjectClassDialog.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/template_plugin/AddObjectClassDialog.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * from plugins.template_plugin.AddObjectClassDialogDesign import AddObjectClassDialogDesign class AddObjectClassDialog(AddObjectClassDialogDesign): Modified: trunk/luma/lib/luma/plugins/template_plugin/AddObjectClassDialogDesign.py =================================================================== --- trunk/luma/lib/luma/plugins/template_plugin/AddObjectClassDialogDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/template_plugin/AddObjectClassDialogDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * image0_data = \ "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ Modified: trunk/luma/lib/luma/plugins/template_plugin/AddTemplateDialog.py =================================================================== --- trunk/luma/lib/luma/plugins/template_plugin/AddTemplateDialog.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/template_plugin/AddTemplateDialog.py 2008-03-12 21:25:00 UTC (rev 773) @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from qt import * +from PyQt4.QtGui import * import os.path from string import strip Modified: trunk/luma/lib/luma/plugins/template_plugin/AddTemplateDialogDesign.py =================================================================== --- trunk/luma/lib/luma/plugins/template_plugin/AddTemplateDialogDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/template_plugin/AddTemplateDialogDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * image0_data = \ "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ Modified: trunk/luma/lib/luma/plugins/template_plugin/ClassDeleteDialog.py =================================================================== --- trunk/luma/lib/luma/plugins/template_plugin/ClassDeleteDialog.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/template_plugin/ClassDeleteDialog.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * image0_data = \ "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ Modified: trunk/luma/lib/luma/plugins/template_plugin/TemplateWidget.py =================================================================== --- trunk/luma/lib/luma/plugins/template_plugin/TemplateWidget.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/template_plugin/TemplateWidget.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * from string import strip from sets import Set import copy Modified: trunk/luma/lib/luma/plugins/template_plugin/TemplateWidgetDesign.py =================================================================== --- trunk/luma/lib/luma/plugins/template_plugin/TemplateWidgetDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/template_plugin/TemplateWidgetDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class TemplateWidgetDesign(QWidget): Modified: trunk/luma/lib/luma/plugins/template_plugin/__init__.py =================================================================== --- trunk/luma/lib/luma/plugins/template_plugin/__init__.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/template_plugin/__init__.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path lumaPlugin = True Modified: trunk/luma/lib/luma/plugins/template_plugin/template_plugin.py =================================================================== --- trunk/luma/lib/luma/plugins/template_plugin/template_plugin.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/template_plugin/template_plugin.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path #from plugins.template_plugin.TemplateForm import TemplateForm Modified: trunk/luma/lib/luma/plugins/usermanagement/AccountWizard.py =================================================================== --- trunk/luma/lib/luma/plugins/usermanagement/AccountWizard.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/usermanagement/AccountWizard.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui import * import os.path import ldap from string import strip Modified: trunk/luma/lib/luma/plugins/usermanagement/AccountWizardDesign.py =================================================================== --- trunk/luma/lib/luma/plugins/usermanagement/AccountWizardDesign.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/usermanagement/AccountWizardDesign.py 2008-03-12 21:25:00 UTC (rev 773) @@ -9,7 +9,7 @@ import sys -from qt import * +from PyQt4.QtGui import * class AccountWizardDesign(QWizard): Modified: trunk/luma/lib/luma/plugins/usermanagement/GroupDialog.py =================================================================== --- trunk/luma/lib/luma/plugins/usermanagement/GroupDialog.py 2008-03-11 21:37:03 UTC (rev 772) +++ trunk/luma/lib/luma/plugins/usermanagement/GroupDialog.py 2008-03-12 21:25:00 UTC (rev 773) @@ -8,7 +8,7 @@ # ########################################################################### -from qt import * +from PyQt4.QtGui ... [truncated message content] |