kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-20 00:41:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show location in window title for non-local URLs. Thanks to Mark Gaiser for the patch and David Faure for the review on http://reviewboard.kde.org/r/5178.

Browse source 
BUG: 244512
FIXED-IN: 4.6.0

svn path=/trunk/KDE/kdebase/apps/; revision=1176395
This commit is contained in:
Peter Penz 2010-09-17 14:42:57 +00:00
parent ddd8cf8b24
commit 89c7af4228
2 changed files with 10 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
dolphin/src/dolphinmainwindow.cpp
View file

@ -114,7 +114,6 @@ DolphinMainWindow::DolphinMainWindow(int id) :
m_actionHandler(0),
m_remoteEncoding(0),
m_settingsDialog(0),
m_captionStatJob(0),
m_lastHandleUrlStatJob(0)
{
setObjectName("Dolphin#");
@ -1158,14 +1157,6 @@ void DolphinMainWindow::tabDropEvent(int tab, QDropEvent* event)
}
}
void DolphinMainWindow::slotCaptionStatFinished(KJob* job)
{
m_captionStatJob = 0;
const KIO::UDSEntry entry = static_cast<KIO::StatJob*>(job)->statResult();
const QString name = entry.stringValue(KIO::UDSEntry::UDS_DISPLAY_NAME);
setCaption(name);
}
void DolphinMainWindow::slotWriteStateChanged(bool isFolderWritable)
{
newFileMenu()->setEnabled(isFolderWritable);
@ -1778,26 +1769,18 @@ QString DolphinMainWindow::tabProperty(const QString& property, int tabIndex) co
void DolphinMainWindow::setUrlAsCaption(const KUrl& url)
{
delete m_captionStatJob;
m_captionStatJob = 0;
if (url.protocol() == QLatin1String("file")) {
QString caption;
if (url.equals(KUrl("file:///"))) {
caption = '/';
} else {
caption = url.fileName();
if (caption.isEmpty()) {
caption = url.protocol();
}
QString caption;
if (!url.isLocalFile()) {
caption.append(url.protocol() + " - ");
if (url.hasHost()) {
caption.append(url.host() + " - ");
}
setCaption(caption);
} else {
m_captionStatJob = KIO::stat(url, KIO::HideProgressInfo);
connect(m_captionStatJob, SIGNAL(result(KJob*)),
this, SLOT(slotCaptionStatFinished(KJob*)));
}
const QString fileName = url.fileName().isEmpty() ? "/" : url.fileName();
caption.append(fileName);
setCaption(caption);
}
QString DolphinMainWindow::squeezedText(const QString& text) const

7
dolphin/src/dolphinmainwindow.h
View file

@ -416,12 +416,6 @@ private slots:
*/
void slotHandleUrlStatFinished(KJob* job);
/**
* setUrlAsCaption() will trigger a stat job which reports its result in
* this slot.
*/
void slotCaptionStatFinished(KJob* job);
/**
* Is connected to the KTabBar signal receivedDropEvent.
* Allows dragging and dropping files onto tabs.
@ -545,7 +539,6 @@ private:
DolphinRemoteEncoding* m_remoteEncoding;
QPointer<DolphinSettingsDialog> m_settingsDialog;
KJob* m_captionStatJob;
KJob* m_lastHandleUrlStatJob;
};