Skip to content

Commit

Permalink
improve layout in Python init function editor (fix #17428)
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexbruy
alexbruy committed Nov 12, 2017
1 parent 944d2f4 commit 7e699f1
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 142 deletions.
29 changes: 8 additions & 21 deletions src/app/qgsattributesforminitcode.cpp
View file
Expand Up @@ -29,9 +29,12 @@ QgsAttributesFormInitCode::QgsAttributesFormInitCode()
mInitCodeSourceComboBox->addItem( tr( "Provide code in this dialog" ) );
mInitCodeSourceComboBox->addItem( tr( "Load from the environment" ) );

connect( mInitCodeSourceComboBox, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsAttributesFormInitCode::mInitCodeSourceComboBox_currentIndexChanged );
connect( pbtnSelectInitFilePath, &QToolButton::clicked, this, &QgsAttributesFormInitCode::pbtnSelectInitFilePath_clicked );
QgsSettings settings;
mInitFileWidget->setDefaultRoot( settings.value( QStringLiteral( "style/lastInitFilePathDir" ), "." ).toString() );
mInitFileWidget->setDialogTitle( tr( "Select Python File" ) );
mInitFileWidget->setFilter( tr( "Python files (*.py *.PY)" ) );

connect( mInitCodeSourceComboBox, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsAttributesFormInitCode::mInitCodeSourceComboBox_currentIndexChanged );
}

void QgsAttributesFormInitCode::setCodeSource( QgsEditFormConfig::PythonInitCodeSource initCodeSource )
Expand All @@ -46,7 +49,7 @@ void QgsAttributesFormInitCode::setInitFunction( const QString &initFunction )
}
void QgsAttributesFormInitCode::setInitFilePath( const QString &initFilePath )
{
mInitFilePathLineEdit->setText( initFilePath );
mInitFileWidget->setFilePath( initFilePath );
}
void QgsAttributesFormInitCode::setInitCode( const QString &initCode )
{
Expand All @@ -64,7 +67,7 @@ QString QgsAttributesFormInitCode::initFunction() const
}
QString QgsAttributesFormInitCode::initFilePath() const
{
return mInitFilePathLineEdit->text();
return mInitFileWidget->filePath();
}
QString QgsAttributesFormInitCode::initCode() const
{
Expand All @@ -74,23 +77,7 @@ QString QgsAttributesFormInitCode::initCode() const
void QgsAttributesFormInitCode::mInitCodeSourceComboBox_currentIndexChanged( int codeSource )
{
mInitFunctionContainer->setVisible( codeSource != QgsEditFormConfig::CodeSourceNone );
mInitFilePathLineEdit->setVisible( codeSource == QgsEditFormConfig::CodeSourceFile );
mInitFilePathLabel->setVisible( codeSource == QgsEditFormConfig::CodeSourceFile );
pbtnSelectInitFilePath->setVisible( codeSource == QgsEditFormConfig::CodeSourceFile );
mInitFileWidget->setVisible( codeSource == QgsEditFormConfig::CodeSourceFile );
mInitCodeEditorPython->setVisible( codeSource == QgsEditFormConfig::CodeSourceDialog );
}

void QgsAttributesFormInitCode::pbtnSelectInitFilePath_clicked( )
{
QgsSettings myQSettings;
QString lastUsedDir = myQSettings.value( QStringLiteral( "style/lastInitFilePathDir" ), "." ).toString();
QString pyfilename = QFileDialog::getOpenFileName( this, tr( "Select Python file" ), lastUsedDir, tr( "Python file" ) + " (*.py)" );

if ( pyfilename.isNull() )
return;

QFileInfo fi( pyfilename );
myQSettings.setValue( QStringLiteral( "style/lastInitFilePathDir" ), fi.path() );
mInitFilePathLineEdit->setText( pyfilename );
}

1 change: 0 additions & 1 deletion src/app/qgsattributesforminitcode.h
View file
Expand Up @@ -49,7 +49,6 @@ class APP_EXPORT QgsAttributesFormInitCode: public QDialog, private Ui::QgsAttri

private slots:
void mInitCodeSourceComboBox_currentIndexChanged( int codeSource );
void pbtnSelectInitFilePath_clicked();
};

#endif // QGSATTRIBUTESFORMINITCODE_H
196 changes: 76 additions & 120 deletions src/ui/qgsattributesforminitcode.ui
View file
Expand Up @@ -7,95 +7,96 @@
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
<height>283</height>
</rect>
</property>
<property name="windowTitle">
<string>Python Init Code Configuration</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
<widget class="QWidget" name="mInitFunctionContainer" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="toolTip">
<string>The function code of the function can be loaded from the source code entered
in this dialog, from an external python file or from the environment (for example
from a plugin or from startup.py).

An example is:

from qgis.PyQt.QtWidgets import QWidget

def my_form_open(dialog, layer, feature):
geom = feature.geometry()
control = dialog.findChild(QWidget,&quot;MyLineEdit&quot;)

Reference in function name: my_form_open

</string>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>50</height>
</size>
<property name="text">
<string>Python Init function</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4">
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="QComboBox" name="mInitCodeSourceComboBox">
<property name="toolTip">
<string>The function code of the function can be loaded from the source code entered
in this dialog, from an external python file or from the environment (for example
from a plugin or from startup.py).

An example is:

rom qgis.PyQt.QtWidgets import QWidget

def my_form_open(dialog, layer, feature):
geom = feature.geometry()
control = dialog.findChild(QWidget,&quot;MyLineEdit&quot;)

Reference in function name: my_form_open

</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="3">
<widget class="QWidget" name="mInitFunctionContainer" native="true">
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="mInitFunctionLabel">
<property name="text">
<string>Function name</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="mInitFunctionLineEdit">
<property name="toolTip">
<string>Enter the name of the form init function.</string>
</property>
</widget>
</item>
<item>
<item row="0" column="0">
<widget class="QLabel" name="mInitFilePathLabel">
<property name="text">
<string>External file</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="mInitFilePathLineEdit"/>
<item row="0" column="1">
<widget class="QgsFileWidget" name="mInitFileWidget" native="true"/>
</item>
<item>
<widget class="QToolButton" name="pbtnSelectInitFilePath">
<item row="1" column="0">
<widget class="QLabel" name="mInitFunctionLabel">
<property name="text">
<string>…</string>
<string>Function name</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
<item row="1" column="1">
<widget class="QLineEdit" name="mInitFunctionLineEdit">
<property name="toolTip">
<string>Enter the name of the form init function.</string>
</property>
</spacer>
</widget>
</item>
</layout>
</widget>
</item>
<item row="4" column="0">
<item row="5" column="0" colspan="3">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>50</height>
</size>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
Expand All @@ -104,75 +105,25 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QgsCodeEditorPython" name="mInitCodeEditorPython" native="true"/>
</item>
<item row="0" column="0">
<widget class="QWidget" name="mInitCodeSourceContainter" native="true">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>50</height>
</size>
<item row="3" column="0" colspan="3">
<widget class="QgsCodeEditorPython" name="mInitCodeEditorPython" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>1</verstretch>
</sizepolicy>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_3">
<property name="toolTip">
<string>The function code of the function can be loaded from the source code entered
in this dialog, from an external python file or from the environment (for example
from a plugin or from startup.py).

An example is:

rom qgis.PyQt.QtWidgets import QWidget

def my_form_open(dialog, layer, feature):
geom = feature.geometry()
control = dialog.findChild(QWidget,&quot;MyLineEdit&quot;)

Reference in function name: my_form_open

</string>
</property>
<property name="text">
<string>Python Init function</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="mInitCodeSourceComboBox">
<property name="toolTip">
<string>The function code of the function can be loaded from the source code entered
in this dialog, from an external python file or from the environment (for example
from a plugin or from startup.py).

An example is:

rom qgis.PyQt.QtWidgets import QWidget

def my_form_open(dialog, layer, feature):
geom = feature.geometry()
control = dialog.findChild(QWidget,&quot;MyLineEdit&quot;)

Reference in function name: my_form_open

</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="3" column="0">
<item row="4" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<height>0</height>
</size>
</property>
</spacer>
Expand All @@ -186,6 +137,11 @@ Reference in function name: my_form_open
<header>qgscodeeditorpython.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsFileWidget</class>
<extends>QWidget</extends>
<header>qgsfilewidget.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections>
Expand All @@ -196,8 +152,8 @@ Reference in function name: my_form_open
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>254</x>
<y>293</y>
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
Expand Down

0 comments on commit 7e699f1

Please sign in to comment.