Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename save_vertices.png to icon_save.png for consistency #248

Merged
merged 5 commits into from
May 10, 2024
Merged

Rename save_vertices.png to icon_save.png for consistency #248

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0a1a03f
fix: rename icon file
merydian May 10, 2024
960b644
style: change import names to correspond to new file name
merydian May 10, 2024
5dec018
style: recompile resources
merydian May 10, 2024
b3bd55f
style: run ruff
merydian May 10, 2024
f263510
fix: remove stdset again
merydian May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ORStools/gui/ORStoolsDialogUI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ def setupUi(self, ORStoolsDialogBase):
self.save_vertices.setSizePolicy(sizePolicy)
self.save_vertices.setText("")
icon4 = QtGui.QIcon()
icon4.addPixmap(QtGui.QPixmap(":/plugins/ORStools/img/save_vertices.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
icon4.addPixmap(QtGui.QPixmap(":/plugins/ORStools/img/icon_save.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.save_vertices.setIcon(icon4)
self.save_vertices.setObjectName("save_vertices")
self.gridLayout.addWidget(self.save_vertices, 2, 0, 1, 1)
Expand Down
28 changes: 14 additions & 14 deletions ORStools/gui/ORStoolsDialogUI.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@
</property>
<property name="icon">
<iconset resource="resources.qrc">
<normaloff>:/plugins/ORStools/img/save_vertices.png</normaloff>:/plugins/ORStools/img/save_vertices.png</iconset>
<normaloff>:/plugins/ORStools/img/icon_save.png</normaloff>:/plugins/ORStools/img/icon_save.png</iconset>
</property>
</widget>
</item>
Expand Down Expand Up @@ -387,10 +387,10 @@
<property name="checked">
<bool>false</bool>
</property>
<property name="collapsed">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you have an explanation what these stdset="0" do?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oversaw that this changed... They appear to set the standard value for the property, with 0 meaning False. Should i remove them again? I think they appeared after saving in QtCreator.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. I guess so, since we don't want a value set?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

<property name="collapsed" stdset="0">
<bool>true</bool>
</property>
<property name="saveCollapsedState">
<property name="saveCollapsedState" stdset="0">
<bool>false</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
Expand Down Expand Up @@ -429,10 +429,10 @@
<property name="checked">
<bool>false</bool>
</property>
<property name="collapsed">
<property name="collapsed" stdset="0">
<bool>true</bool>
</property>
<property name="saveCollapsedState">
<property name="saveCollapsedState" stdset="0">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_2" columnstretch="0,0,0,0">
Expand Down Expand Up @@ -541,10 +541,10 @@ p, li { white-space: pre-wrap; }
<property name="checked">
<bool>false</bool>
</property>
<property name="collapsed">
<property name="collapsed" stdset="0">
<bool>true</bool>
</property>
<property name="saveCollapsedState">
<property name="saveCollapsedState" stdset="0">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_4">
Expand Down Expand Up @@ -615,10 +615,10 @@ p, li { white-space: pre-wrap; }
<property name="checked">
<bool>false</bool>
</property>
<property name="collapsed">
<property name="collapsed" stdset="0">
<bool>true</bool>
</property>
<property name="saveCollapsedState">
<property name="saveCollapsedState" stdset="0">
<bool>false</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
Expand Down Expand Up @@ -661,10 +661,10 @@ p, li { white-space: pre-wrap; }
<property name="checked">
<bool>false</bool>
</property>
<property name="collapsed">
<property name="collapsed" stdset="0">
<bool>true</bool>
</property>
<property name="saveCollapsedState">
<property name="saveCollapsedState" stdset="0">
<bool>false</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
Expand All @@ -673,7 +673,7 @@ p, li { white-space: pre-wrap; }
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Avoid areas by specifying a (Multi-)Polygon layer. &lt;/p&gt;&lt;p&gt;Does &lt;span style=&quot; font-weight:600;&quot;&gt;not work&lt;/span&gt; for memory (scratch) Polygon layers!&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Note&lt;/span&gt;, only the first feature of the layer will be respected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="showCrs">
<property name="showCrs" stdset="0">
<bool>false</bool>
</property>
</widget>
Expand Down Expand Up @@ -821,10 +821,10 @@ p, li { white-space: pre-wrap; }
<property name="flat">
<bool>true</bool>
</property>
<property name="collapsed">
<property name="collapsed" stdset="0">
<bool>true</bool>
</property>
<property name="saveCollapsedState">
<property name="saveCollapsedState" stdset="0">
<bool>false</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
Expand Down
0 ORStools/gui/img/save_vertices.png → ORStools/gui/img/icon_save.png
View file
Open in desktop
File renamed without changes
2 changes: 1 addition & 1 deletion ORStools/gui/resources.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<RCC>
<qresource prefix="/plugins/ORStools">
<file>img/save_vertices.png</file>
<file>img/icon_save.png</file>
<file>img/logo_heigit_300.png</file>
<file>img/icon_add.png</file>
<file>img/icon_refresh.png</file>
Expand Down
Loading
Loading