mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-12 12:54:29 +00:00
Merge remote-tracking branch 'origin/KDE/4.12' into KDE/4.13
This commit is contained in:
commit
006f667ab1
|
@ -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"
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -316,11 +316,18 @@ KVersionControlPlugin* VersionControlObserver::searchPlugin(const KUrl& director
|
|||
}
|
||||
}
|
||||
|
||||
// We use the number of upUrl() calls to find the best matching plugin
|
||||
// for the given directory. The smaller value, the better it is (0 is best).
|
||||
KVersionControlPlugin* bestPlugin = 0;
|
||||
int bestScore = INT_MAX;
|
||||
|
||||
// Verify whether the current directory contains revision information
|
||||
// like .svn, .git, ...
|
||||
foreach (KVersionControlPlugin* plugin, plugins) {
|
||||
const QString fileName = directory.path(KUrl::AddTrailingSlash) + plugin->fileName();
|
||||
if (QFile::exists(fileName)) {
|
||||
// The score of this plugin is 0 (best), so we can just return this plugin,
|
||||
// instead of going through the plugin scoring procedure, we can't find a better one ;)
|
||||
return plugin;
|
||||
}
|
||||
|
||||
|
@ -333,18 +340,24 @@ KVersionControlPlugin* VersionControlObserver::searchPlugin(const KUrl& director
|
|||
if (m_versionedDirectory) {
|
||||
KUrl dirUrl(directory);
|
||||
KUrl upUrl = dirUrl.upUrl();
|
||||
while (upUrl != dirUrl) {
|
||||
int upUrlCounter = 1;
|
||||
while ((upUrlCounter < bestScore) && (upUrl != dirUrl)) {
|
||||
const QString fileName = dirUrl.path(KUrl::AddTrailingSlash) + plugin->fileName();
|
||||
if (QFile::exists(fileName)) {
|
||||
return plugin;
|
||||
if (upUrlCounter < bestScore) {
|
||||
bestPlugin = plugin;
|
||||
bestScore = upUrlCounter;
|
||||
}
|
||||
break;
|
||||
}
|
||||
dirUrl = upUrl;
|
||||
upUrl = dirUrl.upUrl();
|
||||
++upUrlCounter;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
return bestPlugin;
|
||||
}
|
||||
|
||||
bool VersionControlObserver::isVersioned() const
|
||||
|
|
Loading…
Reference in a new issue