kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-19 16:31:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the other bug reported by BCoppens: the tab title was the full path, until switching tabs and back, then it changed to just the dir name (as it should be, in fact).

Browse source 
The logic in KonqView::setCaption was being confused by the part url still being empty; let's do things in the right order here.
+ .rc cleanups

svn path=/trunk/KDE/kdebase/apps/; revision=735495
This commit is contained in:
David Faure 2007-11-11 21:03:59 +00:00
parent af22e14ba7
commit 2a3035088b
2 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/dolphinpart.cpp
View file

@ -93,6 +93,9 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi
// TODO provide these actions in the menu, merged with the existing view-mode-actions somehow
// [Q_PROPERTY introspection?]
// TODO sort_by_* actions
// TODO show_*_info actions
// TODO connect to urlsDropped
// TODO there was a "always open a new window" (when clicking on a directory) setting in konqueror
@ -137,14 +140,14 @@ KAboutData* DolphinPart::createAboutData()
bool DolphinPart::openUrl(const KUrl& url)
{
const QString prettyUrl = url.pathOrUrl();
emit setWindowCaption(prettyUrl);
emit m_extension->setLocationBarUrl(prettyUrl);
const bool reload = arguments().reload();
if (m_view->url() == url && !reload) { // DolphinView won't do anything in that case, so don't emit started
return true;
}
setUrl(url); // remember it at the KParts level
const QString prettyUrl = url.pathOrUrl();
emit setWindowCaption(prettyUrl);
emit m_extension->setLocationBarUrl(prettyUrl);
m_view->setUrl(url);
if (reload)
m_view->reload();

14
src/dolphinpart.rc
View file

@ -1,5 +1,5 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
<kpartgui version="2" name="dolphinpart" >
<kpartgui version="3" name="dolphinpart" >
<MenuBar>
<Menu name="edit">
<Action name="select_all" />
@ -32,18 +32,6 @@
<Action name="show_preview" />
<Action name="show_in_groups" />
<Action name="show_hidden_files" />
<Menu name="panels">
<text context="@title:menu">Panels</text>
<Action name="show_places_panel" />
<Action name="show_info_panel" />
<Action name="show_folders_panel" />
<Action name="show_terminal_panel" />
</Menu>
<Menu name="navigation_bar">
<text context="@title:menu">Navigation Bar</text>
<Action name="editable_location" />
<Action name="edit_location" />
</Menu>
<Separator/>
<Action name="view_properties" />
</Menu>