Changeset cd2cc745 in sasview
- Timestamp:
- Apr 19, 2017 6:51:48 AM (8 years ago)
- Branches:
- ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc
- Children:
- 9d266d2
- Parents:
- 83eb5208
- Location:
- src/sas/qtgui
- Files:
-
- 33 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/Calculators/DensityPanel.py
r83eb5208 rcd2cc745 7 7 8 8 from sas.qtgui.Utilities.GuiUtils import FormulaValidator 9 from sas.qtgui.UI import main_resources_rc 9 10 10 11 # Local UI -
src/sas/qtgui/Calculators/KiessigPanel.py
r83eb5208 rcd2cc745 1 1 from PyQt4 import QtGui 2 2 from PyQt4 import QtCore 3 4 from sas.qtgui.UI import main_resources_rc 3 5 from UI.KiessigPanel import Ui_KiessigPanel 4 6 -
src/sas/qtgui/Calculators/SldPanel.py
r83eb5208 rcd2cc745 8 8 9 9 from sas.qtgui.Utilities.GuiUtils import FormulaValidator 10 from sas.qtgui.UI import main_resources_rc 10 11 11 12 # Local UI -
src/sas/qtgui/Calculators/SlitSizeCalculator.py
r83eb5208 rcd2cc745 7 7 from PyQt4 import QtGui 8 8 from PyQt4 import QtCore 9 10 from sas.qtgui.UI import main_resources_rc 11 9 12 from UI.SlitSizeCalculator import Ui_SlitSizeCalculator 10 13 from sas.sascalc.dataloader.loader import Loader -
src/sas/qtgui/Calculators/UI/DensityPanel.ui
r83eb5208 rcd2cc745 7 7 <x>0</x> 8 8 <y>0</y> 9 <width>29 0</width>10 <height> 178</height>9 <width>295</width> 10 <height>204</height> 11 11 </rect> 12 12 </property> … … 21 21 </property> 22 22 <property name="windowIcon"> 23 <iconset resource="main_resources.qrc">23 <iconset> 24 24 <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 25 25 </property> … … 170 170 <tabstop>buttonBox</tabstop> 171 171 </tabstops> 172 <resources> 173 <include location="main_resources.qrc"/> 174 </resources> 172 <resources/> 175 173 <connections> 176 174 <connection> -
src/sas/qtgui/Calculators/UI/KiessigPanel.ui
r83eb5208 rcd2cc745 15 15 </property> 16 16 <property name="windowIcon"> 17 <iconset resource="main_resources.qrc">17 <iconset> 18 18 <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 19 19 </property> … … 133 133 </layout> 134 134 </widget> 135 <resources> 136 <include location="main_resources.qrc"/> 137 </resources> 135 <resources/> 138 136 <connections/> 139 137 </ui> -
src/sas/qtgui/Calculators/UI/SldPanel.ui
r83eb5208 rcd2cc745 21 21 </property> 22 22 <property name="windowIcon"> 23 <iconset resource="main_resources.qrc">23 <iconset> 24 24 <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 25 25 </property> … … 341 341 <tabstop>buttonBox</tabstop> 342 342 </tabstops> 343 <resources> 344 <include location="main_resources.qrc"/> 345 </resources> 343 <resources/> 346 344 <connections> 347 345 <connection> -
src/sas/qtgui/Calculators/UI/SlitSizeCalculator.ui
r83eb5208 rcd2cc745 15 15 </property> 16 16 <property name="windowIcon"> 17 <iconset resource="main_resources.qrc">17 <iconset> 18 18 <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 19 19 </property> … … 183 183 </layout> 184 184 </widget> 185 <resources> 186 <include location="main_resources.qrc"/> 187 </resources> 185 <resources/> 188 186 <connections/> 189 187 </ui> -
src/sas/qtgui/MainWindow/AboutBox.py
r83eb5208 rcd2cc745 5 5 import sas.qtgui.Utilities.LocalConfig as LocalConfig 6 6 import sas.qtgui.Utilities.GuiUtils as GuiUtils 7 from sas.qtgui.UI import images_rc 8 from sas.qtgui.UI import main_resources_rc 7 9 8 10 from UI.AboutUI import Ui_AboutUI -
src/sas/qtgui/MainWindow/DroppableDataLoadWidget.py
r83eb5208 rcd2cc745 3 3 4 4 # UI 5 from sas.qtgui.UI import main_resources_rc 5 6 from sas.qtgui.MainWindow.UI.DataExplorerUI import Ui_DataLoadWidget 6 7 -
src/sas/qtgui/MainWindow/MainWindow.py
r83eb5208 rcd2cc745 4 4 5 5 # Local UI 6 from sas.qtgui.UI import main_resources_rc 6 7 from UI.MainWindowUI import Ui_MainWindow 7 8 -
src/sas/qtgui/MainWindow/UI/AboutUI.ui
r83eb5208 rcd2cc745 7 7 <x>0</x> 8 8 <y>0</y> 9 <width> 1107</width>9 <width>827</width> 10 10 <height>449</height> 11 11 </rect> … … 243 243 </layout> 244 244 </widget> 245 <resources> 246 <include location="../../UI/main_resources.qrc"/> 247 <include location="../images/images.qrc"/> 248 </resources> 245 <resources/> 249 246 <connections/> 250 247 </ui> -
src/sas/qtgui/MainWindow/UI/DataExplorerUI.ui
r83eb5208 rcd2cc745 21 21 </property> 22 22 <property name="windowIcon"> 23 <iconset resource="../../UI/main_resources.qrc">23 <iconset> 24 24 <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 25 25 </property> … … 70 70 </property> 71 71 <property name="icon"> 72 <iconset resource="../../UI/main_resources.qrc">72 <iconset> 73 73 <normaloff>:/res/down-grey.png</normaloff>:/res/down-grey.png</iconset> 74 74 </property> … … 183 183 </property> 184 184 <property name="icon"> 185 <iconset resource="../../UI/main_resources.qrc">185 <iconset> 186 186 <normaloff>:/res/right-grey.png</normaloff>:/res/right-grey.png</iconset> 187 187 </property> … … 482 482 </action> 483 483 </widget> 484 <resources> 485 <include location="../../UI/main_resources.qrc"/> 486 </resources> 484 <resources/> 487 485 <connections/> 488 486 </ui> -
src/sas/qtgui/MainWindow/UI/MainWindowUI.ui
r83eb5208 rcd2cc745 15 15 </property> 16 16 <property name="windowIcon"> 17 <iconset resource="../../UI/main_resources.qrc">17 <iconset> 18 18 <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 19 19 </property> … … 180 180 <action name="actionReset"> 181 181 <property name="icon"> 182 <iconset resource="../../UI/main_resources.qrc">182 <iconset> 183 183 <normaloff>:/res/reset.png</normaloff>:/res/reset.png</iconset> 184 184 </property> … … 192 192 <action name="actionSave"> 193 193 <property name="icon"> 194 <iconset resource="../../UI/main_resources.qrc">194 <iconset> 195 195 <normaloff>:/res/save.png</normaloff>:/res/save.png</iconset> 196 196 </property> … … 204 204 <action name="actionReport"> 205 205 <property name="icon"> 206 <iconset resource="../../UI/main_resources.qrc">206 <iconset> 207 207 <normaloff>:/res/report.png</normaloff>:/res/report.png</iconset> 208 208 </property> … … 216 216 <action name="actionUndo"> 217 217 <property name="icon"> 218 <iconset resource="../../UI/main_resources.qrc">218 <iconset> 219 219 <normaloff>:/res/undo.png</normaloff> 220 220 <normalon>res/undo.png</normalon>:/res/undo.png</iconset> … … 226 226 <action name="actionRedo"> 227 227 <property name="icon"> 228 <iconset resource="../../UI/main_resources.qrc">228 <iconset> 229 229 <normaloff>:/res/redo.png</normaloff>:/res/redo.png</iconset> 230 230 </property> … … 238 238 <action name="actionCopy"> 239 239 <property name="icon"> 240 <iconset resource="../../UI/main_resources.qrc">240 <iconset> 241 241 <normaloff>:/res/copy.png</normaloff>:/res/copy.png</iconset> 242 242 </property> … … 250 250 <action name="actionPaste"> 251 251 <property name="icon"> 252 <iconset resource="../../UI/main_resources.qrc">252 <iconset> 253 253 <normaloff>:/res/paste.png</normaloff>:/res/paste.png</iconset> 254 254 </property> … … 265 265 </property> 266 266 <property name="icon"> 267 <iconset resource="../../UI/main_resources.qrc">267 <iconset> 268 268 <normaloff>:/res/bookmark.png</normaloff>:/res/bookmark.png</iconset> 269 269 </property> … … 497 497 </action> 498 498 </widget> 499 <resources> 500 <include location="../../UI/main_resources.qrc"/> 501 </resources> 499 <resources/> 502 500 <connections/> 503 501 </ui> -
src/sas/qtgui/MainWindow/UI/WelcomePanelUI.ui
r83eb5208 rcd2cc745 7 7 <x>0</x> 8 8 <y>0</y> 9 <width> 746</width>10 <height> 947</height>9 <width>658</width> 10 <height>737</height> 11 11 </rect> 12 12 </property> … … 21 21 </property> 22 22 <property name="pixmap"> 23 <pixmap resource="../../UI/main_resources.qrc">:/res/SVwelcome.png</pixmap>23 <pixmap>:/res/SVwelcome.png</pixmap> 24 24 </property> 25 25 <property name="alignment"> … … 79 79 </layout> 80 80 </widget> 81 <resources> 82 <include location="../../UI/main_resources.qrc"/> 83 <include location="main_resources.qrc"/> 84 </resources> 81 <resources/> 85 82 <connections/> 86 83 </ui> -
src/sas/qtgui/MainWindow/WelcomePanel.py
r83eb5208 rcd2cc745 8 8 import sas.sasview 9 9 import sas.qtgui.Utilities.LocalConfig as LocalConfig 10 from sas.qtgui.UI import images_rc 11 from sas.qtgui.UI import main_resources_rc 10 12 11 13 from sas.qtgui.MainWindow.UI.WelcomePanelUI import Ui_WelcomePanelUI -
src/sas/qtgui/Plotting/BoxSum.py
r83eb5208 rcd2cc745 6 6 7 7 # Local UI 8 from sas.qtgui.UI import main_resources_rc 8 9 from sas.qtgui.Plotting.UI.BoxSumUI import Ui_BoxSumUI 9 10 -
src/sas/qtgui/Plotting/ColorMap.py
r83eb5208 rcd2cc745 18 18 19 19 # Local UI 20 from sas.qtgui.UI import main_resources_rc 20 21 from sas.qtgui.Plotting.UI.ColorMapUI import Ui_ColorMapUI 21 22 -
src/sas/qtgui/Plotting/LinearFit.py
r83eb5208 rcd2cc745 15 15 16 16 # Local UI 17 from sas.qtgui.UI import main_resources_rc 17 18 from sas.qtgui.Plotting.UI.LinearFitUI import Ui_LinearFitUI 18 19 -
src/sas/qtgui/Plotting/MaskEditor.py
r83eb5208 rcd2cc745 4 4 5 5 # Local UI 6 from sas.qtgui.UI import main_resources_rc 6 7 from sas.qtgui.Plotting.UI.MaskEditorUI import Ui_MaskEditorUI 7 8 from sas.qtgui.Plotting.Plotter2D import Plotter2DWidget -
src/sas/qtgui/Plotting/PlotProperties.py
r83eb5208 rcd2cc745 3 3 from sas.qtgui.Plotting.PlotUtilities import COLORS, SHAPES 4 4 5 from sas.qtgui.UI import main_resources_rc 5 6 from sas.qtgui.Plotting.UI.PlotPropertiesUI import Ui_PlotPropertiesUI 6 7 -
src/sas/qtgui/Plotting/ScaleProperties.py
r83eb5208 rcd2cc745 2 2 3 3 import sas.sasview 4 from sas.qtgui.UI import main_resources_rc 4 5 6 from sas.qtgui.UI import main_resources_rc 5 7 from sas.qtgui.Plotting.UI.ScalePropertiesUI import Ui_scalePropertiesUI 6 8 -
src/sas/qtgui/Plotting/SetGraphRange.py
r83eb5208 rcd2cc745 5 5 6 6 # Local UI 7 from sas.qtgui.UI import main_resources_rc 7 8 from sas.qtgui.Plotting.UI.SetGraphRangeUI import Ui_setGraphRangeUI 8 9 -
src/sas/qtgui/Plotting/SlicerParameters.py
r83eb5208 rcd2cc745 9 9 10 10 # Local UI 11 from sas.qtgui.UI import main_resources_rc 11 12 from sas.qtgui.Plotting.UI.SlicerParametersUI import Ui_SlicerParametersUI 12 13 -
src/sas/qtgui/Plotting/UI/BoxSumUI.ui
r83eb5208 rcd2cc745 21 21 </property> 22 22 <property name="windowIcon"> 23 <iconset resource="main_resources.qrc">23 <iconset> 24 24 <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 25 25 </property> … … 413 413 </layout> 414 414 </widget> 415 <resources> 416 <include location="main_resources.qrc"/> 417 </resources> 415 <resources/> 418 416 <connections> 419 417 <connection> -
src/sas/qtgui/Plotting/UI/ColorMapUI.ui
r83eb5208 rcd2cc745 15 15 </property> 16 16 <property name="windowIcon"> 17 <iconset resource="main_resources.qrc">17 <iconset> 18 18 <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 19 19 </property> … … 234 234 <zorder>verticalSpacer</zorder> 235 235 </widget> 236 <resources> 237 <include location="main_resources.qrc"/> 238 </resources> 236 <resources/> 239 237 <connections> 240 238 <connection> -
src/sas/qtgui/Plotting/UI/LinearFitUI.ui
r83eb5208 rcd2cc745 21 21 </property> 22 22 <property name="windowIcon"> 23 <iconset resource="main_resources.qrc">23 <iconset> 24 24 <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 25 25 </property> … … 272 272 </layout> 273 273 </widget> 274 <resources> 275 <include location="main_resources.qrc"/> 276 </resources> 274 <resources/> 277 275 <connections> 278 276 <connection> -
src/sas/qtgui/Plotting/UI/MaskEditorUI.ui
r83eb5208 rcd2cc745 15 15 </property> 16 16 <property name="windowIcon"> 17 <iconset resource="main_resources.qrc">17 <iconset> 18 18 <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 19 19 </property> … … 137 137 </layout> 138 138 </widget> 139 <resources> 140 <include location="main_resources.qrc"/> 141 </resources> 139 <resources/> 142 140 <connections/> 143 141 </ui> -
src/sas/qtgui/Plotting/UI/PlotPropertiesUI.ui
r83eb5208 rcd2cc745 8 8 <y>0</y> 9 9 <width>319</width> 10 <height> 172</height>10 <height>285</height> 11 11 </rect> 12 12 </property> … … 21 21 </property> 22 22 <property name="windowIcon"> 23 <iconset resource="main_resources.qrc">23 <iconset> 24 24 <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 25 25 </property> … … 121 121 </layout> 122 122 </widget> 123 <resources> 124 <include location="main_resources.qrc"/> 125 </resources> 123 <resources/> 126 124 <connections> 127 125 <connection> -
src/sas/qtgui/Plotting/UI/ScalePropertiesUI.ui
r83eb5208 rcd2cc745 21 21 </property> 22 22 <property name="windowIcon"> 23 <iconset resource="main_resources.qrc">23 <iconset> 24 24 <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 25 25 </property> … … 84 84 </layout> 85 85 </widget> 86 <resources> 87 <include location="main_resources.qrc"/> 88 </resources> 86 <resources/> 89 87 <connections> 90 88 <connection> -
src/sas/qtgui/Plotting/UI/SetGraphRangeUI.ui
r83eb5208 rcd2cc745 21 21 </property> 22 22 <property name="windowIcon"> 23 <iconset resource="main_resources.qrc">23 <iconset> 24 24 <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 25 25 </property> … … 97 97 </layout> 98 98 </widget> 99 <resources> 100 <include location="main_resources.qrc"/> 101 </resources> 99 <resources/> 102 100 <connections> 103 101 <connection> -
src/sas/qtgui/Plotting/UI/SlicerParametersUI.ui
r83eb5208 rcd2cc745 21 21 </property> 22 22 <property name="windowIcon"> 23 <iconset resource="main_resources.qrc">23 <iconset> 24 24 <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 25 25 </property> … … 40 40 </layout> 41 41 </widget> 42 <resources> 43 <include location="main_resources.qrc"/> 44 </resources> 42 <resources/> 45 43 <connections> 46 44 <connection> -
src/sas/qtgui/convertUI.py
r83eb5208 rcd2cc745 27 27 28 28 # Images 29 ui_root = 'images'29 images_root = 'images' 30 30 rc_file = 'images.qrc' 31 31 out_file = 'images_rc.py' 32 pyrrc(os.path.join( ui_root, rc_file), os.path.join(ui_root, out_file))32 pyrrc(os.path.join(images_root, rc_file), os.path.join(ui_root, out_file))
Note: See TracChangeset
for help on using the changeset viewer.