diff options
| author | Frank Reininghaus <[email protected]> | 2012-11-05 22:12:45 +0100 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2012-11-05 22:12:45 +0100 |
| commit | 15faff457dd5ff609b3d6d824e0366beae1abe28 (patch) | |
| tree | 518a559c977bdb116939c0b57d8977f04db916ae /src/panels | |
| parent | c6eb4866d8bb601d63acedd78edaf37a8c5c3c2f (diff) | |
| parent | c0559a2a1d7d66b26e1d00b4ff59c7fce8848566 (diff) | |
Merge remote-tracking branch 'origin/KDE/4.9'
Diffstat (limited to 'src/panels')
| -rw-r--r-- | src/panels/information/phononwidget.cpp | 7 | ||||
| -rw-r--r-- | src/panels/places/placesitem.cpp | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp index f0c030ed6..a36ada180 100644 --- a/src/panels/information/phononwidget.cpp +++ b/src/panels/information/phononwidget.cpp @@ -123,14 +123,17 @@ void PhononWidget::showEvent(QShowEvent *event) m_topLayout->addLayout(controlsLayout); + const int smallIconSize = IconSize(KIconLoader::Small); + const QSize buttonSize(smallIconSize, smallIconSize); + m_playButton->setToolTip(i18n("play")); - m_playButton->setIconSize(QSize(16, 16)); + m_playButton->setIconSize(buttonSize); m_playButton->setIcon(KIcon("media-playback-start")); m_playButton->setAutoRaise(true); connect(m_playButton, SIGNAL(clicked()), this, SLOT(play())); m_stopButton->setToolTip(i18n("stop")); - m_stopButton->setIconSize(QSize(16, 16)); + m_stopButton->setIconSize(buttonSize); m_stopButton->setIcon(KIcon("media-playback-stop")); m_stopButton->setAutoRaise(true); m_stopButton->hide(); diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp index f78c98b76..75e14d0fb 100644 --- a/src/panels/places/placesitem.cpp +++ b/src/panels/places/placesitem.cpp @@ -268,8 +268,7 @@ void PlacesItem::initializeDevice(const QString& udi) } else if (m_disc && (m_disc->availableContent() & Solid::OpticalDisc::Audio) != 0) { const QString device = m_device.as<Solid::Block>()->device(); setUrl(QString("audiocd:/?device=%1").arg(device)); - } else if (m_mtp && m_mtp->supportedProtocols().contains("mtp")) { - setText(m_device.product()); + } else if (m_mtp) { setUrl(QString("mtp:udi=%1").arg(m_device.udi())); } } |