Changeset e540cd2 in sasview for src/sas/qtgui/UI

Timestamp:

Jul 7, 2016 4:54:18 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:

0cd8612

Parents:

f0f309d

Message:

Status bar, progress bar, initial treeview context menu + minor cleanup

Location:

src/sas/qtgui/UI

Files:

• DataExplorerUI.py (modified) (3 diffs)
• DataExplorerUI.ui (modified) (2 diffs)
• MainWindowUI.py (modified) (4 diffs)
• MainWindowUI.ui (modified) (3 diffs)

src/sas/qtgui/UI/DataExplorerUI.py

@@ -69 +69 @@
         self.gridLayout.addLayout(self.horizontalLayout_2, 0, 0, 1, 1)
         self.treeView = QtGui.QTreeView(self.groupBox)
+        self.treeView.setContextMenuPolicy(QtCore.Qt.NoContextMenu)
         self.treeView.setAcceptDrops(True)
         self.treeView.setEditTriggers(QtGui.QAbstractItemView.NoEditTriggers)
@@ -191 +192 @@
         self.gridLayout_8.addLayout(self.gridLayout_5, 1, 0, 1, 1)
         DataLoadWidget.addTab(self.theoryTab, _fromUtf8(""))
+        self.actionDataInfo = QtGui.QAction(DataLoadWidget)
+        self.actionDataInfo.setObjectName(_fromUtf8("actionDataInfo"))
+        self.actionSaveAs = QtGui.QAction(DataLoadWidget)
+        self.actionSaveAs.setObjectName(_fromUtf8("actionSaveAs"))
+        self.actionQuickPlot = QtGui.QAction(DataLoadWidget)
+        self.actionQuickPlot.setObjectName(_fromUtf8("actionQuickPlot"))
+        self.actionQuick3DPlot = QtGui.QAction(DataLoadWidget)
+        self.actionQuick3DPlot.setObjectName(_fromUtf8("actionQuick3DPlot"))
+        self.actionEditMask = QtGui.QAction(DataLoadWidget)
+        self.actionEditMask.setObjectName(_fromUtf8("actionEditMask"))
 
         self.retranslateUi(DataLoadWidget)
@@ -227 +238 @@
         self.cmdHelp_2.setText(_translate("DataLoadWidget", "Help", None))
         DataLoadWidget.setTabText(DataLoadWidget.indexOf(self.theoryTab), _translate("DataLoadWidget", "Theory", None))
+        self.actionDataInfo.setText(_translate("DataLoadWidget", "Data Info", None))
+        self.actionSaveAs.setText(_translate("DataLoadWidget", "Save As", None))
+        self.actionQuickPlot.setText(_translate("DataLoadWidget", "Quick Plot", None))
+        self.actionQuick3DPlot.setText(_translate("DataLoadWidget", "Quick 3DPlot (slow)", None))
+        self.actionEditMask.setText(_translate("DataLoadWidget", "Edit Mask", None))
 
 import main_resources_rc

src/sas/qtgui/UI/DataExplorerUI.ui

@@ -111 +111 @@
        <item row="1" column="0">
         <widget class="QTreeView" name="treeView">
+         <property name="contextMenuPolicy">
+          <enum>Qt::NoContextMenu</enum>
+         </property>
          <property name="acceptDrops">
           <bool>true</bool>
@@ -395 +398 @@
    </layout>
   </widget>
+  <action name="actionDataInfo">
+   <property name="text">
+    <string>Data Info</string>
+   </property>
+  </action>
+  <action name="actionSaveAs">
+   <property name="text">
+    <string>Save As</string>
+   </property>
+  </action>
+  <action name="actionQuickPlot">
+   <property name="text">
+    <string>Quick Plot</string>
+   </property>
+  </action>
+  <action name="actionQuick3DPlot">
+   <property name="text">
+    <string>Quick 3DPlot (slow)</string>
+   </property>
+  </action>
+  <action name="actionEditMask">
+   <property name="text">
+    <string>Edit Mask</string>
+   </property>
+  </action>
  </widget>
  <resources>

src/sas/qtgui/UI/MainWindowUI.py

@@ -26 +26 @@
     def setupUi(self, MainWindow):
         MainWindow.setObjectName(_fromUtf8("MainWindow"))
-        MainWindow.resize(915, 555)
+        MainWindow.resize(915, 527)
         icon = QtGui.QIcon()
         icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/res/ball.ico")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -157 +157 @@
         self.actionCascade = QtGui.QAction(MainWindow)
         self.actionCascade.setObjectName(_fromUtf8("actionCascade"))
-        self.actionTile_Horizontally = QtGui.QAction(MainWindow)
-        self.actionTile_Horizontally.setObjectName(_fromUtf8("actionTile_Horizontally"))
+        self.actionTile = QtGui.QAction(MainWindow)
+        self.actionTile.setObjectName(_fromUtf8("actionTile"))
         self.actionTile_Vertically = QtGui.QAction(MainWindow)
         self.actionTile_Vertically.setObjectName(_fromUtf8("actionTile_Vertically"))
@@ -240 +240 @@
         self.menuFitting.addAction(self.actionEdit_Custom_Model)
         self.menuWindow.addAction(self.actionCascade)
-        self.menuWindow.addAction(self.actionTile_Horizontally)
-        self.menuWindow.addAction(self.actionTile_Vertically)
+        self.menuWindow.addAction(self.actionTile)
         self.menuWindow.addSeparator()
         self.menuWindow.addAction(self.actionArrange_Icons)
@@ -331 +330 @@
         self.actionEdit_Custom_Model.setText(_translate("MainWindow", "Edit Custom Model", None))
         self.actionCascade.setText(_translate("MainWindow", "Cascade", None))
-        self.actionTile_Horizontally.setText(_translate("MainWindow", "Tile Horizontally", None))
+        self.actionTile.setText(_translate("MainWindow", "Tile", None))
         self.actionTile_Vertically.setText(_translate("MainWindow", "Tile Vertically", None))
         self.actionArrange_Icons.setText(_translate("MainWindow", "Arrange Icons", None))

src/sas/qtgui/UI/MainWindowUI.ui

@@ -8 +8 @@
     <y>0</y>
     <width>915</width>
-    <height>555</height>
+    <height>527</height>
    </rect>
   </property>
@@ -112 +112 @@
     </property>
     <addaction name="actionCascade"/>
-    <addaction name="actionTile_Horizontally"/>
-    <addaction name="actionTile_Vertically"/>
+    <addaction name="actionTile"/>
     <addaction name="separator"/>
     <addaction name="actionArrange_Icons"/>
@@ -399 +398 @@
    </property>
   </action>
-  <action name="actionTile_Horizontally">
-   <property name="text">
-    <string>Tile Horizontally</string>
+  <action name="actionTile">
+   <property name="text">
+    <string>Tile</string>
    </property>
   </action>