diff options
| author | Kaj Grönholm <kaj.gronholm@qt.io> | 2018-05-28 10:54:45 +0300 |
|---|---|---|
| committer | Kaj Grönholm <kaj.gronholm@qt.io> | 2018-05-29 09:49:20 +0000 |
| commit | 32aaf15967a91b04c94038dd570f7deed2fa8f4f (patch) | |
| tree | 7ee54e6ce8ab14b6b7240797933f915605203f5c | |
| parent | d9825cfc56d8cd4bac194d6935dcdaec53dfae9f (diff) | |
Adjust loading popup
Change background color & add border. Also updates correct image path
and changes filename label to word-wrap.
Task-number: QT3DS-1788
Change-Id: Ief46b5110e9fc54994675e9cd821849502567266
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| -rw-r--r-- | src/Authoring/Studio/Palettes/Progress/ProgressDlg.ui | 20 | ||||
| -rw-r--r-- | src/Authoring/Studio/Palettes/Progress/ProgressView.cpp | 2 | ||||
| -rw-r--r-- | src/Authoring/Studio/style.qss | 13 |
3 files changed, 29 insertions, 6 deletions
diff --git a/src/Authoring/Studio/Palettes/Progress/ProgressDlg.ui b/src/Authoring/Studio/Palettes/Progress/ProgressDlg.ui index db9b127a..8c9016d3 100644 --- a/src/Authoring/Studio/Palettes/Progress/ProgressDlg.ui +++ b/src/Authoring/Studio/Palettes/Progress/ProgressDlg.ui @@ -13,12 +13,22 @@ <property name="windowTitle"> <string>Sub-presentations</string> </property> + <widget class="QWidget" name="backgroundWidget" native="true"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>360</width> + <height>112</height> + </rect> + </property> + </widget> <widget class="QLabel" name="progressActionText"> <property name="geometry"> <rect> <x>78</x> <y>43</y> - <width>282</width> + <width>280</width> <height>21</height> </rect> </property> @@ -39,7 +49,7 @@ <string/> </property> <property name="pixmap"> - <pixmap resource="../../../images.qrc">:/images/anim_progress.png</pixmap> + <pixmap resource="../../images.qrc">:/images/anim_progress.png</pixmap> </property> <property name="alignment"> <set>Qt::AlignJustify|Qt::AlignVCenter</set> @@ -50,8 +60,8 @@ <rect> <x>78</x> <y>65</y> - <width>282</width> - <height>21</height> + <width>280</width> + <height>40</height> </rect> </property> <property name="text"> @@ -60,7 +70,7 @@ </widget> </widget> <resources> - <include location="../../../images.qrc"/> + <include location="../../images.qrc"/> </resources> <connections/> </ui> diff --git a/src/Authoring/Studio/Palettes/Progress/ProgressView.cpp b/src/Authoring/Studio/Palettes/Progress/ProgressView.cpp index 2fde98ce..a5ea681b 100644 --- a/src/Authoring/Studio/Palettes/Progress/ProgressView.cpp +++ b/src/Authoring/Studio/Palettes/Progress/ProgressView.cpp @@ -42,7 +42,7 @@ CProgressView::CProgressView(QWidget *parent) , m_ui(new Ui::ProgressDlg) { m_ui->setupUi(this); - m_ui->progressActionText->setStyleSheet("font-size: 16px;"); + m_ui->progressAdditionalText->setWordWrap(true); } //============================================================================= diff --git a/src/Authoring/Studio/style.qss b/src/Authoring/Studio/style.qss index f50190ef..471f5e3d 100644 --- a/src/Authoring/Studio/style.qss +++ b/src/Authoring/Studio/style.qss @@ -325,6 +325,19 @@ TimeLineToolbar QLabel#dataInputName { color: #ff5102; } +/* Loading progress dialog */ +QDialog#ProgressDlg QWidget { + background-color: #202020; +} + +QDialog#ProgressDlg QWidget#backgroundWidget { + border: 1px solid #808080; +} + +QDialog#ProgressDlg QWidget#progressActionText { + font-size: 16px; +} + /* Sub-presentation Dialogs and Data Input Dialogs */ QDialog#SubPresentationListDlg QTableView QTableCornerButton::section, QDialog#SubPresentationListDlg QHeaderView::section, |