From 6a8c89d01930619ff8dab828230f3eee185c9707 Mon Sep 17 00:00:00 2001
From: Olivier Keshavjee <olivier.keshavjee@gmail.com>
Date: Tue, 9 Jun 2015 12:47:29 +0200
Subject: [PATCH] Bug fixes: double __init__ in outlineview

---
 src/ui/mainWindow.py        | 12 ++++++------
 src/ui/mainWindow.ui        |  2 +-
 src/ui/views/dndView.py     |  2 +-
 src/ui/views/outlineView.py |  2 +-
 test_project/outline.xml    |  6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/ui/mainWindow.py b/src/ui/mainWindow.py
index f4a1c6c0..481e36fa 100644
--- a/src/ui/mainWindow.py
+++ b/src/ui/mainWindow.py
@@ -1153,7 +1153,7 @@ class Ui_MainWindow(object):
         self.menubar.addAction(self.menuTools.menuAction())
 
         self.retranslateUi(MainWindow)
-        self.tabMain.setCurrentIndex(6)
+        self.tabMain.setCurrentIndex(5)
         self.tabSummary.setCurrentIndex(0)
         self.tabPersos.setCurrentIndex(0)
         self.tabPlot.setCurrentIndex(0)
@@ -1332,11 +1332,11 @@ class Ui_MainWindow(object):
         self.actSpellcheck.setText(_translate("MainWindow", "Spellcheck"))
         self.actSpellcheck.setShortcut(_translate("MainWindow", "F8"))
 
-from ui.cmbOutlinePersoChoser import cmbOutlinePersoChoser
-from ui.collapsibleGroupBox2 import collapsibleGroupBox2
-from ui.sldImportance import sldImportance
 from ui.views.treeView import treeView
-from ui.editors.editorWidget import editorWidget
-from ui.views.outlineView import outlineView
 from ui.chkOutlineCompile import chkOutlineCompile
+from ui.editors.editorWidget import editorWidget
+from ui.collapsibleGroupBox2 import collapsibleGroupBox2
+from ui.cmbOutlinePersoChoser import cmbOutlinePersoChoser
 from ui.cmbOutlineStatusChoser import cmbOutlineStatusChoser
+from ui.views.outlineView import outlineView
+from ui.sldImportance import sldImportance
diff --git a/src/ui/mainWindow.ui b/src/ui/mainWindow.ui
index 0b23a737..76f6f246 100644
--- a/src/ui/mainWindow.ui
+++ b/src/ui/mainWindow.ui
@@ -18,7 +18,7 @@
     <item>
      <widget class="QTabWidget" name="tabMain">
       <property name="currentIndex">
-       <number>6</number>
+       <number>5</number>
       </property>
       <property name="documentMode">
        <bool>true</bool>
diff --git a/src/ui/views/dndView.py b/src/ui/views/dndView.py
index 5b73980f..9c3f40e7 100644
--- a/src/ui/views/dndView.py
+++ b/src/ui/views/dndView.py
@@ -11,7 +11,7 @@ from functions import *
 class dndView(QAbstractItemView):
     
     def __init__(self, parent=None):
-        QAbstractItemView.__init__(self, parent)
+        #QAbstractItemView.__init__(self, parent)
         self.setDragDropMode(self.DragDrop)
         self.setDefaultDropAction(Qt.MoveAction)
         self.setSelectionMode(self.ExtendedSelection)
diff --git a/src/ui/views/outlineView.py b/src/ui/views/outlineView.py
index d1167cc2..3efa3c84 100644
--- a/src/ui/views/outlineView.py
+++ b/src/ui/views/outlineView.py
@@ -14,7 +14,7 @@ class outlineView(QTreeView, dndView):
     
     def __init__(self, parent=None, modelPersos=None):
         QTreeView.__init__(self, parent)
-        dndView.__init__(self, parent)
+        dndView.__init__(self)
         self.modelPersos = modelPersos
         self.header().setStretchLastSection(False)
         
diff --git a/test_project/outline.xml b/test_project/outline.xml
index 84ebbe35..0d1d77f9 100644
--- a/test_project/outline.xml
+++ b/test_project/outline.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<outlineItem title="root" type="folder" compile="2" wordCount="2221" setGoal="112">
+<outlineItem title="root" type="folder" compile="2" wordCount="2014" setGoal="112">
   <outlineItem title="Nouveau" type="folder" compile="2" wordCount="15">
     <outlineItem title="Nouveau" type="scene" compile="2" text="return QTextEdit.resizeEvent(self, e) ad ad  ad ad  adaasd ad adsdasd ad e drset" wordCount="15"/>
   </outlineItem>
@@ -54,7 +54,7 @@
     <outlineItem title="Nouveau" type="scene" status="First draft" compile="2" text="ASDASd ASD " wordCount="2"/>
     <outlineItem title="A" type="scene" status="Final" compile="2" text="asdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasd asd aasdasd asd asd asd asd asdasd asdaasd " wordCount="58" setGoal="50"/>
   </outlineItem>
+  <outlineItem title="A" type="scene" compile="2" text="asdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasd asd aasdasd asd asd asd asd asdasd asdaasd " wordCount="58" setGoal="50"/>
+  <outlineItem title="A" type="scene" compile="2" text="asdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasd asd aasdasd asd asd asd asd asdasd asdaasd " wordCount="58" setGoal="50"/>
   <outlineItem title="B" type="scene" compile="2" text="asd asd asd asd  asd asd asd asd asd asd asd" wordCount="12" setGoal="10"/>
-  <outlineItem title="A" type="scene" compile="2" text="asdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasd asd aasdasd asd asd asd asd asdasd asdaasd " wordCount="58" setGoal="50"/>
-  <outlineItem title="A" type="scene" compile="2" text="asdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasdasdasd asd asd asd asd asdasd asdaasd asdasd asd aasdasd asd asd asd asd asdasd asdaasd " wordCount="58" setGoal="50"/>
 </outlineItem>