diff --git a/src/plugins/fakevim/fakevimoptions.ui b/src/plugins/fakevim/fakevimoptions.ui index 48590d7f6e0..5114db31087 100644 --- a/src/plugins/fakevim/fakevimoptions.ui +++ b/src/plugins/fakevim/fakevimoptions.ui @@ -2,14 +2,6 @@ FakeVim::Internal::FakeVimOptionPage - - - 0 - 0 - 513 - 468 - - @@ -23,99 +15,143 @@ Vim Behavior - - - - - Keyword characters: - - - - - - - Location of .vimrc: - - - - - - - Read .vimrc - - - - - - - - - - Use wrapscan - - - - - - - Automatic indentation - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 17 - 10 - - - - - - - - Use search dialog - - - - - - - - - 1 + + + + + + + Start of line - - 80 + + + + + + Highlight search results + + + + + + + Smart indentation + + + + + + + Smart tabulators + + + + + + + Expand tabulators + + + + + + + Incremental search + + + + + + + Use search dialog + + + + + + + Use smartcase + + + + + + + Use wrapscan + + + + + + + Pass key sequences like Ctrl-S to Qt Creator core instead of interpreting them in FakeVim. This gives easier access to Qt Creator core functionality at the price of losing some features of FakeVim. + + + Pass control key + + + + + + + Automatic indentation + + + + + + + Use ignorecase + + + + + + + Show partial command + + + + + + + Let Qt Creator handle new lines so that comments or code blocks can be properly completed and expanded. + + + Pass new line + + + + + + + Show position of text marks + + + + + + + Read .vimrc + + + + + + + + + + + Shift width: + + + spinBoxShiftWidth - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - + 1 @@ -137,61 +173,132 @@ - - - - - - - - - Backspace: - - - - - - - Shift width: - - - - - - - Vim tabstop option - - - Tabulator size: - - - - - - - Use smartcase - - - - - - + - Keep empty to use the default path, i.e. %USERPROFILE%\_vimrc on Windows, ~/.vimrc otherwise. + Vim tabstop option + + + Tabulator size: + + + spinBoxTabStop - - - Browse... + + + 1 + + + 80 + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Scroll offset: + + + spinBoxScrollOff + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + - + + + + QFormLayout::AllNonFixedFieldsGrow + + + + + Backspace: + + + lineEditBackspace + + + + + + + + + + Keyword characters: + + + lineEditIsKeyword + + + + + + + + + + Location of .vimrc: + + + lineEditVimRcPath + + + + + + + + + Keep empty to use the default path, i.e. %USERPROFILE%\_vimrc on Windows, ~/.vimrc otherwise. + + + + + + + Browse... + + + + + + + + @@ -229,95 +336,22 @@ - - - - Show position of text marks + + + + Qt::Vertical - - - - - - Smart indentation + + + 20 + 40 + - - - - - - Pass key sequences like Ctrl-S to Qt Creator core instead of interpreting them in FakeVim. This gives easier access to Qt Creator core functionality at the price of losing some features of FakeVim. - - - Pass control key - - - - - - - Use ignorecase - - - - - - - Expand tabulators - - - - - - - Smart tabulators - - - - - - - Highlight search results - - - - - - - Incremental search - - - - - - - Show partial command - - - - - - - Start of line - - + - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -329,6 +363,7 @@ checkBoxHlSearch checkBoxShowCmd checkBoxStartOfLine + checkBoxPassNewLine checkBoxIncSearch checkBoxUseCoreSearch checkBoxIgnoreCase @@ -339,6 +374,7 @@ checkBoxReadVimRc spinBoxShiftWidth spinBoxTabStop + spinBoxScrollOff lineEditBackspace lineEditIsKeyword lineEditVimRcPath diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index eef79203a4b..682aadf2356 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -292,8 +292,12 @@ QWidget *FakeVimOptionPage::createPage(QWidget *parent) m_ui.checkBoxSmartTab); m_group.insert(theFakeVimSetting(ConfigStartOfLine), m_ui.checkBoxStartOfLine); + m_group.insert(theFakeVimSetting(ConfigPassNewLine), + m_ui.checkBoxPassNewLine); m_group.insert(theFakeVimSetting(ConfigTabStop), m_ui.spinBoxTabStop); + m_group.insert(theFakeVimSetting(ConfigScrollOff), + m_ui.spinBoxScrollOff); m_group.insert(theFakeVimSetting(ConfigBackspace), m_ui.lineEditBackspace); m_group.insert(theFakeVimSetting(ConfigIsKeyword), @@ -348,10 +352,16 @@ QWidget *FakeVimOptionPage::createPage(QWidget *parent) << sep << m_ui.checkBoxSmartCase->text() << sep << m_ui.checkBoxShowMarks->text() << sep << m_ui.checkBoxPassControlKey->text() + << sep << m_ui.checkBoxPassNewLine->text() + << sep << m_ui.checkBoxIgnoreCase->text() + << sep << m_ui.checkBoxWrapScan->text() + << sep << m_ui.checkBoxShowCmd->text() << sep << m_ui.labelShiftWidth->text() << sep << m_ui.labelTabulator->text() << sep << m_ui.labelBackspace->text() - << sep << m_ui.labelIsKeyword->text(); + << sep << m_ui.labelIsKeyword->text() + << sep << m_ui.labelScrollOff->text() + << sep << m_ui.lineEditVimRcPath->text(); m_searchKeywords.remove(QLatin1Char('&')); } return w; @@ -381,6 +391,7 @@ void FakeVimOptionPage::setQtStyle() m_ui.checkBoxSmartIndent->setChecked(true); m_ui.checkBoxIncSearch->setChecked(true); m_ui.lineEditBackspace->setText(_("indent,eol,start")); + m_ui.checkBoxPassNewLine->setChecked(true); } void FakeVimOptionPage::setPlainStyle() @@ -393,6 +404,7 @@ void FakeVimOptionPage::setPlainStyle() m_ui.checkBoxSmartIndent->setChecked(false); m_ui.checkBoxIncSearch->setChecked(false); m_ui.lineEditBackspace->setText(QString()); + m_ui.checkBoxPassNewLine->setChecked(false); } void FakeVimOptionPage::openVimRc()