Skip to content

Commit

Permalink
Simplify UI files
Browse files Browse the repository at this point in the history
Refs: #159
  • Loading branch information
orontee committed Jul 22, 2024
1 parent bd2fea2 commit 406b4f7
Show file tree
Hide file tree
Showing 22 changed files with 495 additions and 1,057 deletions.
215 changes: 75 additions & 140 deletions argos/ui/album_details_box.ui

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions argos/ui/app_menu.ui
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@
</section>
<section>
<item>
<attribute name="label" translatable="yes">_Preferences</attribute>
<attribute name="action">app.show-preferences</attribute>
<attribute name="label" translatable="yes">_Preferences</attribute>
<attribute name="action">app.show-preferences</attribute>
</item>
<item>
<attribute name="label" translatable="yes">_Shortcuts</attribute>
<attribute name="action">win.show-help-overlay</attribute>
<attribute name="label" translatable="yes">_Shortcuts</attribute>
<attribute name="action">win.show-help-overlay</attribute>
</item>
<item>
<attribute name="label" translatable="yes">_About</attribute>
<attribute name="action">app.show-about-dialog</attribute>
<attribute name="label" translatable="yes">_About</attribute>
<attribute name="action">app.show-about-dialog</attribute>
</item>
</section>
</menu>
Expand Down
85 changes: 32 additions & 53 deletions argos/ui/condensed_playing_box.ui
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,19 @@
<interface>
<requires lib="gtk+" version="3.24"/>
<object class="GtkImage" id="next_image">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="visible">1</property>
<property name="icon-name">media-skip-forward-symbolic</property>
</object>
<object class="GtkImage" id="pause_image">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="visible">1</property>
<property name="icon-name">media-playback-pause-symbolic</property>
</object>
<object class="GtkImage" id="play_image">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="visible">1</property>
<property name="icon-name">media-playback-start-symbolic</property>
</object>
<object class="GtkImage" id="previous_image">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="visible">1</property>
<property name="icon-name">media-skip-backward-symbolic</property>
</object>
<template class="CondensedPlayingBox" parent="GtkBox">
Expand All @@ -29,19 +25,17 @@
<property name="spacing">5</property>
<child>
<object class="GtkEventBox" id="playing_track_image_event_box">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="visible">1</property>
<property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property>
<property name="visible-window">False</property>
<property name="above-child">True</property>
<property name="visible-window">0</property>
<property name="above-child">1</property>
<child>
<object class="GtkImage" id="playing_track_image">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="visible">1</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="icon-name">audio-x-generic</property>
<property name="icon_size">6</property>
<property name="icon-size">6</property>
</object>
</child>
</object>
Expand All @@ -54,70 +48,65 @@
<child>
<object class="GtkBox" id="playback_controls_box">
<property name="name">condensed-playing-box-playback-controls-box</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="visible">1</property>
<property name="halign">center</property>
<child>
<object class="GtkButton" id="prev_button">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="visible">1</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<property name="tooltip-text" translatable="yes">Previous</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="action-name">app.play-prev-track</property>
<property name="image">previous_image</property>
<property name="always-show-image">True</property>
<property name="always-show-image">1</property>
<style>
<class name="pill"/>
</style>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
<property name="expand">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="play_button">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="visible">1</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<property name="tooltip-text" translatable="yes">Play</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="action-name">app.toggle-playback-state</property>
<property name="image">play_image</property>
<property name="always-show-image">True</property>
<property name="always-show-image">1</property>
<style>
<class name="pill"/>
</style>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="expand">1</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="next_button">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="visible">1</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<property name="tooltip-text" translatable="yes">Next</property>
<property name="halign">start</property>
<property name="valign">center</property>
<property name="action-name">app.play-next-track</property>
<property name="image">next_image</property>
<property name="image-position">right</property>
<property name="always-show-image">True</property>
<property name="always-show-image">1</property>
<style>
<class name="pill"/>
</style>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="expand">1</property>
<property name="position">2</property>
</packing>
</child>
Expand All @@ -135,44 +124,34 @@
<child>
<object class="GtkBox" id="labels_box">
<property name="name">condensed-playing-box-labels-box</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="visible">1</property>
<property name="valign">center</property>
<property name="margin-start">10</property>
<property name="margin-end">10</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkLabel" id="track_name_label">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="visible">1</property>
<property name="halign">start</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="hexpand">1</property>
<property name="justify">center</property>
<property name="ellipsize">end</property>
<property name="single-line-mode">True</property>
<property name="single-line-mode">1</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="track_details_label">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="visible">1</property>
<property name="halign">start</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="hexpand">1</property>
<property name="justify">center</property>
<property name="ellipsize">end</property>
<property name="single-line-mode">True</property>
<property name="single-line-mode">1</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
Expand Down
34 changes: 17 additions & 17 deletions argos/ui/help_overlay.ui
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<object class="GtkShortcutsWindow" id="help_overlay">
<property name="modal">True</property>
<property name="modal">1</property>
<child>
<object class="GtkShortcutsSection">
<property name="visible">True</property>
<property name="visible">1</property>
<property name="section-name">shortcuts</property>
<property name="max-height">17</property>
<child>
<object class="GtkShortcutsGroup">
<property name="visible">True</property>
<property name="visible">1</property>
<property name="title" translatable="yes" context="shortcut window">General</property>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
<property name="visible">1</property>
<property name="title" translatable="yes" context="shortcut window">Close window</property>
<property name="accelerator">&lt;Primary&gt;W</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
<property name="visible">1</property>
<property name="title" translatable="yes" context="shortcut window">Quit</property>
<property name="accelerator">&lt;Primary&gt;Q</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
<property name="visible">1</property>
<property name="title" translatable="yes" context="shortcut window">Shortcuts</property>
<property name="accelerator">&lt;Primary&gt;question</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
<property name="visible">1</property>
<property name="title" translatable="yes" context="shortcut window">Fullscreen</property>
<property name="accelerator">F11</property>
</object>
Expand All @@ -43,32 +43,32 @@
</child>
<child>
<object class="GtkShortcutsGroup">
<property name="visible">True</property>
<property name="visible">1</property>
<property name="title" translatable="yes" context="shortcut window">Playback</property>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
<property name="visible">1</property>
<property name="title" translatable="yes" context="shortcut window">Play/Pause</property>
<property name="accelerator">&lt;Primary&gt;space</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
<property name="visible">1</property>
<property name="title" translatable="yes" context="shortcut window">Next track</property>
<property name="accelerator">&lt;Primary&gt;N</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
<property name="visible">1</property>
<property name="title" translatable="yes" context="shortcut window">Previous track</property>
<property name="accelerator">&lt;Primary&gt;P</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
<property name="visible">1</property>
<property name="title" translatable="yes" context="shortcut window">Play random album</property>
<property name="accelerator">&lt;Primary&gt;R</property>
</object>
Expand All @@ -77,32 +77,32 @@
</child>
<child>
<object class="GtkShortcutsGroup">
<property name="visible">True</property>
<property name="visible">1</property>
<property name="title" translatable="yes" context="shortcut window">Navigation</property>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
<property name="visible">1</property>
<property name="title" translatable="yes" context="shortcut window">Go to Playing</property>
<property name="accelerator">&lt;Alt&gt;1</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
<property name="visible">1</property>
<property name="title" translatable="yes" context="shortcut window">Go to Library</property>
<property name="accelerator">&lt;Alt&gt;2</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
<property name="visible">1</property>
<property name="title" translatable="yes" context="shortcut window">Go to Playlists</property>
<property name="accelerator">&lt;Alt&gt;3</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
<property name="visible">1</property>
<property name="title" translatable="yes" context="shortcut window">Go up</property>
<property name="accelerator">&lt;Alt&gt;Up</property>
</object>
Expand Down
24 changes: 7 additions & 17 deletions argos/ui/library_browsing_progress_box.ui
Original file line number Diff line number Diff line change
Expand Up @@ -11,36 +11,27 @@
<property name="spacing">5</property>
<child type="center">
<object class="GtkBox" id="central_box">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="visible">1</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkSpinner" id="progress_spinner">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="visible">1</property>
<property name="valign">end</property>
<property name="active">True</property>
<property name="active">1</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="progress_label">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="visible">1</property>
<property name="halign">center</property>
<property name="valign">start</property>
<property name="margin-start">5</property>
<property name="vexpand">True</property>
<property name="vexpand">1</property>
<property name="label" translatable="yes">Keep calm, library indexation in progress…</property>
<property name="justify">center</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="expand">1</property>
<property name="position">1</property>
</packing>
</child>
Expand All @@ -53,8 +44,7 @@
</child>
<child>
<object class="GtkProgressBar" id="progress_bar">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="visible">1</property>
</object>
<packing>
<property name="expand">False</property>
Expand Down
Loading

0 comments on commit 406b4f7

Please sign in to comment.