mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Provide toolbar-menu when the menubar is hidden
Use a similar default UI like in Rekonq and other browsers: Hide the menubar and add access to all actions by a button in the toolbar. Of course it is still possible to show the menubar so that the same UI is given like before.
This commit is contained in:
parent
a90938c414
commit
9af429cae1
|
@ -184,8 +184,6 @@ void DolphinContextMenu::openTrashContextMenu()
|
|||
QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
|
||||
m_popup->addAction(propertiesAction);
|
||||
|
||||
addShowMenubarAction();
|
||||
|
||||
QAction *action = m_popup->exec(QCursor::pos());
|
||||
if (action == emptyTrashAction) {
|
||||
const QString text(i18nc("@info", "Do you really want to empty the Trash? All items will be deleted."));
|
||||
|
@ -367,8 +365,6 @@ void DolphinContextMenu::openViewportContextMenu()
|
|||
QAction* propertiesAction = m_popup->addAction(i18nc("@action:inmenu", "Properties"));
|
||||
propertiesAction->setIcon(KIcon("document-properties"));
|
||||
|
||||
addShowMenubarAction();
|
||||
|
||||
QAction* action = m_popup->exec(QCursor::pos());
|
||||
if (action == propertiesAction) {
|
||||
const KUrl& url = m_mainWindow->activeViewContainer()->url();
|
||||
|
@ -409,15 +405,6 @@ void DolphinContextMenu::insertDefaultItemActions()
|
|||
}
|
||||
}
|
||||
|
||||
void DolphinContextMenu::addShowMenubarAction()
|
||||
{
|
||||
KAction* showMenuBar = m_mainWindow->showMenuBarAction();
|
||||
if (!m_mainWindow->menuBar()->isVisible()) {
|
||||
m_popup->addSeparator();
|
||||
m_popup->addAction(showMenuBar);
|
||||
}
|
||||
}
|
||||
|
||||
QString DolphinContextMenu::placesName(const KUrl& url) const
|
||||
{
|
||||
QString name = url.fileName();
|
||||
|
|
|
@ -122,12 +122,6 @@ private:
|
|||
|
||||
void insertDefaultItemActions();
|
||||
|
||||
/**
|
||||
* Adds the "Show menubar" action to the menu if the
|
||||
* menubar is hidden.
|
||||
*/
|
||||
void addShowMenubarAction();
|
||||
|
||||
/**
|
||||
* Returns a name for adding the URL \a url to the Places panel.
|
||||
*/
|
||||
|
|
|
@ -64,13 +64,14 @@
|
|||
#include <KFilePlacesModel>
|
||||
#include <KGlobal>
|
||||
#include <KLineEdit>
|
||||
#include <ktoolbar.h>
|
||||
#include <KToolBar>
|
||||
#include <KIcon>
|
||||
#include <KIconLoader>
|
||||
#include <KIO/NetAccess>
|
||||
#include <KInputDialog>
|
||||
#include <KLocale>
|
||||
#include <KProtocolManager>
|
||||
#include <KPushButton>
|
||||
#include <KMenu>
|
||||
#include <KMenuBar>
|
||||
#include <KMessageBox>
|
||||
|
@ -111,7 +112,6 @@ Q_DECLARE_METATYPE(ClosedTab)
|
|||
DolphinMainWindow::DolphinMainWindow(int id) :
|
||||
KXmlGuiWindow(0),
|
||||
m_newFileMenu(0),
|
||||
m_showMenuBar(0),
|
||||
m_tabBar(0),
|
||||
m_activeViewContainer(0),
|
||||
m_centralWidgetLayout(0),
|
||||
|
@ -121,6 +121,10 @@ DolphinMainWindow::DolphinMainWindow(int id) :
|
|||
m_actionHandler(0),
|
||||
m_remoteEncoding(0),
|
||||
m_settingsDialog(0),
|
||||
m_toolBarSpacer(0),
|
||||
m_openToolBarMenuButton(0),
|
||||
m_toolBarMenu(),
|
||||
m_updateToolBarTimer(0),
|
||||
m_lastHandleUrlStatJob(0),
|
||||
m_searchDockIsTemporaryVisible(false)
|
||||
{
|
||||
|
@ -939,12 +943,6 @@ void DolphinMainWindow::goUp(Qt::MouseButtons buttons)
|
|||
}
|
||||
}
|
||||
|
||||
void DolphinMainWindow::goHome()
|
||||
{
|
||||
clearStatusBar();
|
||||
m_activeViewContainer->urlNavigator()->goHome();
|
||||
}
|
||||
|
||||
void DolphinMainWindow::compareFiles()
|
||||
{
|
||||
// The method is only invoked if exactly 2 files have
|
||||
|
@ -1004,6 +1002,11 @@ void DolphinMainWindow::toggleShowMenuBar()
|
|||
{
|
||||
const bool visible = menuBar()->isVisible();
|
||||
menuBar()->setVisible(!visible);
|
||||
if (visible) {
|
||||
createToolBarMenuButton();
|
||||
} else {
|
||||
deleteToolBarMenuButton();
|
||||
}
|
||||
}
|
||||
|
||||
void DolphinMainWindow::openTerminal()
|
||||
|
@ -1308,6 +1311,126 @@ void DolphinMainWindow::openContextMenu(const KFileItem& item,
|
|||
delete contextMenu;
|
||||
}
|
||||
|
||||
void DolphinMainWindow::openToolBarMenu()
|
||||
{
|
||||
const int height = m_openToolBarMenuButton->height();
|
||||
const QPoint pos = m_openToolBarMenuButton->mapToGlobal(QPoint(0, height));
|
||||
|
||||
m_toolBarMenu = new KMenu(m_openToolBarMenuButton);
|
||||
m_toolBarMenu.data()->setAttribute(Qt::WA_DeleteOnClose);
|
||||
connect(m_toolBarMenu.data(), SIGNAL(aboutToShow()), this, SLOT(updateToolBarMenu()));
|
||||
|
||||
m_toolBarMenu.data()->exec(pos);
|
||||
}
|
||||
|
||||
void DolphinMainWindow::updateToolBarMenu()
|
||||
{
|
||||
KMenu* menu = m_toolBarMenu.data();
|
||||
if (!menu) {
|
||||
return;
|
||||
}
|
||||
|
||||
const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();
|
||||
|
||||
KActionCollection* ac = actionCollection();
|
||||
|
||||
// Add "Edit" actions
|
||||
bool added = addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Undo)), menu) |
|
||||
addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Find)), menu) |
|
||||
addActionToMenu(ac->action("select_all"), menu) |
|
||||
addActionToMenu(ac->action("invert_selection"), menu);
|
||||
|
||||
if (added) {
|
||||
menu->addSeparator();
|
||||
}
|
||||
|
||||
// Add "View" actions
|
||||
if (!generalSettings->showZoomSlider()) {
|
||||
addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomIn)), menu);
|
||||
addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomOut)), menu);
|
||||
menu->addSeparator();
|
||||
}
|
||||
|
||||
added = addActionToMenu(ac->action("view_mode"), menu) |
|
||||
addActionToMenu(ac->action("sort"), menu) |
|
||||
addActionToMenu(ac->action("additional_info"), menu) |
|
||||
addActionToMenu(ac->action("show_preview"), menu) |
|
||||
addActionToMenu(ac->action("show_in_groups"), menu) |
|
||||
addActionToMenu(ac->action("show_hidden_files"), menu);
|
||||
|
||||
if (added) {
|
||||
menu->addSeparator();
|
||||
}
|
||||
|
||||
added = addActionToMenu(ac->action("split_view"), menu) |
|
||||
addActionToMenu(ac->action("reload"), menu) |
|
||||
addActionToMenu(ac->action("view_properties"), menu);
|
||||
if (added) {
|
||||
menu->addSeparator();
|
||||
}
|
||||
|
||||
addActionToMenu(ac->action("panels"), menu);
|
||||
KMenu* locationBarMenu = new KMenu(i18nc("@action:inmenu", "Location Bar"), menu);
|
||||
locationBarMenu->addAction(ac->action("editable_location"));
|
||||
locationBarMenu->addAction(ac->action("replace_location"));
|
||||
menu->addMenu(locationBarMenu);
|
||||
|
||||
menu->addSeparator();
|
||||
|
||||
// Add "Go" menu
|
||||
KMenu* goMenu = new KMenu(i18nc("@action:inmenu", "Go"), menu);
|
||||
goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Back)));
|
||||
goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Forward)));
|
||||
goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Up)));
|
||||
goMenu->addAction(ac->action("closed_tabs"));
|
||||
menu->addMenu(goMenu);
|
||||
|
||||
// Add "Tool" menu
|
||||
KMenu* toolsMenu = new KMenu(i18nc("@action:inmenu", "Tools"), menu);
|
||||
toolsMenu->addAction(ac->action("show_filter_bar"));
|
||||
toolsMenu->addAction(ac->action("compare_files"));
|
||||
toolsMenu->addAction(ac->action("open_terminal"));
|
||||
toolsMenu->addAction(ac->action("change_remote_encoding"));
|
||||
menu->addMenu(toolsMenu);
|
||||
|
||||
// Add "Settings" menu
|
||||
KMenu* settingsMenu = new KMenu(i18nc("@action:inmenu", "Settings"), menu);
|
||||
settingsMenu->addAction(ac->action(KStandardAction::name(KStandardAction::KeyBindings)));
|
||||
settingsMenu->addAction(ac->action(KStandardAction::name(KStandardAction::ConfigureToolbars)));
|
||||
settingsMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Preferences)));
|
||||
menu->addMenu(settingsMenu);
|
||||
|
||||
// Add "Help" menu
|
||||
KMenu* helpMenu = new KMenu(i18nc("@action:inmenu", "Help"), menu);
|
||||
helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::HelpContents)));
|
||||
helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::WhatsThis)));
|
||||
helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::AboutApp)));
|
||||
helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::AboutKDE)));
|
||||
menu->addMenu(helpMenu);
|
||||
|
||||
menu->addSeparator();
|
||||
addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ShowMenubar)), menu);
|
||||
}
|
||||
|
||||
void DolphinMainWindow::updateToolBar()
|
||||
{
|
||||
if (!menuBar()->isVisible()) {
|
||||
createToolBarMenuButton();
|
||||
}
|
||||
}
|
||||
|
||||
void DolphinMainWindow::slotToolBarSpacerDeleted()
|
||||
{
|
||||
m_toolBarSpacer = 0;
|
||||
m_updateToolBarTimer->start();
|
||||
}
|
||||
|
||||
void DolphinMainWindow::slotToolBarMenuButtonDeleted()
|
||||
{
|
||||
m_openToolBarMenuButton = 0;
|
||||
m_updateToolBarTimer->start();
|
||||
}
|
||||
|
||||
void DolphinMainWindow::init()
|
||||
{
|
||||
DolphinSettings& settings = DolphinSettings::instance();
|
||||
|
@ -1396,11 +1519,17 @@ void DolphinMainWindow::init()
|
|||
showFilterBarAction->setChecked(generalSettings->filterBar());
|
||||
|
||||
if (firstRun) {
|
||||
// assure a proper default size if Dolphin runs the first time
|
||||
menuBar()->setVisible(false);
|
||||
// Assure a proper default size if Dolphin runs the first time
|
||||
resize(750, 500);
|
||||
}
|
||||
|
||||
m_showMenuBar->setChecked(!menuBar()->isHidden()); // workaround for bug #171080
|
||||
const bool showMenu = !menuBar()->isHidden();
|
||||
QAction* showMenuBarAction = actionCollection()->action(KStandardAction::name(KStandardAction::ShowMenubar));
|
||||
showMenuBarAction->setChecked(showMenu); // workaround for bug #171080
|
||||
if (!showMenu) {
|
||||
createToolBarMenuButton();
|
||||
}
|
||||
}
|
||||
|
||||
void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContainer)
|
||||
|
@ -1532,10 +1661,10 @@ void DolphinMainWindow::setupActions()
|
|||
stop->setIcon(KIcon("process-stop"));
|
||||
connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading()));
|
||||
|
||||
KToggleAction* showFullLocation = actionCollection()->add<KToggleAction>("editable_location");
|
||||
showFullLocation->setText(i18nc("@action:inmenu Navigation Bar", "Editable Location"));
|
||||
showFullLocation->setShortcut(Qt::CTRL | Qt::Key_L);
|
||||
connect(showFullLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation()));
|
||||
KToggleAction* editableLocation = actionCollection()->add<KToggleAction>("editable_location");
|
||||
editableLocation->setText(i18nc("@action:inmenu Navigation Bar", "Editable Location"));
|
||||
editableLocation->setShortcut(Qt::CTRL | Qt::Key_L);
|
||||
connect(editableLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation()));
|
||||
|
||||
KAction* replaceLocation = actionCollection()->addAction("replace_location");
|
||||
replaceLocation->setText(i18nc("@action:inmenu Navigation Bar", "Replace Location"));
|
||||
|
@ -1568,8 +1697,6 @@ void DolphinMainWindow::setupActions()
|
|||
KAction* upAction = KStandardAction::up(this, SLOT(goUp()), actionCollection());
|
||||
connect(upAction, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(goUp(Qt::MouseButtons)));
|
||||
|
||||
KStandardAction::home(this, SLOT(goHome()), actionCollection());
|
||||
|
||||
// setup 'Tools' menu
|
||||
KAction* showFilterBar = actionCollection()->addAction("show_filter_bar");
|
||||
showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar"));
|
||||
|
@ -1590,7 +1717,7 @@ void DolphinMainWindow::setupActions()
|
|||
connect(openTerminal, SIGNAL(triggered()), this, SLOT(openTerminal()));
|
||||
|
||||
// setup 'Settings' menu
|
||||
m_showMenuBar = KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection());
|
||||
KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection());
|
||||
KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
|
||||
|
||||
// not in menu actions
|
||||
|
@ -1828,6 +1955,67 @@ void DolphinMainWindow::updateGoActions()
|
|||
goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
|
||||
}
|
||||
|
||||
void DolphinMainWindow::createToolBarMenuButton()
|
||||
{
|
||||
if (m_toolBarSpacer && m_openToolBarMenuButton) {
|
||||
return;
|
||||
}
|
||||
Q_ASSERT(!m_toolBarSpacer);
|
||||
Q_ASSERT(!m_openToolBarMenuButton);
|
||||
|
||||
m_toolBarSpacer = new QWidget(this);
|
||||
m_toolBarSpacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
|
||||
|
||||
m_openToolBarMenuButton = new KPushButton(this);
|
||||
m_openToolBarMenuButton->setFlat(true);
|
||||
m_openToolBarMenuButton->setIcon(KIcon("configure"));
|
||||
m_openToolBarMenuButton->setMaximumWidth(m_openToolBarMenuButton->sizeHint().height());
|
||||
|
||||
// Instead of using QPushButton::setMenu() the opening of the menu is done manually
|
||||
// to prevent the "clutter" of the down-arrow drawn by the style.
|
||||
connect(m_openToolBarMenuButton, SIGNAL(clicked()), this, SLOT(openToolBarMenu()));
|
||||
|
||||
toolBar()->addWidget(m_toolBarSpacer);
|
||||
toolBar()->addWidget(m_openToolBarMenuButton);
|
||||
|
||||
// The added widgets are owned by the toolbar and may get deleted when e.g. the toolbar
|
||||
// gets edited. In this case we must add them again. The adding is done asynchronously by
|
||||
// m_updateToolBarTimer.
|
||||
connect(m_toolBarSpacer, SIGNAL(destroyed()), this, SLOT(slotToolBarSpacerDeleted()));
|
||||
connect(m_openToolBarMenuButton, SIGNAL(destroyed()), this, SLOT(slotToolBarMenuButtonDeleted()));
|
||||
m_updateToolBarTimer = new QTimer(this);
|
||||
m_updateToolBarTimer->setInterval(500);
|
||||
connect(m_updateToolBarTimer, SIGNAL(timeout()), this, SLOT(updateToolBar()));
|
||||
}
|
||||
|
||||
void DolphinMainWindow::deleteToolBarMenuButton()
|
||||
{
|
||||
delete m_toolBarSpacer;
|
||||
m_toolBarSpacer = 0;
|
||||
|
||||
delete m_openToolBarMenuButton;
|
||||
m_openToolBarMenuButton = 0;
|
||||
|
||||
delete m_updateToolBarTimer;
|
||||
m_updateToolBarTimer = 0;
|
||||
}
|
||||
|
||||
bool DolphinMainWindow::addActionToMenu(QAction* action, KMenu* menu)
|
||||
{
|
||||
Q_ASSERT(action);
|
||||
Q_ASSERT(menu);
|
||||
|
||||
const KToolBar* toolBarWidget = toolBar();
|
||||
foreach (const QWidget* widget, action->associatedWidgets()) {
|
||||
if (widget == toolBarWidget) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
menu->addAction(action);
|
||||
return true;
|
||||
}
|
||||
|
||||
void DolphinMainWindow::rememberClosedTab(int index)
|
||||
{
|
||||
KMenu* tabsMenu = m_recentTabsMenu->menu();
|
||||
|
|
|
@ -38,13 +38,14 @@
|
|||
|
||||
typedef KIO::FileUndoManager::CommandType CommandType;
|
||||
|
||||
class KAction;
|
||||
class DolphinViewActionHandler;
|
||||
class DolphinApplication;
|
||||
class DolphinSettingsDialog;
|
||||
class DolphinViewContainer;
|
||||
class DolphinRemoteEncoding;
|
||||
class KAction;
|
||||
class KNewFileMenu;
|
||||
class KPushButton;
|
||||
class KTabBar;
|
||||
class KUrl;
|
||||
class QSplitter;
|
||||
|
@ -108,12 +109,6 @@ public:
|
|||
*/
|
||||
KNewFileMenu* newFileMenu() const;
|
||||
|
||||
/**
|
||||
* Returns the 'Show Menubar' action which can be shared with
|
||||
* other menus (e. g. a context menu).
|
||||
*/
|
||||
KAction* showMenuBarAction() const;
|
||||
|
||||
public slots:
|
||||
/**
|
||||
* Pastes the clipboard data into the currently selected folder
|
||||
|
@ -295,9 +290,6 @@ private slots:
|
|||
*/
|
||||
void goUp(Qt::MouseButtons buttons);
|
||||
|
||||
/** Goes to the home URL. */
|
||||
void goHome();
|
||||
|
||||
/** Opens Kompare for 2 selected files. */
|
||||
void compareFiles();
|
||||
|
||||
|
@ -446,6 +438,12 @@ private slots:
|
|||
const KUrl& url,
|
||||
const QList<QAction*>& customActions);
|
||||
|
||||
void openToolBarMenu();
|
||||
void updateToolBarMenu();
|
||||
void updateToolBar();
|
||||
void slotToolBarSpacerDeleted();
|
||||
void slotToolBarMenuButtonDeleted();
|
||||
|
||||
private:
|
||||
DolphinMainWindow(int id);
|
||||
void init();
|
||||
|
@ -469,6 +467,16 @@ private:
|
|||
void updateViewActions();
|
||||
void updateGoActions();
|
||||
|
||||
void createToolBarMenuButton();
|
||||
void deleteToolBarMenuButton();
|
||||
|
||||
/**
|
||||
* Adds the action \p action to the menu \p menu in
|
||||
* case if it has not added already to the toolbar.
|
||||
* @return True if the action has been added to the menu.
|
||||
*/
|
||||
bool addActionToMenu(QAction* action, KMenu* menu);
|
||||
|
||||
/**
|
||||
* Adds the tab[\a index] to the closed tab menu's list of actions.
|
||||
*/
|
||||
|
@ -537,12 +545,12 @@ private:
|
|||
|
||||
KNewFileMenu* m_newFileMenu;
|
||||
KActionMenu* m_recentTabsMenu;
|
||||
KAction* m_showMenuBar;
|
||||
KTabBar* m_tabBar;
|
||||
DolphinViewContainer* m_activeViewContainer;
|
||||
QVBoxLayout* m_centralWidgetLayout;
|
||||
int m_id;
|
||||
|
||||
// Members for the tab-handling:
|
||||
struct ViewTab
|
||||
{
|
||||
ViewTab() : isPrimaryViewActive(true), primaryView(0), secondaryView(0), splitter(0) {}
|
||||
|
@ -551,7 +559,6 @@ private:
|
|||
DolphinViewContainer* secondaryView;
|
||||
QSplitter* splitter;
|
||||
};
|
||||
|
||||
int m_tabIndex;
|
||||
QList<ViewTab> m_viewTab;
|
||||
|
||||
|
@ -559,6 +566,12 @@ private:
|
|||
DolphinRemoteEncoding* m_remoteEncoding;
|
||||
QPointer<DolphinSettingsDialog> m_settingsDialog;
|
||||
|
||||
// Members for the toolbar menu that is shown when the menubar is hidden:
|
||||
QWidget* m_toolBarSpacer;
|
||||
KPushButton* m_openToolBarMenuButton;
|
||||
QWeakPointer<KMenu> m_toolBarMenu;
|
||||
QTimer* m_updateToolBarTimer;
|
||||
|
||||
KJob* m_lastHandleUrlStatJob;
|
||||
|
||||
/**
|
||||
|
@ -583,11 +596,6 @@ inline KNewFileMenu* DolphinMainWindow::newFileMenu() const
|
|||
return m_newFileMenu;
|
||||
}
|
||||
|
||||
inline KAction* DolphinMainWindow::showMenuBarAction() const
|
||||
{
|
||||
return m_showMenuBar;
|
||||
}
|
||||
|
||||
inline int DolphinMainWindow::getId() const
|
||||
{
|
||||
return m_id;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
|
||||
<kpartgui name="dolphin" version="13">
|
||||
<kpartgui name="dolphin" version="14">
|
||||
<MenuBar>
|
||||
<Menu name="file">
|
||||
<Action name="create_new" />
|
||||
|
@ -30,7 +30,7 @@
|
|||
<Action name="stop" />
|
||||
<Separator/>
|
||||
<Action name="panels" />
|
||||
<Menu name="navigation_bar">
|
||||
<Menu name="location_bar">
|
||||
<text context="@title:menu">Location Bar</text>
|
||||
<Action name="editable_location" />
|
||||
<Action name="replace_location" />
|
||||
|
|
Loading…
Reference in a new issue