diff --git a/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/ICatAdvancedSearch.ui b/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/ICatAdvancedSearch.ui index 5668bfba421562530c1eda85361f4774ad4ae4b6..3044c827cdeb934d2db3bdfb35d3b83fb787e9e9 100644 --- a/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/ICatAdvancedSearch.ui +++ b/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/ICatAdvancedSearch.ui @@ -1,483 +1,487 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>ICatAdvancedSearch</class> - <widget class="QWidget" name="ICatAdvancedSearch" > - <property name="geometry" > + <widget class="QWidget" name="ICatAdvancedSearch"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>719</width> + <width>735</width> <height>521</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Catalog Advanced Search</string> </property> - <layout class="QGridLayout" name="gridLayout_3" > - <item row="0" column="0" > - <widget class="QLabel" name="advsearchtitleLabel" > - <property name="maximumSize" > + <layout class="QGridLayout" name="gridLayout_3"> + <item row="0" column="0"> + <widget class="QLabel" name="advsearchtitleLabel"> + <property name="maximumSize"> <size> <width>16777215</width> <height>16</height> </size> </property> - <property name="frameShape" > + <property name="frameShape"> <enum>QFrame::StyledPanel</enum> </property> - <property name="frameShadow" > + <property name="frameShadow"> <enum>QFrame::Sunken</enum> </property> - <property name="text" > - <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> + <property name="text"> + <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Advanced Investigations Search</span></p></body></html></string> +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Advanced Investigations Search</span></p></body></html></string> </property> - <property name="indent" > - <number>321</number> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + <property name="indent"> + <number>0</number> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QFrame" name="advframeWidget" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > + <item row="1" column="0"> + <widget class="QFrame" name="advframeWidget"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="styleSheet" > - <string notr="true" >background-image: url(:/BackGroundImage/ICatSearchBackGround.png);</string> + <property name="styleSheet"> + <string notr="true">background-image: url(:/BackGroundImage/ICatSearchBackGround.png);</string> </property> - <property name="frameShape" > + <property name="frameShape"> <enum>QFrame::StyledPanel</enum> </property> - <property name="frameShadow" > + <property name="frameShadow"> <enum>QFrame::Sunken</enum> </property> - <layout class="QGridLayout" name="gridLayout_2" > - <item row="0" column="0" > - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" > - <widget class="QLabel" name="invstNameLabel" > - <property name="text" > + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="invstNameLabel"> + <property name="text"> <string>Investigation Name:</string> </property> </widget> </item> - <item row="0" column="1" > - <widget class="QLineEdit" name="InvestigationName" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <item row="0" column="1"> + <widget class="QLineEdit" name="InvestigationName"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> </widget> </item> - <item row="0" column="2" > - <widget class="QLabel" name="InvestigationName_2" > - <property name="styleSheet" > - <string notr="true" >color: rgb(255, 0, 0);</string> + <item row="0" column="2"> + <widget class="QLabel" name="InvestigationName_2"> + <property name="styleSheet"> + <string notr="true">color: rgb(255, 0, 0);</string> </property> - <property name="text" > + <property name="text"> <string>*</string> </property> </widget> </item> - <item row="0" column="3" > - <widget class="QLabel" name="runNumberLabel" > - <property name="text" > + <item row="0" column="3"> + <widget class="QLabel" name="runNumberLabel"> + <property name="text"> <string>StartRun:</string> </property> </widget> </item> - <item row="0" column="4" > - <widget class="QLineEdit" name="StartRun" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <item row="0" column="4"> + <widget class="QLineEdit" name="StartRun"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> </widget> </item> - <item row="0" column="5" > - <widget class="QLabel" name="StartRun_2" > - <property name="styleSheet" > - <string notr="true" >color: rgb(255, 0, 0);</string> + <item row="0" column="5"> + <widget class="QLabel" name="StartRun_2"> + <property name="styleSheet"> + <string notr="true">color: rgb(255, 0, 0);</string> </property> - <property name="text" > + <property name="text"> <string>*</string> </property> </widget> </item> - <item row="0" column="7" > - <widget class="QLabel" name="label" > - <property name="text" > + <item row="0" column="7"> + <widget class="QLabel" name="label"> + <property name="text"> <string>EndRun:</string> </property> </widget> </item> - <item row="0" column="8" > - <widget class="QLineEdit" name="EndRun" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <item row="0" column="8"> + <widget class="QLineEdit" name="EndRun"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> </widget> </item> - <item row="0" column="10" > - <widget class="QLabel" name="EndRun_2" > - <property name="styleSheet" > - <string notr="true" >color: rgb(255, 0, 0);</string> + <item row="0" column="10"> + <widget class="QLabel" name="EndRun_2"> + <property name="styleSheet"> + <string notr="true">color: rgb(255, 0, 0);</string> </property> - <property name="text" > + <property name="text"> <string>*</string> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QLabel" name="invstAbstractLabel" > - <property name="text" > + <item row="1" column="0"> + <widget class="QLabel" name="invstAbstractLabel"> + <property name="text"> <string>Investigation Abstract:</string> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QLineEdit" name="InvestigationAbstract" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <item row="1" column="1"> + <widget class="QLineEdit" name="InvestigationAbstract"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> </widget> </item> - <item row="1" column="2" > - <widget class="QLabel" name="InvestigationAbstract_2" > - <property name="styleSheet" > - <string notr="true" >color: rgb(255, 0, 0);</string> + <item row="1" column="2"> + <widget class="QLabel" name="InvestigationAbstract_2"> + <property name="styleSheet"> + <string notr="true">color: rgb(255, 0, 0);</string> </property> - <property name="text" > + <property name="text"> <string>*</string> </property> </widget> </item> - <item row="1" column="3" > - <widget class="QLabel" name="startdateLabel" > - <property name="text" > + <item row="1" column="3"> + <widget class="QLabel" name="startdateLabel"> + <property name="text"> <string>Start Date:</string> </property> </widget> </item> - <item row="1" column="4" > - <widget class="QLineEdit" name="StartDate" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <item row="1" column="4"> + <widget class="QLineEdit" name="StartDate"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Date in DD/MM/YYY format</string> </property> - <property name="inputMask" > + <property name="inputMask"> <string>99/99/9999;_</string> </property> - <property name="text" > + <property name="text"> <string>//</string> </property> </widget> </item> - <item row="1" column="5" > - <widget class="QToolButton" name="startdatetoolButton" > - <property name="maximumSize" > + <item row="1" column="5"> + <widget class="QToolButton" name="startdatetoolButton"> + <property name="maximumSize"> <size> <width>25</width> <height>16777215</height> </size> </property> - <property name="text" > + <property name="text"> <string>...</string> </property> </widget> </item> - <item row="1" column="6" > - <widget class="QLabel" name="StartDate_2" > - <property name="styleSheet" > - <string notr="true" >color: rgb(255, 0, 0);</string> + <item row="1" column="6"> + <widget class="QLabel" name="StartDate_2"> + <property name="styleSheet"> + <string notr="true">color: rgb(255, 0, 0);</string> </property> - <property name="text" > + <property name="text"> <string>*</string> </property> </widget> </item> - <item row="1" column="7" > - <widget class="QLabel" name="enddateLabel" > - <property name="text" > + <item row="1" column="7"> + <widget class="QLabel" name="enddateLabel"> + <property name="text"> <string>End Date:</string> </property> </widget> </item> - <item row="1" column="8" > - <widget class="QLineEdit" name="EndDate" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <item row="1" column="8"> + <widget class="QLineEdit" name="EndDate"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize" > + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Date in DD/MM/YYY format</string> </property> - <property name="inputMask" > + <property name="inputMask"> <string>99/99/9999;_</string> </property> - <property name="text" > + <property name="text"> <string>//</string> </property> </widget> </item> - <item row="1" column="10" > - <widget class="QToolButton" name="enddatetoolButton" > - <property name="maximumSize" > + <item row="1" column="10"> + <widget class="QToolButton" name="enddatetoolButton"> + <property name="maximumSize"> <size> <width>25</width> <height>16777215</height> </size> </property> - <property name="text" > + <property name="text"> <string>...</string> </property> </widget> </item> - <item row="1" column="11" > - <widget class="QLabel" name="EndDate_2" > - <property name="styleSheet" > - <string notr="true" >color: rgb(255, 0, 0);</string> + <item row="1" column="11"> + <widget class="QLabel" name="EndDate_2"> + <property name="styleSheet"> + <string notr="true">color: rgb(255, 0, 0);</string> </property> - <property name="text" > + <property name="text"> <string>*</string> </property> </widget> </item> - <item row="2" column="0" > - <widget class="QLabel" name="sampleLabel" > - <property name="text" > + <item row="2" column="0"> + <widget class="QLabel" name="sampleLabel"> + <property name="text"> <string>Sample:</string> </property> </widget> </item> - <item row="2" column="1" > - <widget class="QLineEdit" name="SampleName" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <item row="2" column="1"> + <widget class="QLineEdit" name="SampleName"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="text" > + <property name="text"> <string/> </property> </widget> </item> - <item row="2" column="2" > - <widget class="QLabel" name="SampleName_2" > - <property name="styleSheet" > - <string notr="true" >color: rgb(255, 0, 0);</string> + <item row="2" column="2"> + <widget class="QLabel" name="SampleName_2"> + <property name="styleSheet"> + <string notr="true">color: rgb(255, 0, 0);</string> </property> - <property name="text" > + <property name="text"> <string>*</string> </property> </widget> </item> - <item row="2" column="3" > - <widget class="QLabel" name="instrumentLabel" > - <property name="text" > + <item row="2" column="3"> + <widget class="QLabel" name="instrumentLabel"> + <property name="text"> <string>Instrument:</string> </property> </widget> </item> - <item row="2" column="4" > - <widget class="QComboBox" name="Instrument" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <item row="2" column="4"> + <widget class="QComboBox" name="Instrument"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Instrument Box</string> </property> - <property name="styleSheet" > - <string notr="true" >QComboBox#Instrument QListView{background-color: white;background-image: url(ICatComboBackground.png);background-attachment: scroll;}QComboBox#Instrument QListView QScrollBar:vertical{background-image: url(:/images/ICatComboVScrollbar.png); background-repeat: repeat-y; width: 17px; height:20px;} </string> + <property name="styleSheet"> + <string notr="true">QComboBox#Instrument QListView{background-color: white;background-image: url(ICatComboBackground.png);background-attachment: scroll;}QComboBox#Instrument QListView QScrollBar:vertical{background-image: url(:/images/ICatComboVScrollbar.png); background-repeat: repeat-y; width: 17px; height:20px;} </string> </property> - <property name="sizeAdjustPolicy" > + <property name="sizeAdjustPolicy"> <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum> </property> </widget> </item> - <item row="2" column="5" > - <widget class="QLabel" name="Instrument_2" > - <property name="styleSheet" > - <string notr="true" >color: rgb(255, 0, 0);</string> + <item row="2" column="5"> + <widget class="QLabel" name="Instrument_2"> + <property name="styleSheet"> + <string notr="true">color: rgb(255, 0, 0);</string> </property> - <property name="text" > + <property name="text"> <string>*</string> </property> </widget> </item> - <item row="2" column="7" > - <widget class="QLabel" name="invstTypeLabel" > - <property name="text" > + <item row="2" column="7"> + <widget class="QLabel" name="invstTypeLabel"> + <property name="text"> <string>Investigation Type:</string> </property> </widget> </item> - <item row="2" column="8" > - <widget class="QComboBox" name="InvestigationType" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <item row="2" column="8"> + <widget class="QComboBox" name="InvestigationType"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="styleSheet" > - <string notr="true" >QComboBox#InvestigationType QListView{background-color: white;background-image: url(ICatComboBackground.png);background-attachment: scroll;}QComboBox#InvestigationType QListView QScrollBar:vertical{background-image: url(:/images/ICatComboVScrollbar.png); background-repeat: repeat-y; width: 17px; height:20px;} </string> + <property name="styleSheet"> + <string notr="true">QComboBox#InvestigationType QListView{background-color: white;background-image: url(ICatComboBackground.png);background-attachment: scroll;}QComboBox#InvestigationType QListView QScrollBar:vertical{background-image: url(:/images/ICatComboVScrollbar.png); background-repeat: repeat-y; width: 17px; height:20px;} </string> </property> - <property name="sizeAdjustPolicy" > + <property name="sizeAdjustPolicy"> <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum> </property> </widget> </item> - <item row="2" column="10" > - <widget class="QLabel" name="InvestigationType_2" > - <property name="styleSheet" > - <string notr="true" >color: rgb(255, 0, 0);</string> + <item row="2" column="10"> + <widget class="QLabel" name="InvestigationType_2"> + <property name="styleSheet"> + <string notr="true">color: rgb(255, 0, 0);</string> </property> - <property name="text" > + <property name="text"> <string>*</string> </property> </widget> </item> - <item row="3" column="0" > - <widget class="QLabel" name="invstsurnameLabel" > - <property name="text" > + <item row="3" column="0"> + <widget class="QLabel" name="invstsurnameLabel"> + <property name="text"> <string>Investigators surname:</string> </property> </widget> </item> - <item row="3" column="1" > - <widget class="QLineEdit" name="InvestigatorSurName" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <item row="3" column="1"> + <widget class="QLineEdit" name="InvestigatorSurName"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> </widget> </item> - <item row="3" column="2" > - <widget class="QLabel" name="InvestigatorSurName_2" > - <property name="styleSheet" > - <string notr="true" >color: rgb(255, 0, 0);</string> + <item row="3" column="2"> + <widget class="QLabel" name="InvestigatorSurName_2"> + <property name="styleSheet"> + <string notr="true">color: rgb(255, 0, 0);</string> </property> - <property name="text" > + <property name="text"> <string>*</string> </property> </widget> </item> - <item row="3" column="3" > - <widget class="QLabel" name="datafilenameLabel" > - <property name="text" > + <item row="3" column="3"> + <widget class="QLabel" name="datafilenameLabel"> + <property name="text"> <string>Datafile name:</string> </property> </widget> </item> - <item row="3" column="4" > - <widget class="QLineEdit" name="DataFileName" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <item row="3" column="4"> + <widget class="QLineEdit" name="DataFileName"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> </widget> </item> - <item row="3" column="5" > - <widget class="QLabel" name="DataFileName_2" > - <property name="styleSheet" > - <string notr="true" >color: rgb(255, 0, 0);</string> + <item row="3" column="5"> + <widget class="QLabel" name="DataFileName_2"> + <property name="styleSheet"> + <string notr="true">color: rgb(255, 0, 0);</string> </property> - <property name="text" > + <property name="text"> <string>*</string> </property> </widget> </item> - <item row="3" column="7" > - <widget class="QLabel" name="keywordsLabel" > - <property name="text" > + <item row="3" column="7"> + <widget class="QLabel" name="keywordsLabel"> + <property name="text"> <string> KeyWord(s):</string> </property> </widget> </item> - <item row="3" column="8" > - <widget class="QLineEdit" name="Keywords" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <item row="3" column="8"> + <widget class="QLineEdit" name="Keywords"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> </widget> </item> - <item row="3" column="10" > - <widget class="QLabel" name="Keywords_2" > - <property name="styleSheet" > - <string notr="true" >color: rgb(255, 0, 0);</string> + <item row="3" column="10"> + <widget class="QLabel" name="Keywords_2"> + <property name="styleSheet"> + <string notr="true">color: rgb(255, 0, 0);</string> </property> - <property name="text" > + <property name="text"> <string>*</string> </property> </widget> </item> - <item row="4" column="8" > - <widget class="QCheckBox" name="casesensitiveBox" > - <property name="text" > + <item row="4" column="8"> + <widget class="QCheckBox" name="casesensitiveBox"> + <property name="text"> <string>Case Sensitive</string> </property> </widget> </item> - <item row="4" column="9" > - <widget class="QLabel" name="CaseSensitive_2" > - <property name="styleSheet" > - <string notr="true" >color: rgb(255, 0, 0);</string> + <item row="4" column="9"> + <widget class="QLabel" name="CaseSensitive_2"> + <property name="styleSheet"> + <string notr="true">color: rgb(255, 0, 0);</string> </property> - <property name="text" > + <property name="text"> <string>*</string> </property> </widget> </item> </layout> </item> - <item row="1" column="0" > - <layout class="QHBoxLayout" name="horizontalLayout_2" > + <item row="1" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> - <spacer name="horizontalSpacer_2" > - <property name="orientation" > + <spacer name="horizontalSpacer_2"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>738</width> <height>20</height> @@ -486,11 +490,11 @@ p, li { white-space: pre-wrap; } </spacer> </item> <item> - <widget class="QPushButton" name="searchButton" > - <property name="toolTip" > + <widget class="QPushButton" name="searchButton"> + <property name="toolTip"> <string>Search Investigations</string> </property> - <property name="text" > + <property name="text"> <string>Search</string> </property> </widget> @@ -500,50 +504,50 @@ p, li { white-space: pre-wrap; } </layout> </widget> </item> - <item row="2" column="0" > - <widget class="QLabel" name="advsearchLabel" > - <property name="frameShape" > + <item row="2" column="0"> + <widget class="QLabel" name="advsearchLabel"> + <property name="frameShape"> <enum>QFrame::StyledPanel</enum> </property> - <property name="frameShadow" > + <property name="frameShadow"> <enum>QFrame::Sunken</enum> </property> - <property name="text" > + <property name="text"> <string/> </property> </widget> </item> - <item row="3" column="0" > - <widget class="QTableWidget" name="advSearchtableWidget" > - <property name="styleSheet" > - <string notr="true" >background-color: rgb(216, 225, 255);</string> + <item row="3" column="0"> + <widget class="QTableWidget" name="advSearchtableWidget"> + <property name="styleSheet"> + <string notr="true">background-color: rgb(216, 225, 255);</string> </property> - <property name="horizontalScrollBarPolicy" > + <property name="horizontalScrollBarPolicy"> <enum>Qt::ScrollBarAsNeeded</enum> </property> - <property name="selectionMode" > + <property name="selectionMode"> <enum>QAbstractItemView::SingleSelection</enum> </property> - <property name="selectionBehavior" > + <property name="selectionBehavior"> <enum>QAbstractItemView::SelectRows</enum> </property> </widget> </item> - <item row="4" column="0" > - <layout class="QHBoxLayout" name="horizontalLayout" > + <item row="4" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="QPushButton" name="helpButton" > - <property name="text" > + <widget class="QPushButton" name="helpButton"> + <property name="text"> <string>Help</string> </property> </widget> </item> <item> - <spacer name="horizontalSpacer" > - <property name="orientation" > + <spacer name="horizontalSpacer"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>548</width> <height>17</height> @@ -552,8 +556,8 @@ p, li { white-space: pre-wrap; } </spacer> </item> <item> - <widget class="QPushButton" name="closeButton" > - <property name="text" > + <widget class="QPushButton" name="closeButton"> + <property name="text"> <string>Close</string> </property> </widget> diff --git a/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/ICatSearch.ui b/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/ICatSearch.ui index 566261c88a82ecf4e5f6affcaca9eb3ca396a489..e032fffc8d235a7dbf24edea98f2f2c0ebdc3fa4 100644 --- a/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/ICatSearch.ui +++ b/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/ICatSearch.ui @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>ICatSearch</class> - <widget class="QWidget" name="ICatSearch" > - <property name="geometry" > + <widget class="QWidget" name="ICatSearch"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,264 +10,267 @@ <height>465</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Catalog Search</string> </property> - <layout class="QVBoxLayout" name="verticalLayout" > + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QLabel" name="label" > - <property name="frameShape" > + <widget class="QLabel" name="label"> + <property name="frameShape"> <enum>QFrame::StyledPanel</enum> </property> - <property name="frameShadow" > + <property name="frameShadow"> <enum>QFrame::Sunken</enum> </property> - <property name="text" > - <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> + <property name="text"> + <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><span style=" font-weight:600;">ISIS Investigations Search</span></p></body></html></string> +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><span style=" font-weight:600;">Investigations Search</span></p></body></html></string> </property> - <property name="indent" > - <number>292</number> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + <property name="indent"> + <number>0</number> </property> </widget> </item> <item> - <widget class="QFrame" name="searchframeWidget" > - <property name="styleSheet" > - <string notr="true" >background-image: url(:/BackGroundImage/ICatSearchBackGround.png);</string> + <widget class="QFrame" name="searchframeWidget"> + <property name="styleSheet"> + <string notr="true">background-image: url(:/BackGroundImage/ICatSearchBackGround.png);</string> </property> - <property name="frameShape" > + <property name="frameShape"> <enum>QFrame::StyledPanel</enum> </property> - <property name="frameShadow" > + <property name="frameShadow"> <enum>QFrame::Sunken</enum> </property> - <layout class="QGridLayout" name="gridLayout_2" > - <item row="0" column="0" > - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" > - <widget class="QLabel" name="runNumberLabel" > - <property name="text" > + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="runNumberLabel"> + <property name="text"> <string>Run#:</string> </property> </widget> </item> - <item row="0" column="2" > - <widget class="QLabel" name="StartRun_2" > - <property name="styleSheet" > - <string notr="true" >color: rgb(255, 0, 0);</string> + <item row="0" column="2"> + <widget class="QLabel" name="StartRun_2"> + <property name="styleSheet"> + <string notr="true">color: rgb(255, 0, 0);</string> </property> - <property name="text" > + <property name="text"> <string>*</string> </property> </widget> </item> - <item row="0" column="4" > - <widget class="QLabel" name="EndRun_2" > - <property name="styleSheet" > - <string notr="true" >color: rgb(255, 0, 0);</string> + <item row="0" column="4"> + <widget class="QLabel" name="EndRun_2"> + <property name="styleSheet"> + <string notr="true">color: rgb(255, 0, 0);</string> </property> - <property name="text" > + <property name="text"> <string>*</string> </property> </widget> </item> - <item row="0" column="5" > - <widget class="QLabel" name="startdateLabel" > - <property name="text" > + <item row="0" column="5"> + <widget class="QLabel" name="startdateLabel"> + <property name="text"> <string>Start Date:</string> </property> </widget> </item> - <item row="0" column="7" > - <widget class="QToolButton" name="startdatetoolButton" > - <property name="text" > + <item row="0" column="7"> + <widget class="QToolButton" name="startdatetoolButton"> + <property name="text"> <string>...</string> </property> </widget> </item> - <item row="0" column="8" > - <widget class="QLabel" name="StartDate_2" > - <property name="styleSheet" > - <string notr="true" >color: rgb(255, 0, 0);</string> + <item row="0" column="8"> + <widget class="QLabel" name="StartDate_2"> + <property name="styleSheet"> + <string notr="true">color: rgb(255, 0, 0);</string> </property> - <property name="text" > + <property name="text"> <string>*</string> </property> </widget> </item> - <item row="0" column="9" > - <widget class="QLabel" name="keywordsLabel" > - <property name="text" > + <item row="0" column="9"> + <widget class="QLabel" name="keywordsLabel"> + <property name="text"> <string>KeyWord(s):</string> </property> </widget> </item> - <item row="0" column="12" > - <widget class="QLabel" name="Keywords_2" > - <property name="styleSheet" > - <string notr="true" >color: rgb(255, 0, 0);</string> + <item row="0" column="12"> + <widget class="QLabel" name="Keywords_2"> + <property name="styleSheet"> + <string notr="true">color: rgb(255, 0, 0);</string> </property> - <property name="text" > + <property name="text"> <string>*</string> </property> </widget> </item> - <item row="0" column="1" > - <widget class="QLineEdit" name="StartRun" > - <property name="toolTip" > + <item row="0" column="1"> + <widget class="QLineEdit" name="StartRun"> + <property name="toolTip"> <string>Start Run Number</string> </property> - <property name="statusTip" > + <property name="statusTip"> <string/> </property> - <property name="styleSheet" > - <string notr="true" >background-color: rgb(255, 255, 255);</string> + <property name="styleSheet"> + <string notr="true">background-color: rgb(255, 255, 255);</string> </property> - <property name="inputMask" > + <property name="inputMask"> <string/> </property> - <property name="cursorPosition" > + <property name="cursorPosition"> <number>0</number> </property> </widget> </item> - <item row="0" column="3" > - <widget class="QLineEdit" name="EndRun" > - <property name="toolTip" > + <item row="0" column="3"> + <widget class="QLineEdit" name="EndRun"> + <property name="toolTip"> <string>End Run Number</string> </property> - <property name="styleSheet" > - <string notr="true" >background-color: rgb(255, 255, 255);</string> + <property name="styleSheet"> + <string notr="true">background-color: rgb(255, 255, 255);</string> </property> - <property name="inputMask" > + <property name="inputMask"> <string/> </property> </widget> </item> - <item row="0" column="6" > - <widget class="QLineEdit" name="StartDate" > - <property name="toolTip" > + <item row="0" column="6"> + <widget class="QLineEdit" name="StartDate"> + <property name="toolTip"> <string>Start Date in DD/MM/YYYY format</string> </property> - <property name="styleSheet" > - <string notr="true" >background-color: rgb(255, 255, 255);</string> + <property name="styleSheet"> + <string notr="true">background-color: rgb(255, 255, 255);</string> </property> - <property name="inputMask" > + <property name="inputMask"> <string>00/00/0000;_</string> </property> - <property name="text" > + <property name="text"> <string>//</string> </property> </widget> </item> - <item row="0" column="10" colspan="2" > - <widget class="QLineEdit" name="Keywords" > - <property name="styleSheet" > - <string notr="true" >background-color: rgb(255, 255, 255);</string> + <item row="0" column="10" colspan="2"> + <widget class="QLineEdit" name="Keywords"> + <property name="styleSheet"> + <string notr="true">background-color: rgb(255, 255, 255);</string> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QLabel" name="instrumentLabel" > - <property name="text" > + <item row="1" column="0"> + <widget class="QLabel" name="instrumentLabel"> + <property name="text"> <string>Instrument:</string> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QComboBox" name="Instrument" > - <property name="toolTip" > + <item row="1" column="1"> + <widget class="QComboBox" name="Instrument"> + <property name="toolTip"> <string/> </property> - <property name="styleSheet" > - <string notr="true" >QComboBox#Instrument QListView{background-color: white;background-image: url(ICatComboBackground.png);background-attachment: scroll;}QComboBox#Instrument QListView QScrollBar:vertical{background-image: url(:/images/ICatComboVScrollbar.png); background-repeat: repeat-y; width: 17px; height:20px;} </string> + <property name="styleSheet"> + <string notr="true">QComboBox#Instrument QListView{background-color: white;background-image: url(ICatComboBackground.png);background-attachment: scroll;}QComboBox#Instrument QListView QScrollBar:vertical{background-image: url(:/images/ICatComboVScrollbar.png); background-repeat: repeat-y; width: 17px; height:20px;} </string> </property> </widget> </item> - <item row="1" column="2" > - <widget class="QLabel" name="Instrument_2" > - <property name="styleSheet" > - <string notr="true" >color: rgb(255, 0, 0);</string> + <item row="1" column="2"> + <widget class="QLabel" name="Instrument_2"> + <property name="styleSheet"> + <string notr="true">color: rgb(255, 0, 0);</string> </property> - <property name="text" > + <property name="text"> <string>*</string> </property> </widget> </item> - <item row="1" column="5" > - <widget class="QLabel" name="enddateLabel" > - <property name="text" > + <item row="1" column="5"> + <widget class="QLabel" name="enddateLabel"> + <property name="text"> <string>End Date:</string> </property> </widget> </item> - <item row="1" column="6" > - <widget class="QLineEdit" name="EndDate" > - <property name="toolTip" > + <item row="1" column="6"> + <widget class="QLineEdit" name="EndDate"> + <property name="toolTip"> <string>End Date in DD/MM/YYYY format</string> </property> - <property name="styleSheet" > - <string notr="true" >background-color: rgb(255, 255, 255);</string> + <property name="styleSheet"> + <string notr="true">background-color: rgb(255, 255, 255);</string> </property> - <property name="inputMask" > + <property name="inputMask"> <string>00/00/0000;_</string> </property> - <property name="text" > + <property name="text"> <string>//</string> </property> </widget> </item> - <item row="1" column="7" > - <widget class="QToolButton" name="enddatetoolButton" > - <property name="text" > + <item row="1" column="7"> + <widget class="QToolButton" name="enddatetoolButton"> + <property name="text"> <string>...</string> </property> </widget> </item> - <item row="1" column="8" > - <widget class="QLabel" name="EndDate_2" > - <property name="styleSheet" > - <string notr="true" >color: rgb(255, 0, 0);</string> + <item row="1" column="8"> + <widget class="QLabel" name="EndDate_2"> + <property name="styleSheet"> + <string notr="true">color: rgb(255, 0, 0);</string> </property> - <property name="text" > + <property name="text"> <string>*</string> </property> </widget> </item> - <item row="1" column="10" > - <widget class="QCheckBox" name="CaseSensitive" > - <property name="toolTip" > + <item row="1" column="10"> + <widget class="QCheckBox" name="CaseSensitive"> + <property name="toolTip"> <string/> </property> - <property name="text" > + <property name="text"> <string>Case Sensitive</string> </property> </widget> </item> - <item row="1" column="11" colspan="2" > - <widget class="QLabel" name="CaseSensitive_2" > - <property name="styleSheet" > - <string notr="true" >color: rgb(255, 0, 0);</string> + <item row="1" column="11" colspan="2"> + <widget class="QLabel" name="CaseSensitive_2"> + <property name="styleSheet"> + <string notr="true">color: rgb(255, 0, 0);</string> </property> - <property name="text" > + <property name="text"> <string>*</string> </property> </widget> </item> </layout> </item> - <item row="1" column="0" > - <layout class="QHBoxLayout" name="horizontalLayout_2" > + <item row="1" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> - <spacer name="horizontalSpacer" > - <property name="orientation" > + <spacer name="horizontalSpacer"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>582</width> <height>20</height> @@ -275,11 +279,11 @@ p, li { white-space: pre-wrap; } </spacer> </item> <item> - <widget class="QPushButton" name="searchButton" > - <property name="toolTip" > + <widget class="QPushButton" name="searchButton"> + <property name="toolTip"> <string>Search Investigations</string> </property> - <property name="text" > + <property name="text"> <string>Search</string> </property> </widget> @@ -290,61 +294,61 @@ p, li { white-space: pre-wrap; } </widget> </item> <item> - <widget class="QLabel" name="searchlabel" > - <property name="frameShape" > + <widget class="QLabel" name="searchlabel"> + <property name="frameShape"> <enum>QFrame::StyledPanel</enum> </property> - <property name="frameShadow" > + <property name="frameShadow"> <enum>QFrame::Sunken</enum> </property> - <property name="text" > + <property name="text"> <string/> </property> </widget> </item> <item> - <widget class="QTableWidget" name="searchtableWidget" > - <property name="toolTip" > + <widget class="QTableWidget" name="searchtableWidget"> + <property name="toolTip"> <string/> </property> - <property name="styleSheet" > - <string notr="true" >background-color: rgb(216, 225, 255);</string> + <property name="styleSheet"> + <string notr="true">background-color: rgb(216, 225, 255);</string> </property> - <property name="horizontalScrollBarPolicy" > + <property name="horizontalScrollBarPolicy"> <enum>Qt::ScrollBarAsNeeded</enum> </property> - <property name="autoScroll" > + <property name="autoScroll"> <bool>true</bool> </property> - <property name="alternatingRowColors" > + <property name="alternatingRowColors"> <bool>true</bool> </property> - <property name="selectionMode" > + <property name="selectionMode"> <enum>QAbstractItemView::SingleSelection</enum> </property> - <property name="selectionBehavior" > + <property name="selectionBehavior"> <enum>QAbstractItemView::SelectRows</enum> </property> - <property name="showGrid" > + <property name="showGrid"> <bool>true</bool> </property> </widget> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout" > + <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="QPushButton" name="helpButton" > - <property name="text" > + <widget class="QPushButton" name="helpButton"> + <property name="text"> <string>Help</string> </property> </widget> </item> <item> - <spacer name="horizontalSpacer_4" > - <property name="orientation" > + <spacer name="horizontalSpacer_4"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>527</width> <height>20</height> @@ -353,8 +357,8 @@ p, li { white-space: pre-wrap; } </spacer> </item> <item> - <widget class="QPushButton" name="closeButton" > - <property name="text" > + <widget class="QPushButton" name="closeButton"> + <property name="text"> <string>Close</string> </property> </widget> @@ -368,8 +372,6 @@ p, li { white-space: pre-wrap; } <tabstop>closeButton</tabstop> <tabstop>searchtableWidget</tabstop> </tabstops> - <resources> - <include location="ICatSearchBackGround.qrc" /> - </resources> + <resources/> <connections/> </ui> diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/MdViewerWidget.ui b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/MdViewerWidget.ui index 730851da2ea3fb90afa03372cda9db573249df65..d7790a606155dce9ccd8ac981588c335b0fdb61a 100644 --- a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/MdViewerWidget.ui +++ b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/MdViewerWidget.ui @@ -14,6 +14,21 @@ <string>Form</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> + <property name="spacing"> + <number>0</number> + </property> + <property name="leftMargin"> + <number>1</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>1</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> <item> <layout class="QHBoxLayout" name="horizontalLayout"> <item> diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp index d87f6db2b6f494a40e1b2a33dd590e7623101529..d3f002f809598d9c83e6f0ce953dbdcb3bf0b9c7 100644 --- a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp +++ b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp @@ -409,6 +409,8 @@ void MdViewerWidget::createMenus() if (this->pluginMode) { menubar = new QMenuBar(this); + QSizePolicy policy(QSizePolicy::Preferred, QSizePolicy::Fixed); + menubar->setSizePolicy(policy); } else {