Merged remote changes.

Tue, 07 Apr 2015 13:56:03 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Tue, 07 Apr 2015 13:56:03 +0200
changeset 4202
64027512bbf3
parent 4201
2a9316cb3fad (diff)
parent 4200
15bfd93b53ae (current diff)
child 4206
8f0d697e6384

Merged remote changes.

--- a/Preferences/ConfigurationPages/EditorCalltipsPage.ui	Sat Apr 04 16:10:29 2015 +0200
+++ b/Preferences/ConfigurationPages/EditorCalltipsPage.ui	Tue Apr 07 13:56:03 2015 +0200
@@ -64,9 +64,6 @@
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_4">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
      <property name="title">
       <string>Visible Calltips</string>
      </property>
@@ -105,9 +102,6 @@
    </item>
    <item>
     <widget class="QGroupBox" name="calltipsPositionBox">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
      <property name="title">
       <string>Calltips Position</string>
      </property>
@@ -124,9 +118,6 @@
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_2">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
      <property name="title">
       <string>Colours</string>
      </property>
@@ -172,9 +163,6 @@
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
      <property name="title">
       <string>Plug-In Behavior</string>
      </property>
@@ -228,72 +216,8 @@
      <y>109</y>
     </hint>
     <hint type="destinationlabel">
-     <x>386</x>
-     <y>111</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>ctEnabledCheckBox</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>groupBox_4</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>45</x>
-     <y>44</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>50</x>
-     <y>71</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>ctEnabledCheckBox</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>calltipsPositionBox</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>124</x>
-     <y>44</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>134</x>
-     <y>131</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>ctEnabledCheckBox</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>groupBox_2</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>173</x>
-     <y>46</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>182</x>
-     <y>192</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>ctEnabledCheckBox</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>groupBox</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>232</x>
-     <y>46</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>245</x>
-     <y>257</y>
+     <x>384</x>
+     <y>126</y>
     </hint>
    </hints>
   </connection>
--- a/QScintilla/Editor.py	Sat Apr 04 16:10:29 2015 +0200
+++ b/QScintilla/Editor.py	Tue Apr 07 13:56:03 2015 +0200
@@ -4272,11 +4272,17 @@
         """
         Private method to configure the calltips function.
         """
+        self.setCallTipsBackgroundColor(
+            Preferences.getEditorColour("CallTipsBackground"))
+        self.setCallTipsVisible(Preferences.getEditor("CallTipsVisible"))
+        calltipsStyle = Preferences.getEditor("CallTipsStyle")
+        try:
+            self.setCallTipsPosition(
+                Preferences.getEditor("CallTipsPosition"))
+        except AttributeError:
+            pass
+        
         if Preferences.getEditor("CallTipsEnabled"):
-            self.setCallTipsBackgroundColor(
-                Preferences.getEditorColour("CallTipsBackground"))
-            self.setCallTipsVisible(Preferences.getEditor("CallTipsVisible"))
-            calltipsStyle = Preferences.getEditor("CallTipsStyle")
             if calltipsStyle == QsciScintilla.CallTipsNoContext:
                 self.setCallTipsStyle(QsciScintilla.CallTipsNoContext)
             elif calltipsStyle == \
@@ -4285,11 +4291,6 @@
                     QsciScintilla.CallTipsNoAutoCompletionContext)
             else:
                 self.setCallTipsStyle(QsciScintilla.CallTipsContext)
-            try:
-                self.setCallTipsPosition(
-                    Preferences.getEditor("CallTipsPosition"))
-            except AttributeError:
-                pass
         else:
             self.setCallTipsStyle(QsciScintilla.CallTipsNone)
 

eric ide

mercurial