Skip to content

Commit

Permalink
Merge branch 'fix/node-selector-search-filter' into 'release/v4.9.5'
Browse files Browse the repository at this point in the history 
SNC-3553 In node selector the search filter is not changing out from cloud drive

See merge request desktop/desktop!1995
  • Loading branch information
@eprivado
eprivado committed Jun 15, 2023
2 parents fc57292 + 2eb7c34 commit b399607
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 11 deletions.
9 changes: 9 additions & 0 deletions src/MEGASync/gui/node_selector/gui/linux/NodeSelectorTreeViewWidget.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,9 @@ QToolButton:pressed
<property name="hover_selected" stdset="0">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">searchFilterButtonGroup</string>
</attribute>
</widget>
</item>
<item>
Expand Down Expand Up @@ -469,6 +472,9 @@ QToolButton:pressed
<property name="hover_selected" stdset="0">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">searchFilterButtonGroup</string>
</attribute>
</widget>
</item>
<item>
Expand Down Expand Up @@ -507,6 +513,9 @@ QToolButton:pressed
<property name="hover_selected" stdset="0">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">searchFilterButtonGroup</string>
</attribute>
</widget>
</item>
</layout>
Expand Down
9 changes: 9 additions & 0 deletions src/MEGASync/gui/node_selector/gui/macx/NodeSelectorTreeViewWidget.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,9 @@ QToolButton:pressed
<property name="hover_selected" stdset="0">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">searchFilterButtonGroup</string>
</attribute>
</widget>
</item>
<item>
Expand Down Expand Up @@ -476,6 +479,9 @@ QToolButton:pressed
<property name="hover_selected" stdset="0">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">searchFilterButtonGroup</string>
</attribute>
</widget>
</item>
<item>
Expand Down Expand Up @@ -514,6 +520,9 @@ QToolButton:pressed
<property name="hover_selected" stdset="0">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">searchFilterButtonGroup</string>
</attribute>
</widget>
</item>
</layout>
Expand Down
28 changes: 17 additions & 11 deletions src/MEGASync/gui/node_selector/gui/win/NodeSelectorTreeViewWidget.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ min-height:32px;
<string/>
</property>
<property name="icon">
<iconset resource="../../../Resources_macx.qrc">
<iconset resource="../../../Resources_win.qrc">
<normaloff>:/images/node_selector/chevron-right-active.png</normaloff>
<disabledoff>:/images/node_selector/chevron-right.png</disabledoff>:/images/node_selector/chevron-right-active.png</iconset>
</property>
Expand Down Expand Up @@ -242,7 +242,7 @@ color:#3D3D3D;
<string/>
</property>
<property name="icon">
<iconset resource="../../../Resources_macx.qrc">
<iconset resource="../../../Resources_win.qrc">
<normaloff>:/images/node_selector/chevron-left-active.png</normaloff>
<disabledoff>:/images/node_selector/chevron-left.png</disabledoff>:/images/node_selector/chevron-left-active.png</iconset>
</property>
Expand Down Expand Up @@ -404,7 +404,7 @@ QToolButton:pressed
<string>Cloud drive</string>
</property>
<property name="icon">
<iconset resource="../../../Resources_macx.qrc">
<iconset resource="../../../Resources_win.qrc">
<normaloff>:/images/node_selector/search_filter/small_cloud_default.png</normaloff>:/images/node_selector/search_filter/small_cloud_default.png</iconset>
</property>
<property name="iconSize">
Expand Down Expand Up @@ -434,6 +434,9 @@ QToolButton:pressed
<property name="hover_selected" stdset="0">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">searchFilterButtonGroup</string>
</attribute>
</widget>
</item>
<item>
Expand All @@ -445,7 +448,7 @@ QToolButton:pressed
<string>Backups</string>
</property>
<property name="icon">
<iconset resource="../../../Resources_macx.qrc">
<iconset resource="../../../Resources_win.qrc">
<normaloff>:/images/node_selector/search_filter/small_database_default.png</normaloff>:/images/node_selector/search_filter/small_database_default.png</iconset>
</property>
<property name="iconSize">
Expand All @@ -472,6 +475,9 @@ QToolButton:pressed
<property name="hover_selected" stdset="0">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">searchFilterButtonGroup</string>
</attribute>
</widget>
</item>
<item>
Expand All @@ -483,7 +489,7 @@ QToolButton:pressed
<string>Incoming Shares</string>
</property>
<property name="icon">
<iconset resource="../../../Resources_macx.qrc">
<iconset resource="../../../Resources_win.qrc">
<normaloff>:/images/node_selector/search_filter/small_folder_default.png</normaloff>:/images/node_selector/search_filter/small_folder_default.png</iconset>
</property>
<property name="iconSize">
Expand All @@ -510,6 +516,9 @@ QToolButton:pressed
<property name="hover_selected" stdset="0">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">searchFilterButtonGroup</string>
</attribute>
</widget>
</item>
</layout>
Expand Down Expand Up @@ -785,7 +794,7 @@ QScrollBar::handle:vertical
<string notr="true"/>
</property>
<property name="icon">
<iconset resource="../../../Resources_macx.qrc">
<iconset resource="../../../Resources_win.qrc">
<normaloff>:/images/node_selector/view/cloud.png</normaloff>:/images/node_selector/view/cloud.png</iconset>
</property>
<property name="iconSize">
Expand Down Expand Up @@ -951,7 +960,7 @@ background-color:qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 #8D8D8D, stop:1 #
<string>New folder</string>
</property>
<property name="icon">
<iconset resource="../../../Resources_macx.qrc">
<iconset resource="../../../Resources_win.qrc">
<normaloff>:/images/node_selector/plus.png</normaloff>:/images/node_selector/plus.png</iconset>
</property>
<property name="iconSize">
Expand Down Expand Up @@ -1056,10 +1065,7 @@ color:#333333;
</customwidget>
</customwidgets>
<resources>
<include location="../../../Resources_macx.qrc"/>
<include location="../../../Resources_macx.qrc"/>
<include location="../../../Resources_macx.qrc"/>
<include location="../../../Resources_macx.qrc"/>
<include location="../../../Resources_win.qrc"/>
</resources>
<connections/>
<buttongroups>
Expand Down

0 comments on commit b399607

Please sign in to comment.