diff options
16 files changed, 1266 insertions, 873 deletions
diff --git a/src/Authoring/Studio/Application/DataInputDlg.cpp b/src/Authoring/Studio/Application/DataInputDlg.cpp index 3f63138c..2d8fccd3 100644 --- a/src/Authoring/Studio/Application/DataInputDlg.cpp +++ b/src/Authoring/Studio/Application/DataInputDlg.cpp @@ -35,7 +35,7 @@ CDataInputDlg::CDataInputDlg(CDataInputDialogItem **datainput, QStandardItemModel *data, QWidget *parent, const QVector<EDataType> acceptedTypes) - : QDialog(parent, Qt::MSWindowsFixedSizeDialogHint) + : QDialog(parent) , m_ui(new Ui::DataInputDlg) , m_data(data) , m_dataInput(*datainput) @@ -74,6 +74,8 @@ CDataInputDlg::CDataInputDlg(CDataInputDialogItem **datainput, QStandardItemMode initDialog(); + window()->setFixedSize(size()); + connect(m_ui->comboBoxTypeList, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &CDataInputDlg::onTypeChanged); @@ -128,7 +130,7 @@ void CDataInputDlg::initDialog() updateVisibility(m_dataInput->type); } -void CDataInputDlg::on_buttonBox_accepted() +void CDataInputDlg::accept() { m_dataInput->name = m_name; m_dataInput->type = m_type; @@ -144,11 +146,6 @@ void CDataInputDlg::on_buttonBox_accepted() QDialog::accept(); } -void CDataInputDlg::on_buttonBox_rejected() -{ - QDialog::reject(); -} - void CDataInputDlg::onTypeChanged(int type) { updateVisibility(type); diff --git a/src/Authoring/Studio/Application/DataInputDlg.h b/src/Authoring/Studio/Application/DataInputDlg.h index 7e84e4b0..b560c7cc 100644 --- a/src/Authoring/Studio/Application/DataInputDlg.h +++ b/src/Authoring/Studio/Application/DataInputDlg.h @@ -93,8 +93,7 @@ protected: void updateVisibility(int type); private Q_SLOTS: - void on_buttonBox_accepted(); - void on_buttonBox_rejected(); + void accept() override; void onTypeChanged(int type); void onMinChanged(float min); void onMaxChanged(float max); diff --git a/src/Authoring/Studio/Application/DataInputDlg.ui b/src/Authoring/Studio/Application/DataInputDlg.ui index 6f48437c..b27218c4 100644 --- a/src/Authoring/Studio/Application/DataInputDlg.ui +++ b/src/Authoring/Studio/Application/DataInputDlg.ui @@ -16,288 +16,387 @@ <property name="accessibleName"> <string>DataInputDlg</string> </property> - <widget class="QWidget" name="horizontalLayoutWidget"> - <property name="geometry"> - <rect> - <x>10</x> - <y>210</y> - <width>511</width> - <height>31</height> - </rect> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <property name="leftMargin"> + <number>0</number> </property> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <spacer name="horizontalSpacer"> - <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="QDialogButtonBox" name="buttonBox"> - <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> - </property> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> - </property> - </widget> - </item> - </layout> - </widget> - <widget class="QWidget" name="horizontalLayoutWidget_2"> - <property name="geometry"> - <rect> - <x>10</x> - <y>10</y> - <width>511</width> - <height>197</height> - </rect> + <property name="topMargin"> + <number>0</number> </property> - <layout class="QHBoxLayout" name="horizontalLayout_4"> - <item> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QLabel" name="labelNodeName"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>70</width> - <height>24</height> - </size> - </property> - <property name="text"> - <string>Name</string> - </property> - </widget> - </item> - <item> - <spacer name="infoTxtSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Preferred</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>18</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QLabel" name="labelNodeType"> - <property name="minimumSize"> - <size> - <width>90</width> - <height>24</height> - </size> - </property> - <property name="text"> - <string>Input Type</string> - </property> - </widget> - </item> - <item> - <spacer name="verticalSpacer_2"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QLabel" name="labelEvaluation"> - <property name="minimumSize"> - <size> - <width>0</width> - <height>24</height> - </size> - </property> - <property name="text"> - <string>Evaluation</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="labelMin"> - <property name="minimumSize"> - <size> - <width>0</width> - <height>24</height> - </size> - </property> - <property name="layoutDirection"> - <enum>Qt::LeftToRight</enum> - </property> - <property name="text"> - <string>Minimum Range</string> - </property> - <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="labelMax"> - <property name="minimumSize"> - <size> - <width>0</width> - <height>24</height> - </size> - </property> - <property name="text"> - <string>Maximum Range</string> - </property> - <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> - </property> - </widget> - </item> - <item> - <spacer name="verticalSpacer_4"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> - <item> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <item> - <widget class="QLineEdit" name="lineEditInputName"> - <property name="toolTip"> - <string>The name of the data input</string> - </property> - <property name="text"> - <string>newDataInput</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="labelInfoText"> - <property name="font"> - <font> - <pointsize>7</pointsize> - <italic>true</italic> - </font> - </property> - <property name="text"> - <string>Only datatypes compatible with existing controlled properties are allowed</string> - </property> - </widget> - </item> - <item> - <widget class="QComboBox" name="comboBoxTypeList"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>The type of the data input</string> - </property> - </widget> - </item> - <item> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QLineEdit" name="lineEditEvaluation"> - <property name="toolTip"> - <string/> - </property> - </widget> - </item> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <widget class="QWidget" name="widget" native="true"> + <layout class="QVBoxLayout" name="verticalLayout_4"> <item> - <widget class="QDoubleSpinBox" name="doubleSpinBoxMin"> - <property name="toolTip"> - <string>The minimum value for the number</string> - </property> - <property name="minimum"> - <double>-999999999.000000000000000</double> - </property> - <property name="maximum"> - <double>999999999.000000000000000</double> - </property> + <widget class="QWidget" name="widget_4" native="true"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <widget class="QWidget" name="widget_2" native="true"> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <widget class="QLabel" name="labelNodeName"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>70</width> + <height>24</height> + </size> + </property> + <property name="text"> + <string>Name</string> + </property> + </widget> + </item> + <item> + <spacer name="infoTxtSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Preferred</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>18</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="labelNodeType"> + <property name="minimumSize"> + <size> + <width>90</width> + <height>24</height> + </size> + </property> + <property name="text"> + <string>Input Type</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer_2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>14</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="labelEvaluation"> + <property name="minimumSize"> + <size> + <width>0</width> + <height>24</height> + </size> + </property> + <property name="text"> + <string>Evaluation</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="labelMin"> + <property name="minimumSize"> + <size> + <width>0</width> + <height>24</height> + </size> + </property> + <property name="layoutDirection"> + <enum>Qt::LeftToRight</enum> + </property> + <property name="text"> + <string>Minimum Range</string> + </property> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="labelMax"> + <property name="minimumSize"> + <size> + <width>0</width> + <height>24</height> + </size> + </property> + <property name="text"> + <string>Maximum Range</string> + </property> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer_4"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>15</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QWidget" name="widget_5" native="true"> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <widget class="QLineEdit" name="lineEditInputName"> + <property name="toolTip"> + <string>The name of the data input</string> + </property> + <property name="text"> + <string>newDataInput</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="labelInfoText"> + <property name="font"> + <font> + <pointsize>7</pointsize> + <italic>true</italic> + </font> + </property> + <property name="text"> + <string>Only datatypes compatible with existing controlled properties are allowed</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="comboBoxTypeList"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>The type of the data input</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLineEdit" name="lineEditEvaluation"> + <property name="toolTip"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="QDoubleSpinBox" name="doubleSpinBoxMin"> + <property name="toolTip"> + <string>The minimum value for the number</string> + </property> + <property name="minimum"> + <double>-999999999.000000000000000</double> + </property> + <property name="maximum"> + <double>999999999.000000000000000</double> + </property> + </widget> + </item> + <item> + <widget class="QDoubleSpinBox" name="doubleSpinBoxMax"> + <property name="toolTip"> + <string>The maximum value for the number</string> + </property> + <property name="minimum"> + <double>-999999999.000000000000000</double> + </property> + <property name="maximum"> + <double>999999999.000000000000000</double> + </property> + <property name="value"> + <double>10.000000000000000</double> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer_3"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + </layout> </widget> </item> <item> - <widget class="QDoubleSpinBox" name="doubleSpinBoxMax"> - <property name="toolTip"> - <string>The maximum value for the number</string> - </property> - <property name="minimum"> - <double>-999999999.000000000000000</double> - </property> - <property name="maximum"> - <double>999999999.000000000000000</double> - </property> - <property name="value"> - <double>10.000000000000000</double> - </property> + <widget class="QWidget" name="widget_3" native="true"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>252</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> </widget> </item> - <item> - <spacer name="verticalSpacer_3"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> </layout> - </item> - </layout> - </widget> + </widget> + </item> + </layout> </widget> <resources/> - <connections/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>DataInputDlg</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>396</x> + <y>223</y> + </hint> + <hint type="destinationlabel"> + <x>266</x> + <y>121</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>DataInputDlg</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>396</x> + <y>223</y> + </hint> + <hint type="destinationlabel"> + <x>266</x> + <y>121</y> + </hint> + </hints> + </connection> + </connections> </ui> diff --git a/src/Authoring/Studio/Application/DataInputListDlg.cpp b/src/Authoring/Studio/Application/DataInputListDlg.cpp index 71904037..a059a625 100644 --- a/src/Authoring/Studio/Application/DataInputListDlg.cpp +++ b/src/Authoring/Studio/Application/DataInputListDlg.cpp @@ -50,7 +50,7 @@ const int columnCount = 3; CDataInputListDlg::CDataInputListDlg(QMap<QString, CDataInputDialogItem *> *datainputs, bool goToAdd, QWidget *parent, EDataType defaultType, const QVector<EDataType> &acceptedTypes) - : QDialog(parent, Qt::MSWindowsFixedSizeDialogHint) + : QDialog(parent) , m_ui(new Ui::DataInputListDlg) , m_actualDataInputs(datainputs) , m_goToAdd(goToAdd) @@ -91,6 +91,8 @@ CDataInputListDlg::CDataInputListDlg(QMap<QString, CDataInputDialogItem *> *data buttons[2]->setToolTip(tr("Remove Data Input")); initDialog(); + + window()->setFixedSize(size()); } CDataInputListDlg::~CDataInputListDlg() @@ -277,7 +279,7 @@ void CDataInputListDlg::keyPressEvent(QKeyEvent *event) } } -void CDataInputListDlg::on_buttonBox_accepted() +void CDataInputListDlg::accept() { if (g_StudioApp.GetCore()->GetDoc()->IsTransactionOpened()) g_StudioApp.GetCore()->GetDoc()->CloseTransaction(); @@ -291,7 +293,7 @@ void CDataInputListDlg::on_buttonBox_accepted() QDialog::accept(); } -void CDataInputListDlg::on_buttonBox_rejected() +void CDataInputListDlg::reject() { // If the user cancels, also roll back any possible changes to data input bindings. if (g_StudioApp.GetCore()->GetDoc()->IsTransactionOpened()) @@ -320,7 +322,7 @@ void CDataInputListDlg::onAddDataInput() // If we went straight to adding a new datainput, close // dialog automatically if (m_goToAdd) - on_buttonBox_accepted(); + accept(); } void CDataInputListDlg::onRemoveDataInput() diff --git a/src/Authoring/Studio/Application/DataInputListDlg.h b/src/Authoring/Studio/Application/DataInputListDlg.h index c31fd933..bf800cfc 100644 --- a/src/Authoring/Studio/Application/DataInputListDlg.h +++ b/src/Authoring/Studio/Application/DataInputListDlg.h @@ -77,8 +77,8 @@ protected: const QVector<QPair<qt3dsdm::DataModelDataType::Value, bool>> &boundTypes); private Q_SLOTS: - void on_buttonBox_accepted(); - void on_buttonBox_rejected(); + void accept() override; + void reject() override; void onAddDataInput(); void onRemoveDataInput(); void onEditDataInput(); diff --git a/src/Authoring/Studio/Application/DataInputListDlg.ui b/src/Authoring/Studio/Application/DataInputListDlg.ui index e9d91e9e..caa1b4e0 100644 --- a/src/Authoring/Studio/Application/DataInputListDlg.ui +++ b/src/Authoring/Studio/Application/DataInputListDlg.ui @@ -10,139 +10,252 @@ <height>512</height> </rect> </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="windowTitle"> <string>Data Inputs</string> </property> <property name="accessibleName"> <string>DataInputListDlg</string> </property> - <widget class="QWidget" name="horizontalLayoutWidget"> - <property name="geometry"> - <rect> - <x>10</x> - <y>470</y> - <width>491</width> - <height>31</height> - </rect> + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="leftMargin"> + <number>0</number> </property> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <spacer name="horizontalSpacer"> - <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="QDialogButtonBox" name="buttonBox"> - <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> - </property> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> - </property> - </widget> - </item> - </layout> - </widget> - <widget class="QWidget" name="horizontalLayoutWidget_2"> - <property name="geometry"> - <rect> - <x>10</x> - <y>10</y> - <width>491</width> - <height>53</height> - </rect> + <property name="topMargin"> + <number>0</number> </property> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> - <spacer name="horizontalSpacer_2"> - <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="QDialogButtonBox" name="buttonBoxAddEditRemove"> - <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <widget class="QWidget" name="widget" native="true"> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <property name="leftMargin"> + <number>9</number> </property> - <property name="layoutDirection"> - <enum>Qt::LeftToRight</enum> + <property name="topMargin"> + <number>9</number> </property> - <property name="orientation"> - <enum>Qt::Horizontal</enum> + <property name="rightMargin"> + <number>9</number> </property> - <property name="standardButtons"> - <set>QDialogButtonBox::NoButton</set> + <property name="bottomMargin"> + <number>9</number> </property> - </widget> - </item> - </layout> - </widget> - <widget class="QTableView" name="tableView"> - <property name="geometry"> - <rect> - <x>15</x> - <y>75</y> - <width>482</width> - <height>291</height> - </rect> - </property> - <property name="editTriggers"> - <set>QAbstractItemView::NoEditTriggers</set> - </property> - <property name="selectionBehavior"> - <enum>QAbstractItemView::SelectRows</enum> - </property> - <property name="sortingEnabled"> - <bool>true</bool> - </property> - <property name="cornerButtonEnabled"> - <bool>false</bool> - </property> - <attribute name="horizontalHeaderVisible"> - <bool>false</bool> - </attribute> - <attribute name="verticalHeaderVisible"> - <bool>false</bool> - </attribute> - </widget> - <widget class="QTableView" name="elementInfo"> - <property name="geometry"> - <rect> - <x>10</x> - <y>370</y> - <width>489</width> - <height>89</height> - </rect> - </property> - <property name="selectionMode"> - <enum>QAbstractItemView::ExtendedSelection</enum> - </property> - <property name="selectionBehavior"> - <enum>QAbstractItemView::SelectRows</enum> - </property> - <attribute name="horizontalHeaderVisible"> - <bool>false</bool> - </attribute> - </widget> + <item> + <widget class="QWidget" name="widget_2" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>24</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>24</height> + </size> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>473</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBoxAddEditRemove"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> + <property name="layoutDirection"> + <enum>Qt::LeftToRight</enum> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::NoButton</set> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QTableView" name="tableView"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>5</verstretch> + </sizepolicy> + </property> + <property name="editTriggers"> + <set>QAbstractItemView::NoEditTriggers</set> + </property> + <property name="selectionBehavior"> + <enum>QAbstractItemView::SelectRows</enum> + </property> + <property name="sortingEnabled"> + <bool>true</bool> + </property> + <property name="cornerButtonEnabled"> + <bool>false</bool> + </property> + <attribute name="horizontalHeaderVisible"> + <bool>false</bool> + </attribute> + <attribute name="verticalHeaderVisible"> + <bool>false</bool> + </attribute> + </widget> + </item> + <item> + <widget class="QTableView" name="elementInfo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>2</verstretch> + </sizepolicy> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ExtendedSelection</enum> + </property> + <property name="selectionBehavior"> + <enum>QAbstractItemView::SelectRows</enum> + </property> + <attribute name="horizontalHeaderVisible"> + <bool>false</bool> + </attribute> + </widget> + </item> + <item> + <widget class="QWidget" name="widget_3" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>24</height> + </size> + </property> + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>241</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + </item> + </layout> + </widget> + </item> + </layout> </widget> <resources/> - <connections/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>DataInputListDlg</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>380</x> + <y>490</y> + </hint> + <hint type="destinationlabel"> + <x>255</x> + <y>255</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>DataInputListDlg</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>380</x> + <y>490</y> + </hint> + <hint type="destinationlabel"> + <x>255</x> + <y>255</y> + </hint> + </hints> + </connection> + </connections> </ui> diff --git a/src/Authoring/Studio/Application/DurationEditDlg.cpp b/src/Authoring/Studio/Application/DurationEditDlg.cpp index 37ff5cae..0d7c4899 100644 --- a/src/Authoring/Studio/Application/DurationEditDlg.cpp +++ b/src/Authoring/Studio/Application/DurationEditDlg.cpp @@ -83,6 +83,8 @@ CDurationEditDlg::CDurationEditDlg(QWidget *pParent) this, &CDurationEditDlg::onEndTimeChanged); connect(m_ui->lineEditEndMilliseconds, &QLineEdit::textEdited, this, &CDurationEditDlg::onEndTimeChanged); + + window()->setFixedSize(size()); } CDurationEditDlg::~CDurationEditDlg() diff --git a/src/Authoring/Studio/Application/DurationEditDlg.ui b/src/Authoring/Studio/Application/DurationEditDlg.ui index e05ab95c..062a5051 100644 --- a/src/Authoring/Studio/Application/DurationEditDlg.ui +++ b/src/Authoring/Studio/Application/DurationEditDlg.ui @@ -7,233 +7,291 @@ <x>0</x> <y>0</y> <width>300</width> - <height>137</height> + <height>152</height> </rect> </property> <property name="windowTitle"> <string>Set Timebar Start / End Time</string> </property> <layout class="QVBoxLayout" name="verticalLayout_2"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> <item> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QLabel" name="labelStartTime"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>120</width> - <height>30</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>150</width> - <height>16777215</height> - </size> - </property> - <property name="text"> - <string>Start time</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="lineEditMinutes"/> - </item> - <item> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>:</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="lineEditSeconds"/> - </item> - <item> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>.</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="lineEditMilliseconds"/> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_4"> - <item> - <widget class="QLabel" name="labelEndTime"> - <property name="minimumSize"> - <size> - <width>120</width> - <height>30</height> - </size> - </property> - <property name="text"> - <string>End time</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="lineEditEndMinutes"/> - </item> - <item> - <widget class="QLabel" name="label_7"> - <property name="text"> - <string>:</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="lineEditEndSeconds"/> - </item> - <item> - <widget class="QLabel" name="label_8"> - <property name="text"> - <string>.</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="lineEditEndMilliseconds"/> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <item> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Maximum</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>120</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QLabel" name="LabelM"> - <property name="minimumSize"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>20</height> - </size> - </property> - <property name="text"> - <string>min</string> - </property> - <property name="alignment"> - <set>Qt::AlignHCenter|Qt::AlignTop</set> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="labelS"> - <property name="minimumSize"> - <size> - <width>40</width> - <height>0</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>20</height> - </size> - </property> - <property name="text"> - <string>sec</string> - </property> - <property name="alignment"> - <set>Qt::AlignHCenter|Qt::AlignTop</set> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="labelMs"> - <property name="minimumSize"> - <size> - <width>40</width> - <height>0</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>20</height> - </size> - </property> - <property name="text"> - <string>ms</string> - </property> - <property name="alignment"> - <set>Qt::AlignHCenter|Qt::AlignTop</set> - </property> - </widget> - </item> - </layout> - </item> - <item> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Maximum</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>10</height> - </size> - </property> - </spacer> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> - <spacer name="horizontalSpacer_4"> - <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="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> - </property> - </widget> - </item> - </layout> + <widget class="QWidget" name="widget" native="true"> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QWidget" name="startTimeLayout" native="true"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <widget class="QLabel" name="labelStartTime"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>120</width> + <height>30</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>150</width> + <height>16777215</height> + </size> + </property> + <property name="text"> + <string>Start time</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEditMinutes"/> + </item> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>:</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEditSeconds"/> + </item> + <item> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>.</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEditMilliseconds"/> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QWidget" name="endTimeLayout" native="true"> + <layout class="QHBoxLayout" name="horizontalLayout_4"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <widget class="QLabel" name="labelEndTime"> + <property name="minimumSize"> + <size> + <width>120</width> + <height>30</height> + </size> + </property> + <property name="text"> + <string>End time</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEditEndMinutes"/> + </item> + <item> + <widget class="QLabel" name="label_7"> + <property name="text"> + <string>:</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEditEndSeconds"/> + </item> + <item> + <widget class="QLabel" name="label_8"> + <property name="text"> + <string>.</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEditEndMilliseconds"/> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QWidget" name="labelsLayout" native="true"> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Maximum</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>120</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="LabelM"> + <property name="minimumSize"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>20</height> + </size> + </property> + <property name="text"> + <string>min</string> + </property> + <property name="alignment"> + <set>Qt::AlignHCenter|Qt::AlignTop</set> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="labelS"> + <property name="minimumSize"> + <size> + <width>40</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>20</height> + </size> + </property> + <property name="text"> + <string>sec</string> + </property> + <property name="alignment"> + <set>Qt::AlignHCenter|Qt::AlignTop</set> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="labelMs"> + <property name="minimumSize"> + <size> + <width>40</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>20</height> + </size> + </property> + <property name="text"> + <string>ms</string> + </property> + <property name="alignment"> + <set>Qt::AlignHCenter|Qt::AlignTop</set> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QWidget" name="buttonBoxLayout" native="true"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <spacer name="horizontalSpacer_4"> + <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="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + </item> + </layout> + </widget> </item> </layout> </widget> @@ -246,12 +304,12 @@ <slot>accept()</slot> <hints> <hint type="sourcelabel"> - <x>248</x> - <y>254</y> + <x>207</x> + <y>128</y> </hint> <hint type="destinationlabel"> - <x>157</x> - <y>274</y> + <x>149</x> + <y>75</y> </hint> </hints> </connection> @@ -262,12 +320,12 @@ <slot>reject()</slot> <hints> <hint type="sourcelabel"> - <x>316</x> - <y>260</y> + <x>207</x> + <y>128</y> </hint> <hint type="destinationlabel"> - <x>286</x> - <y>274</y> + <x>149</x> + <y>75</y> </hint> </hints> </connection> diff --git a/src/Authoring/Studio/Application/TimeEditDlg.cpp b/src/Authoring/Studio/Application/TimeEditDlg.cpp index 3083e408..499d6d57 100644 --- a/src/Authoring/Studio/Application/TimeEditDlg.cpp +++ b/src/Authoring/Studio/Application/TimeEditDlg.cpp @@ -61,6 +61,8 @@ CTimeEditDlg::CTimeEditDlg(QWidget *pParent) connect(m_ui->lineEditMinutes, &QLineEdit::textEdited, this, &CTimeEditDlg::onTimeChanged); connect(m_ui->lineEditSeconds, &QLineEdit::textEdited, this, &CTimeEditDlg::onTimeChanged); connect(m_ui->lineEditMilliseconds, &QLineEdit::textEdited, this, &CTimeEditDlg::onTimeChanged); + + window()->setFixedSize(size()); } CTimeEditDlg::~CTimeEditDlg() diff --git a/src/Authoring/Studio/Application/TimeEditDlg.ui b/src/Authoring/Studio/Application/TimeEditDlg.ui index cdf51245..6bcb11b3 100644 --- a/src/Authoring/Studio/Application/TimeEditDlg.ui +++ b/src/Authoring/Studio/Application/TimeEditDlg.ui @@ -7,193 +7,253 @@ <x>0</x> <y>0</y> <width>300</width> - <height>106</height> + <height>114</height> </rect> </property> <property name="windowTitle"> <string>Set Keyframe Time</string> </property> <layout class="QVBoxLayout" name="verticalLayout_2"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> <item> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QLabel" name="labelTitle"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>120</width> - <height>30</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>150</width> - <height>16777215</height> - </size> - </property> - <property name="text"> - <string>Set keyframe time</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="lineEditMinutes"/> - </item> - <item> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>:</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="lineEditSeconds"/> - </item> - <item> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>.</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="lineEditMilliseconds"/> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <item> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Maximum</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>120</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QLabel" name="label_5"> - <property name="minimumSize"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>20</height> - </size> - </property> - <property name="text"> - <string>min</string> - </property> - <property name="alignment"> - <set>Qt::AlignHCenter|Qt::AlignTop</set> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="label_4"> - <property name="minimumSize"> - <size> - <width>40</width> - <height>0</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>20</height> - </size> - </property> - <property name="text"> - <string>sec</string> - </property> - <property name="alignment"> - <set>Qt::AlignHCenter|Qt::AlignTop</set> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="label"> - <property name="minimumSize"> - <size> - <width>40</width> - <height>0</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>20</height> - </size> - </property> - <property name="text"> - <string>ms</string> - </property> - <property name="alignment"> - <set>Qt::AlignHCenter|Qt::AlignTop</set> - </property> - </widget> - </item> - </layout> - </item> - <item> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Maximum</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>10</height> - </size> - </property> - </spacer> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> - <spacer name="horizontalSpacer_4"> - <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="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> - </property> - </widget> - </item> - </layout> + <widget class="QWidget" name="widget" native="true"> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QWidget" name="editLayout" native="true"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <widget class="QLabel" name="labelTitle"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>120</width> + <height>30</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>150</width> + <height>16777215</height> + </size> + </property> + <property name="text"> + <string>Set keyframe time</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEditMinutes"/> + </item> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>:</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEditSeconds"/> + </item> + <item> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>.</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEditMilliseconds"/> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QWidget" name="labelsLayout" native="true"> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Maximum</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>120</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="label_5"> + <property name="minimumSize"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>20</height> + </size> + </property> + <property name="text"> + <string>min</string> + </property> + <property name="alignment"> + <set>Qt::AlignHCenter|Qt::AlignTop</set> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_4"> + <property name="minimumSize"> + <size> + <width>40</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>20</height> + </size> + </property> + <property name="text"> + <string>sec</string> + </property> + <property name="alignment"> + <set>Qt::AlignHCenter|Qt::AlignTop</set> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label"> + <property name="minimumSize"> + <size> + <width>40</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>20</height> + </size> + </property> + <property name="text"> + <string>ms</string> + </property> + <property name="alignment"> + <set>Qt::AlignHCenter|Qt::AlignTop</set> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Preferred</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>10</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QWidget" name="buttonsLayout" native="true"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <spacer name="horizontalSpacer_4"> + <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="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + </item> + </layout> + </widget> </item> </layout> </widget> @@ -206,12 +266,12 @@ <slot>accept()</slot> <hints> <hint type="sourcelabel"> - <x>248</x> - <y>254</y> + <x>207</x> + <y>93</y> </hint> <hint type="destinationlabel"> - <x>157</x> - <y>274</y> + <x>149</x> + <y>56</y> </hint> </hints> </connection> @@ -222,12 +282,12 @@ <slot>reject()</slot> <hints> <hint type="sourcelabel"> - <x>316</x> - <y>260</y> + <x>207</x> + <y>93</y> </hint> <hint type="destinationlabel"> - <x>286</x> - <y>274</y> + <x>149</x> + <y>56</y> </hint> </hints> </connection> diff --git a/src/Authoring/Studio/Palettes/Project/ChooseImagePropertyDlg.cpp b/src/Authoring/Studio/Palettes/Project/ChooseImagePropertyDlg.cpp index 77dbd4b9..f651fdc3 100644 --- a/src/Authoring/Studio/Palettes/Project/ChooseImagePropertyDlg.cpp +++ b/src/Authoring/Studio/Palettes/Project/ChooseImagePropertyDlg.cpp @@ -55,6 +55,8 @@ ChooseImagePropertyDlg::ChooseImagePropertyDlg(qt3dsdm::Qt3DSDMInstanceHandle in m_ui->cbDetach->setVisible(false); fillList(); + + window()->setFixedSize(size()); } ChooseImagePropertyDlg::~ChooseImagePropertyDlg() diff --git a/src/Authoring/Studio/Palettes/Project/ChooseImagePropertyDlg.ui b/src/Authoring/Studio/Palettes/Project/ChooseImagePropertyDlg.ui index a6780539..3e3d3924 100644 --- a/src/Authoring/Studio/Palettes/Project/ChooseImagePropertyDlg.ui +++ b/src/Authoring/Studio/Palettes/Project/ChooseImagePropertyDlg.ui @@ -32,34 +32,52 @@ <bool>false</bool> </property> <layout class="QVBoxLayout" name="verticalLayout"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> <item> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Set sub-presentation to:</string> - </property> - </widget> - </item> - <item> - <widget class="QListWidget" name="listProps"/> - </item> - <item> - <widget class="QCheckBox" name="cbDetach"> - <property name="toolTip"> - <string>Detach from referenced material</string> - </property> - <property name="text"> - <string>Detach Material</string> - </property> - </widget> - </item> - <item> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> - </property> + <widget class="QWidget" name="widget" native="true"> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Set sub-presentation to:</string> + </property> + </widget> + </item> + <item> + <widget class="QListWidget" name="listProps"/> + </item> + <item> + <widget class="QCheckBox" name="cbDetach"> + <property name="toolTip"> + <string>Detach from referenced material</string> + </property> + <property name="text"> + <string>Detach Material</string> + </property> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> </widget> </item> </layout> diff --git a/src/Authoring/Studio/Palettes/Project/EditPresentationIdDlg.cpp b/src/Authoring/Studio/Palettes/Project/EditPresentationIdDlg.cpp index d2ea987f..09e1da37 100644 --- a/src/Authoring/Studio/Palettes/Project/EditPresentationIdDlg.cpp +++ b/src/Authoring/Studio/Palettes/Project/EditPresentationIdDlg.cpp @@ -68,6 +68,8 @@ EditPresentationIdDlg::EditPresentationIdDlg(const QString &src, DialogType type QFileInfo fi(src); m_ui->lineEditPresentationId->setText(fi.fileName()); } + + window()->setFixedSize(size()); } void EditPresentationIdDlg::accept() diff --git a/src/Authoring/Studio/Palettes/Project/EditPresentationIdDlg.ui b/src/Authoring/Studio/Palettes/Project/EditPresentationIdDlg.ui index 4aa3d2e4..a894710c 100644 --- a/src/Authoring/Studio/Palettes/Project/EditPresentationIdDlg.ui +++ b/src/Authoring/Studio/Palettes/Project/EditPresentationIdDlg.ui @@ -17,28 +17,60 @@ <bool>false</bool> </property> <layout class="QVBoxLayout" name="verticalLayout"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> <item> - <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0"> - <item> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Presentation Id</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="lineEditPresentationId"/> - </item> - </layout> - </item> - <item> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> - </property> + <widget class="QWidget" name="widget" native="true"> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QWidget" name="labelEditLayout" native="true"> + <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Presentation Id</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEditPresentationId"/> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> </widget> </item> </layout> diff --git a/src/Authoring/Studio/UI/InterpolationDlg.cpp b/src/Authoring/Studio/UI/InterpolationDlg.cpp index f1c0070e..9c4c5c38 100644 --- a/src/Authoring/Studio/UI/InterpolationDlg.cpp +++ b/src/Authoring/Studio/UI/InterpolationDlg.cpp @@ -42,6 +42,7 @@ CInterpolationDlg::CInterpolationDlg(QWidget *parent) , m_ui(new Ui::InterpolationDlg) { m_ui->setupUi(this); + window()->setFixedSize(size()); } CInterpolationDlg::~CInterpolationDlg() diff --git a/src/Authoring/Studio/UI/StudioPreferencesPropSheet.cpp b/src/Authoring/Studio/UI/StudioPreferencesPropSheet.cpp index 00ffff83..4510a9c2 100644 --- a/src/Authoring/Studio/UI/StudioPreferencesPropSheet.cpp +++ b/src/Authoring/Studio/UI/StudioPreferencesPropSheet.cpp @@ -34,6 +34,7 @@ #include "StudioProjectSettingsPage.h" #include <QtWidgets/qpushbutton.h> +#include <QtCore/qtimer.h> CStudioPreferencesPropPage::CStudioPreferencesPropPage(QWidget *parent) : QWidget(parent) @@ -82,6 +83,11 @@ CStudioPreferencesPropSheet::CStudioPreferencesPropSheet(const QString &pszCapti setWindowTitle(pszCaption); onInitDialog(); m_ui->m_TabCtrl->setCurrentIndex(iSelectPage); + + // Fix the size after property sheets have loaded and done their necessary resizes + QTimer::singleShot(500, this, [this]() { + window()->setFixedSize(size()); + }); } CStudioPreferencesPropSheet::~CStudioPreferencesPropSheet() |