Mercurial Repositories > eric / changeset

changeset

Fixed a few issues with the subversion blame dialogs.

Sun, 11 Apr 2010 11:46:28 +0000

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 11 Apr 2010 11:46:28 +0000
changeset 176
ff52b55a90fb
parent 175
c55cab724965
child 177
c822ccc4d138

Fixed a few issues with the subversion blame dialogs.

Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.ui file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.ui file | annotate | diff | comparison | revisions 
--- a/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py	Sat Apr 10 17:40:43 2010 +0000
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py	Sun Apr 11 11:46:28 2010 +0000
@@ -110,16 +110,15 @@
         Private method to resize the list columns.
         """
         self.blameList.header().resizeSections(QHeaderView.ResizeToContents)
-        self.blameList.header().setStretchLastSection(True)
         
     def __generateItem(self, revision, author, lineno, text):
         """
-        Private method to generate a tag item in the taglist.
+        Private method to generate a blame item in the blame list.
         
-        @param revision revision string (integer)
-        @param author author of the tag (string)
-        @param lineno line number (integer)
-        @param text text of the line (string)
+        @param revision revision string (string)
+        @param author author of the change (string)
+        @param lineno linenumber (string)
+        @param text line of text from the annotated file (string)
         """
         itm = QTreeWidgetItem(self.blameList, 
             ["%d" % revision, author, "%d" % lineno, text])
--- a/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.ui	Sat Apr 10 17:40:43 2010 +0000
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.ui	Sun Apr 11 11:46:28 2010 +0000
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>SvnBlameDialog</class>
- <widget class="QDialog" name="SvnBlameDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="SvnBlameDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,71 +10,77 @@
     <height>750</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Subversion Blame</string>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout">
    <item>
-    <widget class="QTreeWidget" name="blameList" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+    <widget class="QTreeWidget" name="blameList">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>6</verstretch>
       </sizepolicy>
      </property>
-     <property name="alternatingRowColors" >
+     <property name="alternatingRowColors">
       <bool>true</bool>
      </property>
-     <property name="selectionMode" >
+     <property name="selectionMode">
       <enum>QAbstractItemView::NoSelection</enum>
      </property>
-     <property name="rootIsDecorated" >
+     <property name="rootIsDecorated">
+      <bool>false</bool>
+     </property>
+     <property name="itemsExpandable">
       <bool>false</bool>
      </property>
-     <property name="itemsExpandable" >
+     <attribute name="headerStretchLastSection">
       <bool>false</bool>
-     </property>
+     </attribute>
+     <attribute name="headerStretchLastSection">
+      <bool>false</bool>
+     </attribute>
      <column>
-      <property name="text" >
+      <property name="text">
        <string>Revision</string>
       </property>
      </column>
      <column>
-      <property name="text" >
+      <property name="text">
        <string>Author</string>
       </property>
      </column>
      <column>
-      <property name="text" >
+      <property name="text">
        <string>Line</string>
       </property>
      </column>
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="errorGroup" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
+    <widget class="QGroupBox" name="errorGroup">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>1</verstretch>
       </sizepolicy>
      </property>
-     <property name="title" >
+     <property name="title">
       <string>Errors</string>
      </property>
-     <layout class="QVBoxLayout" >
+     <layout class="QVBoxLayout">
       <item>
-       <widget class="QTextEdit" name="errors" >
-        <property name="focusPolicy" >
+       <widget class="QTextEdit" name="errors">
+        <property name="focusPolicy">
          <enum>Qt::NoFocus</enum>
         </property>
-        <property name="readOnly" >
+        <property name="readOnly">
          <bool>true</bool>
         </property>
-        <property name="acceptRichText" >
+        <property name="acceptRichText">
          <bool>false</bool>
         </property>
        </widget>
@@ -82,11 +89,11 @@
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
+     <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set>
      </property>
     </widget>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py	Sat Apr 10 17:40:43 2010 +0000
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py	Sun Apr 11 11:46:28 2010 +0000
@@ -148,16 +148,14 @@
         Private method to resize the list columns.
         """
         self.blameList.header().resizeSections(QHeaderView.ResizeToContents)
-        self.blameList.header().setStretchLastSection(True)
         
     def __generateItem(self, revision, author, text):
         """
-        Private method to generate a tag item in the taglist.
+        Private method to generate a blame item in the blame list.
         
         @param revision revision string (string)
-        @param author author of the tag (string)
-        @param date date of the tag (string)
-        @param name name (path) of the tag (string)
+        @param author author of the change (string)
+        @param text line of text from the annotated file (string)
         """
         itm = QTreeWidgetItem(self.blameList, 
             [revision, author, "%d" % self.lineno, text])
--- a/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.ui	Sat Apr 10 17:40:43 2010 +0000
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.ui	Sun Apr 11 11:46:28 2010 +0000
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>SvnBlameDialog</class>
- <widget class="QDialog" name="SvnBlameDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="SvnBlameDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,71 +10,77 @@
     <height>750</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Subversion Blame</string>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout">
    <item>
-    <widget class="QTreeWidget" name="blameList" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+    <widget class="QTreeWidget" name="blameList">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>6</verstretch>
       </sizepolicy>
      </property>
-     <property name="alternatingRowColors" >
+     <property name="alternatingRowColors">
       <bool>true</bool>
      </property>
-     <property name="selectionMode" >
+     <property name="selectionMode">
       <enum>QAbstractItemView::NoSelection</enum>
      </property>
-     <property name="rootIsDecorated" >
+     <property name="rootIsDecorated">
+      <bool>false</bool>
+     </property>
+     <property name="itemsExpandable">
       <bool>false</bool>
      </property>
-     <property name="itemsExpandable" >
+     <attribute name="headerStretchLastSection">
       <bool>false</bool>
-     </property>
+     </attribute>
+     <attribute name="headerStretchLastSection">
+      <bool>false</bool>
+     </attribute>
      <column>
-      <property name="text" >
+      <property name="text">
        <string>Revision</string>
       </property>
      </column>
      <column>
-      <property name="text" >
+      <property name="text">
        <string>Author</string>
       </property>
      </column>
      <column>
-      <property name="text" >
+      <property name="text">
        <string>Line</string>
       </property>
      </column>
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="errorGroup" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
+    <widget class="QGroupBox" name="errorGroup">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>1</verstretch>
       </sizepolicy>
      </property>
-     <property name="title" >
+     <property name="title">
       <string>Errors</string>
      </property>
-     <layout class="QVBoxLayout" >
+     <layout class="QVBoxLayout">
       <item>
-       <widget class="QTextEdit" name="errors" >
-        <property name="focusPolicy" >
+       <widget class="QTextEdit" name="errors">
+        <property name="focusPolicy">
          <enum>Qt::NoFocus</enum>
         </property>
-        <property name="readOnly" >
+        <property name="readOnly">
          <bool>true</bool>
         </property>
-        <property name="acceptRichText" >
+        <property name="acceptRichText">
          <bool>false</bool>
         </property>
        </widget>
@@ -82,20 +89,20 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="inputGroup" >
-     <property name="title" >
+    <widget class="QGroupBox" name="inputGroup">
+     <property name="title">
       <string>Input</string>
      </property>
-     <layout class="QGridLayout" >
-      <item row="1" column="1" >
+     <layout class="QGridLayout">
+      <item row="1" column="1">
        <spacer>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeType" >
+        <property name="sizeType">
          <enum>QSizePolicy::Expanding</enum>
         </property>
-        <property name="sizeHint" stdset="0" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>327</width>
           <height>29</height>
@@ -103,35 +110,35 @@
         </property>
        </spacer>
       </item>
-      <item row="1" column="2" >
-       <widget class="QPushButton" name="sendButton" >
-        <property name="toolTip" >
+      <item row="1" column="2">
+       <widget class="QPushButton" name="sendButton">
+        <property name="toolTip">
          <string>Press to send the input to the subversion process</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>&amp;Send</string>
         </property>
-        <property name="shortcut" >
+        <property name="shortcut">
          <string>Alt+S</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" colspan="3" >
-       <widget class="QLineEdit" name="input" >
-        <property name="toolTip" >
+      <item row="0" column="0" colspan="3">
+       <widget class="QLineEdit" name="input">
+        <property name="toolTip">
          <string>Enter data to be sent to the subversion process</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
-       <widget class="QCheckBox" name="passwordCheckBox" >
-        <property name="toolTip" >
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="passwordCheckBox">
+        <property name="toolTip">
          <string>Select to switch the input field to password mode</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>&amp;Password Mode</string>
         </property>
-        <property name="shortcut" >
+        <property name="shortcut">
          <string>Alt+P</string>
         </property>
        </widget>
@@ -140,11 +147,11 @@
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
+     <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set>
      </property>
     </widget>

Mercurial Repository: eric

eric ide

mercurial