Ronny Pfannschmidt avatar Ronny Pfannschmidt committed ec64c66

rebase

Comments (0)

Files changed (6)

kill-completer-types-enum

 # HG changeset patch
-# Parent 4d64b7a6ab15984b72fe40d84bc81e24f8285e97
+# User Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
+# Date 1280876358 -7200
+# Node ID dc2797856c153b649049583ebef79122fcfe43fd
+# Parent 3e71f50bd846302fd6520c902e853c334506461c
+imported patch kill-completer-types-enum
+
 diff --git a/pida-plugins/python/python.py b/pida-plugins/python/python.py
 --- a/pida-plugins/python/python.py
 +++ b/pida-plugins/python/python.py

kill-most-language-enum-definitions

 # HG changeset patch
-# Parent 967439fac1e58fb7a9dee7afca0de36100eab5ad
+# User Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
+# Date 1280876358 -7200
+# Node ID f9d89ccc19e59f68bf1962d9bc6a566eb4597e5a
+# Parent d2deb6f3af308ed68f2952d00e9a6c533cf5c978
+imported patch kill-most-language-enum-definitions
+
 diff --git a/pida/core/languages.py b/pida/core/languages.py
 --- a/pida/core/languages.py
 +++ b/pida/core/languages.py

kill-outliner-types-enum

 # HG changeset patch
-# Parent f2bd1a42824a40be9726449bad84f44470288189
+# User Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
+# Date 1280876358 -7200
+# Node ID d2deb6f3af308ed68f2952d00e9a6c533cf5c978
+# Parent 15126c8358813d60d0a73d3e5965774bf14a2de0
+imported patch kill-outliner-types-enum
 
 diff --git a/pida-plugins/ctags/ctags.py b/pida-plugins/ctags/ctags.py
 --- a/pida-plugins/ctags/ctags.py
                  is_container = False
                  # nodes with options have no line attribute
                  linenumber = node.line or node.parent.line
-diff --git a/pida/services/language/gui.py b/pida/services/language/gui.py
---- a/pida/services/language/gui.py
-+++ b/pida/services/language/gui.py
-@@ -517,7 +517,7 @@ class BrowserView(PidaView):
-                 )
-             for f in self.filter_map:
-                 tool_button = gtk.ToggleToolButton()
--                tool_button.set_name(str(f))
-+                tool_button.set_name(f)
-                 tool_button.set_active(self.filter_map[f])
-                 #FIXME no tooltip on win32
-                 if not on_windows:
-@@ -539,7 +539,7 @@ class BrowserView(PidaView):
-         self.options_vbox.show_all()
- 
-     def on_filter_toggled(self, but, outliner):
--        self.filter_map[int(but.get_name())] = not self.filter_map[int(but.get_name())]
-+        self.filter_map[but.get_name()] = not self.filter_map[but.get_name()]
-         #self.set_outliner(outliner, self.document)
-         self.filter_model.refilter()
- 
 diff --git a/pida/services/language/outlinefilter.py b/pida/services/language/outlinefilter.py
 --- a/pida/services/language/outlinefilter.py
 +++ b/pida/services/language/outlinefilter.py
          "name": "import",
          "alias": "include",
          "display": "Super properties",
+diff --git a/pida/services/language/views.py b/pida/services/language/views.py
+--- a/pida/services/language/views.py
++++ b/pida/services/language/views.py
+@@ -517,7 +517,7 @@ class BrowserView(PidaView):
+                 )
+             for f in self.filter_map:
+                 tool_button = gtk.ToggleToolButton()
+-                tool_button.set_name(str(f))
++                tool_button.set_name(f)
+                 tool_button.set_active(self.filter_map[f])
+                 #FIXME no tooltip on win32
+                 if not on_windows:
+@@ -539,7 +539,7 @@ class BrowserView(PidaView):
+         self.options_vbox.show_all()
+ 
+     def on_filter_toggled(self, but, outliner):
+-        self.filter_map[int(but.get_name())] = not self.filter_map[int(but.get_name())]
++        self.filter_map[but.get_name()] = not self.filter_map[but.get_name()]
+         #self.set_outliner(outliner, self.document)
+         self.filter_model.refilter()
+ 

kill-validator-types-subtypes-enums

 # HG changeset patch
-# Parent 7930fec0ec63b77ed20bffeaceb32581d1f496f5
+# User Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
+# Date 1280876358 -7200
+# Node ID 15126c8358813d60d0a73d3e5965774bf14a2de0
+# Parent dc2797856c153b649049583ebef79122fcfe43fd
+imported patch kill-validator-types-subtypes-enums
+
 diff --git a/pida-plugins/python/python.py b/pida-plugins/python/python.py
 --- a/pida-plugins/python/python.py
 +++ b/pida-plugins/python/python.py

language-iconname-cachedproperty

 # HG changeset patch
-# Parent 6684d2791c6a7c567cc7f8a9215e7100f0bfda19
+# User Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
+# Date 1280876358 -7200
+# Node ID 15835db48c6f7b84314741dfca4d7a3f4a060bf1
+# Parent 5d747f356bfc547439b23bd62b5b2f225851cf50
+imported patch language-iconname-cachedproperty
 
 diff --git a/pida/utils/languages.py b/pida/utils/languages.py
 --- a/pida/utils/languages.py

validator-markip-format-cleanup

 # HG changeset patch
-# Parent b73bf017d471c43e50ebbfe8a793045276f30918
+# User Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
+# Date 1280876358 -7200
+# Node ID 5d747f356bfc547439b23bd62b5b2f225851cf50
+# Parent f9d89ccc19e59f68bf1962d9bc6a566eb4597e5a
+imported patch validator-markip-format-cleanup
+
 diff --git a/pida-plugins/python/python.py b/pida-plugins/python/python.py
 --- a/pida-plugins/python/python.py
 +++ b/pida-plugins/python/python.py
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.