diff --git a/src/qgisapp.cpp b/src/qgisapp.cpp
index 8a917b11a3c..ace92d225fd 100644
--- a/src/qgisapp.cpp
+++ b/src/qgisapp.cpp
@@ -856,6 +856,7 @@ static void buildSupportedVectorFileFilter_(QString & fileFilters)
*/
static void openFilesRememberingFilter_(QString const &filterName, QString const &filters, QStringList & selectedFiles)
{
+
bool haveLastUsedFilter = false; // by default, there is no last
// used filter
@@ -908,6 +909,7 @@ static void openFilesRememberingFilter_(QString const &filterName, QString const
*/
void QgisApp::addLayer()
{
+
QString fileFilters;
buildSupportedVectorFileFilter_(fileFilters);
diff --git a/src/qgsdlgvectorlayerpropertiesbase.ui b/src/qgsdlgvectorlayerpropertiesbase.ui
index fdc40cc75ce..856b932a97f 100644
--- a/src/qgsdlgvectorlayerpropertiesbase.ui
+++ b/src/qgsdlgvectorlayerpropertiesbase.ui
@@ -8,7 +8,7 @@
0
0
- 488
+ 492
600
diff --git a/src/qgsgrasydialogbase.ui b/src/qgsgrasydialogbase.ui
index 8d97fdeac9e..8086b38387d 100644
--- a/src/qgsgrasydialogbase.ui
+++ b/src/qgsgrasydialogbase.ui
@@ -8,8 +8,8 @@
0
0
- 490
- 572
+ 491
+ 575
diff --git a/src/qgslinestyledialogbase.ui b/src/qgslinestyledialogbase.ui
index 95212df3d07..4670475088e 100644
--- a/src/qgslinestyledialogbase.ui
+++ b/src/qgslinestyledialogbase.ui
@@ -29,120 +29,113 @@
true
-
+
- dashdot
+ unnamed
-
-
- 110
- 36
- 95
- 31
-
-
-
-
-
-
- true
-
-
-
-
- solid
-
-
-
- 9
- 36
- 95
- 31
-
-
-
-
-
-
- true
-
-
-
-
- dashdotdot
-
-
-
- 110
- 73
- 95
- 31
-
-
-
-
-
-
- true
-
-
-
-
- nopen
-
-
-
- 110
- 110
- 95
- 31
-
-
-
-
-
-
- true
-
-
-
-
- dot
-
-
-
- 9
- 110
- 95
- 31
-
-
-
-
-
-
- true
-
-
-
-
- dash
-
-
-
- 9
- 73
- 95
- 31
-
-
-
-
-
-
- true
-
-
+
+
+ dot
+
+
+
+ 60
+ 30
+
+
+
+
+
+
+ true
+
+
+
+
+ nopen
+
+
+
+ 60
+ 30
+
+
+
+
+
+
+ true
+
+
+
+
+ dashdotdot
+
+
+
+ 60
+ 30
+
+
+
+
+
+
+ true
+
+
+
+
+ dashdot
+
+
+
+ 60
+ 30
+
+
+
+
+
+
+ true
+
+
+
+
+ dash
+
+
+
+ 60
+ 30
+
+
+
+
+
+
+ true
+
+
+
+
+ solid
+
+
+
+ 60
+ 30
+
+
+
+
+
+
+ true
+
+
+
diff --git a/src/qgsproject.cpp b/src/qgsproject.cpp
index 2d90d042c8a..d6e69ab4f8e 100644
--- a/src/qgsproject.cpp
+++ b/src/qgsproject.cpp
@@ -960,9 +960,9 @@ dump_( QMap< QString, PropertyKey > const & property_list )
curr_scope != property_list.end();
curr_scope++ )
{
- qDebug( "<%s>", curr_scope.key() );
+// qDebug( "<%s>", curr_scope.key() );
curr_scope.data().dump( );
- qDebug( "", curr_scope.key() );
+ // qDebug( "", curr_scope.key() );
}
} // dump_
diff --git a/src/qgssisydialogbase.ui b/src/qgssisydialogbase.ui
index fc4e700c3af..a9dd3d77eac 100644
--- a/src/qgssisydialogbase.ui
+++ b/src/qgssisydialogbase.ui
@@ -8,7 +8,7 @@
0
0
- 406
+ 366
373
@@ -474,7 +474,7 @@
- Fill Pattern:
+ Fill Patterns:
true