[QGIS Commit] r10552 - trunk/qgis/src/ui

svn_qgis at osgeo.org svn_qgis at osgeo.org
Mon Apr 13 05:41:48 EDT 2009


Author: wonder
Date: 2009-04-13 05:41:48 -0400 (Mon, 13 Apr 2009)
New Revision: 10552

Added:
   trunk/qgis/src/ui/qgsattributetabledialog.ui
Removed:
   trunk/qgis/src/ui/BeataGui.ui
   trunk/qgis/src/ui/qgsattributetablebase.ui
Log:
Removed old attribute table ui file, renamed and updated current ui file.


Deleted: trunk/qgis/src/ui/BeataGui.ui
===================================================================
--- trunk/qgis/src/ui/BeataGui.ui	2009-04-13 09:17:47 UTC (rev 10551)
+++ trunk/qgis/src/ui/BeataGui.ui	2009-04-13 09:41:48 UTC (rev 10552)
@@ -1,274 +0,0 @@
-<ui version="4.0" >
- <class>BeataDialogGui</class>
- <widget class="QDialog" name="BeataDialogGui" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>623</width>
-    <height>570</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Attribute Table</string>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="leftMargin" >
-    <number>0</number>
-   </property>
-   <property name="topMargin" >
-    <number>0</number>
-   </property>
-   <property name="rightMargin" >
-    <number>0</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>0</number>
-   </property>
-   <property name="horizontalSpacing" >
-    <number>2</number>
-   </property>
-   <property name="verticalSpacing" >
-    <number>0</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="BeataView" name="mView" >
-     <property name="alternatingRowColors" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" >
-    <layout class="QHBoxLayout" >
-     <item>
-      <widget class="QToolButton" name="mRemoveSelectionButton" >
-       <property name="toolTip" >
-        <string>Remove selection</string>
-       </property>
-       <property name="text" >
-        <string/>
-       </property>
-       <property name="icon" >
-        <iconset>../../images/themes/default/mActionUnselectAttributes.png</iconset>
-       </property>
-       <property name="iconSize" >
-        <size>
-         <width>18</width>
-         <height>18</height>
-        </size>
-       </property>
-       <property name="shortcut" >
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="mSelectedToTopButton" >
-       <property name="toolTip" >
-        <string>Move selected to top</string>
-       </property>
-       <property name="text" >
-        <string/>
-       </property>
-       <property name="icon" >
-        <iconset>../../images/themes/default/mActionSelectedToTop.png</iconset>
-       </property>
-       <property name="iconSize" >
-        <size>
-         <width>18</width>
-         <height>18</height>
-        </size>
-       </property>
-       <property name="shortcut" >
-        <string>Ctrl+T</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="mInvertSelectionButton" >
-       <property name="toolTip" >
-        <string>Invert selection</string>
-       </property>
-       <property name="text" >
-        <string/>
-       </property>
-       <property name="icon" >
-        <iconset>../../images/themes/default/mActionInvertSelection.png</iconset>
-       </property>
-       <property name="iconSize" >
-        <size>
-         <width>18</width>
-         <height>18</height>
-        </size>
-       </property>
-       <property name="shortcut" >
-        <string>Ctrl+S</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="mCopySelectedRowsButton" >
-       <property name="toolTip" >
-        <string>Copy selected rows to clipboard (Ctrl+C)</string>
-       </property>
-       <property name="whatsThis" >
-        <string>Copies the selected rows to the clipboard</string>
-       </property>
-       <property name="text" >
-        <string/>
-       </property>
-       <property name="icon" >
-        <iconset>../../images/themes/default/mActionEditCopy.png</iconset>
-       </property>
-       <property name="iconSize" >
-        <size>
-         <width>18</width>
-         <height>18</height>
-        </size>
-       </property>
-       <property name="shortcut" >
-        <string>Ctrl+C</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="mZoomMapToSelectedRowsButton" >
-       <property name="toolTip" >
-        <string>Zoom map to the selected rows (Ctrl-J)</string>
-       </property>
-       <property name="whatsThis" >
-        <string>Zoom map to the selected rows</string>
-       </property>
-       <property name="text" >
-        <string/>
-       </property>
-       <property name="icon" >
-        <iconset>../../images/themes/default/mActionZoomToSelected.png</iconset>
-       </property>
-       <property name="iconSize" >
-        <size>
-         <width>18</width>
-         <height>18</height>
-        </size>
-       </property>
-       <property name="shortcut" >
-        <string>Ctrl+J</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="mToggleEditingButton" >
-       <property name="toolTip" >
-        <string>Toggle editing mode</string>
-       </property>
-       <property name="whatsThis" >
-        <string>Click to toggle table editing</string>
-       </property>
-       <property name="text" >
-        <string/>
-       </property>
-       <property name="icon" >
-        <iconset>../../images/themes/default/mActionToggleEditing.png</iconset>
-       </property>
-       <property name="iconSize" >
-        <size>
-         <width>18</width>
-         <height>18</height>
-        </size>
-       </property>
-       <property name="checkable" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="searchFor" >
-       <property name="text" >
-        <string>Look for</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="query" />
-     </item>
-     <item>
-      <widget class="QLabel" name="searchIn" >
-       <property name="text" >
-        <string>in</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="columnBox" />
-     </item>
-     <item>
-      <widget class="QPushButton" name="searchButton" >
-       <property name="text" >
-        <string>&amp;Search</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="2" column="0" >
-    <layout class="QHBoxLayout" >
-     <item>
-      <widget class="QCheckBox" name="cbxShowSelectedOnly" >
-       <property name="text" >
-        <string>Show selected records only</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLabel" name="label" >
-       <property name="text" >
-        <string>Advanced search</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="mAdvancedSearchButton" >
-       <property name="text" >
-        <string>...</string>
-       </property>
-       <property name="iconSize" >
-        <size>
-         <width>12</width>
-         <height>12</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>BeataView</class>
-   <extends>QTableView</extends>
-   <header>BeataView.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>mView</tabstop>
-  <tabstop>searchButton</tabstop>
-  <tabstop>query</tabstop>
-  <tabstop>columnBox</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>

Deleted: trunk/qgis/src/ui/qgsattributetablebase.ui
===================================================================
--- trunk/qgis/src/ui/qgsattributetablebase.ui	2009-04-13 09:17:47 UTC (rev 10551)
+++ trunk/qgis/src/ui/qgsattributetablebase.ui	2009-04-13 09:41:48 UTC (rev 10552)
@@ -1,262 +0,0 @@
-<ui version="4.0" >
- <class>QgsAttributeTableBase</class>
- <widget class="QDialog" name="QgsAttributeTableBase" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>687</width>
-    <height>583</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Attribute Table</string>
-  </property>
-  <property name="windowIcon" >
-   <iconset>
-    <normaloff/>
-   </iconset>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="horizontalSpacing" >
-    <number>6</number>
-   </property>
-   <property name="verticalSpacing" >
-    <number>2</number>
-   </property>
-   <property name="margin" >
-    <number>0</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QToolButton" name="mRemoveSelectionButton" >
-     <property name="toolTip" >
-      <string>Remove selection</string>
-     </property>
-     <property name="text" >
-      <string/>
-     </property>
-     <property name="icon" >
-      <iconset>
-       <normaloff>../xpm/remove_selection.xpm</normaloff>../xpm/remove_selection.xpm</iconset>
-     </property>
-     <property name="shortcut" >
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" >
-    <widget class="QToolButton" name="mSelectedToTopButton" >
-     <property name="toolTip" >
-      <string>Move selected to top</string>
-     </property>
-     <property name="text" >
-      <string/>
-     </property>
-     <property name="icon" >
-      <iconset>
-       <normaloff>../xpm/selected_to_top.png</normaloff>../xpm/selected_to_top.png</iconset>
-     </property>
-     <property name="shortcut" >
-      <string>Ctrl+T</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="2" >
-    <widget class="QToolButton" name="mInvertSelectionButton" >
-     <property name="toolTip" >
-      <string>Invert selection</string>
-     </property>
-     <property name="text" >
-      <string/>
-     </property>
-     <property name="icon" >
-      <iconset>
-       <normaloff>../xpm/switch_selection.png</normaloff>../xpm/switch_selection.png</iconset>
-     </property>
-     <property name="shortcut" >
-      <string>Ctrl+S</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="3" >
-    <widget class="QToolButton" name="mCopySelectedRowsButton" >
-     <property name="toolTip" >
-      <string>Copy selected rows to clipboard (Ctrl+C)</string>
-     </property>
-     <property name="whatsThis" >
-      <string>Copies the selected rows to the clipboard</string>
-     </property>
-     <property name="text" >
-      <string/>
-     </property>
-     <property name="icon" >
-      <iconset>
-       <normaloff>../xpm/copy_selection.png</normaloff>../xpm/copy_selection.png</iconset>
-     </property>
-     <property name="shortcut" >
-      <string>Ctrl+C</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="4" >
-    <widget class="QToolButton" name="mZoomMapToSelectedRowsButton" >
-     <property name="toolTip" >
-      <string>Zoom map to the selected rows (Ctrl-J)</string>
-     </property>
-     <property name="whatsThis" >
-      <string>Zoom map to the selected rows</string>
-     </property>
-     <property name="text" >
-      <string/>
-     </property>
-     <property name="shortcut" >
-      <string>Ctrl+J</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="6" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0" >
-      <size>
-       <width>421</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="2" column="0" colspan="7" >
-    <layout class="QHBoxLayout" >
-     <item>
-      <widget class="QLabel" name="textLabel1" >
-       <property name="text" >
-        <string>Search for</string>
-       </property>
-       <property name="buddy" >
-        <cstring>mSearchText</cstring>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="mSearchText" />
-     </item>
-     <item>
-      <widget class="QLabel" name="textLabel2" >
-       <property name="text" >
-        <string>in</string>
-       </property>
-       <property name="buddy" >
-        <cstring>mSearchColumns</cstring>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="mSearchColumns" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="mSearchButton" >
-       <property name="text" >
-        <string>Search</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="mSearchShowResults" />
-     </item>
-     <item>
-      <widget class="QPushButton" name="btnAdvancedSearch" >
-       <property name="text" >
-        <string>Adva&amp;nced...</string>
-       </property>
-       <property name="shortcut" >
-        <string>Alt+N</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="3" column="0" colspan="7" >
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Close|QDialogButtonBox::Help</set>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="7" >
-    <widget class="QgsAttributeTable" native="1" name="tblAttributes" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="5" >
-    <widget class="QToolButton" name="mToggleEditingButton" >
-     <property name="toolTip" >
-      <string>Toggle editing mode</string>
-     </property>
-     <property name="whatsThis" >
-      <string>Click to toggle table editing</string>
-     </property>
-     <property name="text" >
-      <string/>
-     </property>
-     <property name="checkable" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <customwidgets>
-  <customwidget>
-   <class>QgsAttributeTable</class>
-   <extends>QWidget</extends>
-   <header>qgsattributetable.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>mRemoveSelectionButton</tabstop>
-  <tabstop>mSelectedToTopButton</tabstop>
-  <tabstop>mInvertSelectionButton</tabstop>
-  <tabstop>mCopySelectedRowsButton</tabstop>
-  <tabstop>mZoomMapToSelectedRowsButton</tabstop>
-  <tabstop>mSearchText</tabstop>
-  <tabstop>mSearchColumns</tabstop>
-  <tabstop>mSearchButton</tabstop>
-  <tabstop>mSearchShowResults</tabstop>
-  <tabstop>btnAdvancedSearch</tabstop>
-  <tabstop>buttonBox</tabstop>
- </tabstops>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>QgsAttributeTableBase</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>645</x>
-     <y>560</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>682</x>
-     <y>529</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

Copied: trunk/qgis/src/ui/qgsattributetabledialog.ui (from rev 10549, trunk/qgis/src/ui/BeataGui.ui)
===================================================================
--- trunk/qgis/src/ui/qgsattributetabledialog.ui	                        (rev 0)
+++ trunk/qgis/src/ui/qgsattributetabledialog.ui	2009-04-13 09:41:48 UTC (rev 10552)
@@ -0,0 +1,274 @@
+<ui version="4.0" >
+ <class>QgsAttributeTableDialog</class>
+ <widget class="QDialog" name="QgsAttributeTableDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>623</width>
+    <height>570</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Attribute Table</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>2</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QgsAttributeTableView" name="mView" >
+     <property name="alternatingRowColors" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QToolButton" name="mRemoveSelectionButton" >
+       <property name="toolTip" >
+        <string>Remove selection</string>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="icon" >
+        <iconset>../../images/themes/default/mActionUnselectAttributes.png</iconset>
+       </property>
+       <property name="iconSize" >
+        <size>
+         <width>18</width>
+         <height>18</height>
+        </size>
+       </property>
+       <property name="shortcut" >
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="mSelectedToTopButton" >
+       <property name="toolTip" >
+        <string>Move selected to top</string>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="icon" >
+        <iconset>../../images/themes/default/mActionSelectedToTop.png</iconset>
+       </property>
+       <property name="iconSize" >
+        <size>
+         <width>18</width>
+         <height>18</height>
+        </size>
+       </property>
+       <property name="shortcut" >
+        <string>Ctrl+T</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="mInvertSelectionButton" >
+       <property name="toolTip" >
+        <string>Invert selection</string>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="icon" >
+        <iconset>../../images/themes/default/mActionInvertSelection.png</iconset>
+       </property>
+       <property name="iconSize" >
+        <size>
+         <width>18</width>
+         <height>18</height>
+        </size>
+       </property>
+       <property name="shortcut" >
+        <string>Ctrl+S</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="mCopySelectedRowsButton" >
+       <property name="toolTip" >
+        <string>Copy selected rows to clipboard (Ctrl+C)</string>
+       </property>
+       <property name="whatsThis" >
+        <string>Copies the selected rows to the clipboard</string>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="icon" >
+        <iconset>../../images/themes/default/mActionEditCopy.png</iconset>
+       </property>
+       <property name="iconSize" >
+        <size>
+         <width>18</width>
+         <height>18</height>
+        </size>
+       </property>
+       <property name="shortcut" >
+        <string>Ctrl+C</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="mZoomMapToSelectedRowsButton" >
+       <property name="toolTip" >
+        <string>Zoom map to the selected rows (Ctrl-J)</string>
+       </property>
+       <property name="whatsThis" >
+        <string>Zoom map to the selected rows</string>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="icon" >
+        <iconset>../../images/themes/default/mActionZoomToSelected.png</iconset>
+       </property>
+       <property name="iconSize" >
+        <size>
+         <width>18</width>
+         <height>18</height>
+        </size>
+       </property>
+       <property name="shortcut" >
+        <string>Ctrl+J</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="mToggleEditingButton" >
+       <property name="toolTip" >
+        <string>Toggle editing mode</string>
+       </property>
+       <property name="whatsThis" >
+        <string>Click to toggle table editing</string>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="icon" >
+        <iconset>../../images/themes/default/mActionToggleEditing.png</iconset>
+       </property>
+       <property name="iconSize" >
+        <size>
+         <width>18</width>
+         <height>18</height>
+        </size>
+       </property>
+       <property name="checkable" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="searchFor" >
+       <property name="text" >
+        <string>Look for</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="query" />
+     </item>
+     <item>
+      <widget class="QLabel" name="searchIn" >
+       <property name="text" >
+        <string>in</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="columnBox" />
+     </item>
+     <item>
+      <widget class="QPushButton" name="searchButton" >
+       <property name="text" >
+        <string>&amp;Search</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="2" column="0" >
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QCheckBox" name="cbxShowSelectedOnly" >
+       <property name="text" >
+        <string>Show selected records only</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="label" >
+       <property name="text" >
+        <string>Advanced search</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="mAdvancedSearchButton" >
+       <property name="text" >
+        <string>...</string>
+       </property>
+       <property name="iconSize" >
+        <size>
+         <width>12</width>
+         <height>12</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QgsAttributeTableView</class>
+   <extends>QTableView</extends>
+   <header>qgsattributetableview.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>mView</tabstop>
+  <tabstop>searchButton</tabstop>
+  <tabstop>query</tabstop>
+  <tabstop>columnBox</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>



More information about the QGIS-commit mailing list