Skip to content

Commit 31f3d12

Browse files
dcwhitedcwhite
authored
Merge branch 'master' into split-up-headers
2 parents 7444ed2 + e945e84 commit 31f3d12

File tree

4 files changed

+74
-13
lines changed

4 files changed

+74
-13
lines changed

‎src/Interface/Application/ModuleWidget.cc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ void ModuleWidget::createInputPorts(const ModuleInfoProvider& moduleInfoProvider
606606
auto w = new InputPortWidget(QString::fromStdString(port->get_portname()), to_color(PortColorLookup::toColor(type),
607607
portAlpha()), type,
608608
moduleId, port->id(),
609-
i, port->isDynamic(),
609+
i, port->isDynamic(),
610610
[this]() { return connectionFactory_; },
611611
[this]() { return closestPortFinder_; },
612612
PortDataDescriber(),
@@ -820,7 +820,7 @@ void ModuleWidget::addDynamicPort(const ModuleId& mid, const PortId& pid)
820820
auto port = theModule_->getInputPort(pid);
821821
auto type = port->get_typename();
822822

823-
auto w = new InputPortWidget(QString::fromStdString(port->get_portname()), to_color(PortColorLookup::toColor(type)), type, mid, port->id(), port->getIndex(), port->isDynamic(),
823+
auto w = new InputPortWidget(QString::fromStdString(port->get_portname()), to_color(PortColorLookup::toColor(type)), type, mid, port->id(), port->getIndex(), port->isDynamic(),
824824
[this]() { return connectionFactory_; },
825825
[this]() { return closestPortFinder_; },
826826
PortDataDescriber(), this);
@@ -1162,6 +1162,7 @@ void ModuleWidget::adjustDockState(bool dockEnabled)
11621162
if (dockable_ && !dockable_->isHidden())
11631163
{
11641164
dockable_->setFloating(true);
1165+
updateDockWidgetProperties(true);
11651166
}
11661167
}
11671168
}

‎src/Interface/Application/PreferencesWindow.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ namespace Gui {
3939
class PreferencesWindow : public QDialog, public Ui::PreferencesDialog
4040
{
4141
Q_OBJECT
42-
42+
4343
public:
44-
explicit PreferencesWindow(NetworkEditor* editor, QWidget* parent = 0);
45-
44+
explicit PreferencesWindow(NetworkEditor* editor, QWidget* parent = nullptr);
45+
4646
bool saveBeforeExecute() const;
4747
void setSaveBeforeExecute(bool mode);
4848

‎src/Interface/Application/SCIRunMainWindow.cc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1686,6 +1686,10 @@ void SCIRunMainWindow::keyPressEvent(QKeyEvent *event)
16861686
}
16871687
}
16881688
}
1689+
else if (event->key() == Qt::Key_Period)
1690+
{
1691+
switchMouseMode();
1692+
}
16891693

16901694
QMainWindow::keyPressEvent(event);
16911695
}

‎src/Interface/Modules/Fields/EditMeshBoundingBox.ui‎

Lines changed: 64 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>372</width>
10-
<height>560</height>
9+
<width>429</width>
10+
<height>612</height>
1111
</rect>
1212
</property>
1313
<property name="minimumSize">
1414
<size>
15-
<width>372</width>
16-
<height>560</height>
15+
<width>429</width>
16+
<height>612</height>
1717
</size>
1818
</property>
1919
<property name="windowTitle">
@@ -273,13 +273,13 @@
273273
<widget class="QPushButton" name="resetCenterPushButton_">
274274
<property name="minimumSize">
275275
<size>
276-
<width>100</width>
276+
<width>110</width>
277277
<height>0</height>
278278
</size>
279279
</property>
280280
<property name="maximumSize">
281281
<size>
282-
<width>100</width>
282+
<width>110</width>
283283
<height>16777215</height>
284284
</size>
285285
</property>
@@ -498,13 +498,13 @@
498498
<widget class="QPushButton" name="resetSizePushButton_">
499499
<property name="minimumSize">
500500
<size>
501-
<width>100</width>
501+
<width>110</width>
502502
<height>0</height>
503503
</size>
504504
</property>
505505
<property name="maximumSize">
506506
<size>
507-
<width>100</width>
507+
<width>110</width>
508508
<height>16777215</height>
509509
</size>
510510
</property>
@@ -578,6 +578,12 @@
578578
<layout class="QHBoxLayout" name="horizontalLayout">
579579
<item>
580580
<widget class="QLabel" name="label">
581+
<property name="minimumSize">
582+
<size>
583+
<width>0</width>
584+
<height>15</height>
585+
</size>
586+
</property>
581587
<property name="font">
582588
<font>
583589
<weight>50</weight>
@@ -594,27 +600,51 @@
594600
<property name="enabled">
595601
<bool>true</bool>
596602
</property>
603+
<property name="minimumSize">
604+
<size>
605+
<width>0</width>
606+
<height>15</height>
607+
</size>
608+
</property>
597609
<property name="text">
598610
<string>++</string>
599611
</property>
600612
</widget>
601613
</item>
602614
<item>
603615
<widget class="QToolButton" name="upScaleToolButton_">
616+
<property name="minimumSize">
617+
<size>
618+
<width>0</width>
619+
<height>15</height>
620+
</size>
621+
</property>
604622
<property name="text">
605623
<string>+</string>
606624
</property>
607625
</widget>
608626
</item>
609627
<item>
610628
<widget class="QToolButton" name="downScaleToolButton_">
629+
<property name="minimumSize">
630+
<size>
631+
<width>0</width>
632+
<height>15</height>
633+
</size>
634+
</property>
611635
<property name="text">
612636
<string>-</string>
613637
</property>
614638
</widget>
615639
</item>
616640
<item>
617641
<widget class="QToolButton" name="doubleDownScaleToolButton_">
642+
<property name="minimumSize">
643+
<size>
644+
<width>0</width>
645+
<height>15</height>
646+
</size>
647+
</property>
618648
<property name="text">
619649
<string>--</string>
620650
</property>
@@ -738,6 +768,32 @@
738768
</item>
739769
</layout>
740770
</widget>
771+
<tabstops>
772+
<tabstop>setCenterPushButton_</tabstop>
773+
<tabstop>outputCenterXSpinBox_</tabstop>
774+
<tabstop>outputCenterYSpinBox_</tabstop>
775+
<tabstop>outputCenterZSpinBox_</tabstop>
776+
<tabstop>resetCenterPushButton_</tabstop>
777+
<tabstop>setSizePushButton_</tabstop>
778+
<tabstop>outputSizeXSpinBox_</tabstop>
779+
<tabstop>outputSizeYSpinBox_</tabstop>
780+
<tabstop>outputSizeZSpinBox_</tabstop>
781+
<tabstop>resetSizePushButton_</tabstop>
782+
<tabstop>resetAllPushButton_</tabstop>
783+
<tabstop>doubleUpScaleToolButton_</tabstop>
784+
<tabstop>upScaleToolButton_</tabstop>
785+
<tabstop>downScaleToolButton_</tabstop>
786+
<tabstop>doubleDownScaleToolButton_</tabstop>
787+
<tabstop>noTranslationRadioButton_</tabstop>
788+
<tabstop>xyzTranslationRadioButton_</tabstop>
789+
<tabstop>rdiTranslationRadioButton_</tabstop>
790+
<tabstop>restrictXCheckBox_</tabstop>
791+
<tabstop>restrictYCheckBox_</tabstop>
792+
<tabstop>restrictZCheckBox_</tabstop>
793+
<tabstop>restrictRCheckBox_</tabstop>
794+
<tabstop>restrictDCheckBox_</tabstop>
795+
<tabstop>restrictICheckBox_</tabstop>
796+
</tabstops>
741797
<resources/>
742798
<connections/>
743799
<slots>

0 commit comments

Comments
 (0)