X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/de8ea90ca78ccfb26dd501dc3bc089fb24ad9094..5a0da4a9c8d10dc1921077d84bdabf05d20150b0:/src/dolphinmainwindow.cpp diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 881616480..a126a0bf4 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -178,7 +178,7 @@ DolphinMainWindow::DolphinMainWindow() : if (firstRun) { menuBar()->setVisible(false); // Assure a proper default size if Dolphin runs the first time - resize(750, 500); + resize(760, 550); } const bool showMenu = !menuBar()->isHidden(); @@ -257,7 +257,11 @@ bool DolphinMainWindow::isFoldersPanelEnabled() const bool DolphinMainWindow::isInformationPanelEnabled() const { +#ifdef HAVE_BALOO return actionCollection()->action(QStringLiteral("show_information_panel"))->isChecked(); +#else + return false; +#endif } void DolphinMainWindow::openFiles(const QStringList& files, bool splitView) @@ -1032,7 +1036,7 @@ void DolphinMainWindow::openTerminal() const QUrl url = m_activeViewContainer->url(); if (url.isLocalFile()) { - KToolInvocation::invokeTerminal(QString(), url.toLocalFile()); + KToolInvocation::invokeTerminal(QString(), {}, url.toLocalFile()); return; } @@ -1046,14 +1050,14 @@ void DolphinMainWindow::openTerminal() statUrl = job->mostLocalUrl(); } - KToolInvocation::invokeTerminal(QString(), statUrl.isLocalFile() ? statUrl.toLocalFile() : QDir::homePath()); + KToolInvocation::invokeTerminal(QString(), {}, statUrl.isLocalFile() ? statUrl.toLocalFile() : QDir::homePath()); }); return; } // Nothing worked, just use $HOME - KToolInvocation::invokeTerminal(QString(), QDir::homePath()); + KToolInvocation::invokeTerminal(QString(), {}, QDir::homePath()); } void DolphinMainWindow::editSettings() @@ -1239,7 +1243,9 @@ void DolphinMainWindow::slotPlaceActivated(const QUrl& url) // which had been unmounted earlier, see https://bugs.kde.org/show_bug.cgi?id=161385. reloadView(); } else { + view->disableUrlNavigatorSelectionRequests(); changeUrl(url); + view->enableUrlNavigatorSelectionRequests(); } }