From 255e98716335ab8e40da330bad016a8983046dec Mon Sep 17 00:00:00 2001 From: duplo Date: Mon, 2 Feb 2009 18:03:49 +0000 Subject: [PATCH] Move the .ui files in the ui directory git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2251 38d2e660-2303-0410-9eaa-f027e97ec537 --- wizard/BCpuPage.py | 2 +- wizard/BFolderPage.py | 4 +++- wizard/BModulePage.py | 3 ++- wizard/BOutputPage.py | 3 ++- wizard/BStartPage.py | 4 +++- wizard/BToolchainPage.py | 4 +++- wizard/BToolchainSearch.py | 4 +++- wizard/BVersionPage.py | 4 +++- wizard/const.py | 4 +++- wizard/{ => ui}/bertos_versions.ui | 0 wizard/{ => ui}/board_select.ui | 0 wizard/{ => ui}/cpu_select.ui | 0 wizard/{ => ui}/dir_select.ui | 0 wizard/{ => ui}/module_select.ui | 0 wizard/{ => ui}/output_select.ui | 0 wizard/{ => ui}/start.ui | 0 wizard/{ => ui}/toolchain_search.ui | 0 wizard/{ => ui}/toolchain_select.ui | 0 18 files changed, 23 insertions(+), 9 deletions(-) rename wizard/{ => ui}/bertos_versions.ui (100%) rename wizard/{ => ui}/board_select.ui (100%) rename wizard/{ => ui}/cpu_select.ui (100%) rename wizard/{ => ui}/dir_select.ui (100%) rename wizard/{ => ui}/module_select.ui (100%) rename wizard/{ => ui}/output_select.ui (100%) rename wizard/{ => ui}/start.ui (100%) rename wizard/{ => ui}/toolchain_search.ui (100%) rename wizard/{ => ui}/toolchain_select.ui (100%) diff --git a/wizard/BCpuPage.py b/wizard/BCpuPage.py index 8323b128..2af1df82 100644 --- a/wizard/BCpuPage.py +++ b/wizard/BCpuPage.py @@ -19,7 +19,7 @@ from const import * class BCpuPage(BWizardPage): def __init__(self): - BWizardPage.__init__(self, "cpu_select.ui") + BWizardPage.__init__(self, UI_LOCATION + "/cpu_select.ui") self.setTitle(self.tr("Select the CPU")) self._connectSignals() self._setupUi() diff --git a/wizard/BFolderPage.py b/wizard/BFolderPage.py index dc53d10c..374b231d 100644 --- a/wizard/BFolderPage.py +++ b/wizard/BFolderPage.py @@ -15,10 +15,12 @@ from PyQt4.QtGui import * from BWizardPage import * import bertos_utils +from const import * + class BFolderPage(BWizardPage): def __init__(self): - BWizardPage.__init__(self, "dir_select.ui") + BWizardPage.__init__(self, UI_LOCATION + "/dir_select.ui") self.setTitle(self.tr("Select the project name")) self._initializeAttributes() self._connectSignals() diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py index 3cc9f1af..86095d90 100644 --- a/wizard/BModulePage.py +++ b/wizard/BModulePage.py @@ -15,11 +15,12 @@ from PyQt4.QtGui import * from BWizardPage import * import bertos_utils +from const import * class BModulePage(BWizardPage): def __init__(self): - BWizardPage.__init__(self, "module_select.ui") + BWizardPage.__init__(self, UI_LOCATION + "/module_select.ui") self.setTitle(self.tr("Configure the BeRTOS modules")) self._setupUi() self._controlGroup = QControlGroup() diff --git a/wizard/BOutputPage.py b/wizard/BOutputPage.py index 2f7629d1..84222fee 100644 --- a/wizard/BOutputPage.py +++ b/wizard/BOutputPage.py @@ -15,11 +15,12 @@ from PyQt4.QtGui import * from BWizardPage import * import bertos_utils +from const import * class BOutputPage(BWizardPage): def __init__(self): - BWizardPage.__init__(self, "output_select.ui") + BWizardPage.__init__(self, UI_LOCATION + "/output_select.ui") self.setTitle(self.tr("Choose the project output")) self._setupButtonGroup() self._connectSignals() diff --git a/wizard/BStartPage.py b/wizard/BStartPage.py index 72bffd65..23c869b8 100644 --- a/wizard/BStartPage.py +++ b/wizard/BStartPage.py @@ -13,6 +13,8 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * import PyQt4.uic as uic +from const import * + class BStartPage(QDialog): def __init__(self): @@ -23,7 +25,7 @@ class BStartPage(QDialog): self._initializeButtons() def _setupUi(self): - self.content = uic.loadUi("start.ui", None) + self.content = uic.loadUi(UI_LOCATION + "/start.ui", None) layout = QVBoxLayout() layout.addWidget(self.content) self.setLayout(layout) diff --git a/wizard/BToolchainPage.py b/wizard/BToolchainPage.py index 16cfe7c2..0922d5b5 100644 --- a/wizard/BToolchainPage.py +++ b/wizard/BToolchainPage.py @@ -17,10 +17,12 @@ import BToolchainSearch import bertos_utils import qvariant_converter +from const import * + class BToolchainPage(BWizardPage): def __init__(self): - BWizardPage.__init__(self, "toolchain_select.ui") + BWizardPage.__init__(self, UI_LOCATION + "/toolchain_select.ui") self.setTitle(self.tr("Select toolchain")) self._validationProcess = None self._updateUi() diff --git a/wizard/BToolchainSearch.py b/wizard/BToolchainSearch.py index de3a6840..0290c0ea 100644 --- a/wizard/BToolchainSearch.py +++ b/wizard/BToolchainSearch.py @@ -15,6 +15,8 @@ import PyQt4.uic as uic import qvariant_converter +from const import * + class BToolchainSearch(QDialog): def __init__(self): @@ -24,7 +26,7 @@ class BToolchainSearch(QDialog): self.setWindowTitle(self.tr("Toolchain search page")) def _setupUi(self): - self.content = uic.loadUi("toolchain_search.ui", None) + self.content = uic.loadUi(UI_LOCATION + "/toolchain_search.ui", None) layout = QVBoxLayout() layout.addWidget(self.content) self.setLayout(layout) diff --git a/wizard/BVersionPage.py b/wizard/BVersionPage.py index 2f5a6260..ce72ff46 100644 --- a/wizard/BVersionPage.py +++ b/wizard/BVersionPage.py @@ -14,10 +14,12 @@ from BWizardPage import * import bertos_utils import qvariant_converter +from const import * + class BVersionPage(BWizardPage): def __init__(self): - BWizardPage.__init__(self, "bertos_versions.ui") + BWizardPage.__init__(self, UI_LOCATION + "/bertos_versions.ui") self._connectSignals() self._fillVersionList() self._setupUi() diff --git a/wizard/const.py b/wizard/const.py index 6092686e..32aa18e2 100644 --- a/wizard/const.py +++ b/wizard/const.py @@ -32,4 +32,6 @@ CPU_DEFINITION = "*.cdef" GCC_NAME = "*gcc*" -MODULE_CONFIGURATION = "cfg_*.h" \ No newline at end of file +MODULE_CONFIGURATION = "cfg_*.h" + +UI_LOCATION = "ui" \ No newline at end of file diff --git a/wizard/bertos_versions.ui b/wizard/ui/bertos_versions.ui similarity index 100% rename from wizard/bertos_versions.ui rename to wizard/ui/bertos_versions.ui diff --git a/wizard/board_select.ui b/wizard/ui/board_select.ui similarity index 100% rename from wizard/board_select.ui rename to wizard/ui/board_select.ui diff --git a/wizard/cpu_select.ui b/wizard/ui/cpu_select.ui similarity index 100% rename from wizard/cpu_select.ui rename to wizard/ui/cpu_select.ui diff --git a/wizard/dir_select.ui b/wizard/ui/dir_select.ui similarity index 100% rename from wizard/dir_select.ui rename to wizard/ui/dir_select.ui diff --git a/wizard/module_select.ui b/wizard/ui/module_select.ui similarity index 100% rename from wizard/module_select.ui rename to wizard/ui/module_select.ui diff --git a/wizard/output_select.ui b/wizard/ui/output_select.ui similarity index 100% rename from wizard/output_select.ui rename to wizard/ui/output_select.ui diff --git a/wizard/start.ui b/wizard/ui/start.ui similarity index 100% rename from wizard/start.ui rename to wizard/ui/start.ui diff --git a/wizard/toolchain_search.ui b/wizard/ui/toolchain_search.ui similarity index 100% rename from wizard/toolchain_search.ui rename to wizard/ui/toolchain_search.ui diff --git a/wizard/toolchain_select.ui b/wizard/ui/toolchain_select.ui similarity index 100% rename from wizard/toolchain_select.ui rename to wizard/ui/toolchain_select.ui -- 2.25.1