From 2929c6a965ae53ecfc752c5fc034f15f9b9e4608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Fri, 29 Oct 2010 14:21:21 +0200
Subject: [PATCH] Disable "Insert space after function name" when autobrackets
are off
Reviewed-by: Jarek Kobus
Acked-by: dt
---
.../cpptools/completionsettingspage.ui | 47 ++++++++++++-------
1 file changed, 30 insertions(+), 17 deletions(-)
diff --git a/src/plugins/cpptools/completionsettingspage.ui b/src/plugins/cpptools/completionsettingspage.ui
index 6b4f0a1377b..d2ec0b0817c 100644
--- a/src/plugins/cpptools/completionsettingspage.ui
+++ b/src/plugins/cpptools/completionsettingspage.ui
@@ -104,7 +104,7 @@
</property>
</spacer>
</item>
- <item row="2" column="0" colspan="3">
+ <item row="3" column="0" colspan="3">
<widget class="QCheckBox" name="autoInsertBrackets">
<property name="toolTip">
<string>Automatically insert (, ) and ; when appropriate.</string>
@@ -117,7 +117,17 @@
</property>
</widget>
</item>
- <item row="3" column="0" colspan="3">
+ <item row="5" column="0" colspan="3">
+ <widget class="QCheckBox" name="spaceAfterFunctionName">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>Insert &space after function name</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
<widget class="QCheckBox" name="partiallyComplete">
<property name="toolTip">
<string>Insert the common prefix of available completion items.</string>
@@ -130,16 +140,6 @@
</property>
</widget>
</item>
- <item row="4" column="0" colspan="3">
- <widget class="QCheckBox" name="spaceAfterFunctionName">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="text">
- <string>Insert &space after function name</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
@@ -157,11 +157,24 @@
</spacer>
</item>
</layout>
- <zorder>groupBox</zorder>
- <zorder>autoInsertBrackets</zorder>
- <zorder>partiallyComplete</zorder>
- <zorder>spaceAfterFunctionName</zorder>
</widget>
<resources/>
- <connections/>
+ <connections>
+ <connection>
+ <sender>autoInsertBrackets</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>spaceAfterFunctionName</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>248</x>
+ <y>132</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>246</x>
+ <y>164</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
</ui>
--
GitLab