Commit 4ff6f759 authored by Dominik Haumann's avatar Dominik Haumann

Merge branch 'Applications/16.12'

parent a680dae5
......@@ -57,3 +57,7 @@ KateProjectInfoView::~KateProjectInfoView()
{
}
void KateProjectInfoView::showEvent(QShowEvent *)
{
setFocusProxy(currentWidget());
}
......@@ -56,6 +56,8 @@ public:
return m_project;
}
void showEvent(QShowEvent *) Q_DECL_OVERRIDE;
private:
/**
* our plugin view
......
......@@ -60,6 +60,7 @@ KateProjectInfoViewIndex::KateProjectInfoViewIndex(KateProjectPluginView *plugin
layout->addWidget(m_lineEdit);
layout->addWidget(m_treeView);
setLayout(layout);
setFocusProxy(m_lineEdit);
/**
* connect needed signals
......
......@@ -37,6 +37,7 @@ KateProjectInfoViewNotes::KateProjectInfoViewNotes(KateProjectPluginView *plugin
layout->addWidget(m_edit);
setLayout(layout);
m_edit->setDocument(project->notesDocument());
setFocusProxy(m_edit);
}
KateProjectInfoViewNotes::~KateProjectInfoViewNotes()
......
......@@ -188,6 +188,7 @@ QPair<KateProjectView *, KateProjectInfoView *> KateProjectPluginView::viewForPr
*/
m_stackedProjectViews->addWidget(view);
m_stackedProjectInfoViews->addWidget(infoView);
m_stackedProjectInfoViews->setFocusProxy(infoView);
m_projectsCombo->addItem(QIcon::fromTheme(QStringLiteral("project-open")), project->name(), project->fileName());
/**
......
......@@ -239,6 +239,7 @@ m_mainWindow (mainWin)
connect(container, SIGNAL(nextFocus(QWidget*,bool*,bool)), this, SLOT(nextFocus(QWidget*,bool*,bool)));
QAction *a = actionCollection()->addAction(QStringLiteral("search_in_files"));
actionCollection()->setDefaultShortcut(a, QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_F));
a->setText(i18n("Search in Files"));
connect(a, SIGNAL(triggered(bool)), this, SLOT(openSearchView()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment