sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-04 00:04:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

[ui] Address review: move switch to aliases button next to the search bar. New icon for the 'toggling aliases' button.

Browse Source
This commit is contained in:
Germán Carrillo 2025-04-30 09:37:21 -05:00 committed by Nyall Dawson
parent c6c821990c
commit a1a242386e
4 changed files with 115 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
images/images.qrc
View File

@ -1022,6 +1022,7 @@
<file>themes/default/mIconQt.svg</file>
<file>themes/default/mIconStoredQueries.svg</file>
<file>themes/default/mIconQueryHistory.svg</file>
<file>themes/default/mToggleAliases.svg</file>
</qresource>
<qresource prefix="/images/tips">
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

1
images/themes/default/mToggleAliases.svg Normal file
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24" xmlns:v="https://vecta.io/nano"><path d="M6.203 8.849q-1.115 0-1.558.286-.442.286-.442.98 0 .517.306.823.307.307.831.307.789 0 1.225-.592Q7 10.054 7 8.986V8.85zm2.777-.768v4.348H7v-.849q-.361.503-.926.775-.564.272-1.245.272-1.299 0-2.028-.687-.721-.687-.721-1.919 0-1.334.864-1.966.864-.64 2.674-.64H7v-.334q0-.483-.354-.728-.347-.252-1.028-.252-.715 0-1.388.183-.666.177-1.395.572V5.155q.66-.272 1.34-.401.68-.13 1.442-.13 1.858 0 2.607.756.755.755.755 2.701z" opacity=".6" fill="#555" stroke="#c8c8c8" stroke-width="1.645" stroke-linejoin="round"/><path d="M6.254 8.847q-1.115 0-1.558.286-.442.286-.442.98 0 .517.306.823.307.307.831.307.789 0 1.225-.592.435-.599.435-1.668v-.136zm2.777-.768v4.348h-1.98v-.849q-.361.503-.926.775-.564.272-1.245.272-1.299 0-2.028-.687-.721-.687-.721-1.919 0-1.334.864-1.966.864-.64 2.674-.64h1.382v-.334q0-.483-.354-.728-.347-.252-1.028-.252-.715 0-1.388.183-.666.177-1.395.572V5.153q.66-.272 1.34-.401.68-.13 1.442-.13 1.858 0 2.607.756.755.755.755 2.701z" fill="#2e3436"/><path d="M17.58 11.945l-.946 4.158h1.897zm-1.225-1.836h2.457l2.742 10.159h-2.007l-.627-2.511h-2.688l-.613 2.511h-2.007z" opacity=".6" fill="#555" stroke="#c8c8c8" stroke-width="1.645" stroke-linejoin="round"/><path d="M17.572 12.003l-.946 4.158h1.897zm-1.225-1.836h2.457l2.742 10.159h-2.007l-.627-2.511h-2.687l-.613 2.511h-2.007z" fill="#2e3436"/><path d="M8.797 20.18L15.903 3.6" opacity=".6" fill="#555" stroke="#c8c8c8" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/><path d="M8.627 20.521l7.355-17.211" fill="#2e3436" stroke="#2e3436" stroke-width="1.5" stroke-linejoin="bevel"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

16
src/gui/vector/qgsattributesformproperties.cpp
View File

@ -696,40 +696,30 @@ void QgsAttributesFormProperties::mEditorLayoutComboBox_currentIndexChanged( int
{
case Qgis::AttributeFormLayout::AutoGenerated:
mFormLayoutWidget->setVisible( false );
mTreeViewHorizontalSpacer->changeSize( 0, 20, QSizePolicy::Fixed, QSizePolicy::Fixed );
mUiFileFrame->setVisible( false );
mAddContainerButton->setVisible( false );
mRemoveLayoutItemButton->setVisible( false );
mInvertSelectionButton->setVisible( false );
// Workaround to match the alignment of the
// Available Widgets panel with the horizontal row
// holding the search box (when Form Layout disappears)
searchBarLayout->setContentsMargins( 0, 0, 6, 0 );
break;
case Qgis::AttributeFormLayout::DragAndDrop:
mFormLayoutWidget->setVisible( true );
mTreeViewHorizontalSpacer->changeSize( 6, 20, QSizePolicy::Fixed, QSizePolicy::Fixed );
mUiFileFrame->setVisible( false );
mAddContainerButton->setVisible( true );
mRemoveLayoutItemButton->setVisible( true );
mInvertSelectionButton->setVisible( true );
// Match again the alignment of the tree view panels
searchBarLayout->setContentsMargins( 0, 0, 0, 0 );
break;
case Qgis::AttributeFormLayout::UiFile:
// ui file
mFormLayoutWidget->setVisible( false );
mTreeViewHorizontalSpacer->changeSize( 0, 20, QSizePolicy::Fixed, QSizePolicy::Fixed );
mUiFileFrame->setVisible( true );
mAddContainerButton->setVisible( false );
mRemoveLayoutItemButton->setVisible( false );
mInvertSelectionButton->setVisible( false );
// Workaround to match the alignment of the
// Available Widgets panel with the horizontal row
// holding the search box (when Form Layout disappears)
searchBarLayout->setContentsMargins( 0, 0, 6, 0 );
break;
}

161
src/ui/qgsattributesformproperties.ui
View File

@ -54,23 +54,6 @@
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="mShowAliasesButton">
<property name="toolTip">
<string>Show field aliases instead of names</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mIconFonts.svg</normaloff>:/images/themes/default/mIconFonts.svg</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="mTbInitCode">
<property name="toolTip">
@ -84,6 +67,12 @@ Use this function to add extra logic to your forms.</string>
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/processingScript.svg</normaloff>:/images/themes/default/processingScript.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</widget>
</item>
<item>
@ -129,6 +118,12 @@ Use this function to add extra logic to your forms.</string>
<property name="text">
<string>…</string>
</property>
<property name="iconSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</widget>
</item>
</layout>
@ -140,7 +135,7 @@ Use this function to add extra logic to your forms.</string>
<enum>Qt::Horizontal</enum>
</property>
<widget class="QWidget" name="widget" native="true">
<layout class="QGridLayout" name="gridLayout_3" columnstretch="0,0,0">
<layout class="QGridLayout" name="gridLayout_3">
<property name="leftMargin">
<number>0</number>
</property>
@ -153,7 +148,7 @@ Use this function to add extra logic to your forms.</string>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0" colspan="2">
<item row="0" column="0">
<layout class="QHBoxLayout" name="searchBarLayout">
<item>
<widget class="QgsFilterLineEdit" name="mSearchLineEdit">
@ -176,11 +171,34 @@ Use this function to add extra logic to your forms.</string>
</item>
</layout>
</item>
<item row="0" column="2" rowspan="2">
<item row="0" column="1" rowspan="2">
<layout class="QVBoxLayout" name="verticalLayout">
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<item>
<widget class="QToolButton" name="mShowAliasesButton">
<property name="toolTip">
<string>Show field aliases instead of names</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mToggleAliases.svg</normaloff>:/images/themes/default/mToggleAliases.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="mAddContainerButton">
<property name="toolTip">
@ -193,6 +211,12 @@ Use this function to add extra logic to your forms.</string>
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</widget>
</item>
<item>
@ -207,6 +231,12 @@ Use this function to add extra logic to your forms.</string>
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</widget>
</item>
<item>
@ -221,6 +251,12 @@ Use this function to add extra logic to your forms.</string>
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionInvertSelection.svg</normaloff>:/images/themes/default/mActionInvertSelection.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</widget>
</item>
<item>
@ -239,36 +275,59 @@ Use this function to add extra logic to your forms.</string>
</layout>
</item>
<item row="1" column="0">
<widget class="QWidget" name="mAvailableWidgetsWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="spacing">
<number>0</number>
</property>
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QWidget" name="mFormLayoutWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
</widget>
<item>
<widget class="QWidget" name="mAvailableWidgetsWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item>
<spacer name="mTreeViewHorizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>6</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QWidget" name="mFormLayoutWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
@ -287,7 +346,7 @@ Use this function to add extra logic to your forms.</string>
<rect>
<x>0</x>
<y>0</y>
<width>87</width>
<width>86</width>
<height>488</height>
</rect>
</property>
@ -325,12 +384,12 @@ Use this function to add extra logic to your forms.</string>
</customwidgets>
<tabstops>
<tabstop>mEditorLayoutComboBox</tabstop>
<tabstop>mShowAliasesButton</tabstop>
<tabstop>mTbInitCode</tabstop>
<tabstop>mFormSuppressCmbBx</tabstop>
<tabstop>mEditFormLineEdit</tabstop>
<tabstop>pbnSelectEditForm</tabstop>
<tabstop>mSearchLineEdit</tabstop>
<tabstop>mShowAliasesButton</tabstop>
<tabstop>mAddContainerButton</tabstop>
<tabstop>mRemoveLayoutItemButton</tabstop>
<tabstop>mInvertSelectionButton</tabstop>