diff options
| author |  Chris Xiong <chirs241097@gmail.com>
| 2017-10-18 13:11:42 +0800 |
|---|---|---|
| committer | Chris Xiong <chirs241097@gmail.com>
| 2017-10-18 13:11:42 +0800 |
| commit | c0d53cf1f868a38ffb7681b7904348d69fb6b5c9 (patch) | |
| tree | b97790c8932f2a54c87ac429622c36cc9821eac7 | |
| parent | d985112164bd2bfeca0c895abb523d45f0e065bb (diff) | |
| download | QMidiPlayer-c0d53cf1f868a38ffb7681b7904348d69fb6b5c9.tar.xz | |
Fix inconsistency and build errors.
| -rw-r--r-- | qmidiplayer-desktop/qmpmainwindow.cpp | 1 | ||||
| -rw-r--r-- | qmidiplayer-desktop/qmpmainwindow.ui | 26 | ||||
| -rw-r--r-- | qmidiplayer-desktop/qmpplugin.cpp | 2 |
3 files changed, 18 insertions, 11 deletions
diff --git a/qmidiplayer-desktop/qmpmainwindow.cpp b/qmidiplayer-desktop/qmpmainwindow.cpp index dbec402..558f827 100644 --- a/qmidiplayer-desktop/qmpmainwindow.cpp +++ b/qmidiplayer-desktop/qmpmainwindow.cpp @@ -675,6 +675,7 @@ void qmpMainWindow::setupWidget() } else setButtonWidth(pb,32); + pb->setIconSize(QSize(16,16)); ui->buttonwidget->layout()->addWidget(pb); mfunc[enabled_buttons[i]].setAssignedControl(pb); connect(pb,SIGNAL(onClick(std::string)),this,SLOT(funcReflector(std::string))); diff --git a/qmidiplayer-desktop/qmpmainwindow.ui b/qmidiplayer-desktop/qmpmainwindow.ui index e2522d6..3177703 100644 --- a/qmidiplayer-desktop/qmpmainwindow.ui +++ b/qmidiplayer-desktop/qmpmainwindow.ui @@ -321,8 +321,8 @@ QSlider{height:10px;}</string> </property> <property name="iconSize"> <size> - <width>32</width> - <height>32</height> + <width>24</width> + <height>24</height> </size> </property> </widget> @@ -356,8 +356,8 @@ QSlider{height:10px;}</string> </property> <property name="iconSize"> <size> - <width>32</width> - <height>32</height> + <width>24</width> + <height>24</height> </size> </property> </widget> @@ -391,8 +391,8 @@ QSlider{height:10px;}</string> </property> <property name="iconSize"> <size> - <width>32</width> - <height>32</height> + <width>24</width> + <height>24</height> </size> </property> </widget> @@ -426,8 +426,8 @@ QSlider{height:10px;}</string> </property> <property name="iconSize"> <size> - <width>32</width> - <height>32</height> + <width>24</width> + <height>24</height> </size> </property> </widget> @@ -475,6 +475,12 @@ QSlider{height:10px;}</string> <iconset resource="resources.qrc"> <normaloff>:/img/open.svg</normaloff>:/img/open.svg</iconset> </property> + <property name="iconSize"> + <size> + <width>24</width> + <height>24</height> + </size> + </property> </widget> </item> <item> @@ -506,8 +512,8 @@ QSlider{height:10px;}</string> </property> <property name="iconSize"> <size> - <width>32</width> - <height>32</height> + <width>24</width> + <height>24</height> </size> </property> <property name="checkable"> diff --git a/qmidiplayer-desktop/qmpplugin.cpp b/qmidiplayer-desktop/qmpplugin.cpp index 4c0ee7c..7ef31f3 100644 --- a/qmidiplayer-desktop/qmpplugin.cpp +++ b/qmidiplayer-desktop/qmpplugin.cpp @@ -17,7 +17,7 @@ qmpSettingsWindow* qsw; #include <locale> std::string wstr2str(std::wstring s) { - std::wstring_convert<std::codecvt_utf8<wchar_t>,wchat_t> wsc; + std::wstring_convert<std::codecvt_utf8<wchar_t>,wchar_t> wsc; return wsc.to_bytes(s); } void qmpPluginManager::scanPlugins() |