Cosmetic fixups to organize table columns dialog

qgis · Jun 2, 2016 · 6c6a177 · 6c6a177
1 parent 4f4c0ff
commit 6c6a177
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/python/gui/attributetable/qgsorganizetablecolumnsdialog.sip b/python/gui/attributetable/qgsorganizetablecolumnsdialog.sip
@@ -1,3 +1,9 @@
+/** /class QgsOrganizeTableColumnsDialog
+ * /ingroup gui
+ * Dialog for organising (hiding and reordering) columns in the attributes table.
+ * /note added in QGIS 2.16
+ */
+
 class QgsOrganizeTableColumnsDialog : QDialog
 {
 %TypeHeaderCode
@@ -12,7 +18,7 @@ class QgsOrganizeTableColumnsDialog : QDialog
      * @param parent parent object
      * @param flags window flags
      */
-    QgsOrganizeTableColumnsDialog(const QgsVectorLayer* vl, QWidget* parent = nullptr, Qt::WindowFlags flags = Qt::Window );
+    QgsOrganizeTableColumnsDialog(const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = nullptr, Qt::WindowFlags flags = Qt::Window );
 
     /**
      * Destructor

diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -845,7 +845,7 @@ void QgsAttributeTableDialog::on_mFilterTableFields_clicked()
     return;
   }
 
-  QgsOrganizeTableColumnsDialog dialog( mLayer );
+  QgsOrganizeTableColumnsDialog dialog( mLayer, this );
   if ( dialog.exec() == QDialog::Accepted )
   {
     QgsAttributeTableConfig config = dialog.config();

diff --git a/src/gui/attributetable/qgsorganizetablecolumnsdialog.h b/src/gui/attributetable/qgsorganizetablecolumnsdialog.h
@@ -25,6 +25,11 @@
 
 class QgsVectorLayer;
 
+/** /class QgsOrganizeTableColumnsDialog
+ * /ingroup gui
+ * Dialog for organising (hiding and reordering) columns in the attributes table.
+ * /note added in QGIS 2.16
+ */
 class GUI_EXPORT QgsOrganizeTableColumnsDialog : public QDialog, private Ui::QgsOrganizeTableColumnsDialog
 {
     Q_OBJECT

diff --git a/src/ui/qgsattributetabledialog.ui b/src/ui/qgsattributetabledialog.ui
@@ -584,7 +584,7 @@
      <item>
       <widget class="QToolButton" name="mFilterTableFields">
        <property name="toolTip">
-        <string>Hide some fields</string>
+        <string>Organize table columns</string>
        </property>
        <property name="text">
         <string>...</string>

diff --git a/src/ui/qgsorganizetablecolumnsdialog.ui b/src/ui/qgsorganizetablecolumnsdialog.ui
@@ -6,12 +6,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>392</width>
+    <width>393</width>
     <height>357</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Filter table column</string>
+   <string>Organize table columns</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="2" column="3">
@@ -27,7 +27,7 @@
    <item row="2" column="0">
     <widget class="QPushButton" name="mShowAllButton">
      <property name="text">
-      <string>select all</string>
+      <string>Select all</string>
      </property>
     </widget>
    </item>
@@ -44,7 +44,7 @@
    <item row="2" column="1">
     <widget class="QPushButton" name="mHideAllButton">
      <property name="text">
-      <string>unselect all</string>
+      <string>Unselect all</string>
      </property>
     </widget>
    </item>