diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/nautilus-action-bar.c | 7 | ||||
-rw-r--r-- | src/resources/css/Adwaita.css | 18 | ||||
-rw-r--r-- | src/resources/ui/nautilus-action-bar.ui | 589 |
3 files changed, 448 insertions, 166 deletions
diff --git a/src/nautilus-action-bar.c b/src/nautilus-action-bar.c index 79e607c3d..e50d2fe5c 100644 --- a/src/nautilus-action-bar.c +++ b/src/nautilus-action-bar.c @@ -188,7 +188,7 @@ real_update_status (gpointer data) gtk_label_set_label (GTK_LABEL (actionbar->loading_label), nautilus_view_is_searching (actionbar->view) ? _("Searching") : _("Loading")); - gtk_stack_set_visible_child_name (GTK_STACK (actionbar->stack), "loading"); + gtk_stack_set_visible_child_name (GTK_STACK (actionbar->stack), "loading_bar"); } else { @@ -201,17 +201,18 @@ real_update_status (gpointer data) if (number_of_files == 0) { gtk_label_set_label (GTK_LABEL (actionbar->primary_label), ""); + gtk_stack_set_visible_child_name (GTK_STACK (actionbar->stack), "background_bar"); } else if (number_of_files == 1) { setup_single_file_selection (actionbar, selection->data); + gtk_stack_set_visible_child_name (GTK_STACK (actionbar->stack), "selection_bar"); } else { setup_multiple_files_selection (actionbar, selection); + gtk_stack_set_visible_child_name (GTK_STACK (actionbar->stack), "selection_bar"); } - - gtk_stack_set_visible_child_name (GTK_STACK (actionbar->stack), "main"); } actionbar->update_status_timeout_id = 0; diff --git a/src/resources/css/Adwaita.css b/src/resources/css/Adwaita.css index d4513e968..409e7b40a 100644 --- a/src/resources/css/Adwaita.css +++ b/src/resources/css/Adwaita.css @@ -225,3 +225,21 @@ actionbar /* Same as sidebar_bg_color in gtk */ background-color: mix(@theme_bg_color, @theme_base_color, 0.5); } + +actionbar button, +actionbar button:hover +{ + margin: 2px; + border-color: transparent; + border-width: 0px; + border-radius: 0px; +} + +actionbar button:hover +{ + background-image: none; + border-color: transparent; + box-shadow: none; + background-color: mix (@theme_bg_color, black, 0.06); + transition-duration: 100ms; +}
\ No newline at end of file diff --git a/src/resources/ui/nautilus-action-bar.ui b/src/resources/ui/nautilus-action-bar.ui index b5b8d10e4..219b0159f 100644 --- a/src/resources/ui/nautilus-action-bar.ui +++ b/src/resources/ui/nautilus-action-bar.ui @@ -5,191 +5,265 @@ <template class="NautilusActionBar" parent="GtkFrame"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="vexpand">False</property> <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> <object class="GtkStack" id="stack"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> <property name="border_width">0</property> <property name="transition_type">crossfade</property> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="border_width">4</property> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="hexpand">False</property> + <property name="spacing">4</property> <child> - <object class="GtkButton" id="cut_button"> + <object class="GtkButton"> + <property name="label" translatable="yes">Open</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">view.open-with-default-application</property> + <property name="relief">none</property> + <style> + <class name="flat"/> + </style> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="height_request">15</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + </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="label" translatable="yes">Cut</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Cut item</property> <property name="action_name">view.cut</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">edit-cut-symbolic</property> - </object> - </child> + <property name="relief">none</property> <style> - <class name="image-button"/> + <class name="flat"/> </style> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="height_request">15</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + </object> + <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">3</property> </packing> </child> <child> - <object class="GtkButton" id="copy_button"> + <object class="GtkButton"> + <property name="label" translatable="yes">Copy</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Copy item</property> <property name="action_name">view.copy</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">edit-copy-symbolic</property> - </object> - </child> + <property name="relief">none</property> <style> - <class name="image-button"/> + <class name="flat"/> </style> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="height_request">15</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + </object> + <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">5</property> </packing> </child> <child> - <object class="GtkButton" id="paste_button"> + <object class="GtkButton"> + <property name="label" translatable="yes">Star</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">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> + <property name="action_name">view.star</property> + <property name="relief">none</property> <style> - <class name="image-button"/> + <class name="flat"/> </style> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="height_request">15</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + </object> + <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">7</property> </packing> </child> <child> - <object class="GtkButton" id="rename_button"> + <object class="GtkButton"> + <property name="label" translatable="yes">Rename...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Rename the selected file</property> <property name="action_name">view.rename</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">document-edit-symbolic</property> - </object> - </child> + <property name="relief">none</property> <style> - <class name="image-button"/> + <class name="flat"/> </style> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">8</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="height_request">15</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + </object> + <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">9</property> </packing> </child> <child> <object class="GtkButton"> + <property name="label" translatable="yes">Move to Trash</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="action_name">view.star</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">non-starred-symbolic</property> - </object> - </child> + <property name="action_name">view.move-to-trash</property> + <property name="relief">none</property> <style> - <class name="image-button"/> + <class name="flat"/> </style> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">10</property> </packing> </child> - <style> - <class name="border-box"/> - <class name="linked"/> - </style> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox"> + <object class="GtkBox" id="info-selection"> + <property name="width_request">180</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="spacing">6</property> - <property name="homogeneous">True</property> + <property name="margin_left">25</property> <child> - <object class="GtkButton" id="move_to_button"> - <property name="label" translatable="yes">New Folder…</property> + <object class="GtkButton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Create a folder in the current view</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">window-close-symbolic</property> + </object> + </child> + <style> + <class name="image-button"/> + <class name="flat"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="pack_type">end</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkButton"> - <property name="label" translatable="yes">Open</property> + <object class="GtkSeparator"> + <property name="height_request">15</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Open the selected items</property> - <property name="action_name">view.open-with-default-application</property> + <property name="can_focus">False</property> + <property name="valign">center</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="primary_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_right">6</property> + <property name="label" translatable="yes">org.nautilus.flatpakref</property> + <property name="ellipsize">middle</property> + <property name="single_line_mode">True</property> + <property name="xalign">1</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">2</property> </packing> </child> </object> @@ -201,49 +275,64 @@ </packing> </child> <child> - <object class="GtkMenuButton"> + <object class="GtkSeparator"> + <property name="height_request">15</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">View more actions</property> - <property name="margin_right">6</property> - <property name="menu_model">selection-menu</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">view-more-symbolic</property> - </object> - </child> - <style> - <class name="image-button"/> - </style> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="margin_left">2</property> + <property name="margin_right">2</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> <property name="position">2</property> </packing> </child> <child> - <object class="GtkButton" id="trash_button2"> + <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Move to trash</property> - <property name="margin_left">6</property> - <property name="action_name">view.move-to-trash</property> + <property name="can_focus">False</property> <child> - <object class="GtkImage"> + <object class="GtkSeparator"> + <property name="height_request">15</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">user-trash-symbolic</property> + <property name="valign">center</property> + <property name="margin_left">2</property> + <property name="margin_right">2</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</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="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">view-more-symbolic</property> + </object> + </child> + <style> + <class name="flat"/> + <class name="image-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> - <style> - <class name="image-button"/> - </style> </object> <packing> <property name="expand">False</property> @@ -251,27 +340,10 @@ <property name="position">3</property> </packing> </child> - <child> - <object class="GtkLabel" id="primary_label"> - <property name="width_request">200</property> - <property name="height_request">-1</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="margin_right">12</property> - <property name="margin_start">12</property> - <property name="margin_end">12</property> - <property name="ellipsize">middle</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> </object> <packing> - <property name="name">main</property> + <property name="name">selection_bar</property> + <property name="title" translatable="yes">page0</property> </packing> </child> <child> @@ -279,7 +351,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="border_width">6</property> <property name="spacing">6</property> <child> <object class="GtkSpinner"> @@ -311,6 +382,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="action_name">view.stop-loading</property> + <property name="relief">none</property> <child> <object class="GtkImage"> <property name="visible">True</property> @@ -318,6 +390,11 @@ <property name="icon_name">process-stop-symbolic</property> </object> </child> + <style> + <class name="image-button"/> + <class name="circle"/> + <class name="flat"/> + </style> </object> <packing> <property name="expand">False</property> @@ -328,44 +405,230 @@ </child> </object> <packing> - <property name="name">loading</property> + <property name="name">loading_bar</property> <property name="position">1</property> </packing> </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">4</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">New Folder...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">view.new-folder</property> + <property name="relief">none</property> + <style> + <class name="flat"/> + </style> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="height_request">15</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="paste_button"> + <property name="label" translatable="yes">Paste</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">view.paste</property> + <property name="relief">none</property> + <style> + <class name="flat"/> + </style> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="height_request">15</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">Select All</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">view.select-all</property> + <property name="relief">none</property> + <style> + <class name="flat"/> + </style> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="height_request">15</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">Properties</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">view.properties</property> + <property name="relief">none</property> + <style> + <class name="flat"/> + </style> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="height_request">15</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="margin_left">2</property> + <property name="margin_right">2</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator"> + <property name="height_request">15</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="margin_left">2</property> + <property name="margin_right">2</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</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="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">view-more-symbolic</property> + </object> + </child> + <style> + <class name="flat"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkBox" id="info-placeholder"> + <property name="width_request">180</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_left">25</property> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="name">background_bar</property> + <property name="title" translatable="yes">page1</property> + <property name="position">2</property> + </packing> + </child> </object> </child> </template> - - <menu id="selection-menu"> - <section> - <item> - <attribute name="label" translatable="yes">Open in New Window</attribute> - <attribute name="action">view.open-item-new-window</attribute> - </item> - <item> - <attribute name="label" translatable="yes">Open in New Tab</attribute> - <attribute name="action">view.open-item-new-tab</attribute> - </item> - </section> - <section> - <item> - <attribute name="label" translatable="yes">Copy To…</attribute> - <attribute name="action">view.copy-to</attribute> - </item> - <item> - <attribute name="label" translatable="yes">Move To…</attribute> - <attribute name="action">view.move-to</attribute> - </item> - <item> - <attribute name="label" translatable="yes">New Folder With Selection…</attribute> - <attribute name="action">view.new-folder-with-selection</attribute> - </item> - </section> - <section> - <item> - <attribute name="label" translatable="yes">Properties</attribute> - <attribute name="action">view.properties</attribute> - </item> - </section> - </menu> </interface> |