Skip to content

Commit

Permalink
Refs #9043 Interface UI file changed
Browse files Browse the repository at this point in the history 
The column resize bug has been fixed fixed (horizontalHeaderCascadingSectionResizes was true instead of false)

The new Edit menu has been created with Copy, Cut, Paste and Clear with their universally recognised shortcuts Ctrl-C, Ctrl-X, Ctrl-V, and Del
  • Loading branch information
@keithnbrown
keithnbrown committed Mar 3, 2014
1 parent 890a51a commit 42698f6
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 3 deletions.
31 changes: 29 additions & 2 deletions Code/Mantid/scripts/Interface/ui/reflectometer/refl_window.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Form implementation generated from reading ui file 'D:\mantid\windows\Code\Mantid\scripts\Interface\ui\reflectometer/refl_window.ui'
#
# Created: Tue Jan 28 18:18:03 2014
# Created: Fri Feb 28 10:16:43 2014
# by: PyQt4 UI code generator 4.8.3
#
# WARNING! All changes made in this file will be lost!
Expand Down Expand Up @@ -176,10 +176,13 @@ def setupUi(self, windowRefl):
self.tableMain.setHorizontalHeaderItem(16, item)
item = QtGui.QTableWidgetItem()
self.tableMain.setHorizontalHeaderItem(17, item)
self.tableMain.horizontalHeader().setCascadingSectionResizes(True)
self.tableMain.horizontalHeader().setCascadingSectionResizes(False)
self.tableMain.horizontalHeader().setDefaultSectionSize(60)
self.tableMain.horizontalHeader().setMinimumSectionSize(20)
self.tableMain.horizontalHeader().setStretchLastSection(True)
self.tableMain.verticalHeader().setCascadingSectionResizes(False)
self.tableMain.verticalHeader().setDefaultSectionSize(20)
self.tableMain.verticalHeader().setStretchLastSection(True)
self.layoutTableColumn.addWidget(self.tableMain)
self.layoutTableButton = QtGui.QHBoxLayout()
self.layoutTableButton.setObjectName(_fromUtf8("layoutTableButton"))
Expand Down Expand Up @@ -207,6 +210,8 @@ def setupUi(self, windowRefl):
self.menuHelp.setObjectName(_fromUtf8("menuHelp"))
self.menuFunction = QtGui.QMenu(self.menuBar)
self.menuFunction.setObjectName(_fromUtf8("menuFunction"))
self.menuEdit = QtGui.QMenu(self.menuBar)
self.menuEdit.setObjectName(_fromUtf8("menuEdit"))
windowRefl.setMenuBar(self.menuBar)
self.statusMain = QtGui.QStatusBar(windowRefl)
self.statusMain.setObjectName(_fromUtf8("statusMain"))
Expand Down Expand Up @@ -235,6 +240,14 @@ def setupUi(self, windowRefl):
self.actionClear_Table.setObjectName(_fromUtf8("actionClear_Table"))
self.actionSearch_RB = QtGui.QAction(windowRefl)
self.actionSearch_RB.setObjectName(_fromUtf8("actionSearch_RB"))
self.actionCopy = QtGui.QAction(windowRefl)
self.actionCopy.setObjectName(_fromUtf8("actionCopy"))
self.actionPaste = QtGui.QAction(windowRefl)
self.actionPaste.setObjectName(_fromUtf8("actionPaste"))
self.actionCut = QtGui.QAction(windowRefl)
self.actionCut.setObjectName(_fromUtf8("actionCut"))
self.actionClear = QtGui.QAction(windowRefl)
self.actionClear.setObjectName(_fromUtf8("actionClear"))
self.menuFile.addAction(self.actionOpen_Table)
self.menuFile.addAction(self.actionReload_from_Disk)
self.menuFile.addSeparator()
Expand All @@ -251,7 +264,12 @@ def setupUi(self, windowRefl):
self.menuFunction.addAction(self.actionClear_Table)
self.menuFunction.addSeparator()
self.menuFunction.addAction(self.actionSearch_RB)
self.menuEdit.addAction(self.actionCopy)
self.menuEdit.addAction(self.actionCut)
self.menuEdit.addAction(self.actionPaste)
self.menuEdit.addAction(self.actionClear)
self.menuBar.addAction(self.menuFile.menuAction())
self.menuBar.addAction(self.menuEdit.menuAction())
self.menuBar.addAction(self.menuFunction.menuAction())
self.menuBar.addAction(self.menuHelp.menuAction())
self.labelInstrument.setBuddy(self.comboInstrument)
Expand Down Expand Up @@ -318,6 +336,7 @@ def retranslateUi(self, windowRefl):
self.menuFile.setTitle(QtGui.QApplication.translate("windowRefl", "File", None, QtGui.QApplication.UnicodeUTF8))
self.menuHelp.setTitle(QtGui.QApplication.translate("windowRefl", "Help", None, QtGui.QApplication.UnicodeUTF8))
self.menuFunction.setTitle(QtGui.QApplication.translate("windowRefl", "Function", None, QtGui.QApplication.UnicodeUTF8))
self.menuEdit.setTitle(QtGui.QApplication.translate("windowRefl", "Edit", None, QtGui.QApplication.UnicodeUTF8))
self.actionSave_As.setText(QtGui.QApplication.translate("windowRefl", "Save As...", None, QtGui.QApplication.UnicodeUTF8))
self.actionSave_As.setShortcut(QtGui.QApplication.translate("windowRefl", "Ctrl+Alt+S", None, QtGui.QApplication.UnicodeUTF8))
self.actionOpen_Table.setText(QtGui.QApplication.translate("windowRefl", "Open Table...", None, QtGui.QApplication.UnicodeUTF8))
Expand All @@ -342,4 +361,12 @@ def retranslateUi(self, windowRefl):
self.actionClear_Table.setShortcut(QtGui.QApplication.translate("windowRefl", "Alt+C", None, QtGui.QApplication.UnicodeUTF8))
self.actionSearch_RB.setText(QtGui.QApplication.translate("windowRefl", "Search RB", None, QtGui.QApplication.UnicodeUTF8))
self.actionSearch_RB.setShortcut(QtGui.QApplication.translate("windowRefl", "Alt+R", None, QtGui.QApplication.UnicodeUTF8))
self.actionCopy.setText(QtGui.QApplication.translate("windowRefl", "Copy", None, QtGui.QApplication.UnicodeUTF8))
self.actionCopy.setShortcut(QtGui.QApplication.translate("windowRefl", "Ctrl+C", None, QtGui.QApplication.UnicodeUTF8))
self.actionPaste.setText(QtGui.QApplication.translate("windowRefl", "Paste", None, QtGui.QApplication.UnicodeUTF8))
self.actionPaste.setShortcut(QtGui.QApplication.translate("windowRefl", "Ctrl+V", None, QtGui.QApplication.UnicodeUTF8))
self.actionCut.setText(QtGui.QApplication.translate("windowRefl", "Cut", None, QtGui.QApplication.UnicodeUTF8))
self.actionCut.setShortcut(QtGui.QApplication.translate("windowRefl", "Ctrl+X", None, QtGui.QApplication.UnicodeUTF8))
self.actionClear.setText(QtGui.QApplication.translate("windowRefl", "Clear", None, QtGui.QApplication.UnicodeUTF8))
self.actionClear.setShortcut(QtGui.QApplication.translate("windowRefl", "Del", None, QtGui.QApplication.UnicodeUTF8))

53 changes: 52 additions & 1 deletion Code/Mantid/scripts/Interface/ui/reflectometer/refl_window.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,17 +341,26 @@
<number>18</number>
</property>
<attribute name="horizontalHeaderCascadingSectionResizes">
<bool>true</bool>
<bool>false</bool>
</attribute>
<attribute name="horizontalHeaderDefaultSectionSize">
<number>60</number>
</attribute>
<attribute name="horizontalHeaderMinimumSectionSize">
<number>20</number>
</attribute>
<attribute name="horizontalHeaderStretchLastSection">
<bool>true</bool>
</attribute>
<attribute name="verticalHeaderCascadingSectionResizes">
<bool>false</bool>
</attribute>
<attribute name="verticalHeaderDefaultSectionSize">
<number>20</number>
</attribute>
<attribute name="verticalHeaderStretchLastSection">
<bool>true</bool>
</attribute>
<row/>
<row/>
<row/>
Expand Down Expand Up @@ -616,7 +625,17 @@
<addaction name="separator"/>
<addaction name="actionSearch_RB"/>
</widget>
<widget class="QMenu" name="menuEdit">
<property name="title">
<string>Edit</string>
</property>
<addaction name="actionCopy"/>
<addaction name="actionCut"/>
<addaction name="actionPaste"/>
<addaction name="actionClear"/>
</widget>
<addaction name="menuFile"/>
<addaction name="menuEdit"/>
<addaction name="menuFunction"/>
<addaction name="menuHelp"/>
</widget>
Expand Down Expand Up @@ -717,6 +736,38 @@
<string>Alt+R</string>
</property>
</action>
<action name="actionCopy">
<property name="text">
<string>Copy</string>
</property>
<property name="shortcut">
<string>Ctrl+C</string>
</property>
</action>
<action name="actionPaste">
<property name="text">
<string>Paste</string>
</property>
<property name="shortcut">
<string>Ctrl+V</string>
</property>
</action>
<action name="actionCut">
<property name="text">
<string>Cut</string>
</property>
<property name="shortcut">
<string>Ctrl+X</string>
</property>
</action>
<action name="actionClear">
<property name="text">
<string>Clear</string>
</property>
<property name="shortcut">
<string>Del</string>
</property>
</action>
</widget>
<tabstops>
<tabstop>comboInstrument</tabstop>
Expand Down

0 comments on commit 42698f6

Please sign in to comment.