Move dialogs to a dialogs package.

gns3/dialogs/about_dialog.py

@@ -15,9 +15,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from .qt import QtGui
-from .version import __version__
-from .ui.about_dialog_ui import Ui_AboutDialog
+from ..qt import QtGui
+from ..version import __version__
+from ..ui.about_dialog_ui import Ui_AboutDialog
 
 
 class AboutDialog(QtGui.QDialog, Ui_AboutDialog):

gns3/dialogs/early_release_dialog.py

@@ -16,8 +16,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import re
-from .qt import QtGui
-from .ui.early_release_dialog_ui import Ui_EarlyReleaseDialog
+from ..qt import QtGui
+from ..ui.early_release_dialog_ui import Ui_EarlyReleaseDialog
 
 
 class EarlyReleaseDialog(QtGui.QDialog, Ui_EarlyReleaseDialog):

gns3/dialogs/new_project_dialog.py

@@ -16,8 +16,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-from .qt import QtCore, QtGui
-from .ui.new_project_dialog_ui import Ui_NewProjectDialog
+from ..qt import QtCore, QtGui
+from ..ui.new_project_dialog_ui import Ui_NewProjectDialog
 
 
 class NewProjectDialog(QtGui.QDialog, Ui_NewProjectDialog):

gns3/dialogs/news_dialog.py

@@ -15,8 +15,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from .qt import QtCore, QtGui, QtWebKit
-from .ui.news_dialog_ui import Ui_NewsDialog
+from ..qt import QtCore, QtGui, QtWebKit
+from ..ui.news_dialog_ui import Ui_NewsDialog
 
 
 class NewsDialog(QtGui.QDialog, Ui_NewsDialog):

gns3/dialogs/node_configurator_dialog.py

@@ -19,11 +19,11 @@
 Dialog to configure and update node settings using widget pages.
 """
 
-from .qt import QtCore, QtGui
-from .ui.node_configurator_ui import Ui_NodeConfiguratorDialog
+from ..qt import QtCore, QtGui
+from ..ui.node_configurator_dialog_ui import Ui_NodeConfiguratorDialog
 
 
-class NodeConfigurator(QtGui.QDialog, Ui_NodeConfiguratorDialog):
+class NodeConfiguratorDialog(QtGui.QDialog, Ui_NodeConfiguratorDialog):
     """
     Node configurator implementation.
 

gns3/dialogs/preferences_dialog.py

@@ -19,12 +19,12 @@
 Dialog to load module and built-in preference pages.
 """
 
-from .qt import QtCore, QtGui
-from .ui.preferences_dialog_ui import Ui_PreferencesDialog
-from .pages.server_preferences_page import ServerPreferencesPage
-from .pages.general_preferences_page import GeneralPreferencesPage
-from .pages.cloud_preferences_page import CloudPreferencesPage
-from .modules import MODULES
+from ..qt import QtCore, QtGui
+from ..ui.preferences_dialog_ui import Ui_PreferencesDialog
+from ..pages.server_preferences_page import ServerPreferencesPage
+from ..pages.general_preferences_page import GeneralPreferencesPage
+from ..pages.cloud_preferences_page import CloudPreferencesPage
+from ..modules import MODULES
 
 
 class PreferencesDialog(QtGui.QDialog, Ui_PreferencesDialog):

gns3/dialogs/style_editor_dialog.py

@@ -19,8 +19,8 @@
 Style editor to edit Shape items.
 """
 
-from .qt import QtCore, QtGui
-from .ui.style_editor_dialog_ui import Ui_StyleEditorDialog
+from ..qt import QtCore, QtGui
+from ..ui.style_editor_dialog_ui import Ui_StyleEditorDialog
 
 
 class StyleEditorDialog(QtGui.QDialog, Ui_StyleEditorDialog):

gns3/dialogs/text_editor_dialog.py

@@ -19,8 +19,8 @@
 Text editor to edit Note items.
 """
 
-from .qt import QtCore, QtGui
-from .ui.text_editor_dialog_ui import Ui_TextEditorDialog
+from ..qt import QtCore, QtGui
+from ..ui.text_editor_dialog_ui import Ui_TextEditorDialog
 
 
 class TextEditorDialog(QtGui.QDialog, Ui_TextEditorDialog):

gns3/graphics_view.py

@@ -24,7 +24,7 @@ import pickle
 
 from .qt import QtCore, QtGui, QtNetwork
 from .items.node_item import NodeItem
-from .node_configurator import NodeConfigurator
+from .dialogs.node_configurator_dialog import NodeConfiguratorDialog
 from .link import Link
 from .node import Node
 from .modules import MODULES
@@ -33,8 +33,8 @@ from .modules.module_error import ModuleError
 from .settings import GRAPHICS_VIEW_SETTINGS, GRAPHICS_VIEW_SETTING_TYPES
 from .topology import Topology
 from .ports.port import Port
-from .style_editor_dialog import StyleEditorDialog
-from .text_editor_dialog import TextEditorDialog
+from .dialogs.style_editor_dialog import StyleEditorDialog
+from .dialogs.text_editor_dialog import TextEditorDialog
 from .utils.progress_dialog import ProgressDialog
 from .utils.wait_for_connection_thread import WaitForConnectionThread
 
@@ -608,7 +608,7 @@ class GraphicsView(QtGui.QGraphicsView):
 
         if not items:
             items = self.scene().selectedItems()
-        node_configurator = NodeConfigurator(items, self._main_window)
+        node_configurator = NodeConfiguratorDialog(items, self._main_window)
         node_configurator.setModal(True)
         node_configurator.show()
         node_configurator.exec_()

gns3/main_window.py

@@ -25,15 +25,16 @@ import socket
 import shutil
 import json
 import glob
+import logging
 
 from .qt import QtGui, QtCore
 from .servers import Servers
 from .node import Node
 from .ui.main_window_ui import Ui_MainWindow
-from .about_dialog import AboutDialog
-from .early_release_dialog import EarlyReleaseDialog
-from .new_project_dialog import NewProjectDialog
-from .preferences_dialog import PreferencesDialog
+from .dialogs.about_dialog import AboutDialog
+from .dialogs.early_release_dialog import EarlyReleaseDialog
+from .dialogs.new_project_dialog import NewProjectDialog
+from .dialogs.preferences_dialog import PreferencesDialog
 from .settings import GENERAL_SETTINGS, GENERAL_SETTING_TYPES, CLOUD_SETTINGS, CLOUD_SETTINGS_TYPES
 from .utils.progress_dialog import ProgressDialog
 from .utils.process_files_thread import ProcessFilesThread
@@ -43,7 +44,6 @@ from .items.node_item import NodeItem
 from .items.link_item import LinkItem
 from .topology import Topology
 
-import logging
 log = logging.getLogger(__name__)
 
 CLOUD_SETTINGS_GROUP = "Cloud"
@@ -655,7 +655,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         try:
             # QtWebKit which is used by NewsDialog is not installed
             # by default on FreeBSD, Solaris and possibly other systems.
-            from .news_dialog import NewsDialog
+            from .dialogs.news_dialog import NewsDialog
         except ImportError:
             return
 

gns3/ui/node_configurator_dialog_ui.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file '/home/grossmj/workspace/git/gns3-gui/gns3/ui/node_configurator.ui'
+# Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/ui/node_configurator_dialog.ui'
 #
-# Created: Sun Jan 26 13:41:56 2014
-#      by: PyQt4 UI code generator 4.10
+# Created: Fri Jun 20 14:27:39 2014
+#      by: PyQt4 UI code generator 4.10.4
 #
 # WARNING! All changes made in this file will be lost!
 

tests/test_preferences_dlg.py

@@ -13,7 +13,7 @@ from gns3.pages.cloud_preferences_page import CloudPreferencesPage
 from gns3.settings import CLOUD_SETTINGS
 from gns3.main_window import MainWindow
 from gns3.main_window import CLOUD_SETTINGS_GROUP
-from gns3.preferences_dialog import PreferencesDialog
+from gns3.dialogs.preferences_dialog import PreferencesDialog
 
 import pytest