Skip to content

Reimplement toolbar with regular boxes and buttons #166

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.

Sign up for GitHub

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

Open
andy128k wants to merge 1 commit into
base: master
Choose a base branch
from
+234 −152
Open

Reimplement toolbar with regular boxes and buttons #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
263 changes: 147 additions & 116 deletions gtk/gtkbuilder/window_main.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,179 +20,210 @@
<object class="GtkBox" id="hbox_button_toolbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">horizontal</property>
<property name="spacing">10</property>
<child>
<object class="GtkToolbar" id="toolbar_main">
<object class="GtkButton">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<property name="relief">GTK_RELIEF_NONE</property>
<property name="tooltip-text" translatable="yes">Reload the package information to become informed about new, removed or upgraded software packages.</property>
<property name="use_underline">True</property>
<property name="action-name">win.reload</property>
<child>
<object class="GtkToolButton">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="is_important">True</property>
<property name="label" translatable="yes">Reload</property>
<property name="tooltip-text" translatable="yes">Reload the package information to become informed about new, removed or upgraded software packages.</property>
<property name="use_underline">True</property>
<property name="icon_name">view-refresh</property>
<property name="action-name">win.reload</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="is_important">True</property>
<property name="label" translatable="yes">Mark All Upgrades</property>
<property name="tooltip-text" translatable="yes">Mark all possible upgrades</property>
<property name="use_underline">True</property>
<property name="icon-name">system-upgrade</property>
<property name="action-name">win.mark-all-upgrades</property>
<property name="spacing">6</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="icon_name">view-refresh</property>
</object>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Reload</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
<object class="GtkButton">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="relief">GTK_RELIEF_NONE</property>
<property name="tooltip-text" translatable="yes">Mark all possible upgrades</property>
<property name="use_underline">True</property>
<property name="action-name">win.mark-all-upgrades</property>
<child>
<object class="GtkToolButton">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="is_important">True</property>
<property name="label" translatable="yes">Apply</property>
<property name="tooltip-text" translatable="yes">Apply all marked changes</property>
<property name="use_underline">True</property>
<property name="icon_name">system-run</property>
<property name="action-name">win.apply</property>
<property name="spacing">6</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="icon_name">system-upgrade</property>
</object>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Mark All Upgrades</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
<property name="expand">False</property>
</packing>
</child>
<child type="center">
<object class="GtkToolbar" id="toolbar_filter">
<child>
<object class="GtkButton">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="halign">start</property>
<property name="relief">GTK_RELIEF_NONE</property>
<property name="tooltip-text" translatable="yes">Apply all marked changes</property>
<property name="use_underline">True</property>
<property name="action-name">win.apply</property>
<child>
<object class="GtkToolItem" id="toolitem_fast_search">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="spacing">6</property>
<child>
<object class="GtkBox" id="vbox_fast_search">
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="label_fast_search">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Quick filter</property>
<property name="ellipsize">end</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSearchEntry" id="entry_fast_search">
<property name="width_request">200</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<property name="icon_name">system-run</property>
</object>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Apply</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">False</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkToolbar" id="toolbar_search">
<object class="GtkBox" id="toolbar_filter">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<child>
<object class="GtkToolButton" id="button_details">
<object class="GtkLabel" id="label_fast_search">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="is_important">True</property>
<property name="label" translatable="yes">Properties</property>
<property name="tooltip-text" translatable="yes">View package properties</property>
<property name="use_underline">True</property>
<property name="icon_name">document-properties</property>
<property name="action-name">win.package-properties</property>
<property name="label" translatable="yes">Quick filter</property>
<property name="ellipsize">end</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
<property name="expand">True</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkToolButton">
<object class="GtkSearchEntry" id="entry_fast_search">
<property name="width_request">200</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="is_important">True</property>
<property name="label" translatable="yes">Search</property>
<property name="tooltip-text" translatable="yes">Search for packages</property>
<property name="use_underline">True</property>
<property name="icon_name">edit-find</property>
<property name="action-name">win.search</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
<style>
<class name="primary-toolbar"/>
Copy link
Owner

@mvo5 mvo5 Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might be a silly question(sorry!) but should we keep the primary-toolbar style here? Or is there a deeper reason for removing it?

</style>
<child>
<object class="GtkButton" id="button_details">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="relief">GTK_RELIEF_NONE</property>
<property name="tooltip-text" translatable="yes">View package properties</property>
<property name="use_underline">True</property>
<property name="action-name">win.package-properties</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="icon_name">document-properties</property>
</object>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Properties</property>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
<object class="GtkButton">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="relief">GTK_RELIEF_NONE</property>
<property name="tooltip-text" translatable="yes">Search for packages</property>
<property name="use_underline">True</property>
<property name="action-name">win.search</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="icon_name">edit-find</property>
</object>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Search</property>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
Expand Down
Loading