mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-02 14:45:04 +00:00
Touch up various user-visible strings
This improves consistency among wording. More clarity is achieved by avoiding technical terms or terms with multiple meanings. Notable changes: -Specify full settings path: "Configure Dolphin > View > General" in Show Hidden Files whatsThis -Mention setting to hide files with application/x-trash MIME type in "Show Hidden Files" whatsThis -Mention Split View mode in "Copy/Move to Other View" whatsThis -Reword "Activate Tab" actions to "Go to Tab" (Next, Previous, Last, numbers) -Add "Last Tab" iconText, consistent with "Next Tab" & "Previous Tab" -Update Split View whatsthis to explain how to tell which view is "in focus" visually -Replace "pane" with "view" in split view settings text, and clarify tooltip text -Reword "objects" to "items" in whatsThis texts -Reword "find bar" to "search bar" in Search button whatsThis text
This commit is contained in:
parent
240d33ce17
commit
d1b06ab94f
|
@ -96,7 +96,7 @@ namespace
|
||||||
const int CurrentDolphinVersion = 202;
|
const int CurrentDolphinVersion = 202;
|
||||||
// The maximum number of entries in the back/forward popup menu
|
// The maximum number of entries in the back/forward popup menu
|
||||||
const int MaxNumberOfNavigationentries = 12;
|
const int MaxNumberOfNavigationentries = 12;
|
||||||
// The maximum number of "Activate Tab" shortcuts
|
// The maximum number of "Go to Tab" shortcuts
|
||||||
const int MaxActivateTabShortcuts = 9;
|
const int MaxActivateTabShortcuts = 9;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1640,7 +1640,7 @@ void DolphinMainWindow::setupActions()
|
||||||
newWindow->setToolTip(i18nc("@info", "Open a new Dolphin window"));
|
newWindow->setToolTip(i18nc("@info", "Open a new Dolphin window"));
|
||||||
newWindow->setWhatsThis(xi18nc("@info:whatsthis",
|
newWindow->setWhatsThis(xi18nc("@info:whatsthis",
|
||||||
"This opens a new "
|
"This opens a new "
|
||||||
"window just like this one with the current location and view."
|
"window just like this one with the current location."
|
||||||
"<nl/>You can drag and drop items between windows."));
|
"<nl/>You can drag and drop items between windows."));
|
||||||
newWindow->setIcon(QIcon::fromTheme(QStringLiteral("window-new")));
|
newWindow->setIcon(QIcon::fromTheme(QStringLiteral("window-new")));
|
||||||
|
|
||||||
|
@ -1649,8 +1649,8 @@ void DolphinMainWindow::setupActions()
|
||||||
newTab->setText(i18nc("@action:inmenu File", "New Tab"));
|
newTab->setText(i18nc("@action:inmenu File", "New Tab"));
|
||||||
newTab->setWhatsThis(xi18nc("@info:whatsthis",
|
newTab->setWhatsThis(xi18nc("@info:whatsthis",
|
||||||
"This opens a new "
|
"This opens a new "
|
||||||
"<emphasis>Tab</emphasis> with the current location and view.<nl/>"
|
"<emphasis>Tab</emphasis> with the current location."
|
||||||
"A tab is an additional view within this window. "
|
"<nl/>Tabs allow you to quickly switch between multiple locations and views within this window. "
|
||||||
"You can drag and drop items between tabs."));
|
"You can drag and drop items between tabs."));
|
||||||
actionCollection()->setDefaultShortcut(newTab, Qt::CTRL | Qt::Key_T);
|
actionCollection()->setDefaultShortcut(newTab, Qt::CTRL | Qt::Key_T);
|
||||||
connect(newTab, &QAction::triggered, this, &DolphinMainWindow::openNewActivatedTab);
|
connect(newTab, &QAction::triggered, this, &DolphinMainWindow::openNewActivatedTab);
|
||||||
|
@ -1665,10 +1665,11 @@ void DolphinMainWindow::setupActions()
|
||||||
|
|
||||||
QAction *closeTab = KStandardAction::close(m_tabWidget, QOverload<>::of(&DolphinTabWidget::closeTab), actionCollection());
|
QAction *closeTab = KStandardAction::close(m_tabWidget, QOverload<>::of(&DolphinTabWidget::closeTab), actionCollection());
|
||||||
closeTab->setText(i18nc("@action:inmenu File", "Close Tab"));
|
closeTab->setText(i18nc("@action:inmenu File", "Close Tab"));
|
||||||
|
closeTab->setToolTip(i18nc("@info", "Close Tab"));
|
||||||
closeTab->setWhatsThis(i18nc("@info:whatsthis",
|
closeTab->setWhatsThis(i18nc("@info:whatsthis",
|
||||||
"This closes the "
|
"This closes the "
|
||||||
"currently viewed tab. If no more tabs are left this window "
|
"currently viewed tab. If no more tabs are left, this closes "
|
||||||
"will close instead."));
|
"the whole window instead."));
|
||||||
|
|
||||||
QAction *quitAction = KStandardAction::quit(this, &DolphinMainWindow::quit, actionCollection());
|
QAction *quitAction = KStandardAction::quit(this, &DolphinMainWindow::quit, actionCollection());
|
||||||
quitAction->setWhatsThis(i18nc("@info:whatsthis quit", "This closes this window."));
|
quitAction->setWhatsThis(i18nc("@info:whatsthis quit", "This closes this window."));
|
||||||
|
@ -1719,9 +1720,10 @@ void DolphinMainWindow::setupActions()
|
||||||
m_actionTextHelper->registerTextWhenNothingIsSelected(copyToOtherViewAction, i18nc("@action:inmenu", "Copy to Other View…"));
|
m_actionTextHelper->registerTextWhenNothingIsSelected(copyToOtherViewAction, i18nc("@action:inmenu", "Copy to Other View…"));
|
||||||
copyToOtherViewAction->setWhatsThis(xi18nc("@info:whatsthis Copy",
|
copyToOtherViewAction->setWhatsThis(xi18nc("@info:whatsthis Copy",
|
||||||
"This copies the selected items from "
|
"This copies the selected items from "
|
||||||
"the <emphasis>active</emphasis> view to the inactive split view."));
|
"the view in focus to the other view. "
|
||||||
|
"(Only available while in Split View mode.)"));
|
||||||
copyToOtherViewAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-copy")));
|
copyToOtherViewAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-copy")));
|
||||||
copyToOtherViewAction->setIconText(i18nc("@action:inmenu Edit", "Copy to Inactive Split View"));
|
copyToOtherViewAction->setIconText(i18nc("@action:inmenu Edit", "Copy to Other View"));
|
||||||
actionCollection()->setDefaultShortcut(copyToOtherViewAction, Qt::SHIFT | Qt::Key_F5);
|
actionCollection()->setDefaultShortcut(copyToOtherViewAction, Qt::SHIFT | Qt::Key_F5);
|
||||||
connect(copyToOtherViewAction, &QAction::triggered, this, &DolphinMainWindow::copyToInactiveSplitView);
|
connect(copyToOtherViewAction, &QAction::triggered, this, &DolphinMainWindow::copyToInactiveSplitView);
|
||||||
|
|
||||||
|
@ -1730,9 +1732,10 @@ void DolphinMainWindow::setupActions()
|
||||||
m_actionTextHelper->registerTextWhenNothingIsSelected(moveToOtherViewAction, i18nc("@action:inmenu", "Move to Other View…"));
|
m_actionTextHelper->registerTextWhenNothingIsSelected(moveToOtherViewAction, i18nc("@action:inmenu", "Move to Other View…"));
|
||||||
moveToOtherViewAction->setWhatsThis(xi18nc("@info:whatsthis Move",
|
moveToOtherViewAction->setWhatsThis(xi18nc("@info:whatsthis Move",
|
||||||
"This moves the selected items from "
|
"This moves the selected items from "
|
||||||
"the <emphasis>active</emphasis> view to the inactive split view."));
|
"the view in focus to the other view. "
|
||||||
|
"(Only available while in Split View mode.)"));
|
||||||
moveToOtherViewAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-cut")));
|
moveToOtherViewAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-cut")));
|
||||||
moveToOtherViewAction->setIconText(i18nc("@action:inmenu Edit", "Move to Inactive Split View"));
|
moveToOtherViewAction->setIconText(i18nc("@action:inmenu Edit", "Move to Other View"));
|
||||||
actionCollection()->setDefaultShortcut(moveToOtherViewAction, Qt::SHIFT | Qt::Key_F6);
|
actionCollection()->setDefaultShortcut(moveToOtherViewAction, Qt::SHIFT | Qt::Key_F6);
|
||||||
connect(moveToOtherViewAction, &QAction::triggered, this, &DolphinMainWindow::moveToInactiveSplitView);
|
connect(moveToOtherViewAction, &QAction::triggered, this, &DolphinMainWindow::moveToInactiveSplitView);
|
||||||
|
|
||||||
|
@ -1742,7 +1745,7 @@ void DolphinMainWindow::setupActions()
|
||||||
showFilterBar->setWhatsThis(xi18nc("@info:whatsthis",
|
showFilterBar->setWhatsThis(xi18nc("@info:whatsthis",
|
||||||
"This opens the "
|
"This opens the "
|
||||||
"<emphasis>Filter Bar</emphasis> at the bottom of the window.<nl/> "
|
"<emphasis>Filter Bar</emphasis> at the bottom of the window.<nl/> "
|
||||||
"There you can enter a text to filter the files and folders currently displayed. "
|
"There you can enter text to filter the files and folders currently displayed. "
|
||||||
"Only those that contain the text in their name will be kept in view."));
|
"Only those that contain the text in their name will be kept in view."));
|
||||||
showFilterBar->setIcon(QIcon::fromTheme(QStringLiteral("view-filter")));
|
showFilterBar->setIcon(QIcon::fromTheme(QStringLiteral("view-filter")));
|
||||||
actionCollection()->setDefaultShortcuts(showFilterBar, {Qt::CTRL | Qt::Key_I, Qt::Key_Slash});
|
actionCollection()->setDefaultShortcuts(showFilterBar, {Qt::CTRL | Qt::Key_I, Qt::Key_Slash});
|
||||||
|
@ -1765,10 +1768,10 @@ void DolphinMainWindow::setupActions()
|
||||||
searchAction->setToolTip(i18nc("@info:tooltip", "Search for files and folders"));
|
searchAction->setToolTip(i18nc("@info:tooltip", "Search for files and folders"));
|
||||||
searchAction->setWhatsThis(xi18nc("@info:whatsthis find",
|
searchAction->setWhatsThis(xi18nc("@info:whatsthis find",
|
||||||
"<para>This helps you "
|
"<para>This helps you "
|
||||||
"find files and folders by opening a <emphasis>find bar</emphasis>. "
|
"find files and folders by opening a <emphasis>search bar</emphasis>. "
|
||||||
"There you can enter search terms and specify settings to find the "
|
"There you can enter search terms and specify settings to find the "
|
||||||
"objects you are looking for.</para><para>Use this help again on "
|
"items you are looking for.</para><para>Use this help again on "
|
||||||
"the find bar so we can have a look at it while the settings are "
|
"the search bar so we can have a look at it while the settings are "
|
||||||
"explained.</para>"));
|
"explained.</para>"));
|
||||||
|
|
||||||
// toggle_search acts as a copy of the main searchAction to be used mainly
|
// toggle_search acts as a copy of the main searchAction to be used mainly
|
||||||
|
@ -1820,7 +1823,7 @@ void DolphinMainWindow::setupActions()
|
||||||
invertSelection->setText(i18nc("@action:inmenu Edit", "Invert Selection"));
|
invertSelection->setText(i18nc("@action:inmenu Edit", "Invert Selection"));
|
||||||
invertSelection->setWhatsThis(xi18nc("@info:whatsthis invert",
|
invertSelection->setWhatsThis(xi18nc("@info:whatsthis invert",
|
||||||
"This selects all "
|
"This selects all "
|
||||||
"objects that you have currently <emphasis>not</emphasis> selected instead."));
|
"items that you have currently <emphasis>not</emphasis> selected instead."));
|
||||||
invertSelection->setIcon(QIcon::fromTheme(QStringLiteral("edit-select-invert")));
|
invertSelection->setIcon(QIcon::fromTheme(QStringLiteral("edit-select-invert")));
|
||||||
actionCollection()->setDefaultShortcut(invertSelection, Qt::CTRL | Qt::SHIFT | Qt::Key_A);
|
actionCollection()->setDefaultShortcut(invertSelection, Qt::CTRL | Qt::SHIFT | Qt::Key_A);
|
||||||
connect(invertSelection, &QAction::triggered, this, &DolphinMainWindow::invertSelection);
|
connect(invertSelection, &QAction::triggered, this, &DolphinMainWindow::invertSelection);
|
||||||
|
@ -1836,11 +1839,12 @@ void DolphinMainWindow::setupActions()
|
||||||
m_splitViewAction = actionCollection()->add<KActionMenu>(QStringLiteral("split_view"));
|
m_splitViewAction = actionCollection()->add<KActionMenu>(QStringLiteral("split_view"));
|
||||||
m_splitViewMenuAction = actionCollection()->addAction(QStringLiteral("split_view_menu"));
|
m_splitViewMenuAction = actionCollection()->addAction(QStringLiteral("split_view_menu"));
|
||||||
|
|
||||||
m_splitViewAction->setWhatsThis(xi18nc("@info:whatsthis find",
|
m_splitViewAction->setWhatsThis(xi18nc("@info:whatsthis split",
|
||||||
"<para>This splits "
|
"<para>This presents "
|
||||||
"the folder view below into two autonomous views.</para><para>This "
|
"a second view side-by-side with the current view, so you can see "
|
||||||
"way you can see two locations at once and move items between them "
|
"the contents of two folders at once and easily move items between "
|
||||||
"quickly.</para>Click this again afterwards to recombine the views."));
|
"them.</para><para>The view that is not \"in focus\" will be dimmed. "
|
||||||
|
"</para>Click this button again to close one of the views."));
|
||||||
m_splitViewMenuAction->setWhatsThis(m_splitViewAction->whatsThis());
|
m_splitViewMenuAction->setWhatsThis(m_splitViewAction->whatsThis());
|
||||||
|
|
||||||
// only set it for the menu version
|
// only set it for the menu version
|
||||||
|
@ -1851,8 +1855,8 @@ void DolphinMainWindow::setupActions()
|
||||||
|
|
||||||
QAction *popoutSplit = actionCollection()->addAction(QStringLiteral("popout_split_view"));
|
QAction *popoutSplit = actionCollection()->addAction(QStringLiteral("popout_split_view"));
|
||||||
popoutSplit->setWhatsThis(xi18nc("@info:whatsthis",
|
popoutSplit->setWhatsThis(xi18nc("@info:whatsthis",
|
||||||
"If the folder view has been split, this will pop the active folder "
|
"If the view has been split, this will pop the view in focus "
|
||||||
"view out into a new window."));
|
"out into a new window."));
|
||||||
popoutSplit->setIcon(QIcon::fromTheme(QStringLiteral("window-new")));
|
popoutSplit->setIcon(QIcon::fromTheme(QStringLiteral("window-new")));
|
||||||
actionCollection()->setDefaultShortcut(popoutSplit, Qt::SHIFT | Qt::Key_F3);
|
actionCollection()->setDefaultShortcut(popoutSplit, Qt::SHIFT | Qt::Key_F3);
|
||||||
connect(popoutSplit, &QAction::triggered, this, &DolphinMainWindow::popoutSplitView);
|
connect(popoutSplit, &QAction::triggered, this, &DolphinMainWindow::popoutSplitView);
|
||||||
|
@ -1940,10 +1944,10 @@ void DolphinMainWindow::setupActions()
|
||||||
undoAction->setWhatsThis(xi18nc("@info:whatsthis",
|
undoAction->setWhatsThis(xi18nc("@info:whatsthis",
|
||||||
"This undoes "
|
"This undoes "
|
||||||
"the last change you made to files or folders.<nl/>"
|
"the last change you made to files or folders.<nl/>"
|
||||||
"Such changes include <interface>creating, renaming</interface> "
|
"Such changes include <interface>creating</interface>, <interface>renaming</interface> "
|
||||||
"and <interface>moving</interface> them to a different location "
|
"and <interface>moving</interface> them to a different location "
|
||||||
"or to the <filename>Trash</filename>. <nl/>Changes that can't "
|
"or to the <filename>Trash</filename>. <nl/>Any changes that cannot be undone "
|
||||||
"be undone will ask for your confirmation."));
|
"will ask for your confirmation beforehand."));
|
||||||
undoAction->setEnabled(false); // undo should be disabled by default
|
undoAction->setEnabled(false); // undo should be disabled by default
|
||||||
|
|
||||||
{
|
{
|
||||||
|
@ -1969,8 +1973,8 @@ void DolphinMainWindow::setupActions()
|
||||||
homeAction->setWhatsThis(xi18nc("@info:whatsthis",
|
homeAction->setWhatsThis(xi18nc("@info:whatsthis",
|
||||||
"Go to your "
|
"Go to your "
|
||||||
"<filename>Home</filename> folder.<nl/>Every user account "
|
"<filename>Home</filename> folder.<nl/>Every user account "
|
||||||
"has their own <filename>Home</filename> that contains their data "
|
"has their own <filename>Home</filename> that contains their personal files, "
|
||||||
"including folders that contain personal application data."));
|
"as well as hidden folders for their applications' data and configuration files."));
|
||||||
|
|
||||||
// setup 'Tools' menu
|
// setup 'Tools' menu
|
||||||
QAction *compareFiles = actionCollection()->addAction(QStringLiteral("compare_files"));
|
QAction *compareFiles = actionCollection()->addAction(QStringLiteral("compare_files"));
|
||||||
|
@ -1993,7 +1997,7 @@ void DolphinMainWindow::setupActions()
|
||||||
openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal"));
|
openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal"));
|
||||||
openTerminal->setWhatsThis(xi18nc("@info:whatsthis",
|
openTerminal->setWhatsThis(xi18nc("@info:whatsthis",
|
||||||
"<para>This opens a <emphasis>terminal</emphasis> application for the viewed location.</para>"
|
"<para>This opens a <emphasis>terminal</emphasis> application for the viewed location.</para>"
|
||||||
"<para>To learn more about terminals use the help in the terminal application.</para>"));
|
"<para>To learn more about terminals use the help features in the terminal application.</para>"));
|
||||||
openTerminal->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal")));
|
openTerminal->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal")));
|
||||||
actionCollection()->setDefaultShortcut(openTerminal, Qt::SHIFT | Qt::Key_F4);
|
actionCollection()->setDefaultShortcut(openTerminal, Qt::SHIFT | Qt::Key_F4);
|
||||||
connect(openTerminal, &QAction::triggered, this, &DolphinMainWindow::openTerminal);
|
connect(openTerminal, &QAction::triggered, this, &DolphinMainWindow::openTerminal);
|
||||||
|
@ -2003,7 +2007,7 @@ void DolphinMainWindow::setupActions()
|
||||||
openTerminalHere->setText(i18nc("@action:inmenu Tools", "Open Terminal Here"));
|
openTerminalHere->setText(i18nc("@action:inmenu Tools", "Open Terminal Here"));
|
||||||
openTerminalHere->setWhatsThis(xi18nc("@info:whatsthis",
|
openTerminalHere->setWhatsThis(xi18nc("@info:whatsthis",
|
||||||
"<para>This opens <emphasis>terminal</emphasis> applications for the selected items' locations.</para>"
|
"<para>This opens <emphasis>terminal</emphasis> applications for the selected items' locations.</para>"
|
||||||
"<para>To learn more about terminals use the help in the terminal application.</para>"));
|
"<para>To learn more about terminals use the help features in the terminal application.</para>"));
|
||||||
openTerminalHere->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal")));
|
openTerminalHere->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal")));
|
||||||
actionCollection()->setDefaultShortcut(openTerminalHere, Qt::SHIFT | Qt::ALT | Qt::Key_F4);
|
actionCollection()->setDefaultShortcut(openTerminalHere, Qt::SHIFT | Qt::ALT | Qt::Key_F4);
|
||||||
connect(openTerminalHere, &QAction::triggered, this, &DolphinMainWindow::openTerminalHere);
|
connect(openTerminalHere, &QAction::triggered, this, &DolphinMainWindow::openTerminalHere);
|
||||||
|
@ -2029,10 +2033,10 @@ void DolphinMainWindow::setupActions()
|
||||||
KToggleAction *showMenuBar = KStandardAction::showMenubar(nullptr, nullptr, actionCollection());
|
KToggleAction *showMenuBar = KStandardAction::showMenubar(nullptr, nullptr, actionCollection());
|
||||||
showMenuBar->setWhatsThis(xi18nc("@info:whatsthis",
|
showMenuBar->setWhatsThis(xi18nc("@info:whatsthis",
|
||||||
"<para>This switches between having a <emphasis>Menubar</emphasis> "
|
"<para>This switches between having a <emphasis>Menubar</emphasis> "
|
||||||
"and having a <interface>%1</interface> button. Both "
|
"and having an <interface>%1</interface> button. Both "
|
||||||
"contain mostly the same actions and configuration options.</para>"
|
"contain mostly the same actions and configuration options.</para>"
|
||||||
"<para>The Menubar takes up more space but allows for fast and organised access to all "
|
"<para>The Menubar takes up more space but allows for fast and organized access to all "
|
||||||
"actions an application has to offer.</para><para>The <interface>%1</interface> button "
|
"actions an application has to offer.</para><para>The %1 button "
|
||||||
"is simpler and small which makes triggering advanced actions more time consuming.</para>",
|
"is simpler and small which makes triggering advanced actions more time consuming.</para>",
|
||||||
hamburgerMenuAction->text().replace('&', "")));
|
hamburgerMenuAction->text().replace('&', "")));
|
||||||
connect(showMenuBar,
|
connect(showMenuBar,
|
||||||
|
@ -2061,7 +2065,7 @@ void DolphinMainWindow::setupActions()
|
||||||
|
|
||||||
for (int i = 0; i < MaxActivateTabShortcuts; ++i) {
|
for (int i = 0; i < MaxActivateTabShortcuts; ++i) {
|
||||||
QAction *activateTab = actionCollection()->addAction(QStringLiteral("activate_tab_%1").arg(i));
|
QAction *activateTab = actionCollection()->addAction(QStringLiteral("activate_tab_%1").arg(i));
|
||||||
activateTab->setText(i18nc("@action:inmenu", "Activate Tab %1", i + 1));
|
activateTab->setText(i18nc("@action:inmenu", "Go to Tab %1", i + 1));
|
||||||
activateTab->setEnabled(false);
|
activateTab->setEnabled(false);
|
||||||
connect(activateTab, &QAction::triggered, this, [this, i]() {
|
connect(activateTab, &QAction::triggered, this, [this, i]() {
|
||||||
m_tabWidget->activateTab(i);
|
m_tabWidget->activateTab(i);
|
||||||
|
@ -2074,21 +2078,22 @@ void DolphinMainWindow::setupActions()
|
||||||
}
|
}
|
||||||
|
|
||||||
QAction *activateLastTab = actionCollection()->addAction(QStringLiteral("activate_last_tab"));
|
QAction *activateLastTab = actionCollection()->addAction(QStringLiteral("activate_last_tab"));
|
||||||
activateLastTab->setText(i18nc("@action:inmenu", "Activate Last Tab"));
|
activateLastTab->setIconText(i18nc("@action:inmenu", "Last Tab"));
|
||||||
|
activateLastTab->setText(i18nc("@action:inmenu", "Go to Last Tab"));
|
||||||
activateLastTab->setEnabled(false);
|
activateLastTab->setEnabled(false);
|
||||||
connect(activateLastTab, &QAction::triggered, m_tabWidget, &DolphinTabWidget::activateLastTab);
|
connect(activateLastTab, &QAction::triggered, m_tabWidget, &DolphinTabWidget::activateLastTab);
|
||||||
actionCollection()->setDefaultShortcut(activateLastTab, Qt::ALT | Qt::Key_0);
|
actionCollection()->setDefaultShortcut(activateLastTab, Qt::ALT | Qt::Key_0);
|
||||||
|
|
||||||
QAction *activateNextTab = actionCollection()->addAction(QStringLiteral("activate_next_tab"));
|
QAction *activateNextTab = actionCollection()->addAction(QStringLiteral("activate_next_tab"));
|
||||||
activateNextTab->setIconText(i18nc("@action:inmenu", "Next Tab"));
|
activateNextTab->setIconText(i18nc("@action:inmenu", "Next Tab"));
|
||||||
activateNextTab->setText(i18nc("@action:inmenu", "Activate Next Tab"));
|
activateNextTab->setText(i18nc("@action:inmenu", "Go to Next Tab"));
|
||||||
activateNextTab->setEnabled(false);
|
activateNextTab->setEnabled(false);
|
||||||
connect(activateNextTab, &QAction::triggered, m_tabWidget, &DolphinTabWidget::activateNextTab);
|
connect(activateNextTab, &QAction::triggered, m_tabWidget, &DolphinTabWidget::activateNextTab);
|
||||||
actionCollection()->setDefaultShortcuts(activateNextTab, nextTabKeys);
|
actionCollection()->setDefaultShortcuts(activateNextTab, nextTabKeys);
|
||||||
|
|
||||||
QAction *activatePrevTab = actionCollection()->addAction(QStringLiteral("activate_prev_tab"));
|
QAction *activatePrevTab = actionCollection()->addAction(QStringLiteral("activate_prev_tab"));
|
||||||
activatePrevTab->setIconText(i18nc("@action:inmenu", "Previous Tab"));
|
activatePrevTab->setIconText(i18nc("@action:inmenu", "Previous Tab"));
|
||||||
activatePrevTab->setText(i18nc("@action:inmenu", "Activate Previous Tab"));
|
activatePrevTab->setText(i18nc("@action:inmenu", "Go to Previous Tab"));
|
||||||
activatePrevTab->setEnabled(false);
|
activatePrevTab->setEnabled(false);
|
||||||
connect(activatePrevTab, &QAction::triggered, m_tabWidget, &DolphinTabWidget::activatePrevTab);
|
connect(activatePrevTab, &QAction::triggered, m_tabWidget, &DolphinTabWidget::activatePrevTab);
|
||||||
actionCollection()->setDefaultShortcuts(activatePrevTab, prevTabKeys);
|
actionCollection()->setDefaultShortcuts(activatePrevTab, prevTabKeys);
|
||||||
|
@ -2256,7 +2261,7 @@ void DolphinMainWindow::setupDockWidgets()
|
||||||
"<nl/>The location in the terminal will always match the folder "
|
"<nl/>The location in the terminal will always match the folder "
|
||||||
"view so you can navigate using either.</para><para>The terminal "
|
"view so you can navigate using either.</para><para>The terminal "
|
||||||
"panel is not needed for basic computer usage but can be useful "
|
"panel is not needed for basic computer usage but can be useful "
|
||||||
"for advanced tasks. To learn more about terminals use the help "
|
"for advanced tasks. To learn more about terminals use the help features "
|
||||||
"in a standalone terminal application like Konsole.</para>"));
|
"in a standalone terminal application like Konsole.</para>"));
|
||||||
terminalDock->setWhatsThis(xi18nc("@info:whatsthis",
|
terminalDock->setWhatsThis(xi18nc("@info:whatsthis",
|
||||||
"<para>This is "
|
"<para>This is "
|
||||||
|
@ -2264,7 +2269,7 @@ void DolphinMainWindow::setupDockWidgets()
|
||||||
"normal terminal but will match the location of the folder view "
|
"normal terminal but will match the location of the folder view "
|
||||||
"so you can navigate using either.</para><para>The terminal panel "
|
"so you can navigate using either.</para><para>The terminal panel "
|
||||||
"is not needed for basic computer usage but can be useful for "
|
"is not needed for basic computer usage but can be useful for "
|
||||||
"advanced tasks. To learn more about terminals use the help in a "
|
"advanced tasks. To learn more about terminals use the help features in a "
|
||||||
"standalone terminal application like Konsole.</para>")
|
"standalone terminal application like Konsole.</para>")
|
||||||
+ panelWhatsThis);
|
+ panelWhatsThis);
|
||||||
}
|
}
|
||||||
|
@ -2309,7 +2314,7 @@ void DolphinMainWindow::setupDockWidgets()
|
||||||
actionShowAllPlaces->setWhatsThis(i18nc("@info:whatsthis",
|
actionShowAllPlaces->setWhatsThis(i18nc("@info:whatsthis",
|
||||||
"This displays "
|
"This displays "
|
||||||
"all places in the places panel that have been hidden. They will "
|
"all places in the places panel that have been hidden. They will "
|
||||||
"appear semi-transparent unless you uncheck their hide property."));
|
"appear semi-transparent and allow you to uncheck their \"Hide\" property."));
|
||||||
|
|
||||||
connect(actionShowAllPlaces, &QAction::triggered, this, [this](bool checked) {
|
connect(actionShowAllPlaces, &QAction::triggered, this, [this](bool checked) {
|
||||||
m_placesPanel->setShowAll(checked);
|
m_placesPanel->setShowAll(checked);
|
||||||
|
@ -2551,14 +2556,14 @@ void DolphinMainWindow::updateSplitActions()
|
||||||
m_splitViewAction->setText(i18nc("@action:intoolbar Close left view", "Close"));
|
m_splitViewAction->setText(i18nc("@action:intoolbar Close left view", "Close"));
|
||||||
m_splitViewAction->setToolTip(i18nc("@info", "Close left view"));
|
m_splitViewAction->setToolTip(i18nc("@info", "Close left view"));
|
||||||
m_splitViewAction->setIcon(QIcon::fromTheme(QStringLiteral("view-left-close")));
|
m_splitViewAction->setIcon(QIcon::fromTheme(QStringLiteral("view-left-close")));
|
||||||
popoutSplitAction->setText(i18nc("@action:intoolbar Move left split view to a new window", "Pop out"));
|
popoutSplitAction->setText(i18nc("@action:intoolbar Move left view to a new window", "Pop out Left View"));
|
||||||
popoutSplitAction->setToolTip(i18nc("@info", "Move left split view to a new window"));
|
popoutSplitAction->setToolTip(i18nc("@info", "Move left view to a new window"));
|
||||||
} else {
|
} else {
|
||||||
m_splitViewAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
|
m_splitViewAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
|
||||||
m_splitViewAction->setToolTip(i18nc("@info", "Close right view"));
|
m_splitViewAction->setToolTip(i18nc("@info", "Close right view"));
|
||||||
m_splitViewAction->setIcon(QIcon::fromTheme(QStringLiteral("view-right-close")));
|
m_splitViewAction->setIcon(QIcon::fromTheme(QStringLiteral("view-right-close")));
|
||||||
popoutSplitAction->setText(i18nc("@action:intoolbar Move right split view to a new window", "Pop out"));
|
popoutSplitAction->setText(i18nc("@action:intoolbar Move right view to a new window", "Pop out Right View"));
|
||||||
popoutSplitAction->setToolTip(i18nc("@info", "Move right split view to a new window"));
|
popoutSplitAction->setToolTip(i18nc("@info", "Move right view to a new window"));
|
||||||
}
|
}
|
||||||
popoutSplitAction->setEnabled(true);
|
popoutSplitAction->setEnabled(true);
|
||||||
if (!m_splitViewAction->menu()) {
|
if (!m_splitViewAction->menu()) {
|
||||||
|
@ -2570,7 +2575,7 @@ void DolphinMainWindow::updateSplitActions()
|
||||||
m_splitViewAction->setText(i18nc("@action:intoolbar Split view", "Split"));
|
m_splitViewAction->setText(i18nc("@action:intoolbar Split view", "Split"));
|
||||||
m_splitViewAction->setToolTip(i18nc("@info", "Split view"));
|
m_splitViewAction->setToolTip(i18nc("@info", "Split view"));
|
||||||
m_splitViewAction->setIcon(QIcon::fromTheme(QStringLiteral("view-right-new")));
|
m_splitViewAction->setIcon(QIcon::fromTheme(QStringLiteral("view-right-new")));
|
||||||
popoutSplitAction->setText(i18nc("@action:intoolbar Move active split view to a new window", "Pop out"));
|
popoutSplitAction->setText(i18nc("@action:intoolbar Move view in focus to a new window", "Pop out"));
|
||||||
popoutSplitAction->setEnabled(false);
|
popoutSplitAction->setEnabled(false);
|
||||||
if (m_splitViewAction->menu()) {
|
if (m_splitViewAction->menu()) {
|
||||||
m_splitViewAction->removeAction(popoutSplitAction);
|
m_splitViewAction->removeAction(popoutSplitAction);
|
||||||
|
|
|
@ -51,7 +51,7 @@
|
||||||
<default>true</default>
|
<default>true</default>
|
||||||
</entry>
|
</entry>
|
||||||
<entry name="SplitView" type="Bool">
|
<entry name="SplitView" type="Bool">
|
||||||
<label>Split the view into two panes</label>
|
<label>Place two views side by side</label>
|
||||||
<default>false</default>
|
<default>false</default>
|
||||||
<emit signal="splitViewChanged" />
|
<emit signal="splitViewChanged" />
|
||||||
</entry>
|
</entry>
|
||||||
|
@ -76,7 +76,7 @@
|
||||||
<default>true</default>
|
<default>true</default>
|
||||||
</entry>
|
</entry>
|
||||||
<entry name="RenameInline" type="Bool">
|
<entry name="RenameInline" type="Bool">
|
||||||
<label>Rename inline</label>
|
<label>Rename single items inline</label>
|
||||||
<default>true</default>
|
<default>true</default>
|
||||||
</entry>
|
</entry>
|
||||||
<entry name="ShowSelectionToggle" type="Bool">
|
<entry name="ShowSelectionToggle" type="Bool">
|
||||||
|
@ -88,11 +88,11 @@
|
||||||
<default>true</default>
|
<default>true</default>
|
||||||
</entry>
|
</entry>
|
||||||
<entry name="UseTabForSwitchingSplitView" type="Bool">
|
<entry name="UseTabForSwitchingSplitView" type="Bool">
|
||||||
<label>Use tab for switching between right and left split</label>
|
<label>Use tab for switching between right and left view</label>
|
||||||
<default>false</default>
|
<default>false</default>
|
||||||
</entry>
|
</entry>
|
||||||
<entry name="CloseActiveSplitView" type="Bool">
|
<entry name="CloseActiveSplitView" type="Bool">
|
||||||
<label>Close active pane when toggling off split view</label>
|
<label>Close the view in focus when turning off split view</label>
|
||||||
<default>true</default>
|
<default>true</default>
|
||||||
</entry>
|
</entry>
|
||||||
<entry name="OpenNewTabAfterLastTab" type="Bool">
|
<entry name="OpenNewTabAfterLastTab" type="Bool">
|
||||||
|
@ -100,7 +100,7 @@
|
||||||
<default>false</default>
|
<default>false</default>
|
||||||
</entry>
|
</entry>
|
||||||
<entry name="ShowToolTips" type="Bool">
|
<entry name="ShowToolTips" type="Bool">
|
||||||
<label>Show tooltips</label>
|
<label>Show item information on hover</label>
|
||||||
<default>false</default>
|
<default>false</default>
|
||||||
</entry>
|
</entry>
|
||||||
<entry name="ViewPropsTimestamp" type="DateTime" >
|
<entry name="ViewPropsTimestamp" type="DateTime" >
|
||||||
|
|
|
@ -115,13 +115,14 @@ FoldersTabsSettingsPage::FoldersTabsSettingsPage(QWidget *parent)
|
||||||
topLayout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed));
|
topLayout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed));
|
||||||
|
|
||||||
// 'Switch between panes of split views with tab key'
|
// 'Switch between panes of split views with tab key'
|
||||||
m_useTabForSplitViewSwitch = new QCheckBox(i18nc("option:check split view panes", "Switch between panes with Tab key"));
|
m_useTabForSplitViewSwitch = new QCheckBox(i18nc("option:check split view panes", "Switch between views with Tab key"));
|
||||||
topLayout->addRow(i18nc("@title:group", "Split view: "), m_useTabForSplitViewSwitch);
|
topLayout->addRow(i18nc("@title:group", "Split view: "), m_useTabForSplitViewSwitch);
|
||||||
|
|
||||||
// 'Close active pane when turning off split view'
|
// 'Close active pane when turning off split view'
|
||||||
m_closeActiveSplitView = new QCheckBox(i18nc("option:check", "Turning off split view closes active pane"));
|
m_closeActiveSplitView = new QCheckBox(i18nc("option:check", "Turning off split view closes the view in focus"));
|
||||||
topLayout->addRow(QString(), m_closeActiveSplitView);
|
topLayout->addRow(QString(), m_closeActiveSplitView);
|
||||||
m_closeActiveSplitView->setToolTip(i18n("When deactivated, turning off split view will close the inactive pane"));
|
m_closeActiveSplitView->setToolTip(
|
||||||
|
i18n("When unchecked, the opposite view will be closed. The Close icon always illustrates which view (left or right) will be closed."));
|
||||||
|
|
||||||
// 'Begin in split view mode'
|
// 'Begin in split view mode'
|
||||||
m_splitView = new QCheckBox(i18nc("@option:check Startup Settings", "Begin in split view mode"));
|
m_splitView = new QCheckBox(i18nc("@option:check Startup Settings", "Begin in split view mode"));
|
||||||
|
|
|
@ -60,7 +60,7 @@ GeneralViewSettingsPage::GeneralViewSettingsPage(const QUrl &url, QWidget *paren
|
||||||
|
|
||||||
#if HAVE_BALOO
|
#if HAVE_BALOO
|
||||||
// 'Show tooltips'
|
// 'Show tooltips'
|
||||||
m_showToolTips = new QCheckBox(i18nc("@option:check", "Show tooltips"));
|
m_showToolTips = new QCheckBox(i18nc("@option:check", "Show item information on hover"));
|
||||||
topLayout->addRow(i18nc("@title:group", "Miscellaneous: "), m_showToolTips);
|
topLayout->addRow(i18nc("@title:group", "Miscellaneous: "), m_showToolTips);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -73,7 +73,8 @@ GeneralViewSettingsPage::GeneralViewSettingsPage(const QUrl &url, QWidget *paren
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// 'Inline renaming of items'
|
// 'Inline renaming of items'
|
||||||
m_renameInline = new QCheckBox(i18nc("option:check", "Rename inline"));
|
m_renameInline = new QCheckBox(i18nc("option:check", "Rename single items inline"));
|
||||||
|
m_renameInline->setToolTip(i18n("Renaming multiple items is always done with a dialog window."));
|
||||||
topLayout->addRow(QString(), m_renameInline);
|
topLayout->addRow(QString(), m_renameInline);
|
||||||
|
|
||||||
m_hideXtrashFiles = new QCheckBox(i18nc("option:check", "Also hide backup files while hiding hidden files"));
|
m_hideXtrashFiles = new QCheckBox(i18nc("option:check", "Also hide backup files while hiding hidden files"));
|
||||||
|
|
|
@ -90,7 +90,7 @@ void DolphinViewActionHandler::createActions(SelectionMode::ActionTextHelper *ac
|
||||||
renameAction->setWhatsThis(xi18nc("@info:whatsthis",
|
renameAction->setWhatsThis(xi18nc("@info:whatsthis",
|
||||||
"This renames the "
|
"This renames the "
|
||||||
"items in your current selection.<nl/>Renaming multiple items "
|
"items in your current selection.<nl/>Renaming multiple items "
|
||||||
"at once amounts to their new names differing only in a number."));
|
"at once results in their new names differing only in a number."));
|
||||||
|
|
||||||
auto trashAction = KStandardAction::moveToTrash(this, &DolphinViewActionHandler::slotTrashActivated, m_actionCollection);
|
auto trashAction = KStandardAction::moveToTrash(this, &DolphinViewActionHandler::slotTrashActivated, m_actionCollection);
|
||||||
auto trashShortcuts = trashAction->shortcuts();
|
auto trashShortcuts = trashAction->shortcuts();
|
||||||
|
@ -102,8 +102,8 @@ void DolphinViewActionHandler::createActions(SelectionMode::ActionTextHelper *ac
|
||||||
trashAction->setWhatsThis(xi18nc("@info:whatsthis",
|
trashAction->setWhatsThis(xi18nc("@info:whatsthis",
|
||||||
"This moves the "
|
"This moves the "
|
||||||
"items in your current selection to the <filename>Trash"
|
"items in your current selection to the <filename>Trash"
|
||||||
"</filename>.<nl/>The trash is a temporary storage where "
|
"</filename>.<nl/>The trash is a temporary storage location where "
|
||||||
"items can be deleted from if disk space is needed."));
|
"items can be deleted later if disk space is needed."));
|
||||||
|
|
||||||
auto deleteAction = KStandardAction::deleteFile(this, &DolphinViewActionHandler::slotDeleteItems, m_actionCollection);
|
auto deleteAction = KStandardAction::deleteFile(this, &DolphinViewActionHandler::slotDeleteItems, m_actionCollection);
|
||||||
auto deleteShortcuts = deleteAction->shortcuts();
|
auto deleteShortcuts = deleteAction->shortcuts();
|
||||||
|
@ -114,8 +114,8 @@ void DolphinViewActionHandler::createActions(SelectionMode::ActionTextHelper *ac
|
||||||
}
|
}
|
||||||
deleteAction->setWhatsThis(xi18nc("@info:whatsthis",
|
deleteAction->setWhatsThis(xi18nc("@info:whatsthis",
|
||||||
"This deletes "
|
"This deletes "
|
||||||
"the items in your current selection completely. They can "
|
"the items in your current selection permanently. They "
|
||||||
"not be recovered by normal means."));
|
"cannot be recovered by normal means."));
|
||||||
|
|
||||||
// This action is useful for being enabled when KStandardAction::MoveToTrash should be
|
// This action is useful for being enabled when KStandardAction::MoveToTrash should be
|
||||||
// disabled and KStandardAction::DeleteFile is enabled (e.g. non-local files), so that Key_Del
|
// disabled and KStandardAction::DeleteFile is enabled (e.g. non-local files), so that Key_Del
|
||||||
|
@ -199,7 +199,7 @@ void DolphinViewActionHandler::createActions(SelectionMode::ActionTextHelper *ac
|
||||||
compactAction->setWhatsThis(xi18nc("@info:whatsthis Compact view mode",
|
compactAction->setWhatsThis(xi18nc("@info:whatsthis Compact view mode",
|
||||||
"<para>This switches to a compact view mode that lists the folders "
|
"<para>This switches to a compact view mode that lists the folders "
|
||||||
"and files in columns with the names beside the icons.</para><para>"
|
"and files in columns with the names beside the icons.</para><para>"
|
||||||
"This helps to keep the overview in folders with many items.</para>"));
|
"This helps to give you an overview in folders with many items.</para>"));
|
||||||
detailsAction->setWhatsThis(xi18nc("@info:whatsthis Details view mode",
|
detailsAction->setWhatsThis(xi18nc("@info:whatsthis Details view mode",
|
||||||
"<para>This switches to a list view mode that focuses on folder "
|
"<para>This switches to a list view mode that focuses on folder "
|
||||||
"and file details.</para><para>Click on a detail in the column "
|
"and file details.</para><para>Click on a detail in the column "
|
||||||
|
@ -207,8 +207,8 @@ void DolphinViewActionHandler::createActions(SelectionMode::ActionTextHelper *ac
|
||||||
"way around. To select which details should be displayed click "
|
"way around. To select which details should be displayed click "
|
||||||
"the header with the right mouse button.</para><para>You can "
|
"the header with the right mouse button.</para><para>You can "
|
||||||
"view the contents of a folder without leaving the current "
|
"view the contents of a folder without leaving the current "
|
||||||
"location by clicking to the left of it. This way you can view "
|
"location by clicking the region to the left of it. This way you can "
|
||||||
"the contents of multiple folders in the same list.</para>"));
|
"view the contents of multiple folders in the same list.</para>"));
|
||||||
|
|
||||||
KSelectAction *viewModeActions = m_actionCollection->add<KSelectAction>(QStringLiteral("view_mode"));
|
KSelectAction *viewModeActions = m_actionCollection->add<KSelectAction>(QStringLiteral("view_mode"));
|
||||||
viewModeActions->setText(i18nc("@action:intoolbar", "View Mode"));
|
viewModeActions->setText(i18nc("@action:intoolbar", "View Mode"));
|
||||||
|
@ -320,11 +320,15 @@ void DolphinViewActionHandler::createActions(SelectionMode::ActionTextHelper *ac
|
||||||
showHiddenFiles->setText(i18nc("@action:inmenu View", "Show Hidden Files"));
|
showHiddenFiles->setText(i18nc("@action:inmenu View", "Show Hidden Files"));
|
||||||
showHiddenFiles->setWhatsThis(xi18nc("@info:whatsthis",
|
showHiddenFiles->setWhatsThis(xi18nc("@info:whatsthis",
|
||||||
"<para>When "
|
"<para>When "
|
||||||
"this is enabled <emphasis>hidden</emphasis> files and folders "
|
"this is enabled, <emphasis>hidden</emphasis> files and folders "
|
||||||
"are visible. They will be displayed semi-transparent.</para>"
|
"are visible. They will be displayed semi-transparent.</para>"
|
||||||
"<para>Hidden items only differ from other ones in that their "
|
"<para>Hidden items only differ from normal ones in that their "
|
||||||
"name starts with a \".\". In general there is no need for "
|
"name starts with a dot (\".\"). Typically, there is no need for "
|
||||||
"users to access them which is why they are hidden.</para>"));
|
"users to access them, which is why they are hidden.</para>"
|
||||||
|
"<para>Items can also be hidden if their names are listed in a text file "
|
||||||
|
"named \".hidden\". Files with the \"application/x-trash\" MIME type, "
|
||||||
|
"such as backup files, can also be hidden by enabling that setting in "
|
||||||
|
"Configure Dolphin > View > General.</para>"));
|
||||||
m_actionCollection->setDefaultShortcuts(showHiddenFiles, KStandardShortcut::showHideHiddenFiles());
|
m_actionCollection->setDefaultShortcuts(showHiddenFiles, KStandardShortcut::showHideHiddenFiles());
|
||||||
connect(showHiddenFiles, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleShowHiddenFiles);
|
connect(showHiddenFiles, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleShowHiddenFiles);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue