Show the correct icon size in the zoom slider tooltip.

BUG: 305694
FIXED-IN: 4.12.3
REVIEW: 111197
This commit is contained in:
Emmanuel Pescosta 2014-02-25 19:41:45 +01:00
parent 2a6a1f5acd
commit 885d260cd4
2 changed files with 13 additions and 13 deletions

View file

@ -73,6 +73,7 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) :
m_zoomSlider->setRange(ZoomLevelInfo::minimumLevel(), ZoomLevelInfo::maximumLevel());
connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SIGNAL(zoomLevelChanged(int)));
connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(updateZoomSliderToolTip(int)));
connect(m_zoomSlider, SIGNAL(sliderMoved(int)), this, SLOT(showZoomSliderToolTip(int)));
// Initialize space information
@ -240,7 +241,6 @@ void DolphinStatusBar::setZoomLevel(int zoomLevel)
{
if (zoomLevel != m_zoomSlider->value()) {
m_zoomSlider->setValue(zoomLevel);
updateZoomSliderToolTip(zoomLevel);
}
}
@ -338,6 +338,12 @@ void DolphinStatusBar::slotResetToDefaultText()
updateLabelText();
}
void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel)
{
const int size = ZoomLevelInfo::iconSizeForZoomLevel(zoomLevel);
m_zoomSlider->setToolTip(i18ncp("@info:tooltip", "Size: 1 pixel", "Size: %1 pixels", size));
}
void DolphinStatusBar::setExtensionsVisible(bool visible)
{
bool showSpaceInfo = visible;
@ -350,10 +356,4 @@ void DolphinStatusBar::setExtensionsVisible(bool visible)
m_zoomSlider->setVisible(showZoomSlider);
}
void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel)
{
const int size = ZoomLevelInfo::iconSizeForZoomLevel(zoomLevel);
m_zoomSlider->setToolTip(i18ncp("@info:tooltip", "Size: 1 pixel", "Size: %1 pixels", size));
}
#include "dolphinstatusbar.moc"

View file

@ -122,6 +122,12 @@ private slots:
*/
void slotResetToDefaultText();
/**
* Updates the text of the zoom slider tooltip to show
* the currently used size.
*/
void updateZoomSliderToolTip(int zoomLevel);
private:
/**
* Makes the space information widget and zoom slider widget
@ -131,12 +137,6 @@ private:
*/
void setExtensionsVisible(bool visible);
/**
* Updates the text of the zoom slider tooltip to show
* the currently used size.
*/
void updateZoomSliderToolTip(int zoomLevel);
private:
QString m_text;
QString m_defaultText;