diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index ee0c161f487..2fa185d48b7 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -82,6 +82,7 @@ SET(QGIS_APP_SRCS qgsmaptooltextannotation.cpp qgsmaptoolvertexedit.cpp qgssavestyletodbdialog.cpp + qgsloadstylefromdbdialog.cpp nodetool/qgsmaptoolnodetool.cpp nodetool/qgsselectedfeature.cpp @@ -229,6 +230,7 @@ SET (QGIS_APP_MOC_HDRS qgsmaptoolsplitfeatures.h qgsmaptoolvertexedit.h qgssavestyletodbdialog.h + qgsloadstylefromdbdialog.h nodetool/qgsmaptoolnodetool.h nodetool/qgsselectedfeature.h diff --git a/src/app/qgsloadstylefromdbdialog.cpp b/src/app/qgsloadstylefromdbdialog.cpp new file mode 100644 index 00000000000..d79e26fff0b --- /dev/null +++ b/src/app/qgsloadstylefromdbdialog.cpp @@ -0,0 +1,19 @@ +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ + +#include "qgsloadstylefromdbdialog.h" +#include "qgslogger.h" + +#include + +QgsLoadStyleFromDBDialog::QgsLoadStyleFromDBDialog( QWidget *parent ) + : QDialog( parent ) +{ + setupUi( this ); +} diff --git a/src/app/qgsloadstylefromdbdialog.h b/src/app/qgsloadstylefromdbdialog.h new file mode 100644 index 00000000000..e57f37a6695 --- /dev/null +++ b/src/app/qgsloadstylefromdbdialog.h @@ -0,0 +1,42 @@ +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ + +#ifndef QGSADDATTRDIALOG_H +#define QGSADDATTRDIALOG_H + +#include "ui_qgsloadstylefromdbdialog.h" +#include "qgisgui.h" +#include "qgsfield.h" + +//class QgsVectorLayer; + +class QgsLoadStyleFromDBDialog: public QDialog, private Ui::QgsLoadStyleFromDBDialogLayout +{ + Q_OBJECT + public: + explicit QgsLoadStyleFromDBDialog( QWidget *parent = 0 ); +// QgsAddAttrDialog( QgsVectorLayer *vlayer, +// QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags ); +// QgsAddAttrDialog( const std::list& typelist, +// QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags ); + +// QgsField field() const; + + public slots: +// void on_mTypeBox_currentIndexChanged( int idx ); +// void on_mLength_editingFinished(); +// void accept(); + + private: +// QString mLayerType; + +// void setPrecisionMinMax(); +}; + +#endif diff --git a/src/app/qgssavestyletodbdialog.cpp b/src/app/qgssavestyletodbdialog.cpp index d58a02b0cc8..16d907783fd 100644 --- a/src/app/qgssavestyletodbdialog.cpp +++ b/src/app/qgssavestyletodbdialog.cpp @@ -18,7 +18,7 @@ QgsSaveStyleToDbDialog::QgsSaveStyleToDbDialog( QWidget *parent ) : QDialog( parent ) { setupUi( this ); - setWindowTitle( "Save style in Postgres" ); + setWindowTitle( "Save style in database" ); mDescriptionEdit->setTabChangesFocus( true ); setTabOrder( mNameEdit, mDescriptionEdit ); setTabOrder( mDescriptionEdit, mUseAsDefault ); diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp index 9e3f852b5ca..5974330db3b 100644 --- a/src/app/qgsvectorlayerproperties.cpp +++ b/src/app/qgsvectorlayerproperties.cpp @@ -34,6 +34,7 @@ #include "qgslabelinggui.h" #include "qgslabel.h" #include "qgslegenditem.h" +//#include "qgsloadstylefromdbdialog.h" #include "qgsgenericprojectionselector.h" #include "qgslogger.h" #include "qgsmaplayerregistry.h" @@ -747,7 +748,7 @@ void QgsVectorLayerProperties::loadStyleMenuTriggered( QAction *action ) void QgsVectorLayerProperties::showListOfStylesFromDatabase() { - //TODO el1073 ui&logic +// QgsLoadStyleFromDBDialog dialog; } QList QgsVectorLayerProperties::overlayPlugins() const diff --git a/src/app/qgsvectorlayerproperties.h b/src/app/qgsvectorlayerproperties.h index 0998d137f57..8bde6cc6891 100644 --- a/src/app/qgsvectorlayerproperties.h +++ b/src/app/qgsvectorlayerproperties.h @@ -136,13 +136,15 @@ class QgsVectorLayerProperties : public QDialog, private Ui::QgsVectorLayerPrope /** called when is possible to choice if load the style from filesystem or from db */ void loadStyleMenuTriggered( QAction * ); - /** when provider supports, it will list all the styles relative the layer */ - void showListOfStylesFromDatabase(); + protected: void saveStyleAs( StyleType styleType ); + /** when provider supports, it will list all the styles relative the layer */ + void showListOfStylesFromDatabase(); + void updateSymbologyPage(); QgsVectorLayer *layer; diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp index 7514f2fae59..68581da0c35 100644 --- a/src/providers/postgres/qgspostgresprovider.cpp +++ b/src/providers/postgres/qgspostgresprovider.cpp @@ -3246,7 +3246,7 @@ QGISEXTERN bool saveStyle( const QString& uri, const QString& qmlStyle, const QS char* c = PQgetvalue( result, 0, 0 ); if( *c == '0' ) { - QString createTabeQuery = QObject::tr( "CREATE TABLE public.%1 ( f_table_catalog varchar(256), f_table_schema varchar(256), f_table_name varchar(256), f_geometry_column varchar(256), styleName varchar(30), styleQML xml, styleSLD xml, useAsDefault boolean, description text, owner varchar(30), ui xml, update_time timestamp DEFAULT CURRENT_TIMESTAMP );" ).arg( styleTableName ); + QString createTabeQuery = QObject::tr( "CREATE TABLE public.%1 (id SERIAL PRIMARY KEY, f_table_catalog varchar(256), f_table_schema varchar(256), f_table_name varchar(256), f_geometry_column varchar(256), styleName varchar(30), styleQML xml, styleSLD xml, useAsDefault boolean, description text, owner varchar(30), ui xml, update_time timestamp DEFAULT CURRENT_TIMESTAMP );" ).arg( styleTableName ); res = conn->PQexec( createTabeQuery ); if ( res.PQresultStatus() != PGRES_COMMAND_OK ) diff --git a/src/ui/qgsloadstylefromdbdialog.ui b/src/ui/qgsloadstylefromdbdialog.ui new file mode 100644 index 00000000000..6df880e23b5 --- /dev/null +++ b/src/ui/qgsloadstylefromdbdialog.ui @@ -0,0 +1,98 @@ + + + QgsLoadStyleFromDBDialogLayout + + + + 0 + 0 + 475 + 390 + + + + + 0 + 0 + + + + Add column + + + true + + + + + + + + Styles related to the layer + + + + + + + + + + Other styles on the database + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + Cancel + + + + + + + + 0 + 0 + + + + Load Style + + + + + + + + + + + + +