Changeset 488c49d in sasview for src/sas/qtgui/Perspectives/Invariant

Timestamp:

Jun 8, 2016 7:56:28 AM (8 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

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:

5032ea68

Parents:

f721030

git-author:

Piotr Rozyczko <piotr.rozyczko@…> (06/08/16 07:53:59)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (06/08/16 07:56:28)

Message:

Hold data objects in model. Added more Data Explorer functionality. Added unit tests.

Location:

src/sas/qtgui/Perspectives/Invariant/UI

Files:

• InvariantDetailsUI.py (modified) (1 diff)
• TabbedInvariantUI.py (modified) (3 diffs)
• TabbedInvariantUI.ui (modified) (2 diffs)

src/sas/qtgui/Perspectives/Invariant/UI/InvariantDetailsUI.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'InvariantDetails.ui'
+# Form implementation generated from reading ui file 'InvariantDetailsUI.ui'
 #
 # Created by: PyQt4 UI code generator 4.11.4

src/sas/qtgui/Perspectives/Invariant/UI/TabbedInvariantUI.py

@@ -27 +27 @@
         tabbedInvariantUI.setObjectName(_fromUtf8("tabbedInvariantUI"))
         tabbedInvariantUI.resize(465, 408)
-        icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/res/ball.ico")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        tabbedInvariantUI.setWindowIcon(icon)
         self.gridLayout_11 = QtGui.QGridLayout(tabbedInvariantUI)
         self.gridLayout_11.setObjectName(_fromUtf8("gridLayout_11"))
@@ -315 +312 @@
 
         self.retranslateUi(tabbedInvariantUI)
-        self.tabWidget.setCurrentIndex(1)
+        self.tabWidget.setCurrentIndex(0)
         QtCore.QMetaObject.connectSlotsByName(tabbedInvariantUI)
 
@@ -374 +371 @@
         self.pushButton_3.setText(_translate("tabbedInvariantUI", "Help", None))
 
-import main_resources_rc
 
 class tabbedInvariantUI(QtGui.QDialog, Ui_tabbedInvariantUI):

src/sas/qtgui/Perspectives/Invariant/UI/TabbedInvariantUI.ui

@@ -13 +13 @@
   <property name="windowTitle">
    <string>Dialog</string>
-  </property>
-  <property name="windowIcon">
-   <iconset resource="main_resources.qrc">
-    <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_11">
@@ -582 +578 @@
   </layout>
  </widget>
- <resources>
-  <include location="main_resources.qrc"/>
- </resources>
  <connections/>
 </ui>