--- a/Preferences/ConfigurationPages/EditorAutocompletionPage.ui Tue Oct 24 19:09:09 2017 +0200
+++ b/Preferences/ConfigurationPages/EditorAutocompletionPage.ui Wed Oct 25 21:00:48 2017 +0200
@@ -32,23 +32,7 @@
</widget>
</item>
<item>
- <widget class="QCheckBox" name="acEnabledCheckBox">
- <property name="toolTip">
- <string>Select this to enable autocompletion</string>
- </property>
- <property name="whatsThis">
- <string><b>Autocompletion Enabled</b><p>Select to enable autocompletion. In order to get autocompletion from alternative autocompletion providers (if installed), these have to be enabled on their respective configuration page. Only one alternative provider might be enabled.</p></string>
- </property>
- <property name="text">
- <string>Automatic Completion Enabled</string>
- </property>
- </widget>
- </item>
- <item>
<widget class="QGroupBox" name="groupBox">
- <property name="enabled">
- <bool>false</bool>
- </property>
<property name="title">
<string>General</string>
</property>
@@ -83,6 +67,24 @@
</property>
</widget>
</item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="acEnabledGroupBox">
+ <property name="toolTip">
+ <string>Select this to enable autocompletion</string>
+ </property>
+ <property name="whatsThis">
+ <string><b>Autocompletion Enabled</b><p>Select to enable autocompletion. In order to get autocompletion from alternative autocompletion providers (if installed), these have to be enabled on their respective configuration page. Only one alternative provider might be enabled.</p></string>
+ </property>
+ <property name="title">
+ <string>Automatic Completion Enabled</string>
+ </property>
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_4">
<item row="2" column="0">
<widget class="QLabel" name="textLabel1_2">
<property name="text">
@@ -90,7 +92,14 @@
</property>
</widget>
</item>
- <item row="2" column="1" colspan="3">
+ <item row="3" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Time to start completion:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QSlider" name="acThresholdSlider">
@@ -129,15 +138,20 @@
</item>
</layout>
</item>
- <item row="3" column="0">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Time to wait until completion:</string>
+ <item row="3" column="1">
+ <widget class="QSpinBox" name="acTimeoutSpinBox">
+ <property name="minimumSize">
+ <size>
+ <width>70</width>
+ <height>0</height>
+ </size>
</property>
- </widget>
- </item>
- <item row="3" column="1" colspan="2">
- <widget class="QSpinBox" name="acTimeoutSpinBox">
+ <property name="maximumSize">
+ <size>
+ <width>70</width>
+ <height>16777215</height>
+ </size>
+ </property>
<property name="toolTip">
<string>Enter the time in milliseconds after which a list with completion proposals shall be shown</string>
</property>
@@ -154,110 +168,197 @@
<number>0</number>
</property>
<property name="maximum">
- <number>999</number>
+ <number>1000</number>
+ </property>
+ <property name="singleStep">
+ <number>50</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ <zorder>textLabel1_2</zorder>
+ <zorder>textLabel1_2</zorder>
+ <zorder></zorder>
+ <zorder>label</zorder>
+ <zorder>acTimeoutSpinBox</zorder>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_3">
+ <property name="title">
+ <string>Plug-In Behavior</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QCheckBox" name="acScintillaCheckBox">
+ <property name="toolTip">
+ <string>Select to show QScintilla provided completions, if the selected plug-ins fail</string>
+ </property>
+ <property name="whatsThis">
+ <string>Qscintilla provided completions are shown, if this option is enabled and completions shall be provided by plug-ins (see completions sub-page of the plug-in) and the plugin-ins don't deliver any completions.</string>
+ </property>
+ <property name="text">
+ <string>Show QScintilla completions, if plug-ins fail</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>Maximum time to wait:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDoubleSpinBox" name="acWatchdogDoubleSpinBox">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>70</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>70</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Enter the time in seconds after which QSintilla should be used</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="accelerated">
+ <bool>true</bool>
+ </property>
+ <property name="correctionMode">
+ <enum>QAbstractSpinBox::CorrectToNearestValue</enum>
+ </property>
+ <property name="suffix">
+ <string> s</string>
+ </property>
+ <property name="decimals">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <double>10.000000000000000</double>
+ </property>
+ <property name="singleStep">
+ <double>0.500000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="title">
+ <string>Completions Cache</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Size:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="acCacheSizeSpinBox">
+ <property name="minimumSize">
+ <size>
+ <width>80</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Enter the maximum number of entries to be kept in the completions cache</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="correctionMode">
+ <enum>QAbstractSpinBox::CorrectToNearestValue</enum>
+ </property>
+ <property name="suffix">
+ <string> entries</string>
+ </property>
+ <property name="minimum">
+ <number>0</number>
+ </property>
+ <property name="maximum">
+ <number>1000</number>
</property>
<property name="singleStep">
<number>10</number>
</property>
</widget>
</item>
- <item row="3" column="3">
- <spacer name="horizontalSpacer">
+ <item row="0" column="2">
+ <spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>192</width>
+ <width>271</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
- <item row="4" column="0" colspan="4">
- <widget class="QGroupBox" name="groupBox_2">
- <property name="title">
- <string>Completions Cache</string>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Timeout:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QSpinBox" name="acCacheTimeSpinBox">
+ <property name="toolTip">
+ <string>Enter the time in seconds after which a cached completion entry should be removed from the completions cache</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Size:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="acCacheSizeSpinBox">
- <property name="toolTip">
- <string>Enter the maximum number of entries to be kept in the completions cache</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="correctionMode">
- <enum>QAbstractSpinBox::CorrectToNearestValue</enum>
- </property>
- <property name="suffix">
- <string> entries</string>
- </property>
- <property name="minimum">
- <number>0</number>
- </property>
- <property name="maximum">
- <number>999</number>
- </property>
- <property name="singleStep">
- <number>10</number>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>271</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>Timeout:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="acCacheTimeSpinBox">
- <property name="toolTip">
- <string>Enter the time in seconds after which a cached completion entry should be removed from the completions cache</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="correctionMode">
- <enum>QAbstractSpinBox::CorrectToNearestValue</enum>
- </property>
- <property name="suffix">
- <string> s</string>
- </property>
- <property name="minimum">
- <number>0</number>
- </property>
- <property name="maximum">
- <number>3600</number>
- </property>
- <property name="singleStep">
- <number>60</number>
- </property>
- </widget>
- </item>
- </layout>
+ <property name="correctionMode">
+ <enum>QAbstractSpinBox::CorrectToNearestValue</enum>
+ </property>
+ <property name="suffix">
+ <string> s</string>
+ </property>
+ <property name="minimum">
+ <number>0</number>
+ </property>
+ <property name="maximum">
+ <number>3600</number>
+ </property>
+ <property name="singleStep">
+ <number>60</number>
+ </property>
</widget>
</item>
</layout>
@@ -279,12 +380,16 @@
</layout>
</widget>
<tabstops>
- <tabstop>acEnabledCheckBox</tabstop>
<tabstop>acCaseSensitivityCheckBox</tabstop>
<tabstop>acReplaceWordCheckBox</tabstop>
<tabstop>acReversedCheckBox</tabstop>
+ <tabstop>acEnabledGroupBox</tabstop>
<tabstop>acThresholdSlider</tabstop>
<tabstop>acTimeoutSpinBox</tabstop>
+ <tabstop>acScintillaCheckBox</tabstop>
+ <tabstop>acWatchdogDoubleSpinBox</tabstop>
+ <tabstop>acCacheSizeSpinBox</tabstop>
+ <tabstop>acCacheTimeSpinBox</tabstop>
</tabstops>
<resources/>
<connections>
@@ -295,28 +400,28 @@
<slot>display(int)</slot>
<hints>
<hint type="sourcelabel">
- <x>304</x>
- <y>114</y>
+ <x>442</x>
+ <y>161</y>
</hint>
<hint type="destinationlabel">
- <x>465</x>
- <y>116</y>
+ <x>485</x>
+ <y>162</y>
</hint>
</hints>
</connection>
<connection>
- <sender>acEnabledCheckBox</sender>
+ <sender>acScintillaCheckBox</sender>
<signal>toggled(bool)</signal>
- <receiver>groupBox</receiver>
+ <receiver>acWatchdogDoubleSpinBox</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>103</x>
- <y>43</y>
+ <x>30</x>
+ <y>237</y>
</hint>
<hint type="destinationlabel">
- <x>114</x>
- <y>64</y>
+ <x>155</x>
+ <y>259</y>
</hint>
</hints>
</connection>
