summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Palettes
diff options
context:
space:
mode:
Diffstat (limited to 'src/Authoring/Studio/Palettes')
-rw-r--r--src/Authoring/Studio/Palettes/Project/ChooseImagePropertyDlg.cpp2
-rw-r--r--src/Authoring/Studio/Palettes/Project/ChooseImagePropertyDlg.ui72
-rw-r--r--src/Authoring/Studio/Palettes/Project/EditPresentationIdDlg.cpp2
-rw-r--r--src/Authoring/Studio/Palettes/Project/EditPresentationIdDlg.ui74
4 files changed, 102 insertions, 48 deletions
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>