diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2021-03-12 14:07:24 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2021-03-12 14:07:24 +0100 |
| commit | 439a05f08510ce548064a7f43c4a19ec8cee04a2 (patch) | |
| tree | 26d296eb575f72f56a2ba279fd3abc6a93c9fb07 /src/dialog | |
| parent | 6eb47941d05ac28a392c17fecbb402524db7e99d (diff) | |
| parent | d72af1b56a5b03aeb06422061801c54e71e9080d (diff) | |
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git
Diffstat (limited to 'src/dialog')
| -rw-r--r-- | src/dialog/dlgabout.cpp | 3 | ||||
| -rw-r--r-- | src/dialog/dlgaboutdlg.ui | 29 |
2 files changed, 7 insertions, 25 deletions
diff --git a/src/dialog/dlgabout.cpp b/src/dialog/dlgabout.cpp index 3029b9b3be..a5a0ece2f7 100644 --- a/src/dialog/dlgabout.cpp +++ b/src/dialog/dlgabout.cpp @@ -10,6 +10,9 @@ DlgAbout::DlgAbout(QWidget* parent) : QDialog(parent), Ui::DlgAboutDlg() { setupUi(this); + mixxx_icon->load(QString(":/images/mixxx_icon.svg")); + mixxx_logo->load(QString(":/images/mixxx_logo.svg")); + QString mixxxVersion = Version::version(); QString buildBranch = Version::developmentBranch(); QString buildRevision = Version::developmentRevision(); diff --git a/src/dialog/dlgaboutdlg.ui b/src/dialog/dlgaboutdlg.ui index 9d6d6deda7..f52c992ef1 100644 --- a/src/dialog/dlgaboutdlg.ui +++ b/src/dialog/dlgaboutdlg.ui @@ -29,44 +29,23 @@ <item> <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="QLabel" name="mixxx_icon"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> + <widget class="QSvgWidget" name="mixxx_icon"> <property name="maximumSize"> <size> - <width>48</width> - <height>68</height> + <width>32</width> + <height>32</height> </size> </property> - <property name="pixmap"> - <pixmap resource="../../res/mixxx.qrc">:/images/mixxx_icon.svg</pixmap> - </property> </widget> </item> <item> - <widget class="QLabel" name="mixxx_logo"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> + <widget class="QSvgWidget" name="mixxx_logo"> <property name="maximumSize"> <size> <width>170</width> <height>68</height> </size> </property> - <property name="pixmap"> - <pixmap resource="../../res/mixxx.qrc">:/images/mixxx_logo.svg</pixmap> - </property> - <property name="scaledContents"> - <bool>true</bool> - </property> </widget> </item> <item> |