feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

FakeVim: Move .vimrc related options closer to each other

Browse Source 
Task-number: QTCREATORBUG-9406

Change-Id: I61333e3105e8d8edb03edecdfdac9d9f11dfc3b5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
hjk
2013-06-06 15:15:33 +02:00
parent b00bb2c57c
commit 17dcb6d38c
2 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/fakevim/fakevimoptions.ui
View File

@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>580</width> <width>580</width>
<height>479</height> <height>474</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -137,13 +137,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="1">
<widget class="QCheckBox" name="checkBoxReadVimRc">
<property name="text">
<string>Read .vimrc</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item> <item>
@@ -248,9 +241,9 @@
<item> <item>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy"> <property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum> <enum>QFormLayout::ExpandingFieldsGrow</enum>
</property> </property>
<item row="1" column="0"> <item row="0" column="0">
<widget class="QLabel" name="labelBackspace"> <widget class="QLabel" name="labelBackspace">
<property name="text"> <property name="text">
<string>Backspace:</string> <string>Backspace:</string>
@@ -260,10 +253,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="0" column="1">
<widget class="QLineEdit" name="lineEditBackspace"/> <widget class="QLineEdit" name="lineEditBackspace"/>
</item> </item>
<item row="2" column="0"> <item row="1" column="0">
<widget class="QLabel" name="labelIsKeyword"> <widget class="QLabel" name="labelIsKeyword">
<property name="text"> <property name="text">
<string>Keyword characters:</string> <string>Keyword characters:</string>
@@ -273,26 +266,26 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="1" column="1">
<widget class="QLineEdit" name="lineEditIsKeyword"/> <widget class="QLineEdit" name="lineEditIsKeyword"/>
</item> </item>
<item row="3" column="0"> <item row="2" column="0">
<widget class="QLabel" name="labelVimRcPath"> <widget class="QCheckBox" name="checkBoxReadVimRc">
<property name="text"> <property name="text">
<string>Location of .vimrc:</string> <string>Read .vimrc, from location:</string>
</property>
<property name="buddy">
<cstring>lineEditVimRcPath</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayoutVimRcPath"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<widget class="QLineEdit" name="lineEditVimRcPath"> <widget class="QLineEdit" name="lineEditVimRcPath">
<property name="toolTip"> <property name="toolTip">
<string>Keep empty to use the default path, i.e. %USERPROFILE%\_vimrc on Windows, ~/.vimrc otherwise.</string> <string>Keep empty to use the default path, i.e. %USERPROFILE%\_vimrc on Windows, ~/.vimrc otherwise.</string>
</property> </property>
<property name="placeholderText">
<string/>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@@ -379,12 +372,12 @@
<tabstop>checkBoxWrapScan</tabstop> <tabstop>checkBoxWrapScan</tabstop>
<tabstop>checkBoxShowMarks</tabstop> <tabstop>checkBoxShowMarks</tabstop>
<tabstop>checkBoxPassControlKey</tabstop> <tabstop>checkBoxPassControlKey</tabstop>
<tabstop>checkBoxReadVimRc</tabstop>
<tabstop>spinBoxShiftWidth</tabstop> <tabstop>spinBoxShiftWidth</tabstop>
<tabstop>spinBoxTabStop</tabstop> <tabstop>spinBoxTabStop</tabstop>
<tabstop>spinBoxScrollOff</tabstop> <tabstop>spinBoxScrollOff</tabstop>
<tabstop>lineEditBackspace</tabstop> <tabstop>lineEditBackspace</tabstop>
<tabstop>lineEditIsKeyword</tabstop> <tabstop>lineEditIsKeyword</tabstop>
<tabstop>checkBoxReadVimRc</tabstop>
<tabstop>lineEditVimRcPath</tabstop> <tabstop>lineEditVimRcPath</tabstop>
<tabstop>pushButtonVimRcPath</tabstop> <tabstop>pushButtonVimRcPath</tabstop>
<tabstop>pushButtonCopyTextEditorSettings</tabstop> <tabstop>pushButtonCopyTextEditorSettings</tabstop>

4
src/plugins/fakevim/fakevimplugin.cpp
View File

@@ -270,6 +270,9 @@ QWidget *FakeVimOptionPage::createPage(QWidget *parent)
{ {
QWidget *w = new QWidget(parent); QWidget *w = new QWidget(parent);
m_ui.setupUi(w); m_ui.setupUi(w);
m_ui.lineEditVimRcPath->setPlaceholderText(
Utils::HostOsInfo::isAnyUnixHost() ? tr("Default: $HOME/.vimrc")
: tr("Default: %USERPROFILE%\\_vimrc"));
m_group.clear(); m_group.clear();
m_group.insert(theFakeVimSetting(ConfigUseFakeVim), m_group.insert(theFakeVimSetting(ConfigUseFakeVim),
@@ -417,7 +420,6 @@ void FakeVimOptionPage::openVimRc()
void FakeVimOptionPage::updateVimRcWidgets() void FakeVimOptionPage::updateVimRcWidgets()
{ {
bool enabled = m_ui.checkBoxReadVimRc->isChecked(); bool enabled = m_ui.checkBoxReadVimRc->isChecked();
m_ui.labelVimRcPath->setEnabled(enabled);
m_ui.lineEditVimRcPath->setEnabled(enabled); m_ui.lineEditVimRcPath->setEnabled(enabled);
m_ui.pushButtonVimRcPath->setEnabled(enabled); m_ui.pushButtonVimRcPath->setEnabled(enabled);
} }