Skip to content
Permalink
Browse files

Rename QgsFilterTableFields to QgsOrganizeTableColumns

  • Loading branch information
m-kuhn committed Apr 27, 2016
1 parent d4ccc77 commit ff4ad50809e3bee1649b588dd7d683faf68732a3
@@ -1,7 +1,7 @@
class QgsFilterTableFieldsDialog : QDialog
class QgsOrganizeTableColumnsDialog : QDialog
{
%TypeHeaderCode
#include <qgsfiltertablefieldsdialog.h>
#include <qgsorganizetablecolumnsdialog.h>
%End

public:
@@ -12,8 +12,8 @@ class QgsFilterTableFieldsDialog : QDialog
* @param parent parent object
* @param flags window flags
*/
QgsFilterTableFieldsDialog( const QgsVectorLayer* vl, QStringList visible, QWidget *parent /TransferThis/ = nullptr, Qt::WindowFlags flags = Qt::Window );
~QgsFilterTableFieldsDialog();
QgsOrganizeTableColumnsDialog( const QgsVectorLayer* vl, QStringList visible, QWidget *parent /TransferThis/ = nullptr, Qt::WindowFlags flags = Qt::Window );
~QgsOrganizeTableColumnsDialog();

/**
* Get the selected fields name
@@ -166,7 +166,7 @@
%Include attributetable/qgsfeatureselectionmodel.sip
%Include attributetable/qgsfieldconditionalformatwidget.sip
%Include attributetable/qgsifeatureselectionmanager.sip
%Include attributetable/qgsfiltertablefieldsdialog.sip
%Include attributetable/qgsorganizetablecolumnsdialog.sip

%Include auth/qgsauthauthoritieseditor.sip
%Include auth/qgsauthcertificateinfo.sip
@@ -21,7 +21,7 @@
#include "qgsattributetablemodel.h"
#include "qgsattributetablefiltermodel.h"
#include "qgsattributetableview.h"
#include "qgsfiltertablefieldsdialog.h"
#include "qgsorganizetablecolumnsdialog.h"

#include <qgsapplication.h>
#include <qgsvectordataprovider.h>
@@ -776,7 +776,7 @@ void QgsAttributeTableDialog::on_mFilterTableFields_clicked()
return;
}

QgsFilterTableFieldsDialog dialog( mLayer, mVisibleFields );
QgsOrganizeTableColumnsDialog dialog( mLayer, mVisibleFields );
if ( dialog.exec() == QDialog::Accepted )
{
mVisibleFields = dialog.selectedFields();
@@ -62,7 +62,7 @@ SET(QGIS_GUI_SRCS
attributetable/qgsfieldconditionalformatwidget.cpp
attributetable/qgsgenericfeatureselectionmanager.cpp
attributetable/qgsvectorlayerselectionmanager.cpp
attributetable/qgsfiltertablefieldsdialog.cpp
attributetable/qgsorganizetablecolumnsdialog.cpp

auth/qgsauthauthoritieseditor.cpp
auth/qgsauthcertificateinfo.cpp
@@ -473,7 +473,7 @@ SET(QGIS_GUI_MOC_HDRS
attributetable/qgsgenericfeatureselectionmanager.h
attributetable/qgsifeatureselectionmanager.h
attributetable/qgsvectorlayerselectionmanager.h
attributetable/qgsfiltertablefieldsdialog.h
attributetable/qgsorganizetablecolumnsdialog.h

auth/qgsauthauthoritieseditor.h
auth/qgsauthcertificateinfo.h
@@ -1,5 +1,5 @@
/***************************************************************************
QgsFilterTableFieldsDialog.cpp
qgsorganizetablecolumnsdialog.cpp
-------------------
date : Feb 2016
copyright : Stéphane Brunner
@@ -17,7 +17,7 @@
#include <QDockWidget>
#include <QMessageBox>

#include "qgsfiltertablefieldsdialog.h"
#include "qgsorganizetablecolumnsdialog.h"
#include "qgsattributetablemodel.h"
#include "qgsattributetablefiltermodel.h"
#include "qgsattributetableview.h"
@@ -41,7 +41,7 @@
#include "qgseditorwidgetregistry.h"


QgsFilterTableFieldsDialog::QgsFilterTableFieldsDialog( const QgsVectorLayer* vl, const QStringList visble, QWidget *parent, Qt::WindowFlags flags )
QgsOrganizeTableColumnsDialog::QgsOrganizeTableColumnsDialog( const QgsVectorLayer* vl, const QStringList visble, QWidget *parent, Qt::WindowFlags flags )
: QDialog( parent, flags )
{
setupUi( this );
@@ -76,13 +76,13 @@ QgsFilterTableFieldsDialog::QgsFilterTableFieldsDialog( const QgsVectorLayer* vl
restoreGeometry( settings.value( "/Windows/QgsFilterTableFieldsDialog/geometry" ).toByteArray() );
}

QgsFilterTableFieldsDialog::~QgsFilterTableFieldsDialog()
QgsOrganizeTableColumnsDialog::~QgsOrganizeTableColumnsDialog()
{
QSettings settings;
settings.setValue( "/Windows/QgsFilterTableFieldsDialog/geometry", saveGeometry() );
}

QStringList QgsFilterTableFieldsDialog::selectedFields()
QStringList QgsOrganizeTableColumnsDialog::selectedFields() const
{
QStringList selectionList;
for ( int i = 0 ; i < mFieldsList->count() ; i++ )
@@ -1,5 +1,5 @@
/***************************************************************************
QgsFilterTableFieldsDialog.h - dialog for attribute table
qgsorganizetablecolumnsdialog.h - dialog for attribute table
-------------------
date : Feb 2016
copyright : Stéphane Brunner
@@ -14,35 +14,16 @@
* *
***************************************************************************/

#ifndef QGSFILTERTABLEFIELDSDIALOG_H_
#define QGSFILTERTABLEFIELDSDIALOG_H_
#ifndef QGSORGANIZEFILTERTABLESDIALOG_H_
#define QGSORGANIZEFILTERTABLESDIALOG_H_

#include <QDialog>
#include <QModelIndex>
#include <QItemSelectionModel>

#include <time.h>
#include "ui_qgsorganizetablecolumnsdialog.h"

#include "ui_qgsfiltertablefieldsdialog.h"
#include "qgscontexthelp.h"
class QgsVectorLayer;

#include "qgsattributedialog.h"
#include "qgsvectorlayer.h" //QgsFeatureIds
#include "qgsfieldmodel.h"
#include "qgssearchwidgetwrapper.h"
#include <QDockWidget>

class QDialogButtonBox;
class QPushButton;
class QLineEdit;
class QComboBox;
class QMenu;
class QSignalMapper;
class QgsAttributeTableModel;
class QgsAttributeTableFilterModel;
class QgsRubberBand;

class GUI_EXPORT QgsFilterTableFieldsDialog : public QDialog, private Ui::QgsFilterTableFieldsDialog
class GUI_EXPORT QgsOrganizeTableColumnsDialog : public QDialog, private Ui::QgsOrganizeTableColumnsDialog
{
Q_OBJECT

@@ -54,17 +35,17 @@ class GUI_EXPORT QgsFilterTableFieldsDialog : public QDialog, private Ui::QgsFil
* @param parent parent object
* @param flags window flags
*/
QgsFilterTableFieldsDialog( const QgsVectorLayer* vl, QStringList visible, QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::Window );
QgsOrganizeTableColumnsDialog( const QgsVectorLayer* vl, QStringList visible, QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::Window );
/**
* Destructor
*/
~QgsFilterTableFieldsDialog();
~QgsOrganizeTableColumnsDialog();

/**
* Get the selected fields name
* @return The selected fields name
*/
QStringList selectedFields();
QStringList selectedFields() const;
};

#endif
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>QgsFilterTableFieldsDialog</class>
<widget class="QDialog" name="QgsFilterTableFieldsDialog">
<class>QgsOrganizeTableColumnsDialog</class>
<widget class="QDialog" name="QgsOrganizeTableColumnsDialog">
<property name="geometry">
<rect>
<x>0</x>
@@ -34,7 +34,7 @@
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>QgsFilterTableFieldsDialog</receiver>
<receiver>QgsOrganizeTableColumnsDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
@@ -50,7 +50,7 @@
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>QgsFilterTableFieldsDialog</receiver>
<receiver>QgsOrganizeTableColumnsDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">

0 comments on commit ff4ad50

Please sign in to comment.
You can’t perform that action at this time.