Differential D20471 Diff 60535 src/dolphinmainwindow.cpp

Changeset View

Standalone View

View Options

src/dolphinmainwindow.cpp

Show First 20 Lines • Show All 66 Lines • ▼ Show 20 Line(s)
67#include <KToolInvocation> 67​#include <KToolInvocation>
68#include <KUrlComboBox> 68​#include <KUrlComboBox>
69#include <KUrlNavigator> 69​#include <KUrlNavigator>
70#include <KWindowSystem> 70​#include <KWindowSystem>
71 71​
72#include <QApplication> 72​#include <QApplication>
73#include <QClipboard> 73​#include <QClipboard>
74#include <QCloseEvent> 74​#include <QCloseEvent>
75​#include <QDesktopServices>
75#include <QDialog> 76​#include <QDialog>
76#include <QFileInfo> 77​#include <QFileInfo>
77#include <QLineEdit> 78​#include <QLineEdit>
78#include <QMenu> 79​#include <QMenu>
79#include <QMenuBar> 80​#include <QMenuBar>
80#include <QPushButton> 81​#include <QPushButton>
81#include <QShowEvent> 82​#include <QShowEvent>
82#include <QStandardPaths> 83​#include <QStandardPaths>
elvisangelaccioUnsubmitted
Done

Please keep the includes sorted by name.

elvisangelaccio: Please keep the includes sorted by name.
83#include <QTimer> 84​#include <QTimer>
84#include <QToolButton> 85​#include <QToolButton>
86​#include <QWhatsThisClickedEvent>
85 87​
86namespace { 88​namespace {
87 // Used for GeneralSettings::version() to determine whether 89​ // Used for GeneralSettings::version() to determine whether
88 // an updated version of Dolphin is running. 90​ // an updated version of Dolphin is running.
89 const int CurrentDolphinVersion = 200; 91​ const int CurrentDolphinVersion = 200;
90} 92​}
91 93​
92DolphinMainWindow::DolphinMainWindow() : 94​DolphinMainWindow::DolphinMainWindow() :
93 KXmlGuiWindow(nullptr), 95​ KXmlGuiWindow(nullptr, Qt::WindowContextHelpButtonHint),
94 m_newFileMenu(nullptr), 96​ m_newFileMenu(nullptr),
97​ m_helpMenu(nullptr),
95 m_tabWidget(nullptr), 98​ m_tabWidget(nullptr),
96 m_activeViewContainer(nullptr), 99​ m_activeViewContainer(nullptr),
97 m_actionHandler(nullptr), 100​ m_actionHandler(nullptr),
98 m_remoteEncoding(nullptr), 101​ m_remoteEncoding(nullptr),
99 m_settingsDialog(), 102​ m_settingsDialog(),
100 m_bookmarkHandler(nullptr), 103​ m_bookmarkHandler(nullptr),
101 m_controlButton(nullptr), 104​ m_controlButton(nullptr),
102 m_updateToolBarTimer(nullptr), 105​ m_updateToolBarTimer(nullptr),
▲ Show 20 Lines • Show All 73 Lines • ▼ Show 20 Line(s)110{
176 if (!showMenu) { 179​ if (!showMenu) {
177 createControlButton(); 180​ createControlButton();
178 } 181​ }
179 182​
180 // enable middle-click on back/forward/up to open in a new tab 183​ // enable middle-click on back/forward/up to open in a new tab
181 auto *middleClickEventFilter = new MiddleClickActionEventFilter(this); 184​ auto *middleClickEventFilter = new MiddleClickActionEventFilter(this);
182 connect(middleClickEventFilter, &MiddleClickActionEventFilter::actionMiddleClicked, this, &DolphinMainWindow::slotToolBarActionMiddleClicked); 185​ connect(middleClickEventFilter, &MiddleClickActionEventFilter::actionMiddleClicked, this, &DolphinMainWindow::slotToolBarActionMiddleClicked);
183 toolBar()->installEventFilter(middleClickEventFilter); 186​ toolBar()->installEventFilter(middleClickEventFilter);
187​
188​ setupWhatsThis();
184} 189​}
185 190​
186DolphinMainWindow::~DolphinMainWindow() 191​DolphinMainWindow::~DolphinMainWindow()
187{ 192​{
188} 193​}
189 194​
190QVector<DolphinViewContainer*> DolphinMainWindow::viewContainers() const 195​QVector<DolphinViewContainer*> DolphinMainWindow::viewContainers() const
191{ 196​{
▲ Show 20 Lines • Show All 121 Lines • ▼ Show 20 Line(s)
313void DolphinMainWindow::updateHistory() 318​void DolphinMainWindow::updateHistory()
314{ 319​{
315 const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator(); 320​ const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
316 const int index = urlNavigator->historyIndex(); 321​ const int index = urlNavigator->historyIndex();
317 322​
318 QAction* backAction = actionCollection()->action(KStandardAction::name(KStandardAction::Back)); 323​ QAction* backAction = actionCollection()->action(KStandardAction::name(KStandardAction::Back));
319 if (backAction) { 324​ if (backAction) {
320 backAction->setToolTip(i18nc("@info", "Go back")); 325​ backAction->setToolTip(i18nc("@info", "Go back"));
326​ backAction->setWhatsThis(i18nc("@info:whatsthis go back", "Return to the previously viewed folder."));
321 backAction->setEnabled(index < urlNavigator->historySize() - 1); 327​ backAction->setEnabled(index < urlNavigator->historySize() - 1);
322 } 328​ }
323 329​
324 QAction* forwardAction = actionCollection()->action(KStandardAction::name(KStandardAction::Forward)); 330​ QAction* forwardAction = actionCollection()->action(KStandardAction::name(KStandardAction::Forward));
325 if (forwardAction) { 331​ if (forwardAction) {
326 forwardAction->setToolTip(i18nc("@info", "Go forward")); 332​ forwardAction->setToolTip(i18nc("@info", "Go forward"));
333​ forwardAction->setWhatsThis(xi18nc("@info:whatsthis go forward",
334​ "This undoes a <interface>Go|Back</interface> action."));
327 forwardAction->setEnabled(index > 0); 335​ forwardAction->setEnabled(index > 0);
328 } 336​ }
329} 337​}
330 338​
331void DolphinMainWindow::updateFilterBarAction(bool show) 339​void DolphinMainWindow::updateFilterBarAction(bool show)
332{ 340​{
333 QAction* showFilterBarAction = actionCollection()->action(QStringLiteral("show_filter_bar")); 341​ QAction* showFilterBarAction = actionCollection()->action(QStringLiteral("show_filter_bar"));
334 showFilterBarAction->setChecked(show); 342​ showFilterBarAction->setChecked(show);
▲ Show 20 Lines • Show All 691 Lines • ▼ Show 20 Line(s)954{
1026 menu->addMenu(toolsMenu); 1034​ menu->addMenu(toolsMenu);
1027 1035​
1028 // Add "Settings" menu entries 1036​ // Add "Settings" menu entries
1029 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::KeyBindings)), menu); 1037​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::KeyBindings)), menu);
1030 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ConfigureToolbars)), menu); 1038​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ConfigureToolbars)), menu);
1031 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Preferences)), menu); 1039​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Preferences)), menu);
1032 1040​
1033 // Add "Help" menu 1041​ // Add "Help" menu
1034 auto helpMenu = new KHelpMenu(menu); 1042​ menu->addMenu(m_helpMenu->menu());
1035 menu->addMenu(helpMenu->menu()); ​
1036 1043​
1037 menu->addSeparator(); 1044​ menu->addSeparator();
1038 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ShowMenubar)), menu); 1045​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ShowMenubar)), menu);
1039} 1046​}
1040 1047​
1041void DolphinMainWindow::updateToolBar() 1048​void DolphinMainWindow::updateToolBar()
1042{ 1049​{
1043 if (!menuBar()->isVisible()) { 1050​ if (!menuBar()->isVisible()) {
▲ Show 20 Lines • Show All 96 Lines • ▼ Show 20 Line(s)
1140{ 1147​{
1141 // setup 'File' menu 1148​ // setup 'File' menu
1142 m_newFileMenu = new DolphinNewFileMenu(actionCollection(), this); 1149​ m_newFileMenu = new DolphinNewFileMenu(actionCollection(), this);
1143 QMenu* menu = m_newFileMenu->menu(); 1150​ QMenu* menu = m_newFileMenu->menu();
1144 menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New")); 1151​ menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
1145 menu->setIcon(QIcon::fromTheme(QStringLiteral("document-new"))); 1152​ menu->setIcon(QIcon::fromTheme(QStringLiteral("document-new")));
1146 m_newFileMenu->setDelayed(false); 1153​ m_newFileMenu->setDelayed(false);
1147 connect(menu, &QMenu::aboutToShow, 1154​ connect(menu, &QMenu::aboutToShow,
1148 this, &DolphinMainWindow::updateNewMenu); 1155​ this, &DolphinMainWindow::updateNewMenu);
elvisangelaccioUnsubmitted
Done

Please add const

elvisangelaccio: Please add `const`
1149 1156​
1150 QAction* newWindow = KStandardAction::openNew(this, &DolphinMainWindow::openNewMainWindow, actionCollection()); 1157​ QAction* newWindow = KStandardAction::openNew(this, &DolphinMainWindow::openNewMainWindow, actionCollection());
1151 newWindow->setText(i18nc("@action:inmenu File", "New &Window")); 1158​ newWindow->setText(i18nc("@action:inmenu File", "New &Window"));
1159​ newWindow->setWhatsThis(xi18nc("@info:whatsthis", "This opens a new "
1160​ "window just like this one with the current location and view."
1161​ "<nl/>You can drag and drop items between windows."));
elvisangelaccioUnsubmitted
Done

Please call it cutAction. (I know we use paste below for the paste action, but that's old code).

elvisangelaccio: Please call it `cutAction`. (I know we use `paste` below for the paste action, but that's old…
1152 newWindow->setIcon(QIcon::fromTheme(QStringLiteral("window-new"))); 1162​ newWindow->setIcon(QIcon::fromTheme(QStringLiteral("window-new")));
1153 1163​
1154 QAction* newTab = actionCollection()->addAction(QStringLiteral("new_tab")); 1164​ QAction* newTab = actionCollection()->addAction(QStringLiteral("new_tab"));
1155 newTab->setIcon(QIcon::fromTheme(QStringLiteral("tab-new"))); 1165​ newTab->setIcon(QIcon::fromTheme(QStringLiteral("tab-new")));
1156 newTab->setText(i18nc("@action:inmenu File", "New Tab")); 1166​ newTab->setText(i18nc("@action:inmenu File", "New Tab"));
1167​ newTab->setWhatsThis(xi18nc("@info:whatsthis", "This opens a new "
elvisangelaccioUnsubmitted
Done

Please call it copyAction.

elvisangelaccio: Please call it `copyAction`.
1168​ "<emphasis>Tab</emphasis> with the current location and view.<nl/>"
1169​ "A tab is an additional view within this window. "
1170​ "You can drag and drop items between tabs."));
1157 actionCollection()->setDefaultShortcuts(newTab, {Qt::CTRL + Qt::Key_T, Qt::CTRL + Qt::SHIFT + Qt::Key_N}); 1171​ actionCollection()->setDefaultShortcuts(newTab, {Qt::CTRL + Qt::Key_T, Qt::CTRL + Qt::SHIFT + Qt::Key_N});
1158 connect(newTab, &QAction::triggered, this, &DolphinMainWindow::openNewActivatedTab); 1172​ connect(newTab, &QAction::triggered, this, &DolphinMainWindow::openNewActivatedTab);
1159 1173​
1160 QAction* closeTab = KStandardAction::close(m_tabWidget, QOverload<>::of(&DolphinTabWidget::closeTab), actionCollection()); 1174​ QAction* closeTab = KStandardAction::close(m_tabWidget, QOverload<>::of(&DolphinTabWidget::closeTab), actionCollection());
1161 closeTab->setText(i18nc("@action:inmenu File", "Close Tab")); 1175​ closeTab->setText(i18nc("@action:inmenu File", "Close Tab"));
1176​ closeTab->setWhatsThis(i18nc("@info:whatsthis", "This closes the "
1177​ "currently viewed tab. If no more tabs are left this window "
1178​ "will close instead."));
1162 1179​
1163 KStandardAction::quit(this, &DolphinMainWindow::quit, actionCollection()); 1180​ QAction* quitAction = KStandardAction::quit(this, &DolphinMainWindow::quit, actionCollection());
1181​ quitAction->setWhatsThis(i18nc("@info:whatsthis quit", "This closes this window."));
1164 1182​
elvisangelaccioUnsubmitted
Done

Please call it findAction.

elvisangelaccio: Please call it `findAction`.
1165 // setup 'Edit' menu 1183​ // setup 'Edit' menu
1166 KStandardAction::undo(this, 1184​ KStandardAction::undo(this,
1167 &DolphinMainWindow::undo, 1185​ &DolphinMainWindow::undo,
1168 actionCollection()); 1186​ actionCollection());
1169 1187​
1170 1188​ // i18n: This will be the last paragraph for the whatsthis for all three:
1171 KStandardAction::cut(this, &DolphinMainWindow::cut, actionCollection()); 1189​ // Cut, Copy and Paste
1172 KStandardAction::copy(this, &DolphinMainWindow::copy, actionCollection()); 1190​ const QString cutCopyPastePara = xi18nc("@info:whatsthis", "<para><emphasis>Cut, "
1191​ "Copy</emphasis> and <emphasis>Paste</emphasis> work between many "
elvisangelaccioUnsubmitted
Done

Please call it selectAllAction.

elvisangelaccio: Please call it `selectAllAction`.
1192​ "applications and are among the most used commands. That's why their "
1193​ "<emphasis>keyboard shortcuts</emphasis> are prominently placed right "
1194​ "next to each other on the keyboard: <shortcut>Ctrl+X</shortcut>, "
1195​ "<shortcut>Ctrl+C</shortcut> and <shortcut>Ctrl+V</shortcut>.</para>");
1196​ QAction* cutAction = KStandardAction::cut(this, &DolphinMainWindow::cut, actionCollection());
1197​ cutAction->setWhatsThis(xi18nc("@info:whatsthis cut", "This copies the items "
1198​ "in your current selection to the <emphasis>clipboard</emphasis>.<nl/>"
1199​ "Use the <emphasis>Paste</emphasis> action afterwards to copy them from "
1200​ "the clipboard to a new location. The items will be removed from their "
1201​ "initial location.") + cutCopyPastePara);
1202​ QAction* copyAction = KStandardAction::copy(this, &DolphinMainWindow::copy, actionCollection());
1203​ copyAction->setWhatsThis(xi18nc("@info:whatsthis copy", "This copies the "
1204​ "items in your current selection to the <emphasis>clipboard</emphasis>."
1205​ "<nl/>Use the <emphasis>Paste</emphasis> action afterwards to copy them "
1206​ "from the clipboard to a new location.") + cutCopyPastePara);
1173 QAction* paste = KStandardAction::paste(this, &DolphinMainWindow::paste, actionCollection()); 1207​ QAction* paste = KStandardAction::paste(this, &DolphinMainWindow::paste, actionCollection());
1174 // The text of the paste-action is modified dynamically by Dolphin 1208​ // The text of the paste-action is modified dynamically by Dolphin
1175 // (e. g. to "Paste One Folder"). To prevent that the size of the toolbar changes 1209​ // (e. g. to "Paste One Folder"). To prevent that the size of the toolbar changes
1176 // due to the long text, the text "Paste" is used: 1210​ // due to the long text, the text "Paste" is used:
1177 paste->setIconText(i18nc("@action:inmenu Edit", "Paste")); 1211​ paste->setIconText(i18nc("@action:inmenu Edit", "Paste"));
1212​ paste->setWhatsThis(xi18nc("@info:whatsthis paste", "This copies the items from "
1213​ "your <emphasis>clipboard</emphasis> to the currently viewed folder.<nl/>"
1214​ "If the items were added to the clipboard by the <emphasis>Cut</emphasis> "
1215​ "action they are removed from their old location.") + cutCopyPastePara);
1178 1216​
1179 QAction *searchAction = KStandardAction::find(this, &DolphinMainWindow::find, actionCollection()); 1217​ QAction *searchAction = KStandardAction::find(this, &DolphinMainWindow::find, actionCollection());
1180 searchAction->setText(i18n("Search...")); 1218​ searchAction->setText(i18n("Search..."));
1181 1219​ searchAction->setToolTip(i18nc("@info:tooltip", "Search for files and folders"));
1182 KStandardAction::selectAll(this, &DolphinMainWindow::selectAll, actionCollection()); 1220​ searchAction->setWhatsThis(xi18nc("@info:whatsthis find", "<para>This helps you "
1221​ "find files and folders by opening a <emphasis>find bar</emphasis>. "
1222​ "There you can enter search terms and specify settings to find the "
1223​ "objects you are looking for.</para><para>Use this help again on "
1224​ "the find bar so we can have a look at it while the settings are "
1225​ "explained.</para>"));
1226​
1227​ QAction* selectAllAction = KStandardAction::selectAll(this, &DolphinMainWindow::selectAll, actionCollection());
1228​ selectAllAction->setWhatsThis(xi18nc("@info:whatsthis", "This selects all "
1229​ "files and folders in the current location."));
1183 1230​
1184 QAction* invertSelection = actionCollection()->addAction(QStringLiteral("invert_selection")); 1231​ QAction* invertSelection = actionCollection()->addAction(QStringLiteral("invert_selection"));
1185 invertSelection->setText(i18nc("@action:inmenu Edit", "Invert Selection")); 1232​ invertSelection->setText(i18nc("@action:inmenu Edit", "Invert Selection"));
1233​ invertSelection->setWhatsThis(xi18nc("@info:whatsthis invert", "This selects all "
1234​ "objects that you have currently <emphasis>not</emphasis> selected instead."));
1186 invertSelection->setIcon(QIcon::fromTheme(QStringLiteral("edit-select-invert"))); 1235​ invertSelection->setIcon(QIcon::fromTheme(QStringLiteral("edit-select-invert")));
1187 actionCollection()->setDefaultShortcut(invertSelection, Qt::CTRL + Qt::SHIFT + Qt::Key_A); 1236​ actionCollection()->setDefaultShortcut(invertSelection, Qt::CTRL + Qt::SHIFT + Qt::Key_A);
1188 connect(invertSelection, &QAction::triggered, this, &DolphinMainWindow::invertSelection); 1237​ connect(invertSelection, &QAction::triggered, this, &DolphinMainWindow::invertSelection);
1189 1238​
1190 // setup 'View' menu 1239​ // setup 'View' menu
1191 // (note that most of it is set up in DolphinViewActionHandler) 1240​ // (note that most of it is set up in DolphinViewActionHandler)
1192 1241​
1193 QAction* split = actionCollection()->addAction(QStringLiteral("split_view")); 1242​ QAction* split = actionCollection()->addAction(QStringLiteral("split_view"));
1243​ split->setWhatsThis(xi18nc("@info:whatsthis find", "<para>This splits "
1244​ "the folder view below into two autonomous views.</para><para>This "
1245​ "way you can see two locations at once and move items between them "
1246​ "quickly.</para>Click this again afterwards to recombine the views."));
1194 actionCollection()->setDefaultShortcut(split, Qt::Key_F3); 1247​ actionCollection()->setDefaultShortcut(split, Qt::Key_F3);
1195 connect(split, &QAction::triggered, this, &DolphinMainWindow::toggleSplitView); 1248​ connect(split, &QAction::triggered, this, &DolphinMainWindow::toggleSplitView);
1196 1249​
1197 QAction* stashSplit = actionCollection()->addAction(QStringLiteral("split_stash")); 1250​ QAction* stashSplit = actionCollection()->addAction(QStringLiteral("split_stash"));
1198 actionCollection()->setDefaultShortcut(stashSplit, Qt::CTRL + Qt::Key_S); 1251​ actionCollection()->setDefaultShortcut(stashSplit, Qt::CTRL + Qt::Key_S);
1199 stashSplit->setText(i18nc("@action:intoolbar Stash", "Stash")); 1252​ stashSplit->setText(i18nc("@action:intoolbar Stash", "Stash"));
1200 stashSplit->setToolTip(i18nc("@info", "Opens the stash virtual directory in a split window")); 1253​ stashSplit->setToolTip(i18nc("@info", "Opens the stash virtual directory in a split window"));
1201 stashSplit->setIcon(QIcon::fromTheme(QStringLiteral("folder-stash"))); 1254​ stashSplit->setIcon(QIcon::fromTheme(QStringLiteral("folder-stash")));
1202 stashSplit->setCheckable(false); 1255​ stashSplit->setCheckable(false);
1203 stashSplit->setVisible(KProtocolInfo::isKnownProtocol("stash")); 1256​ stashSplit->setVisible(KProtocolInfo::isKnownProtocol("stash"));
1204 connect(stashSplit, &QAction::triggered, this, &DolphinMainWindow::toggleSplitStash); 1257​ connect(stashSplit, &QAction::triggered, this, &DolphinMainWindow::toggleSplitStash);
1205 1258​
1206 KStandardAction::redisplay(this, &DolphinMainWindow::reloadView, actionCollection()); 1259​ KStandardAction::redisplay(this, &DolphinMainWindow::reloadView, actionCollection());
1207 1260​
1208 QAction* stop = actionCollection()->addAction(QStringLiteral("stop")); 1261​ QAction* stop = actionCollection()->addAction(QStringLiteral("stop"));
1209 stop->setText(i18nc("@action:inmenu View", "Stop")); 1262​ stop->setText(i18nc("@action:inmenu View", "Stop"));
1210 stop->setToolTip(i18nc("@info", "Stop loading")); 1263​ stop->setToolTip(i18nc("@info", "Stop loading"));
1264​ stop->setWhatsThis(i18nc("@info", "This stops the loading of the contents of the current folder."));
1211 stop->setIcon(QIcon::fromTheme(QStringLiteral("process-stop"))); 1265​ stop->setIcon(QIcon::fromTheme(QStringLiteral("process-stop")));
1212 connect(stop, &QAction::triggered, this, &DolphinMainWindow::stopLoading); 1266​ connect(stop, &QAction::triggered, this, &DolphinMainWindow::stopLoading);
1213 1267​
1214 KToggleAction* editableLocation = actionCollection()->add<KToggleAction>(QStringLiteral("editable_location")); 1268​ KToggleAction* editableLocation = actionCollection()->add<KToggleAction>(QStringLiteral("editable_location"));
1215 editableLocation->setText(i18nc("@action:inmenu Navigation Bar", "Editable Location")); 1269​ editableLocation->setText(i18nc("@action:inmenu Navigation Bar", "Editable Location"));
1270​ editableLocation->setWhatsThis(xi18nc("@info:whatsthis",
1271​ "This toggles the <emphasis>Location Bar</emphasis> to be "
1272​ "editable so you can directly enter a location you want to go to.<nl/>"
1273​ "You can also switch to editing by clicking to the right of the "
1274​ "location and switch back by confirming the edited location."));
1216 actionCollection()->setDefaultShortcut(editableLocation, Qt::Key_F6); 1275​ actionCollection()->setDefaultShortcut(editableLocation, Qt::Key_F6);
1217 connect(editableLocation, &KToggleAction::triggered, this, &DolphinMainWindow::toggleEditLocation); 1276​ connect(editableLocation, &KToggleAction::triggered, this, &DolphinMainWindow::toggleEditLocation);
1218 1277​
1219 QAction* replaceLocation = actionCollection()->addAction(QStringLiteral("replace_location")); 1278​ QAction* replaceLocation = actionCollection()->addAction(QStringLiteral("replace_location"));
1220 replaceLocation->setText(i18nc("@action:inmenu Navigation Bar", "Replace Location")); 1279​ replaceLocation->setText(i18nc("@action:inmenu Navigation Bar", "Replace Location"));
1280​ // i18n: "enter" is used both in the meaning of "writing" and "going to" a new location here.
1281​ // Both meanings are useful but not necessary to understand the use of "Replace Location".
1282​ // So you might want to be more verbose in your language to convey the meaning but it's up to you.
1283​ replaceLocation->setWhatsThis(xi18nc("@info:whatsthis",
1284​ "This switches to editing the location and selects it "
1285​ "so you can quickly enter a different location."));
1221 actionCollection()->setDefaultShortcut(replaceLocation, Qt::CTRL + Qt::Key_L); 1286​ actionCollection()->setDefaultShortcut(replaceLocation, Qt::CTRL + Qt::Key_L);
1222 connect(replaceLocation, &QAction::triggered, this, &DolphinMainWindow::replaceLocation); 1287​ connect(replaceLocation, &QAction::triggered, this, &DolphinMainWindow::replaceLocation);
1223 1288​
1224 // setup 'Go' menu 1289​ // setup 'Go' menu
1225 QAction* backAction = KStandardAction::back(this, &DolphinMainWindow::goBack, actionCollection()); 1290​ QAction* backAction = KStandardAction::back(this, &DolphinMainWindow::goBack, actionCollection());
1226 auto backShortcuts = backAction->shortcuts(); 1291​ auto backShortcuts = backAction->shortcuts();
1227 backShortcuts.append(QKeySequence(Qt::Key_Backspace)); 1292​ backShortcuts.append(QKeySequence(Qt::Key_Backspace));
1228 actionCollection()->setDefaultShortcuts(backAction, backShortcuts); 1293​ actionCollection()->setDefaultShortcuts(backAction, backShortcuts);
1229 1294​
1230 DolphinRecentTabsMenu* recentTabsMenu = new DolphinRecentTabsMenu(this); 1295​ DolphinRecentTabsMenu* recentTabsMenu = new DolphinRecentTabsMenu(this);
1231 actionCollection()->addAction(QStringLiteral("closed_tabs"), recentTabsMenu); 1296​ actionCollection()->addAction(QStringLiteral("closed_tabs"), recentTabsMenu);
1232 connect(m_tabWidget, &DolphinTabWidget::rememberClosedTab, 1297​ connect(m_tabWidget, &DolphinTabWidget::rememberClosedTab,
1233 recentTabsMenu, &DolphinRecentTabsMenu::rememberClosedTab); 1298​ recentTabsMenu, &DolphinRecentTabsMenu::rememberClosedTab);
1234 connect(recentTabsMenu, &DolphinRecentTabsMenu::restoreClosedTab, 1299​ connect(recentTabsMenu, &DolphinRecentTabsMenu::restoreClosedTab,
1235 m_tabWidget, &DolphinTabWidget::restoreClosedTab); 1300​ m_tabWidget, &DolphinTabWidget::restoreClosedTab);
1236 connect(recentTabsMenu, &DolphinRecentTabsMenu::closedTabsCountChanged, 1301​ connect(recentTabsMenu, &DolphinRecentTabsMenu::closedTabsCountChanged,
1237 this, &DolphinMainWindow::closedTabsCountChanged); 1302​ this, &DolphinMainWindow::closedTabsCountChanged);
1238 1303​
1239 QAction* undoCloseTab = actionCollection()->addAction(QStringLiteral("undo_close_tab")); 1304​ QAction* undoCloseTab = actionCollection()->addAction(QStringLiteral("undo_close_tab"));
1240 undoCloseTab->setText(i18nc("@action:inmenu File", "Undo close tab")); 1305​ undoCloseTab->setText(i18nc("@action:inmenu File", "Undo close tab"));
1306​ undoCloseTab->setWhatsThis(i18nc("@info:whatsthis undo close tab",
1307​ "This returns you to the previously closed tab."));
1241 actionCollection()->setDefaultShortcut(undoCloseTab, Qt::CTRL + Qt::SHIFT + Qt::Key_T); 1308​ actionCollection()->setDefaultShortcut(undoCloseTab, Qt::CTRL + Qt::SHIFT + Qt::Key_T);
1242 undoCloseTab->setIcon(QIcon::fromTheme(QStringLiteral("edit-undo"))); 1309​ undoCloseTab->setIcon(QIcon::fromTheme(QStringLiteral("edit-undo")));
1243 undoCloseTab->setEnabled(false); 1310​ undoCloseTab->setEnabled(false);
1244 connect(undoCloseTab, &QAction::triggered, recentTabsMenu, &DolphinRecentTabsMenu::undoCloseTab); 1311​ connect(undoCloseTab, &QAction::triggered, recentTabsMenu, &DolphinRecentTabsMenu::undoCloseTab);
1245 1312​
1246 auto undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo)); 1313​ auto undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo));
1314​ undoAction->setWhatsThis(xi18nc("@info:whatsthis", "This undoes "
1315​ "the last change you made to files or folders.<nl/>"
1316​ "Such changes include <interface>creating, renaming</interface> "
1317​ "and <interface>moving</interface> them to a different location "
1318​ "or to the <filename>Trash</filename>. <nl/>Changes that can't "
1319​ "be undone will ask for your confirmation."));
1247 undoAction->setEnabled(false); // undo should be disabled by default 1320​ undoAction->setEnabled(false); // undo should be disabled by default
1248 1321​
1249 KStandardAction::forward(this, &DolphinMainWindow::goForward, actionCollection()); 1322​ KStandardAction::forward(this, &DolphinMainWindow::goForward, actionCollection());
1250 KStandardAction::up(this, &DolphinMainWindow::goUp, actionCollection()); 1323​ KStandardAction::up(this, &DolphinMainWindow::goUp, actionCollection());
1251 KStandardAction::home(this, &DolphinMainWindow::goHome, actionCollection()); 1324​ QAction* homeAction = KStandardAction::home(this, &DolphinMainWindow::goHome, actionCollection());
1325​ homeAction->setWhatsThis(xi18nc("@info:whatsthis", "Go to your "
1326​ "<filename>Home</filename> folder.<nl/>Every user account "
1327​ "has their own <filename>Home</filename> that contains their data "
1328​ "including folders that contain personal application data."));
1252 1329​
1253 // setup 'Tools' menu 1330​ // setup 'Tools' menu
1254 QAction* showFilterBar = actionCollection()->addAction(QStringLiteral("show_filter_bar")); 1331​ QAction* showFilterBar = actionCollection()->addAction(QStringLiteral("show_filter_bar"));
1255 showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar")); 1332​ showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar"));
1333​ showFilterBar->setWhatsThis(xi18nc("@info:whatsthis", "This opens the "
1334​ "<emphasis>Filter Bar</emphasis> at the bottom of the window.<nl/> "
1335​ "There you can enter a text to filter the files and folders currently displayed. "
1336​ "Only those that contain the text in their name will be kept in view."));
1256 showFilterBar->setIcon(QIcon::fromTheme(QStringLiteral("view-filter"))); 1337​ showFilterBar->setIcon(QIcon::fromTheme(QStringLiteral("view-filter")));
1257 actionCollection()->setDefaultShortcuts(showFilterBar, {Qt::CTRL + Qt::Key_I, Qt::Key_Slash}); 1338​ actionCollection()->setDefaultShortcuts(showFilterBar, {Qt::CTRL + Qt::Key_I, Qt::Key_Slash});
1258 connect(showFilterBar, &QAction::triggered, this, &DolphinMainWindow::showFilterBar); 1339​ connect(showFilterBar, &QAction::triggered, this, &DolphinMainWindow::showFilterBar);
1259 1340​
1260 QAction* compareFiles = actionCollection()->addAction(QStringLiteral("compare_files")); 1341​ QAction* compareFiles = actionCollection()->addAction(QStringLiteral("compare_files"));
1261 compareFiles->setText(i18nc("@action:inmenu Tools", "Compare Files")); 1342​ compareFiles->setText(i18nc("@action:inmenu Tools", "Compare Files"));
1262 compareFiles->setIcon(QIcon::fromTheme(QStringLiteral("kompare"))); 1343​ compareFiles->setIcon(QIcon::fromTheme(QStringLiteral("kompare")));
1263 compareFiles->setEnabled(false); 1344​ compareFiles->setEnabled(false);
1264 connect(compareFiles, &QAction::triggered, this, &DolphinMainWindow::compareFiles); 1345​ connect(compareFiles, &QAction::triggered, this, &DolphinMainWindow::compareFiles);
1265 1346​
1266#ifdef HAVE_TERMINAL 1347​#ifdef HAVE_TERMINAL
1267 if (KAuthorized::authorize(QStringLiteral("shell_access"))) { 1348​ if (KAuthorized::authorize(QStringLiteral("shell_access"))) {
1268 QAction* openTerminal = actionCollection()->addAction(QStringLiteral("open_terminal")); 1349​ QAction* openTerminal = actionCollection()->addAction(QStringLiteral("open_terminal"));
1269 openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal")); 1350​ openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal"));
1351​ openTerminal->setWhatsThis(xi18nc("@info:whatsthis",
1352​ "<para>This opens a <emphasis>terminal</emphasis> application for the viewed location.</para>"
1353​ "<para>To learn more about terminals use the help in the terminal application.</para>"));
1270 openTerminal->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal"))); 1354​ openTerminal->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal")));
1271 actionCollection()->setDefaultShortcut(openTerminal, Qt::SHIFT + Qt::Key_F4); 1355​ actionCollection()->setDefaultShortcut(openTerminal, Qt::SHIFT + Qt::Key_F4);
1272 connect(openTerminal, &QAction::triggered, this, &DolphinMainWindow::openTerminal); 1356​ connect(openTerminal, &QAction::triggered, this, &DolphinMainWindow::openTerminal);
1273 } 1357​ }
1274#endif 1358​#endif
1275 1359​
1276 // setup 'Bookmarks' menu 1360​ // setup 'Bookmarks' menu
1277 KActionMenu *bookmarkMenu = new KActionMenu(i18nc("@title:menu", "&Bookmarks"), this); 1361​ KActionMenu *bookmarkMenu = new KActionMenu(i18nc("@title:menu", "&Bookmarks"), this);
1278 bookmarkMenu->setIcon(QIcon::fromTheme(QStringLiteral("bookmarks"))); 1362​ bookmarkMenu->setIcon(QIcon::fromTheme(QStringLiteral("bookmarks")));
1279 // Make the toolbar button version work properly on click 1363​ // Make the toolbar button version work properly on click
1280 bookmarkMenu->setDelayed(false); 1364​ bookmarkMenu->setDelayed(false);
1281 m_bookmarkHandler = new DolphinBookmarkHandler(this, actionCollection(), bookmarkMenu->menu(), this); 1365​ m_bookmarkHandler = new DolphinBookmarkHandler(this, actionCollection(), bookmarkMenu->menu(), this);
1282 actionCollection()->addAction(QStringLiteral("bookmarks"), bookmarkMenu); 1366​ actionCollection()->addAction(QStringLiteral("bookmarks"), bookmarkMenu);
1283 1367​
1284 // setup 'Settings' menu 1368​ // setup 'Settings' menu
1285 KToggleAction* showMenuBar = KStandardAction::showMenubar(nullptr, nullptr, actionCollection()); 1369​ KToggleAction* showMenuBar = KStandardAction::showMenubar(nullptr, nullptr, actionCollection());
1370​ showMenuBar->setWhatsThis(xi18nc("@info:whatsthis",
1371​ "This switches between having a <emphasis>Menubar</emphasis> "
1372​ "and having a <interface>Control</interface> button. Both "
1373​ "contain mostly the same commands and configuration options."));
1286 connect(showMenuBar, &KToggleAction::triggered, // Fixes #286822 1374​ connect(showMenuBar, &KToggleAction::triggered, // Fixes #286822
1287 this, &DolphinMainWindow::toggleShowMenuBar, Qt::QueuedConnection); 1375​ this, &DolphinMainWindow::toggleShowMenuBar, Qt::QueuedConnection);
1288 KStandardAction::preferences(this, &DolphinMainWindow::editSettings, actionCollection()); 1376​ KStandardAction::preferences(this, &DolphinMainWindow::editSettings, actionCollection());
1289 1377​
1378​ // setup 'Help' menu for the m_controlButton. The other one is set up in the base class.
1379​ m_helpMenu = new KHelpMenu(nullptr);
1380​ m_helpMenu->menu()->installEventFilter(this);
1381​ // remove duplicate shortcuts
1382​ m_helpMenu->action(KHelpMenu::menuHelpContents)->setShortcut(QKeySequence());
1383​ m_helpMenu->action(KHelpMenu::menuWhatsThis)->setShortcut(QKeySequence());
1384​
1290 // not in menu actions 1385​ // not in menu actions
1291 QList<QKeySequence> nextTabKeys = KStandardShortcut::tabNext(); 1386​ QList<QKeySequence> nextTabKeys = KStandardShortcut::tabNext();
1292 nextTabKeys.append(QKeySequence(Qt::CTRL + Qt::Key_Tab)); 1387​ nextTabKeys.append(QKeySequence(Qt::CTRL + Qt::Key_Tab));
1293 1388​
1294 QList<QKeySequence> prevTabKeys = KStandardShortcut::tabPrev(); 1389​ QList<QKeySequence> prevTabKeys = KStandardShortcut::tabPrev();
1295 prevTabKeys.append(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Tab)); 1390​ prevTabKeys.append(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Tab));
1296 1391​
1297 QAction* activateNextTab = actionCollection()->addAction(QStringLiteral("activate_next_tab")); 1392​ QAction* activateNextTab = actionCollection()->addAction(QStringLiteral("activate_next_tab"));
Show All 26 Lines
1324 openInNewTabs->setText(i18nc("@action:inmenu", "Open in New Tabs")); 1419​ openInNewTabs->setText(i18nc("@action:inmenu", "Open in New Tabs"));
1325 openInNewTabs->setIcon(QIcon::fromTheme(QStringLiteral("tab-new"))); 1420​ openInNewTabs->setIcon(QIcon::fromTheme(QStringLiteral("tab-new")));
1326 connect(openInNewTabs, &QAction::triggered, this, &DolphinMainWindow::openInNewTab); 1421​ connect(openInNewTabs, &QAction::triggered, this, &DolphinMainWindow::openInNewTab);
1327 1422​
1328 QAction* openInNewWindow = actionCollection()->addAction(QStringLiteral("open_in_new_window")); 1423​ QAction* openInNewWindow = actionCollection()->addAction(QStringLiteral("open_in_new_window"));
1329 openInNewWindow->setText(i18nc("@action:inmenu", "Open in New Window")); 1424​ openInNewWindow->setText(i18nc("@action:inmenu", "Open in New Window"));
1330 openInNewWindow->setIcon(QIcon::fromTheme(QStringLiteral("window-new"))); 1425​ openInNewWindow->setIcon(QIcon::fromTheme(QStringLiteral("window-new")));
1331 connect(openInNewWindow, &QAction::triggered, this, &DolphinMainWindow::openInNewWindow); 1426​ connect(openInNewWindow, &QAction::triggered, this, &DolphinMainWindow::openInNewWindow);
1332} 1427​}
elvisangelaccioUnsubmitted
Done

Please add const

elvisangelaccio: Please add `const`
1333 1428​
1334void DolphinMainWindow::setupDockWidgets() 1429​void DolphinMainWindow::setupDockWidgets()
1335{ 1430​{
1336 const bool lock = GeneralSettings::lockPanels(); 1431​ const bool lock = GeneralSettings::lockPanels();
1337 1432​
1338 KDualAction* lockLayoutAction = actionCollection()->add<KDualAction>(QStringLiteral("lock_panels")); 1433​ KDualAction* lockLayoutAction = actionCollection()->add<KDualAction>(QStringLiteral("lock_panels"));
yurchorUnsubmitted
Done

Typo: informations -> information

yurchor: Typo: informations -> information
1339 lockLayoutAction->setActiveText(i18nc("@action:inmenu Panels", "Unlock Panels")); 1434​ lockLayoutAction->setActiveText(i18nc("@action:inmenu Panels", "Unlock Panels"));
1340 lockLayoutAction->setActiveIcon(QIcon::fromTheme(QStringLiteral("object-unlocked"))); 1435​ lockLayoutAction->setActiveIcon(QIcon::fromTheme(QStringLiteral("object-unlocked")));
1341 lockLayoutAction->setInactiveText(i18nc("@action:inmenu Panels", "Lock Panels")); 1436​ lockLayoutAction->setInactiveText(i18nc("@action:inmenu Panels", "Lock Panels"));
1342 lockLayoutAction->setInactiveIcon(QIcon::fromTheme(QStringLiteral("object-locked"))); 1437​ lockLayoutAction->setInactiveIcon(QIcon::fromTheme(QStringLiteral("object-locked")));
1438​ lockLayoutAction->setWhatsThis(xi18nc("@info:whatsthis", "This "
yurchorUnsubmitted
Done

Typo: informations -> information

yurchor: Typo: informations -> information
1439​ "switches between having panels <emphasis>locked</emphasis> or "
1440​ "<emphasis>unlocked</emphasis>.<nl/>Unlocked panels can be "
1441​ "dragged to the other side of the window and have a close "
1442​ "button.<nl/>Locked panels are embedded more cleanly."));
1343 lockLayoutAction->setActive(lock); 1443​ lockLayoutAction->setActive(lock);
1344 connect(lockLayoutAction, &KDualAction::triggered, this, &DolphinMainWindow::togglePanelLockState); 1444​ connect(lockLayoutAction, &KDualAction::triggered, this, &DolphinMainWindow::togglePanelLockState);
1345 1445​
1346 // Setup "Information" 1446​ // Setup "Information"
1347 DolphinDockWidget* infoDock = new DolphinDockWidget(i18nc("@title:window", "Information")); 1447​ DolphinDockWidget* infoDock = new DolphinDockWidget(i18nc("@title:window", "Information"));
1348 infoDock->setLocked(lock); 1448​ infoDock->setLocked(lock);
1349 infoDock->setObjectName(QStringLiteral("infoDock")); 1449​ infoDock->setObjectName(QStringLiteral("infoDock"));
1350 infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); 1450​ infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
Show All 11 Lines1452#ifdef HAVE_BALOO
1362 connect(this, &DolphinMainWindow::urlChanged, 1462​ connect(this, &DolphinMainWindow::urlChanged,
1363 infoPanel, &InformationPanel::setUrl); 1463​ infoPanel, &InformationPanel::setUrl);
1364 connect(this, &DolphinMainWindow::selectionChanged, 1464​ connect(this, &DolphinMainWindow::selectionChanged,
1365 infoPanel, &InformationPanel::setSelection); 1465​ infoPanel, &InformationPanel::setSelection);
1366 connect(this, &DolphinMainWindow::requestItemInfo, 1466​ connect(this, &DolphinMainWindow::requestItemInfo,
1367 infoPanel, &InformationPanel::requestDelayedItemInfo); 1467​ infoPanel, &InformationPanel::requestDelayedItemInfo);
1368#endif 1468​#endif
1369 1469​
1470​ // i18n: This is the last paragraph for the "What's This"-texts of all four panels.
1471​ const QString panelWhatsThis = xi18nc("@info:whatsthis", "<para>To show or "
1472​ "hide panels like this go to <interface>Control|Panels</interface> "
1473​ "or <interface>View|Panels</interface>.</para>");
1474​ actionCollection()->action(QStringLiteral("show_information_panel"))
broulikUnsubmitted
Not Done

Crashes here for me. The action looks like it's only added when you have #if HAVE_BALOO

broulik: Crashes here for me. The action looks like it's only added when you have `#if HAVE_BALOO`
broulikUnsubmitted
Not Done

Fixed it https://cgit.kde.org/dolphin.git/commit/?id=5d83ceeb339c56e6b9a241e809cff2dd0a260fcb

broulik: Fixed it https://cgit.kde.org/dolphin.git/commit/?id=5d83ceeb339c56e6b9a241e809cff2dd0a260fcb
1475​ ->setWhatsThis(xi18nc("@info:whatsthis", "<para> This toggles the "
1476​ "<emphasis>information</emphasis> panel at the right side of the "
1477​ "window.</para><para>The panel provides in-depth information "
1478​ "about the items your mouse is hovering over or about the selected "
1479​ "items. Otherwise it informs you about the currently viewed folder.<nl/>"
1480​ "For single items a preview of their contents is provided.</para>"));
1481​ infoDock->setWhatsThis(xi18nc("@info:whatsthis", "<para>This panel "
1482​ "provides in-depth information about the items your mouse is "
1483​ "hovering over or about the selected items. Otherwise it informs "
1484​ "you about the currently viewed folder.<nl/>For single items a "
1485​ "preview of their contents is provided.</para><para>You can configure "
1486​ "which and how details are given here by right-clicking.</para>") + panelWhatsThis);
1487​
1370 // Setup "Folders" 1488​ // Setup "Folders"
1371 DolphinDockWidget* foldersDock = new DolphinDockWidget(i18nc("@title:window", "Folders")); 1489​ DolphinDockWidget* foldersDock = new DolphinDockWidget(i18nc("@title:window", "Folders"));
1372 foldersDock->setLocked(lock); 1490​ foldersDock->setLocked(lock);
1373 foldersDock->setObjectName(QStringLiteral("foldersDock")); 1491​ foldersDock->setObjectName(QStringLiteral("foldersDock"));
1374 foldersDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); 1492​ foldersDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
1375 FoldersPanel* foldersPanel = new FoldersPanel(foldersDock); 1493​ FoldersPanel* foldersPanel = new FoldersPanel(foldersDock);
1376 foldersPanel->setCustomContextMenuActions({lockLayoutAction}); 1494​ foldersPanel->setCustomContextMenuActions({lockLayoutAction});
1377 foldersDock->setWidget(foldersPanel); 1495​ foldersDock->setWidget(foldersPanel);
1378 1496​
1379 QAction* foldersAction = foldersDock->toggleViewAction(); 1497​ QAction* foldersAction = foldersDock->toggleViewAction();
1380 createPanelAction(QIcon::fromTheme(QStringLiteral("folder")), Qt::Key_F7, foldersAction, QStringLiteral("show_folders_panel")); 1498​ createPanelAction(QIcon::fromTheme(QStringLiteral("folder")), Qt::Key_F7, foldersAction, QStringLiteral("show_folders_panel"));
1381 1499​
1382 addDockWidget(Qt::LeftDockWidgetArea, foldersDock); 1500​ addDockWidget(Qt::LeftDockWidgetArea, foldersDock);
1383 connect(this, &DolphinMainWindow::urlChanged, 1501​ connect(this, &DolphinMainWindow::urlChanged,
1384 foldersPanel, &FoldersPanel::setUrl); 1502​ foldersPanel, &FoldersPanel::setUrl);
1385 connect(foldersPanel, &FoldersPanel::folderActivated, 1503​ connect(foldersPanel, &FoldersPanel::folderActivated,
1386 this, &DolphinMainWindow::changeUrl); 1504​ this, &DolphinMainWindow::changeUrl);
1387 connect(foldersPanel, &FoldersPanel::folderMiddleClicked, 1505​ connect(foldersPanel, &FoldersPanel::folderMiddleClicked,
1388 this, &DolphinMainWindow::openNewTabAfterCurrentTab); 1506​ this, &DolphinMainWindow::openNewTabAfterCurrentTab);
1389 connect(foldersPanel, &FoldersPanel::errorMessage, 1507​ connect(foldersPanel, &FoldersPanel::errorMessage,
1390 this, &DolphinMainWindow::showErrorMessage); 1508​ this, &DolphinMainWindow::showErrorMessage);
1391 1509​
1510​ actionCollection()->action(QStringLiteral("show_folders_panel"))
1511​ ->setWhatsThis(xi18nc("@info:whatsthis", "This toggles the "
1512​ "<emphasis>folders</emphasis> panel at the left side of the window."
1513​ "<nl/><nl/>It shows the folders of the <emphasis>file system"
1514​ "</emphasis> in a <emphasis>tree view</emphasis>."));
1515​ foldersDock->setWhatsThis(xi18nc("@info:whatsthis", "<para>This panel "
1516​ "shows the folders of the <emphasis>file system</emphasis> in a "
1517​ "<emphasis>tree view</emphasis>.</para><para>Click a folder to go "
1518​ "there. Click the arrow to the left of a folder to see its subfolders. "
1519​ "This allows quick switching between any folders.</para>") + panelWhatsThis);
1520​
1392 // Setup "Terminal" 1521​ // Setup "Terminal"
1393#ifdef HAVE_TERMINAL 1522​#ifdef HAVE_TERMINAL
1394 if (KAuthorized::authorize(QStringLiteral("shell_access"))) { 1523​ if (KAuthorized::authorize(QStringLiteral("shell_access"))) {
1395 DolphinDockWidget* terminalDock = new DolphinDockWidget(i18nc("@title:window Shell terminal", "Terminal")); 1524​ DolphinDockWidget* terminalDock = new DolphinDockWidget(i18nc("@title:window Shell terminal", "Terminal"));
1396 terminalDock->setLocked(lock); 1525​ terminalDock->setLocked(lock);
1397 terminalDock->setObjectName(QStringLiteral("terminalDock")); 1526​ terminalDock->setObjectName(QStringLiteral("terminalDock"));
1398 m_terminalPanel = new TerminalPanel(terminalDock); 1527​ m_terminalPanel = new TerminalPanel(terminalDock);
1399 m_terminalPanel->setCustomContextMenuActions({lockLayoutAction}); 1528​ m_terminalPanel->setCustomContextMenuActions({lockLayoutAction});
Show All 11 Lines
1411 1540​
1412 addDockWidget(Qt::BottomDockWidgetArea, terminalDock); 1541​ addDockWidget(Qt::BottomDockWidgetArea, terminalDock);
1413 connect(this, &DolphinMainWindow::urlChanged, 1542​ connect(this, &DolphinMainWindow::urlChanged,
1414 m_terminalPanel, &TerminalPanel::setUrl); 1543​ m_terminalPanel, &TerminalPanel::setUrl);
1415 1544​
1416 if (GeneralSettings::version() < 200) { 1545​ if (GeneralSettings::version() < 200) {
1417 terminalDock->hide(); 1546​ terminalDock->hide();
1418 } 1547​ }
1548​
1549​ actionCollection()->action(QStringLiteral("show_terminal_panel"))
1550​ ->setWhatsThis(xi18nc("@info:whatsthis", "<para>This toggles the "
1551​ "<emphasis>terminal</emphasis> panel at the bottom of the window."
1552​ "<nl/>The location in the terminal will always match the folder "
1553​ "view so you can navigate using either.</para><para>The terminal "
1554​ "panel is not needed for basic computer usage but can be useful "
1555​ "for advanced tasks. To learn more about terminals use the help "
1556​ "in a standalone terminal application like Konsole.</para>"));
1557​ terminalDock->setWhatsThis(xi18nc("@info:whatsthis", "<para>This is "
1558​ "the <emphasis>terminal</emphasis> panel. It behaves like a "
1559​ "normal terminal but will match the location of the folder view "
1560​ "so you can navigate using either.</para><para>The terminal panel "
1561​ "is not needed for basic computer usage but can be useful for "
1562​ "advanced tasks. To learn more about terminals use the help in a "
1563​ "standalone terminal application like Konsole.</para>") + panelWhatsThis);
1419 } 1564​ }
1420#endif 1565​#endif
1421 1566​
1422 if (GeneralSettings::version() < 200) { 1567​ if (GeneralSettings::version() < 200) {
1423 infoDock->hide(); 1568​ infoDock->hide();
1424 foldersDock->hide(); 1569​ foldersDock->hide();
1425 } 1570​ }
1426 1571​
Show All 27 Lines1598 connect(m_placesPanel, &PlacesPanel::storageTearDownRequested,
1454 this, &DolphinMainWindow::slotStorageTearDownFromPlacesRequested); 1599​ this, &DolphinMainWindow::slotStorageTearDownFromPlacesRequested);
1455 connect(m_placesPanel, &PlacesPanel::storageTearDownExternallyRequested, 1600​ connect(m_placesPanel, &PlacesPanel::storageTearDownExternallyRequested,
1456 this, &DolphinMainWindow::slotStorageTearDownExternallyRequested); 1601​ this, &DolphinMainWindow::slotStorageTearDownExternallyRequested);
1457 m_tabWidget->slotPlacesPanelVisibilityChanged(m_placesPanel->isVisible()); 1602​ m_tabWidget->slotPlacesPanelVisibilityChanged(m_placesPanel->isVisible());
1458 1603​
1459 auto actionShowAllPlaces = new QAction(QIcon::fromTheme(QStringLiteral("hint")), i18nc("@item:inmenu", "Show Hidden Places"), this); 1604​ auto actionShowAllPlaces = new QAction(QIcon::fromTheme(QStringLiteral("hint")), i18nc("@item:inmenu", "Show Hidden Places"), this);
1460 actionShowAllPlaces->setCheckable(true); 1605​ actionShowAllPlaces->setCheckable(true);
1461 actionShowAllPlaces->setDisabled(true); 1606​ actionShowAllPlaces->setDisabled(true);
1607​ actionShowAllPlaces->setWhatsThis(i18nc("@info:whatsthis", "This displays "
1608​ "all places in the places panel that have been hidden. They will "
1609​ "appear semi-transparent unless you uncheck their hide property."));
1462 1610​
1463 connect(actionShowAllPlaces, &QAction::triggered, this, [actionShowAllPlaces, this](bool checked){ 1611​ connect(actionShowAllPlaces, &QAction::triggered, this, [actionShowAllPlaces, this](bool checked){
1464 actionShowAllPlaces->setIcon(QIcon::fromTheme(checked ? QStringLiteral("visibility") : QStringLiteral("hint"))); 1612​ actionShowAllPlaces->setIcon(QIcon::fromTheme(checked ? QStringLiteral("visibility") : QStringLiteral("hint")));
1465 m_placesPanel->showHiddenEntries(checked); 1613​ m_placesPanel->showHiddenEntries(checked);
1466 }); 1614​ });
1467 1615​
1468 connect(m_placesPanel, &PlacesPanel::showHiddenEntriesChanged, this, [actionShowAllPlaces] (bool checked){ 1616​ connect(m_placesPanel, &PlacesPanel::showHiddenEntriesChanged, this, [actionShowAllPlaces] (bool checked){
1469 actionShowAllPlaces->setChecked(checked); 1617​ actionShowAllPlaces->setChecked(checked);
1470 actionShowAllPlaces->setIcon(QIcon::fromTheme(checked ? QStringLiteral("visibility") : QStringLiteral("hint"))); 1618​ actionShowAllPlaces->setIcon(QIcon::fromTheme(checked ? QStringLiteral("visibility") : QStringLiteral("hint")));
1471 }); 1619​ });
1472 1620​
1621​ actionCollection()->action(QStringLiteral("show_places_panel"))
1622​ ->setWhatsThis(xi18nc("@info:whatsthis", "<para>This toggles the "
1623​ "<emphasis>places</emphasis> panel at the left side of the window."
1624​ "</para><para>It allows you to go to locations you have "
1625​ "bookmarked and to access disk or media attached to the computer "
1626​ "or to the network. It also contains sections to find recently "
1627​ "saved files or files of a certain type.</para>"));
1628​ placesDock->setWhatsThis(xi18nc("@info:whatsthis", "<para>This is the "
1629​ "<emphasis>Places</emphasis> panel. It allows you to go to locations "
1630​ "you have bookmarked and to access disk or media attached to the "
1631​ "computer or to the network. It also contains sections to find "
1632​ "recently saved files or files of a certain type.</para><para>"
1633​ "Click on an entry to go there. Click with the right mouse button "
1634​ "instead to open any entry in a new tab or new window.</para>"
1635​ "<para>New entries can be added by dragging folders onto this panel. "
1636​ "Right-click any section or entry to hide it. Right-click an empty "
1637​ "space on this panel and select <interface>Show Hidden Places"
1638​ "</interface> to display it again.</para>") + panelWhatsThis);
1639​
1473 // Add actions into the "Panels" menu 1640​ // Add actions into the "Panels" menu
1474 KActionMenu* panelsMenu = new KActionMenu(i18nc("@action:inmenu View", "Panels"), this); 1641​ KActionMenu* panelsMenu = new KActionMenu(i18nc("@action:inmenu View", "Panels"), this);
1475 actionCollection()->addAction(QStringLiteral("panels"), panelsMenu); 1642​ actionCollection()->addAction(QStringLiteral("panels"), panelsMenu);
1476 panelsMenu->setDelayed(false); 1643​ panelsMenu->setDelayed(false);
1477 const KActionCollection* ac = actionCollection(); 1644​ const KActionCollection* ac = actionCollection();
1478 panelsMenu->addAction(ac->action(QStringLiteral("show_places_panel"))); 1645​ panelsMenu->addAction(ac->action(QStringLiteral("show_places_panel")));
1479#ifdef HAVE_BALOO 1646​#ifdef HAVE_BALOO
1480 panelsMenu->addAction(ac->action(QStringLiteral("show_information_panel"))); 1647​ panelsMenu->addAction(ac->action(QStringLiteral("show_information_panel")));
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Line(s)1689{
1531 const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator(); 1698​ const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
1532 editableLocactionAction->setChecked(urlNavigator->isUrlEditable()); 1699​ editableLocactionAction->setChecked(urlNavigator->isUrlEditable());
1533} 1700​}
1534 1701​
1535void DolphinMainWindow::updateGoActions() 1702​void DolphinMainWindow::updateGoActions()
1536{ 1703​{
1537 QAction* goUpAction = actionCollection()->action(KStandardAction::name(KStandardAction::Up)); 1704​ QAction* goUpAction = actionCollection()->action(KStandardAction::name(KStandardAction::Up));
1538 const QUrl currentUrl = m_activeViewContainer->url(); 1705​ const QUrl currentUrl = m_activeViewContainer->url();
1706​ // I think this is one of the best places to firstly be confronted
1707​ // with a file system and its hierarchy. Talking about the root
1708​ // directory might seem too much here but it is the question that
1709​ // naturally arises in this context.
1710​ goUpAction->setWhatsThis(xi18nc("@info:whatsthis", "<para>Go to "
1711​ "the folder that contains the currenty viewed one.</para>"
1712​ "<para>All files and folders are organized in a hierarchical "
1713​ "<emphasis>file system</emphasis>. At the top of this hierarchy is "
1714​ "a directory that contains all data connected to this computer"
1715​ "—the <emphasis>root directory</emphasis>.</para>"));
1539 goUpAction->setEnabled(KIO::upUrl(currentUrl) != currentUrl); 1716​ goUpAction->setEnabled(KIO::upUrl(currentUrl) != currentUrl);
1540} 1717​}
1541 1718​
1542void DolphinMainWindow::createControlButton() 1719​void DolphinMainWindow::createControlButton()
1543{ 1720​{
1544 if (m_controlButton) { 1721​ if (m_controlButton) {
1545 return; 1722​ return;
1546 } 1723​ }
1547 Q_ASSERT(!m_controlButton); 1724​ Q_ASSERT(!m_controlButton);
1548 1725​
1549 m_controlButton = new QToolButton(this); 1726​ m_controlButton = new QToolButton(this);
1550 m_controlButton->setIcon(QIcon::fromTheme(QStringLiteral("application-menu"))); 1727​ m_controlButton->setIcon(QIcon::fromTheme(QStringLiteral("application-menu")));
1551 m_controlButton->setText(i18nc("@action", "Control")); 1728​ m_controlButton->setText(i18nc("@action", "Control"));
1729​ m_controlButton->setAttribute(Qt::WidgetAttribute::WA_CustomWhatsThis);
1552 m_controlButton->setPopupMode(QToolButton::InstantPopup); 1730​ m_controlButton->setPopupMode(QToolButton::InstantPopup);
1553 m_controlButton->setToolButtonStyle(toolBar()->toolButtonStyle()); 1731​ m_controlButton->setToolButtonStyle(toolBar()->toolButtonStyle());
1554 1732​
1555 QMenu* controlMenu = new QMenu(m_controlButton); 1733​ QMenu* controlMenu = new QMenu(m_controlButton);
1556 connect(controlMenu, &QMenu::aboutToShow, this, &DolphinMainWindow::updateControlMenu); 1734​ connect(controlMenu, &QMenu::aboutToShow, this, &DolphinMainWindow::updateControlMenu);
1735​ controlMenu->installEventFilter(this);
1557 1736​
1558 m_controlButton->setMenu(controlMenu); 1737​ m_controlButton->setMenu(controlMenu);
1559 1738​
1560 toolBar()->addWidget(m_controlButton); 1739​ toolBar()->addWidget(m_controlButton);
1561 connect(toolBar(), &KToolBar::iconSizeChanged, 1740​ connect(toolBar(), &KToolBar::iconSizeChanged,
1562 m_controlButton, &QToolButton::setIconSize); 1741​ m_controlButton, &QToolButton::setIconSize);
1563 connect(toolBar(), &KToolBar::toolButtonStyleChanged, 1742​ connect(toolBar(), &KToolBar::toolButtonStyleChanged,
1564 m_controlButton, &QToolButton::setToolButtonStyle); 1743​ m_controlButton, &QToolButton::setToolButtonStyle);
▲ Show 20 Lines • Show All 124 Lines • ▼ Show 20 Line(s)1865 if (!initialized) {
1689 installed = !QStandardPaths::findExecutable(QStringLiteral("kompare")).isEmpty(); 1868​ installed = !QStandardPaths::findExecutable(QStringLiteral("kompare")).isEmpty();
1690 initialized = true; 1869​ initialized = true;
1691 } 1870​ }
1692 return installed; 1871​ return installed;
1693} 1872​}
1694 1873​
1695void DolphinMainWindow::createPanelAction(const QIcon& icon, 1874​void DolphinMainWindow::createPanelAction(const QIcon& icon,
1696 const QKeySequence& shortcut, 1875​ const QKeySequence& shortcut,
1697 QAction* dockAction, 1876​ QAction* dockAction,
1698 const QString& actionName) 1877​ const QString& actionName)
1699{ 1878​{
elvisangelaccioUnsubmitted
Done

This is not correct, as the Control button only has a subset of all the available actions.

elvisangelaccio: This is not correct, as the Control button only has a subset of all the available actions.
1700 QAction* panelAction = actionCollection()->addAction(actionName); 1879​ QAction* panelAction = actionCollection()->addAction(actionName);
1701 panelAction->setCheckable(true); 1880​ panelAction->setCheckable(true);
1702 panelAction->setChecked(dockAction->isChecked()); 1881​ panelAction->setChecked(dockAction->isChecked());
1703 panelAction->setText(dockAction->text()); 1882​ panelAction->setText(dockAction->text());
1704 panelAction->setIcon(icon); 1883​ panelAction->setIcon(icon);
1705 actionCollection()->setDefaultShortcut(panelAction, shortcut); 1884​ actionCollection()->setDefaultShortcut(panelAction, shortcut);
1706 1885​
1707 connect(panelAction, &QAction::triggered, dockAction, &QAction::trigger); 1886​ connect(panelAction, &QAction::triggered, dockAction, &QAction::trigger);
1708 connect(dockAction, &QAction::toggled, panelAction, &QAction::setChecked); 1887​ connect(dockAction, &QAction::toggled, panelAction, &QAction::setChecked);
1709} 1888​}
1710 1889​
1890​void DolphinMainWindow::setupWhatsThis()
1891​{
1892​ // main widgets
1893​ menuBar()->setWhatsThis(xi18nc("@info:whatsthis", "<para>This is the "
1894​ "<emphasis>Menubar</emphasis>. It provides access to commands and "
1895​ "configuration options. Left-click on any of the menus on this "
1896​ "bar to see its contents.</para><para>The Menubar can be hidden "
1897​ "by unchecking <interface>Settings|Show Menubar</interface>. Then "
1898​ "most of its contents become available through a <interface>Control"
1899​ "</interface> button on the <emphasis>Toolbar</emphasis>.</para>"));
1900​ toolBar()->setWhatsThis(xi18nc("@info:whatsthis", "<para>This is the "
1901​ "<emphasis>Toolbar</emphasis>. It allows quick access to "
1902​ "frequently used actions.</para><para>It is highly customizable. "
1903​ "All items you see in the <interface>Control</interface> menu or "
1904​ "in the <interface>Menubar</interface> can be placed on the "
1905​ "Toolbar. Just right-click on it and select <interface>Configure "
1906​ "Toolbars…</interface> or find this action in the <interface>"
1907​ "Control</interface> or <interface>Settings</interface> menu."
1908​ "</para><para>The location of the bar and the style of its "
1909​ "buttons can also be changed in the right-click menu. Right-click "
1910​ "a button if you want to show or hide its text.</para>"));
1911​ m_tabWidget->setWhatsThis(xi18nc("@info:whatsthis main view",
1912​ "<para>Here you can see the <emphasis>folders</emphasis> and "
elvisangelaccioUnsubmitted
Done

Please add const

elvisangelaccio: Please add `const`
1913​ "<emphasis>files</emphasis> that are at the location described in "
1914​ "the <interface>Location Bar</interface> above. This area is the "
1915​ "central part of this application where you navigate to the files "
1916​ "you want to use.</para><para>For an elaborate and general "
1917​ "introduction to this application <link "
1918​ "url='https://userbase.kde.org/Dolphin/File_Management#Introduction_to_Dolphin'>"
1919​ "click here</link>. This will open an introductory article from "
1920​ "the <emphasis>KDE UserBase Wiki</emphasis>.</para><para>For brief "
1921​ "explanations of all the features of this <emphasis>view</emphasis> "
1922​ "<link url='help:/dolphin/dolphin-view.html'>click here</link> "
1923​ "instead. This will open a page from the <emphasis>Handbook"
1924​ "</emphasis> that covers the basics.</para>"));
1925​
1926​ // Settings menu
1927​ actionCollection()->action(KStandardAction::name(KStandardAction::KeyBindings))
1928​ ->setWhatsThis(xi18nc("@info:whatsthis","<para>This opens a window "
elvisangelaccioUnsubmitted
Done

Funny name :D

Please add const here as well

elvisangelaccio: Funny name :D Please add `const` here as well
1929​ "that lists the <emphasis>keyboard shortcuts</emphasis>.<nl/>"
1930​ "There you can set up key combinations to trigger an action when "
1931​ "they are pressed simultaneously. All commands in this application can "
1932​ "be triggered this way.</para>"));
1933​ actionCollection()->action(KStandardAction::name(KStandardAction::ConfigureToolbars))
1934​ ->setWhatsThis(xi18nc("@info:whatsthis","<para>This opens a window in which "
1935​ "you can change which buttons appear on the <emphasis>Toolbar</emphasis>.</para>"
1936​ "<para>All items you see in the <interface>Control</interface> menu "
1937​ "or in the <interface>Menubar</interface> can also be placed on the Toolbar.</para>"));
1938​ actionCollection()->action(KStandardAction::name(KStandardAction::Preferences))
1939​ ->setWhatsThis(xi18nc("@info:whatsthis","This opens a window where you can "
1940​ "change a multitude of settings for this application. For an explanation "
1941​ "of the various settings go to the chapter <emphasis>Configuring Dolphin"
1942​ "</emphasis> in <interface>Help|Dolphin Handbook</interface>."));
1943​
1944​ // Help menu
1945​ // The whatsthis has to be set for the m_helpMenu and for the
1946​ // StandardAction separately because both are used in different locations.
1947​ // m_helpMenu is only used for createControlButton() button.
1948​
1949​ // Links do not work within the Menubar so texts without links are provided there.
1950​
elvisangelaccioUnsubmitted
Done

Please add const

elvisangelaccio: Please add `const`
1951​ // i18n: If the external link isn't available in your language you should
1952​ // probably state the external link language at least in brackets to not
1953​ // frustrate the user. If there are multiple languages that the user might
1954​ // know with a reasonable chance you might want to have 2 external links.
1955​ // The same is in my opinion true for every external link you translate.
1956​ const QString whatsThisHelpContents = xi18nc("@info:whatsthis handbook",
1957​ "<para>This opens the Handbook for this application. It provides "
1958​ "explanations for every part of <emphasis>Dolphin</emphasis>.</para>");
1959​ actionCollection()->action(KStandardAction::name(KStandardAction::HelpContents))
1960​ ->setWhatsThis(whatsThisHelpContents
1961​ + xi18nc("@info:whatsthis second half of handbook hb text without link",
1962​ "<para>If you want more elaborate introductions to the "
elvisangelaccioUnsubmitted
Done

Please add const

elvisangelaccio: Please add `const`
1963​ "different features of <emphasis>Dolphin</emphasis> "
1964​ "go to the KDE UserBase Wiki.</para>"));
1965​ m_helpMenu->action(KHelpMenu::menuHelpContents)->setWhatsThis(whatsThisHelpContents
1966​ + xi18nc("@info:whatsthis second half of handbook text with link",
1967​ "<para>If you want more elaborate introductions to the "
1968​ "different features of <emphasis>Dolphin</emphasis> "
1969​ "<link url='https://userbase.kde.org/Dolphin/File_Management'>click here</link>. "
1970​ "It will open the dedicated page in the KDE UserBase Wiki.</para>"));
1971​
1972​ const QString whatsThisWhatsThis = xi18nc("@info:whatsthis whatsthis button",
1973​ "<para>This is the button that invokes the help feature you are "
1974​ "using right now! Click it, then click any component of this "
1975​ "application to ask \"What's this?\" about it. The mouse cursor "
1976​ "will change appearance if no help is available for a spot.</para>");
elvisangelaccioUnsubmitted
Done

Please add const

elvisangelaccio: Please add `const`
1977​ actionCollection()->action(KStandardAction::name(KStandardAction::WhatsThis))
1978​ ->setWhatsThis(whatsThisWhatsThis
1979​ + xi18nc("@info:whatsthis second half of whatsthis button text without link",
1980​ "<para>There are two other ways to get help for this application: The "
1981​ "<interface>Dolphin Handbook</interface> in the <interface>Help"
1982​ "</interface> menu and the <emphasis>KDE UserBase Wiki</emphasis> "
1983​ "article about <emphasis>File Management</emphasis> online."
1984​ "</para><para>The \"What's this?\" help is "
elvisangelaccioUnsubmitted
Done

Please add const

elvisangelaccio: Please add `const`
1985​ "missing in most other windows so don't get too used to this.</para>"));
1986​ m_helpMenu->action(KHelpMenu::menuWhatsThis)->setWhatsThis(whatsThisWhatsThis
1987​ + xi18nc("@info:whatsthis second half of whatsthis button text with link",
1988​ "<para>There are two other ways to get help: "
1989​ "The <link url='help:/dolphin/index.html'>Dolphin Handbook</link> and "
1990​ "the <link url='https://userbase.kde.org/Dolphin/File_Management'>KDE "
1991​ "UserBase Wiki</link>.</para><para>The \"What's this?\" help is "
elvisangelaccioUnsubmitted
Done

Please add const

elvisangelaccio: Please add `const`
1992​ "missing in most other windows so don't get too used to this.</para>"));
1993​
1994​ const QString whatsThisReportBug = xi18nc("@info:whatsthis","<para>This opens a "
1995​ "window that will guide you through reporting errors or flaws "
1996​ "in this application or in other KDE software.</para>");
1997​ actionCollection()->action(KStandardAction::name(KStandardAction::ReportBug))
1998​ ->setWhatsThis(whatsThisReportBug);
1999​ m_helpMenu->action(KHelpMenu::menuReportBug)->setWhatsThis(whatsThisReportBug
2000​ + xi18nc("@info:whatsthis second half of reportbug text with link",
2001​ "<para>High-quality bug reports are much appreciated. To learn "
2002​ "how to make your bug report as effective as possible "
2003​ "<link url='https://community.kde.org/Get_Involved/Bug_Reporting'>"
2004​ "click here</link>.</para>"));
2005​
2006​ const QString whatsThisDonate = xi18nc("@info:whatsthis","<para>This opens a "
2007​ "<emphasis>web page</emphasis> where you can donate to "
2008​ "support the continued work on this application and many "
2009​ "other projects by the <emphasis>KDE</emphasis> community.</para>"
elvisangelaccioUnsubmitted
Done

Coding style: please use

if (event->type() == QEvent::WhatsThisClicked) {

}
elvisangelaccio: Coding style: please use ``` if (event->type() == QEvent::WhatsThisClicked) { } ```
2010​ "<para>Donating is the easiest and fastest way to efficiently "
2011​ "support KDE and its projects. KDE projects are available for "
2012​ "free therefore your donation is needed to cover things that "
2013​ "require money like servers, contributor meetings, etc.</para>"
2014​ "<para><emphasis>KDE e.V.</emphasis> is the non-profit "
elvisangelaccioUnsubmitted
Done

Unnecessary semicolon.

elvisangelaccio: Unnecessary semicolon.
2015​ "organization behind the KDE community.</para>");
2016​ actionCollection()->action(KStandardAction::name(KStandardAction::Donate))
2017​ ->setWhatsThis(whatsThisDonate);
2018​ m_helpMenu->action(KHelpMenu::menuDonate)->setWhatsThis(whatsThisDonate);
2019​
2020​ const QString whatsThisSwitchLanguage = xi18nc("@info:whatsthis",
2021​ "With this you can change the language this application uses."
elvisangelaccioUnsubmitted
Done

Coding style (same as above).

elvisangelaccio: Coding style (same as above).
2022​ "<nl/>You can even set secondary languages which will be used "
2023​ "if texts are not available in your preferred language.");
2024​ actionCollection()->action(KStandardAction::name(KStandardAction::SwitchApplicationLanguage))
2025​ ->setWhatsThis(whatsThisSwitchLanguage);
2026​ m_helpMenu->action(KHelpMenu::menuSwitchLanguage)->setWhatsThis(whatsThisSwitchLanguage);
2027​
2028​ const QString whatsThisAboutApp = xi18nc("@info:whatsthis","This opens a "
2029​ "window that informs you about the version, license, "
2030​ "used libraries and maintainers of this application.");
2031​ actionCollection()->action(KStandardAction::name(KStandardAction::AboutApp))
2032​ ->setWhatsThis(whatsThisAboutApp);
2033​ m_helpMenu->action(KHelpMenu::menuAboutApp)->setWhatsThis(whatsThisAboutApp);
2034​
elvisangelaccioUnsubmitted
Done

Please add a space before this function.

elvisangelaccio: Please add a space before this function.
2035​ const QString whatsThisAboutKDE = xi18nc("@info:whatsthis","This opens a "
2036​ "window with information about <emphasis>KDE</emphasis>. "
2037​ "The KDE community are the people behind this free software."
2038​ "<nl/>If you like using this application but don't know "
2039​ "about KDE or want to see a cute dragon have a look!");
2040​ actionCollection()->action(KStandardAction::name(KStandardAction::AboutKDE))
2041​ ->setWhatsThis(whatsThisAboutKDE);
2042​ m_helpMenu->action(KHelpMenu::menuAboutKDE)->setWhatsThis(whatsThisAboutKDE);
2043​}
2044​
2045​bool DolphinMainWindow::event(QEvent *event)
2046​{
2047​ if (event->type() == QEvent::WhatsThisClicked) {
2048​ event->accept();
2049​ QWhatsThisClickedEvent* whatsThisEvent = dynamic_cast<QWhatsThisClickedEvent*>(event);
2050​ QDesktopServices::openUrl(QUrl(whatsThisEvent->href()));
2051​ return true;
2052​ }
2053​ return KXmlGuiWindow::event(event);
2054​}
2055​
2056​bool DolphinMainWindow::eventFilter(QObject* obj, QEvent* event)
2057​{
2058​ Q_UNUSED(obj)
2059​ if (event->type() == QEvent::WhatsThisClicked) {
2060​ event->accept();
2061​ QWhatsThisClickedEvent* whatsThisEvent = dynamic_cast<QWhatsThisClickedEvent*>(event);
2062​ QDesktopServices::openUrl(QUrl(whatsThisEvent->href()));
2063​ return true;
2064​ }
2065​ return false;
2066​}
2067​
1711DolphinMainWindow::UndoUiInterface::UndoUiInterface() : 2068​DolphinMainWindow::UndoUiInterface::UndoUiInterface() :
1712 KIO::FileUndoManager::UiInterface() 2069​ KIO::FileUndoManager::UiInterface()
1713{ 2070​{
1714} 2071​}
1715 2072​
1716DolphinMainWindow::UndoUiInterface::~UndoUiInterface() 2073​DolphinMainWindow::UndoUiInterface::~UndoUiInterface()
1717{ 2074​{
1718} 2075​}
Show All 21 Lines