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.

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

fixed paths in resources #958

Merged
merged 1 commit into from
Feb 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions libqf/libqfqmlwidgets/src/framework/logwidget.ui
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<string>Clear</string>
</property>
<property name="icon">
<iconset resource="../../images/flat/flat.qrc">
<iconset resource="../../images/flat/qfqmlwidgets_flat.qrc">
<normaloff>:/qf/qmlwidgets/images/flat/delete.svg</normaloff>:/qf/qmlwidgets/images/flat/delete.svg</iconset>
</property>
<property name="autoRaise">
Expand Down Expand Up @@ -102,7 +102,7 @@
<string>Resize columns to fit content</string>
</property>
<property name="icon">
<iconset resource="../../images/flat/flat.qrc">
<iconset resource="../../images/flat/qfqmlwidgets_flat.qrc">
<normaloff>:/qf/qmlwidgets/images/flat/zoom_fitwidth.svg</normaloff>:/qf/qmlwidgets/images/flat/zoom_fitwidth.svg</iconset>
</property>
<property name="autoRaise">
Expand All @@ -119,7 +119,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../images/flat/flat.qrc">
<iconset resource="../../images/flat/qfqmlwidgets_flat.qrc">
<normaloff>:/qf/qmlwidgets/images/flat/settings.svg</normaloff>:/qf/qmlwidgets/images/flat/settings.svg</iconset>
</property>
<property name="popupMode">
Expand Down Expand Up @@ -159,7 +159,7 @@
</customwidgets>
<resources>
<include location="../../images/images.qrc"/>
<include location="../../images/flat/flat.qrc"/>
<include location="../../images/flat/qfqmlwidgets_flat.qrc"/>
</resources>
<connections/>
</ui>
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@
<item>
<widget class="QPushButton" name="btPlay">
<property name="icon">
<iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc">
<iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc">
<normaloff>:/qf/qmlwidgets/images/flat/media-play.svg</normaloff>:/qf/qmlwidgets/images/flat/media-play.svg</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btShowDetail">
<property name="icon">
<iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc">
<iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc">
<normaloff>:/qf/qmlwidgets/images/flat/settings.svg</normaloff>:/qf/qmlwidgets/images/flat/settings.svg</iconset>
</property>
</widget>
Expand All @@ -79,7 +79,7 @@
</widget>
<resources>
<include location="../../../../../../libqf/libqfcore/images/images.qrc"/>
<include location="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc"/>
<include location="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc"/>
</resources>
<connections/>
</ui>
12 changes: 6 additions & 6 deletions quickevent/app/quickevent/plugins/Relays/src/relaywidget.ui
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
<string>Add leg Ctrl+Ins</string>
</property>
<property name="icon">
<iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc">
<iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc">
<normaloff>:/qf/qmlwidgets/images/flat/insert-row.svg</normaloff>:/qf/qmlwidgets/images/flat/insert-row.svg</iconset>
</property>
<property name="shortcut">
Expand All @@ -193,7 +193,7 @@
<string>Remove leg Ctrl+Del</string>
</property>
<property name="icon">
<iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc">
<iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc">
<normaloff>:/qf/qmlwidgets/images/flat/delete-row.svg</normaloff>:/qf/qmlwidgets/images/flat/delete-row.svg</iconset>
</property>
<property name="shortcut">
Expand All @@ -207,7 +207,7 @@
<string>Move leg down Ctrl+D</string>
</property>
<property name="icon">
<iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc">
<iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc">
<normaloff>:/qf/qmlwidgets/images/flat/down.svg</normaloff>:/qf/qmlwidgets/images/flat/down.svg</iconset>
</property>
<property name="shortcut">
Expand All @@ -221,7 +221,7 @@
<string>Move leg up Ctrl+U</string>
</property>
<property name="icon">
<iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc">
<iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc">
<normaloff>:/qf/qmlwidgets/images/flat/up.svg</normaloff>:/qf/qmlwidgets/images/flat/up.svg</iconset>
</property>
<property name="shortcut">
Expand All @@ -235,7 +235,7 @@
<string>Reload Ctrl+R</string>
</property>
<property name="icon">
<iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc">
<iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc">
<normaloff>:/qf/qmlwidgets/images/flat/reload.svg</normaloff>:/qf/qmlwidgets/images/flat/reload.svg</iconset>
</property>
<property name="shortcut">
Expand Down Expand Up @@ -287,7 +287,7 @@
<tabstop>tblLegs</tabstop>
</tabstops>
<resources>
<include location="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc"/>
<include location="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc"/>
</resources>
<connections/>
</ui>
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<string>Print results in selected rows</string>
</property>
<property name="icon">
<iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc">
<iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc">
<normaloff>:/qf/qmlwidgets/images/flat/printer.svg</normaloff>:/qf/qmlwidgets/images/flat/printer.svg</iconset>
</property>
<property name="autoRaise">
Expand All @@ -87,7 +87,7 @@
<string>Clear new results in selected rows</string>
</property>
<property name="icon">
<iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc">
<iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc">
<normaloff>:/qf/qmlwidgets/images/flat/delete.svg</normaloff>:/qf/qmlwidgets/images/flat/delete.svg</iconset>
</property>
<property name="autoRaise">
Expand All @@ -101,7 +101,7 @@
<string>Reload table</string>
</property>
<property name="icon">
<iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc">
<iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc">
<normaloff>:/qf/qmlwidgets/images/flat/reload.svg</normaloff>:/qf/qmlwidgets/images/flat/reload.svg</iconset>
</property>
<property name="autoRaise">
Expand All @@ -115,7 +115,7 @@
<string>Options</string>
</property>
<property name="icon">
<iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc">
<iconset resource="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc">
<normaloff>:/qf/qmlwidgets/images/flat/settings.svg</normaloff>:/qf/qmlwidgets/images/flat/settings.svg</iconset>
</property>
<property name="autoRaise">
Expand Down Expand Up @@ -159,7 +159,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../../../../libqf/libqfqmlwidgets/images/flat/flat.qrc"/>
<include location="../../../../../../libqf/libqfqmlwidgets/images/flat/qfqmlwidgets_flat.qrc"/>
<include location="../Runs.qrc"/>
</resources>
<connections/>
Expand Down
Loading