diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/dolphinpart.cpp | 9 | ||||
| -rw-r--r-- | src/dolphinpart.rc | 14 |
2 files changed, 7 insertions, 16 deletions
diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index 3a76286e7..2f52447ec 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -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(); diff --git a/src/dolphinpart.rc b/src/dolphinpart.rc index 85be1e5be..0f9dd276f 100644 --- a/src/dolphinpart.rc +++ b/src/dolphinpart.rc @@ -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> |