Skip to content

Commit

Permalink
Correct for changes lost in merge
Browse files Browse the repository at this point in the history 
Refs #10850
  • Loading branch information
@DanNixon
DanNixon committed Feb 6, 2015
1 parent 803f3a8 commit ca2a427
Show file tree
Hide file tree
Showing 13 changed files with 2 additions and 289 deletions.
29 changes: 0 additions & 29 deletions Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ApplyCorr.ui
View file
Expand Up @@ -267,35 +267,6 @@
<string>Output Options</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="ckVerbose">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Verbose</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_0">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="lbPlotOutput">
<property name="sizePolicy">
Expand Down
29 changes: 0 additions & 29 deletions Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/CalcCorr.ui
View file
Expand Up @@ -953,35 +953,6 @@
<layout class="QVBoxLayout" name="verticalLayout_11">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QCheckBox" name="ckVerbose">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Verbose</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="lbPlotOutput">
<property name="sizePolicy">
Expand Down
23 changes: 0 additions & 23 deletions Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ConvFit.ui
View file
Expand Up @@ -351,29 +351,6 @@
<string>Output</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_10">
<item>
<widget class="QCheckBox" name="ckVerbose">
<property name="text">
<string>Verbose</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_0">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="lbPlotType">
<property name="text">
Expand Down
26 changes: 0 additions & 26 deletions Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Fury.ui
View file
Expand Up @@ -123,32 +123,6 @@
<string>Output</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
<widget class="QCheckBox" name="ckVerbose">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Verbose</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_0">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="ckPlot">
<property name="text">
Expand Down
23 changes: 0 additions & 23 deletions Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/FuryFit.ui
View file
Expand Up @@ -257,29 +257,6 @@
<string>Output</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QCheckBox" name="ckVerbose">
<property name="text">
<string>Verbose</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_0">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="lbPlotType">
<property name="text">
Expand Down
20 changes: 0 additions & 20 deletions ...id/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectCalibration.ui
View file
Expand Up @@ -179,26 +179,6 @@
<string>Output</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="ckVerbose">
<property name="text">
<string>Verbose</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_1">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="ckPlot">
<property name="toolTip">
Expand Down
23 changes: 0 additions & 23 deletions ...id/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDiagnostics.ui
View file
Expand Up @@ -137,29 +137,6 @@
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_0">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="ckVerbose">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Verbose</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_1">
<property name="orientation">
Expand Down
20 changes: 0 additions & 20 deletions ...Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectMoments.ui
View file
Expand Up @@ -175,26 +175,6 @@
<string>Output</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="ckVerbose">
<property name="text">
<string>Verbose</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_0">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="ckPlot">
<property name="text">
Expand Down
20 changes: 0 additions & 20 deletions Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSqw.ui
View file
Expand Up @@ -397,26 +397,6 @@
<string>Output</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="ckVerbose">
<property name="text">
<string>Verbose</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_0">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="lbPlotOutput">
<property name="text">
Expand Down
23 changes: 0 additions & 23 deletions ...tid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSymmetrise.ui
View file
Expand Up @@ -95,29 +95,6 @@
<property name="margin">
<number>6</number>
</property>
<item>
<widget class="QCheckBox" name="ckVerbose">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Verbose</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_0">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>165</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="ckPlot">
<property name="text">
Expand Down
23 changes: 0 additions & 23 deletions ...d/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTransmission.ui
View file
Expand Up @@ -163,29 +163,6 @@
<string>Output</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="ckVerbose">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Verbose</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_1">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="ckPlot">
<property name="text">
Expand Down
28 changes: 1 addition & 27 deletions Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/MSDFit.ui
View file
Expand Up @@ -190,39 +190,13 @@
<string>Output</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QCheckBox" name="ckVerbose">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Verbose</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_0">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="ckPlot">
<property name="text">
<string>Plot Result</string>
</property>
<property name="checked">
<bool>true</bool>
<bool>false</bool>
</property>
</widget>
</item>
Expand Down

0 comments on commit ca2a427

Please sign in to comment.