From: duplo Date: Mon, 2 Feb 2009 18:03:49 +0000 (+0000) Subject: Move the .ui files in the ui directory X-Git-Tag: 2.1.0~431 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=255e98716335ab8e40da330bad016a8983046dec;p=bertos.git Move the .ui files in the ui directory git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2251 38d2e660-2303-0410-9eaa-f027e97ec537 --- 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/bertos_versions.ui b/wizard/bertos_versions.ui deleted file mode 100644 index 7336a614..00000000 --- a/wizard/bertos_versions.ui +++ /dev/null @@ -1,129 +0,0 @@ - - Form - - - - 0 - 0 - 445 - 371 - - - - - 0 - 0 - - - - Form - - - - - - - - - - - - - - 26 - 26 - - - - - 26 - 26 - - - - + - - - - :/images/listadd.png:/images/listadd.png - - - - 16 - 16 - - - - - - - - - 26 - 26 - - - - - 26 - 26 - - - - - - - - - :/images/listremove.png:/images/listremove.png - - - - 16 - 16 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 26 - - - - - 16777215 - 26 - - - - Update - - - - - - - - - - - - - - diff --git a/wizard/board_select.ui b/wizard/board_select.ui deleted file mode 100644 index 02877b9e..00000000 --- a/wizard/board_select.ui +++ /dev/null @@ -1,74 +0,0 @@ - - Form - - - - 0 - 0 - 640 - 480 - - - - - 0 - 0 - - - - Form - - - - - 120 - 80 - 389 - 291 - - - - - - - - - - - Selected board - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - - - - New board - - - - - - - - - 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/cpu_select.ui b/wizard/cpu_select.ui deleted file mode 100644 index 7d8951f2..00000000 --- a/wizard/cpu_select.ui +++ /dev/null @@ -1,36 +0,0 @@ - - Form - - - - 0 - 0 - 406 - 243 - - - - - 0 - 0 - - - - Form - - - - - - - - - - - - - - - - - diff --git a/wizard/dir_select.ui b/wizard/dir_select.ui deleted file mode 100644 index 7b9faae8..00000000 --- a/wizard/dir_select.ui +++ /dev/null @@ -1,140 +0,0 @@ - - Form - - - - 0 - 0 - 369 - 119 - - - - - 0 - 0 - - - - Form - - - - - - - - - - Project Name - - - - - - - Destination directory - - - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - 26 - 26 - - - - - 26 - 26 - - - - - 26 - 26 - - - - - - - - :/images/folderopen.png:/images/folderopen.png - - - - 26 - 26 - - - - - - - - - - - - - - - - - 110 - 16777215 - - - - Project directory: - - - - - - - None - - - - - - - - - - - - diff --git a/wizard/module_select.ui b/wizard/module_select.ui deleted file mode 100644 index d9b8486e..00000000 --- a/wizard/module_select.ui +++ /dev/null @@ -1,72 +0,0 @@ - - Form - - - - 0 - 0 - 559 - 412 - - - - - 0 - 0 - - - - Form - - - - - - - 150 - 16777215 - - - - QAbstractItemView::NoEditTriggers - - - QAbstractItemView::SingleSelection - - - QAbstractItemView::SelectRows - - - false - - - - - - - - - Qt::Vertical - - - - - - - - - QAbstractItemView::NoEditTriggers - - - QAbstractItemView::SelectRows - - - false - - - - - - - - diff --git a/wizard/output_select.ui b/wizard/output_select.ui deleted file mode 100644 index c866c3ed..00000000 --- a/wizard/output_select.ui +++ /dev/null @@ -1,225 +0,0 @@ - - Form - - - - 0 - 0 - 358 - 372 - - - - - 0 - 0 - - - - Form - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - BeRTOS build system - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Classic BeRTOS makefile based project - - - - - - - - - - - - false - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - false - - - Eclipse project - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - false - - - Eclipse project files and configurations - - - - - - - - - - - - false - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - false - - - XCode project - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - false - - - XCode project files and configurations - - - - - - - - - - - - false - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - false - - - CodeLite project - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - false - - - CodeLite project files and configurations - - - - - - - - - - - - - diff --git a/wizard/start.ui b/wizard/start.ui deleted file mode 100644 index 7e71f4e7..00000000 --- a/wizard/start.ui +++ /dev/null @@ -1,130 +0,0 @@ - - Form - - - - 0 - 0 - 358 - 311 - - - - Form - - - - - - - - - - - 128 - 128 - - - - - 128 - 128 - - - - - - - - :/images/filenew.png:/images/filenew.png - - - - 128 - 128 - - - - false - - - false - - - - - - - - - Create a new bertos project - - - - - - - - - - - Qt::Horizontal - - - - - - - - - - 128 - 128 - - - - - 128 - 128 - - - - - - - - :/images/fileopen.png:/images/fileopen.png - - - - 128 - 128 - - - - false - - - - - - - - - Edit an existent bertos project - - - - - - - - - - - - - - - - diff --git a/wizard/toolchain_search.ui b/wizard/toolchain_search.ui deleted file mode 100644 index bb166502..00000000 --- a/wizard/toolchain_search.ui +++ /dev/null @@ -1,141 +0,0 @@ - - Form - - - - 0 - 0 - 350 - 290 - - - - Form - - - - - - - 0 - 0 - - - - Search in PATH - - - - - - - Custom directories - - - - - - - - - - - - 26 - 26 - - - - - 26 - 26 - - - - - - - - :/images/listadd.png:/images/listadd.png - - - - - - - - 26 - 26 - - - - - 26 - 26 - - - - - - - - :/images/listremove.png:/images/listremove.png - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Cancel - - - - - - - Search - - - - - - - - - - - - diff --git a/wizard/toolchain_select.ui b/wizard/toolchain_select.ui deleted file mode 100644 index 43fa81cc..00000000 --- a/wizard/toolchain_select.ui +++ /dev/null @@ -1,155 +0,0 @@ - - Form - - - - 0 - 0 - 321 - 298 - - - - Form - - - - - - - - - - - - true - - - - - - - - - - 26 - 26 - - - - - 26 - 26 - - - - - - - - :/images/listadd.png:/images/listadd.png - - - - 16 - 16 - - - - - - - - - 26 - 26 - - - - - 26 - 26 - - - - - - - - :/images/listremove.png:/images/listremove.png - - - - 16 - 16 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 26 - 26 - - - - - 26 - 26 - - - - Validate all the toolchains - - - - - - - :/images/ok.png:/images/ok.png - - - - - - - - 26 - 26 - - - - - 16777215 - 26 - - - - Search - - - - - - - - - - - - diff --git a/wizard/ui/bertos_versions.ui b/wizard/ui/bertos_versions.ui new file mode 100644 index 00000000..7336a614 --- /dev/null +++ b/wizard/ui/bertos_versions.ui @@ -0,0 +1,129 @@ + + Form + + + + 0 + 0 + 445 + 371 + + + + + 0 + 0 + + + + Form + + + + + + + + + + + + + + 26 + 26 + + + + + 26 + 26 + + + + + + + + + :/images/listadd.png:/images/listadd.png + + + + 16 + 16 + + + + + + + + + 26 + 26 + + + + + 26 + 26 + + + + - + + + + :/images/listremove.png:/images/listremove.png + + + + 16 + 16 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 26 + + + + + 16777215 + 26 + + + + Update + + + + + + + + + + + + + + diff --git a/wizard/ui/board_select.ui b/wizard/ui/board_select.ui new file mode 100644 index 00000000..02877b9e --- /dev/null +++ b/wizard/ui/board_select.ui @@ -0,0 +1,74 @@ + + Form + + + + 0 + 0 + 640 + 480 + + + + + 0 + 0 + + + + Form + + + + + 120 + 80 + 389 + 291 + + + + + + + + + + + Selected board + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + + + New board + + + + + + + + + diff --git a/wizard/ui/cpu_select.ui b/wizard/ui/cpu_select.ui new file mode 100644 index 00000000..7d8951f2 --- /dev/null +++ b/wizard/ui/cpu_select.ui @@ -0,0 +1,36 @@ + + Form + + + + 0 + 0 + 406 + 243 + + + + + 0 + 0 + + + + Form + + + + + + + + + + + + + + + + + diff --git a/wizard/ui/dir_select.ui b/wizard/ui/dir_select.ui new file mode 100644 index 00000000..7b9faae8 --- /dev/null +++ b/wizard/ui/dir_select.ui @@ -0,0 +1,140 @@ + + Form + + + + 0 + 0 + 369 + 119 + + + + + 0 + 0 + + + + Form + + + + + + + + + + Project Name + + + + + + + Destination directory + + + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + + 26 + 26 + + + + + 26 + 26 + + + + + 26 + 26 + + + + + + + + :/images/folderopen.png:/images/folderopen.png + + + + 26 + 26 + + + + + + + + + + + + + + + + + 110 + 16777215 + + + + Project directory: + + + + + + + None + + + + + + + + + + + + diff --git a/wizard/ui/module_select.ui b/wizard/ui/module_select.ui new file mode 100644 index 00000000..d9b8486e --- /dev/null +++ b/wizard/ui/module_select.ui @@ -0,0 +1,72 @@ + + Form + + + + 0 + 0 + 559 + 412 + + + + + 0 + 0 + + + + Form + + + + + + + 150 + 16777215 + + + + QAbstractItemView::NoEditTriggers + + + QAbstractItemView::SingleSelection + + + QAbstractItemView::SelectRows + + + false + + + + + + + + + Qt::Vertical + + + + + + + + + QAbstractItemView::NoEditTriggers + + + QAbstractItemView::SelectRows + + + false + + + + + + + + diff --git a/wizard/ui/output_select.ui b/wizard/ui/output_select.ui new file mode 100644 index 00000000..c866c3ed --- /dev/null +++ b/wizard/ui/output_select.ui @@ -0,0 +1,225 @@ + + Form + + + + 0 + 0 + 358 + 372 + + + + + 0 + 0 + + + + Form + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + BeRTOS build system + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Classic BeRTOS makefile based project + + + + + + + + + + + + false + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + false + + + Eclipse project + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + false + + + Eclipse project files and configurations + + + + + + + + + + + + false + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + false + + + XCode project + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + false + + + XCode project files and configurations + + + + + + + + + + + + false + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + false + + + CodeLite project + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + false + + + CodeLite project files and configurations + + + + + + + + + + + + + diff --git a/wizard/ui/start.ui b/wizard/ui/start.ui new file mode 100644 index 00000000..7e71f4e7 --- /dev/null +++ b/wizard/ui/start.ui @@ -0,0 +1,130 @@ + + Form + + + + 0 + 0 + 358 + 311 + + + + Form + + + + + + + + + + + 128 + 128 + + + + + 128 + 128 + + + + + + + + :/images/filenew.png:/images/filenew.png + + + + 128 + 128 + + + + false + + + false + + + + + + + + + Create a new bertos project + + + + + + + + + + + Qt::Horizontal + + + + + + + + + + 128 + 128 + + + + + 128 + 128 + + + + + + + + :/images/fileopen.png:/images/fileopen.png + + + + 128 + 128 + + + + false + + + + + + + + + Edit an existent bertos project + + + + + + + + + + + + + + + + diff --git a/wizard/ui/toolchain_search.ui b/wizard/ui/toolchain_search.ui new file mode 100644 index 00000000..bb166502 --- /dev/null +++ b/wizard/ui/toolchain_search.ui @@ -0,0 +1,141 @@ + + Form + + + + 0 + 0 + 350 + 290 + + + + Form + + + + + + + 0 + 0 + + + + Search in PATH + + + + + + + Custom directories + + + + + + + + + + + + 26 + 26 + + + + + 26 + 26 + + + + + + + + :/images/listadd.png:/images/listadd.png + + + + + + + + 26 + 26 + + + + + 26 + 26 + + + + + + + + :/images/listremove.png:/images/listremove.png + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Cancel + + + + + + + Search + + + + + + + + + + + + diff --git a/wizard/ui/toolchain_select.ui b/wizard/ui/toolchain_select.ui new file mode 100644 index 00000000..43fa81cc --- /dev/null +++ b/wizard/ui/toolchain_select.ui @@ -0,0 +1,155 @@ + + Form + + + + 0 + 0 + 321 + 298 + + + + Form + + + + + + + + + + + + true + + + + + + + + + + 26 + 26 + + + + + 26 + 26 + + + + + + + + :/images/listadd.png:/images/listadd.png + + + + 16 + 16 + + + + + + + + + 26 + 26 + + + + + 26 + 26 + + + + + + + + :/images/listremove.png:/images/listremove.png + + + + 16 + 16 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 26 + 26 + + + + + 26 + 26 + + + + Validate all the toolchains + + + + + + + :/images/ok.png:/images/ok.png + + + + + + + + 26 + 26 + + + + + 16777215 + 26 + + + + Search + + + + + + + + + + + +