[nautilus/path-bar-discoverability] toolbar: Trying to improve path bar discoverability
- From: Carlos Soriano <csoriano src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/path-bar-discoverability] toolbar: Trying to improve path bar discoverability
- Date: Mon, 14 Jan 2019 16:52:10 +0000 (UTC)
commit 2c266876fc1a1b2173dfd9fe648974f37c61a073
Author: Carlos Soriano <csoriano redhat com>
Date: Mon Jan 14 17:45:00 2019 +0100
toolbar: Trying to improve path bar discoverability
Fixes: https://gitlab.gnome.org/GNOME/nautilus/issues/734
src/nautilus-pathbar.c | 4 +-
src/resources/ui/nautilus-toolbar.ui | 198 +++++++++++++++++++++++++----------
2 files changed, 147 insertions(+), 55 deletions(-)
---
diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c
index 2723ab62c..008e00116 100644
--- a/src/nautilus-pathbar.c
+++ b/src/nautilus-pathbar.c
@@ -1585,7 +1585,7 @@ make_button_data (NautilusPathBar *self,
{
button_data->label = gtk_label_new (NULL);
child = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
- button_data->disclosure_arrow = gtk_image_new_from_icon_name ("pan-down-symbolic",
+ button_data->disclosure_arrow = gtk_image_new_from_icon_name ("view-more-symbolic",
GTK_ICON_SIZE_MENU);
button_data->container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start (GTK_BOX (button_data->container), button_data->button, FALSE, FALSE, 0);
@@ -1606,7 +1606,7 @@ make_button_data (NautilusPathBar *self,
gtk_style_context_add_class (gtk_widget_get_style_context (separator_label), "dim-label");
button_data->label = gtk_label_new (NULL);
child = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
- button_data->disclosure_arrow = gtk_image_new_from_icon_name ("pan-down-symbolic",
+ button_data->disclosure_arrow = gtk_image_new_from_icon_name ("view-more-symbolic",
GTK_ICON_SIZE_MENU);
button_data->container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start (GTK_BOX (button_data->container), separator_label, FALSE, FALSE, 0);
diff --git a/src/resources/ui/nautilus-toolbar.ui b/src/resources/ui/nautilus-toolbar.ui
index e5b8b4771..97c7e4376 100644
--- a/src/resources/ui/nautilus-toolbar.ui
+++ b/src/resources/ui/nautilus-toolbar.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.22.0 -->
<interface>
<requires lib="gtk+" version="3.22"/>
<object class="GtkPopoverMenu" id="app_menu">
@@ -13,6 +13,95 @@
<property name="margin_top">10</property>
<property name="margin_bottom">10</property>
<property name="orientation">vertical</property>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_bottom">6</property>
+ <child>
+ <object class="GtkButton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="hexpand">True</property>
+ <property name="action_name">view.new-folder</property>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">folder-new-symbolic</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="hexpand">True</property>
+ <property name="action_name">view.paste</property>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">edit-paste-symbolic</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="hexpand">True</property>
+ <property name="action_name">win.bookmark-current-location</property>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">bookmark-new-symbolic</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <style>
+ <class name="linked"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparator">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
@@ -24,7 +113,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -38,7 +127,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -49,7 +138,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
@@ -63,7 +152,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">5</property>
</packing>
</child>
<child>
@@ -74,7 +163,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">6</property>
</packing>
</child>
<child>
@@ -88,7 +177,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">7</property>
</packing>
</child>
<child>
@@ -102,7 +191,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">6</property>
+ <property name="position">8</property>
</packing>
</child>
<child>
@@ -116,7 +205,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">7</property>
+ <property name="position">9</property>
</packing>
</child>
<child>
@@ -130,9 +219,12 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">8</property>
+ <property name="position">10</property>
</packing>
</child>
+ <style>
+ <class name="linked"/>
+ </style>
</object>
<packing>
<property name="submenu">main</property>
@@ -276,28 +368,20 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_close_button">True</property>
- <child>
- <object class="GtkBox" id="navigation_box">
+ <child type="title">
+ <object class="GtkBox" id="header_toolbar">
+ <property name="width_request">270</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkButton" id="back_button">
+ <object class="GtkBox" id="toolbar_switcher_container">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Go back</property>
- <property name="action_name">win.back</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkImage" id="back_icon">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">go-previous-symbolic</property>
- <property name="icon_size">1</property>
- </object>
+ <placeholder/>
</child>
- <style>
- <class name="image-button"/>
- </style>
</object>
<packing>
<property name="expand">False</property>
@@ -306,17 +390,17 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="forward_button">
+ <object class="GtkToggleButton" id="search_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Go forward</property>
- <property name="action_name">win.forward</property>
+ <property name="tooltip_text" translatable="yes">Search</property>
+ <property name="action_name">slot.search-visible</property>
<child>
- <object class="GtkImage" id="forward_icon">
+ <object class="GtkImage" id="search_icon">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon_name">go-next-symbolic</property>
+ <property name="icon_name">edit-find-symbolic</property>
<property name="icon_size">1</property>
</object>
</child>
@@ -327,29 +411,36 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
- <style>
- <class name="linked"/>
- <class name="raised"/>
- </style>
</object>
+ <packing>
+ <property name="pack_type">end</property>
+ </packing>
</child>
- <child type="title">
- <object class="GtkBox" id="header_toolbar">
- <property name="width_request">270</property>
+ <child>
+ <object class="GtkBox" id="navigation_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkBox" id="toolbar_switcher_container">
+ <object class="GtkButton" id="back_button">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Go back</property>
+ <property name="action_name">win.back</property>
<child>
- <placeholder/>
+ <object class="GtkImage" id="back_icon">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">go-previous-symbolic</property>
+ <property name="icon_size">1</property>
+ </object>
</child>
+ <style>
+ <class name="image-button"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
@@ -358,17 +449,17 @@
</packing>
</child>
<child>
- <object class="GtkToggleButton" id="search_button">
+ <object class="GtkButton" id="forward_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Search</property>
- <property name="action_name">slot.search-visible</property>
+ <property name="tooltip_text" translatable="yes">Go forward</property>
+ <property name="action_name">win.forward</property>
<child>
- <object class="GtkImage" id="search_icon">
+ <object class="GtkImage" id="forward_icon">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon_name">edit-find-symbolic</property>
+ <property name="icon_name">go-next-symbolic</property>
<property name="icon_size">1</property>
</object>
</child>
@@ -379,13 +470,14 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="linked"/>
+ <class name="raised"/>
+ </style>
</object>
- <packing>
- <property name="pack_type">end</property>
- </packing>
</child>
<child>
<object class="GtkBox">
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
