summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/css/Adwaita.css5
-rw-r--r--src/resources/ui/nautilus-toolbar.ui188
2 files changed, 112 insertions, 81 deletions
diff --git a/src/resources/css/Adwaita.css b/src/resources/css/Adwaita.css
index 4edefa206..a05f44e27 100644
--- a/src/resources/css/Adwaita.css
+++ b/src/resources/css/Adwaita.css
@@ -29,6 +29,11 @@
background: none;
}
+.disclosure-button > * {
+ padding-left: 4px;
+ padding-right: 4px;
+}
+
/* Path bar */
.nautilus-path-bar > scrolledwindow {
diff --git a/src/resources/ui/nautilus-toolbar.ui b/src/resources/ui/nautilus-toolbar.ui
index 139764612..e9a101029 100644
--- a/src/resources/ui/nautilus-toolbar.ui
+++ b/src/resources/ui/nautilus-toolbar.ui
@@ -130,6 +130,7 @@
<property name="focusable">False</property>
<child type="title">
<object class="GtkBox" id="header_toolbar">
+ <property name="width_request">270</property>
<property name="spacing">6</property>
<child>
<object class="GtkStack" id="toolbar_switcher">
@@ -190,112 +191,137 @@
</object>
</child>
<child type="start">
- <object class="GtkButton" id="back_button">
- <property name="focusable">True</property>
- <property name="tooltip_text" translatable="yes">Go back</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
- <property name="action_name">win.back</property>
+ <object class="GtkBox" id="navigation_box">
<child>
- <object class="GtkImage" id="back_icon">
- <property name="icon_name">go-previous-symbolic</property>
- <property name="icon_size">1</property>
+ <object class="GtkButton" id="back_button">
+ <property name="focusable">True</property>
+ <property name="tooltip_text" translatable="yes">Go back</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="action_name">win.back</property>
+ <child>
+ <object class="GtkImage" id="back_icon">
+ <property name="icon_name">go-previous-symbolic</property>
+ <property name="icon_size">1</property>
+ </object>
+ </child>
+ <style>
+ <class name="image-button"/>
+ </style>
</object>
</child>
- <style>
- <class name="image-button"/>
- </style>
- </object>
- </child>
- <child type="start">
- <object class="GtkButton" id="forward_button">
- <property name="focusable">True</property>
- <property name="tooltip_text" translatable="yes">Go forward</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
- <property name="action_name">win.forward</property>
<child>
- <object class="GtkImage" id="forward_icon">
- <property name="icon_name">go-next-symbolic</property>
- <property name="icon_size">1</property>
+ <object class="GtkButton" id="forward_button">
+ <property name="focusable">True</property>
+ <property name="tooltip_text" translatable="yes">Go forward</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="action_name">win.forward</property>
+ <child>
+ <object class="GtkImage" id="forward_icon">
+ <property name="icon_name">go-next-symbolic</property>
+ <property name="icon_size">1</property>
+ </object>
+ </child>
+ <style>
+ <class name="image-button"/>
+ </style>
</object>
</child>
<style>
- <class name="image-button"/>
- </style>
- </object>
- </child>
- <child type="start">
- <object class="GtkSeparator">
- <style>
- <class name="spacer"/>
+ <class name="linked"/>
+ <class name="raised"/>
</style>
</object>
</child>
<child type="end">
- <object class="GtkMenuButton" id="app_button">
- <property name="focusable">True</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
- <property name="menu-model">app_menu</property>
+ <object class="GtkBox">
+ <property name="margin_start">72</property>
<child>
- <object class="GtkImage">
- <property name="icon_name">open-menu-symbolic</property>
- <property name="icon_size">1</property>
+ <object class="GtkRevealer" id="operations_revealer">
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="transition_type">slide-right</property>
+ <property name="child">
+ <object class="GtkMenuButton" id="operations_button">
+ <property name="focusable">True</property>
+ <property name="tooltip_text" translatable="yes">Show operations</property>
+ <property name="margin_end">6</property>
+ <property name="popover">operations_popover</property>
+ <child>
+ <object class="GtkDrawingArea" id="operations_icon">
+ <property name="width_request">16</property>
+ <property name="height_request">16</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ </object>
+ </child>
+ <style>
+ <class name="button"/>
+ </style>
+ </object>
+ </property>
</object>
</child>
- <style>
- <class name="image-button"/>
- </style>
- </object>
- </child>
- <child type="end">
- <object class="AdwSplitButton" id="view_split_button">
- <property name="halign">center</property>
- <property name="valign">center</property>
- <property name="margin_end">6</property>
- <property name="focusable">True</property>
- <property name="tooltip_text" translatable="yes">Toggle view</property>
- <property name="action_name">slot.files-view-mode-toggle</property>
- <property name="menu-model">view_menu</property>
<child>
- <object class="GtkImage" id="view_toggle_icon">
- <property name="icon_size">1</property>
+ <object class="GtkBox">
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="margin_end">6</property>
+ <child>
+ <object class="GtkButton" id="view_toggle_button">
+ <property name="focusable">True</property>
+ <property name="tooltip_text" translatable="yes">Toggle view</property>
+ <property name="action_name">slot.files-view-mode-toggle</property>
+ <child>
+ <object class="GtkImage" id="view_toggle_icon">
+ <property name="icon_size">1</property>
+ </object>
+ </child>
+ <style>
+ <class name="image-button"/>
+ </style>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuButton" id="view_button">
+ <property name="focusable">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes" comments="“View” is a noun">View options</property>
+ <property name="halign">start</property>
+ <property name="menu-model">view_menu</property>
+ <child>
+ <object class="GtkImage">
+ <property name="icon_name">pan-down-symbolic</property>
+ </object>
+ </child>
+ <style>
+ <class name="disclosure-button"/>
+ </style>
+ </object>
+ </child>
+ <style>
+ <class name="linked"/>
+ </style>
</object>
</child>
- </object>
- </child>
- <child type="end">
- <object class="GtkRevealer" id="operations_revealer">
- <property name="halign">center</property>
- <property name="valign">center</property>
- <property name="transition_type">slide-right</property>
- <property name="child">
- <object class="GtkMenuButton" id="operations_button">
+ <child>
+ <object class="GtkMenuButton" id="app_button">
<property name="focusable">True</property>
- <property name="tooltip_text" translatable="yes">Show operations</property>
- <property name="margin_end">6</property>
- <property name="popover">operations_popover</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="menu-model">app_menu</property>
<child>
- <object class="GtkDrawingArea" id="operations_icon">
- <property name="width_request">16</property>
- <property name="height_request">16</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
+ <object class="GtkImage">
+ <property name="icon_name">open-menu-symbolic</property>
+ <property name="icon_size">1</property>
</object>
</child>
<style>
<class name="image-button"/>
</style>
</object>
- </property>
- </object>
- </child>
- <child type="end">
- <object class="GtkSeparator">
- <style>
- <class name="spacer"/>
- </style>
+ </child>
</object>
</child>
</object>
View Lorry Controller Status