Navigation Menu

Skip to content

Commit

Permalink
[feature]: Possibility to set if newly created project should default…
Browse files Browse the repository at this point in the history 
… to relative or absolute paths
  • Loading branch information
@mhugent @nyalldawson
mhugent authored and nyalldawson committed Jun 21, 2021
1 parent 6fbb4e8 commit a544ba3
Show file tree
Hide file tree
Showing 3 changed files with 87 additions and 42 deletions.
4 changes: 4 additions & 0 deletions src/app/options/qgsoptions.cpp
View file
Expand Up @@ -826,6 +826,8 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
Qgis::PythonMacroMode pyMacroMode = mSettings->enumValue( QStringLiteral( "/qgis/enableMacros" ), Qgis::PythonMacroMode::Ask );
mEnableMacrosComboBox->setCurrentIndex( mEnableMacrosComboBox->findData( QVariant::fromValue( pyMacroMode ) ) );

mDefaultPathsComboBox->setCurrentIndex( mSettings->value( QStringLiteral( "/qgis/defaultProjectPathsRelative" ), QVariant( true ) ).toBool() ? 0 : 1 );

QgsProject::FileFormat defaultProjectFileFormat = mSettings->enumValue( QStringLiteral( "/qgis/defaultProjectFileFormat" ), QgsProject::FileFormat::Qgz );
mFileFormatQgzButton->setChecked( defaultProjectFileFormat == QgsProject::FileFormat::Qgz );
mFileFormatQgsButton->setChecked( defaultProjectFileFormat == QgsProject::FileFormat::Qgs );
Expand Down Expand Up @@ -1653,6 +1655,8 @@ void QgsOptions::saveOptions()
}
mSettings->setEnumValue( QStringLiteral( "/qgis/enableMacros" ), mEnableMacrosComboBox->currentData().value<Qgis::PythonMacroMode>() );

mSettings->setValue( QStringLiteral( "/qgis/defaultProjectPathsRelative" ), mDefaultPathsComboBox->currentIndex() == 0 );

mSettings->setEnumValue( QStringLiteral( "/qgis/defaultProjectFileFormat" ), mFileFormatQgsButton->isChecked() ? QgsProject::FileFormat::Qgs : QgsProject::FileFormat::Qgz );

QgsApplication::setNullRepresentation( leNullValue->text() );
Expand Down
5 changes: 4 additions & 1 deletion src/core/project/qgsproject.cpp
View file
Expand Up @@ -843,7 +843,10 @@ void QgsProject::clear()
// XXX THESE SHOULD BE MOVED TO STATUSBAR RELATED SOURCE
writeEntry( QStringLiteral( "PositionPrecision" ), QStringLiteral( "/Automatic" ), true );
writeEntry( QStringLiteral( "PositionPrecision" ), QStringLiteral( "/DecimalPlaces" ), 2 );
writeEntry( QStringLiteral( "Paths" ), QStringLiteral( "/Absolute" ), false );

QSettings s;
bool defaultRelativePaths = s.value( QStringLiteral( "/qgis/defaultProjectPathsRelative" ), true ).toBool();
writeEntry( QStringLiteral( "Paths" ), QStringLiteral( "/Absolute" ), !defaultRelativePaths );

//copy default units to project
writeEntry( QStringLiteral( "Measurement" ), QStringLiteral( "/DistanceUnits" ), mSettings.value( QStringLiteral( "/qgis/measure/displayunits" ) ).toString() );
Expand Down
120 changes: 79 additions & 41 deletions src/ui/qgsoptionsbase.ui
View file
Expand Up @@ -360,9 +360,9 @@
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>843</width>
<height>959</height>
<y>-536</y>
<width>856</width>
<height>1223</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_28">
Expand Down Expand Up @@ -772,8 +772,8 @@
<property name="title">
<string>Project Files</string>
</property>
<layout class="QVBoxLayout">
<item>
<layout class="QGridLayout" name="gridLayout_38">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="2" colspan="2">
<widget class="QComboBox" name="mProjectOnLaunchCmbBx">
Expand Down Expand Up @@ -882,14 +882,14 @@
</item>
</layout>
</item>
<item>
<item row="1" column="0">
<widget class="QCheckBox" name="cbxProjectDefaultNew">
<property name="text">
<string>Create new project from default project</string>
</property>
</widget>
</item>
<item>
<item row="2" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_16">
<item>
<spacer name="horizontalSpacer_22">
Expand Down Expand Up @@ -936,7 +936,7 @@
</item>
</layout>
</item>
<item>
<item row="3" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_15">
<item>
<widget class="QLabel" name="label_31">
Expand Down Expand Up @@ -982,28 +982,28 @@
</item>
</layout>
</item>
<item>
<item row="4" column="0">
<widget class="QCheckBox" name="chbAskToSaveProjectChanges">
<property name="text">
<string>Prompt to save project and data source changes when required</string>
</property>
</widget>
</item>
<item>
<item row="5" column="0">
<widget class="QCheckBox" name="mLayerDeleteConfirmationChkBx">
<property name="text">
<string>Prompt for confirmation when a layer is to be removed</string>
</property>
</widget>
</item>
<item>
<item row="6" column="0">
<widget class="QCheckBox" name="chbWarnOldProjectVersion">
<property name="text">
<string>Warn when opening a project file saved with an older version of QGIS</string>
</property>
</widget>
</item>
<item>
<item row="7" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_21">
<item>
<widget class="QLabel" name="label_33">
Expand Down Expand Up @@ -1037,7 +1037,45 @@
</item>
</layout>
</item>
<item>
<item row="8" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="mDefaultPathsLabel">
<property name="text">
<string>Default paths</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="mDefaultPathsComboBox">
<item>
<property name="text">
<string>relative</string>
</property>
</item>
<item>
<property name="text">
<string>absolute</string>
</property>
</item>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_24">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="9" column="0">
<layout class="QGridLayout" name="gridLayout_31">
<item row="0" column="0">
<widget class="QLabel" name="label_67">
Expand Down Expand Up @@ -1133,8 +1171,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>843</width>
<height>1068</height>
<width>617</width>
<height>1135</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_22">
Expand Down Expand Up @@ -1672,8 +1710,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>857</width>
<height>695</height>
<width>673</width>
<height>575</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_15">
Expand Down Expand Up @@ -1916,8 +1954,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>596</width>
<height>105</height>
<width>648</width>
<height>118</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_47">
Expand Down Expand Up @@ -1999,8 +2037,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>637</width>
<height>717</height>
<width>702</width>
<height>895</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_27">
Expand Down Expand Up @@ -2398,8 +2436,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>719</width>
<height>1132</height>
<width>772</width>
<height>1396</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_22">
Expand Down Expand Up @@ -3203,8 +3241,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>508</width>
<height>357</height>
<width>523</width>
<height>435</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_25">
Expand Down Expand Up @@ -3648,8 +3686,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>630</width>
<height>686</height>
<width>678</width>
<height>850</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_30">
Expand Down Expand Up @@ -4165,8 +4203,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<rect>
<x>0</x>
<y>0</y>
<width>147</width>
<height>251</height>
<width>155</width>
<height>320</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_46">
Expand Down Expand Up @@ -4345,8 +4383,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<rect>
<x>0</x>
<y>0</y>
<width>555</width>
<height>968</height>
<width>608</width>
<height>1229</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_31">
Expand Down Expand Up @@ -4424,7 +4462,7 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
</item>
<item row="3" column="2">
<widget class="QgsDoubleSpinBox" name="mDefaultZValueSpinBox">
<property name="toolTip">
<property name="toolTip">
<string>Default Z Value</string>
</property>
<property name="decimals">
Expand All @@ -4443,7 +4481,7 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
</item>
<item row="4" column="2">
<widget class="QgsDoubleSpinBox" name="mDefaultMValueSpinBox">
<property name="toolTip">
<property name="toolTip">
<string>Default Measure Value</string>
</property>
<property name="decimals">
Expand Down Expand Up @@ -5048,8 +5086,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<rect>
<x>0</x>
<y>0</y>
<width>494</width>
<height>539</height>
<width>546</width>
<height>606</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_39">
Expand Down Expand Up @@ -5329,8 +5367,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<rect>
<x>0</x>
<y>0</y>
<width>457</width>
<height>419</height>
<width>498</width>
<height>455</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
Expand Down Expand Up @@ -5601,8 +5639,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<rect>
<x>0</x>
<y>0</y>
<width>657</width>
<height>669</height>
<width>712</width>
<height>828</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_33">
Expand Down Expand Up @@ -6082,8 +6120,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'.AppleSystemUIFont'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Noto Sans'; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Noto Sans'; font-size:12pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
Expand Down

0 comments on commit a544ba3

Please sign in to comment.