diff options
| -rw-r--r-- | src/dolphinmainwindow.cpp | 14 | ||||
| -rw-r--r-- | src/dolphinui.rc | 17 |
2 files changed, 16 insertions, 15 deletions
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 96a919747..7d0e09926 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -1306,23 +1306,21 @@ void DolphinMainWindow::setupActions() void DolphinMainWindow::setupDockWidgets() { - QDockWidget *shortcutsDock = new QDockWidget(i18n("Shortcuts")); - - shortcutsDock->setObjectName("shortcutsDock"); + QDockWidget* shortcutsDock = new QDockWidget(i18n("Shortcuts")); + shortcutsDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); shortcutsDock->setWidget(new BookmarksSidebarPage(this)); - shortcutsDock->toggleViewAction()->setObjectName("show_shortcuts_pane"); + shortcutsDock->toggleViewAction()->setObjectName("show_shortcuts_panel"); shortcutsDock->toggleViewAction()->setText(i18n("Show Shortcuts Panel")); actionCollection()->insert(shortcutsDock->toggleViewAction()); addDockWidget(Qt::LeftDockWidgetArea, shortcutsDock); - QDockWidget *infoDock = new QDockWidget(i18n("Information")); - - infoDock->setObjectName("infoDock"); + QDockWidget* infoDock = new QDockWidget(i18n("Information")); + infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); infoDock->setWidget(new InfoSidebarPage(this)); - infoDock->toggleViewAction()->setObjectName("show_info_pane"); + infoDock->toggleViewAction()->setObjectName("show_info_panel"); infoDock->toggleViewAction()->setText(i18n("Show Information Panel")); actionCollection()->insert(infoDock->toggleViewAction()); diff --git a/src/dolphinui.rc b/src/dolphinui.rc index 33b689e76..22bfe909e 100644 --- a/src/dolphinui.rc +++ b/src/dolphinui.rc @@ -1,7 +1,7 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> <kpartgui version="2" name="dolphin" > <MenuBar> - <Menu name="file" > + <Menu name="file"> <Action name="new_window" /> <Menu name="create_new" > <text>Create New</text> @@ -16,17 +16,17 @@ <Separator/> <Action name="properties" /> </Menu> - <Menu name="edit" > + <Menu name="edit"> <Action name="select_all" /> <Action name="invert_selection" /> </Menu> - <Menu name="view" > + <Menu name="view"> <Menu name="view_mode" > <text>View Mode</text> <Action name="icons" /> <Action name="details" /> </Menu> - <Menu name="sort" > + <Menu name="sort"> <text>Sort</text> <Action name="by_name" /> <Action name="by_size" /> @@ -41,13 +41,16 @@ <Action name="reload" /> <Action name="stop" /> <Separator/> - <Menu name="navigation_bar" > + <Menu name="panels"> + <text>Panels</text> + <Action name="show_shortcuts_panel" /> + <Action name="show_info_panel" /> + </Menu> + <Menu name="navigation_bar"> <text>Navigation Bar</text> <Action name="editable_location" /> <Action name="edit_location" /> </Menu> - <Action name="show_shortcuts_pane" /> - <Action name="show_info_pane" /> <Separator/> <Action name="view_properties" /> </Menu> |