From 951dbd6d67d885d9583e8ce45635a4ae086445fb Mon Sep 17 00:00:00 2001 From: Alex Fiestas Date: Thu, 1 Nov 2012 00:25:36 +0100 Subject: Removed customm setText for mtp devices and check for kio_mtp We are already checking if kio_mtp is installed when we build the predicate so we don't need to check if it is installed again. Also, the fix for "Showing the product as a name for some kind of massive storage" will have to be delayed to 4.9.4, so removing this. --- src/panels/places/placesitem.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/panels') 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()->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())); } } -- cgit v1.3 From 07721cf76459d8fff9b96ffe3dde83bc418bed31 Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Sun, 4 Nov 2012 14:39:49 +0100 Subject: Do not use a hardcoded size for the buttons in the Information panel Thanks to Kai Uwe Broulok and Jekyll Wu for the investigation! BUG: 309498 FIXED-IN: 4.9.4 --- src/panels/information/phononwidget.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/panels') 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(); -- cgit v1.3