Skip to content

Commit

Permalink
design makeover
Browse files Browse the repository at this point in the history
  • Loading branch information
@GabMus
GabMus committed Feb 14, 2018
1 parent efe4c07 commit 26b5a7b
Show file tree
Hide file tree
Showing 4 changed files with 266 additions and 97 deletions.
1 change: 1 addition & 0 deletions data/org.gabmus.hydrapaper.appdata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<release version="1.2" timestamp="1516974888">
<description>
<ul>
<li>Design makeover</li>
<li>Added longpress/rightclick menu</li>
<li>Implemented favorites</li>
<li>Added option to temporarely disable paths</li>
Expand Down
291 changes: 212 additions & 79 deletions data/ui/ui.glade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,54 @@ Author: Gabriele Musco
</object>
</child>
</object>
<object class="GtkButtonBox" id="wallpapersFoldersActionbarButtonbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="layout_style">expand</property>
<child>
<object class="GtkButton" id="addWallpapersPath">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Add</property>
<signal name="clicked" handler="on_addWallpapersPath_clicked" swapped="no"/>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">add</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="removeWallpapersPath">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Remove</property>
<signal name="clicked" handler="remove_wallpaper_folder" swapped="no"/>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">remove</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<object class="GtkApplicationWindow" id="window">
<property name="can_focus">False</property>
<property name="default_width">600</property>
Expand Down Expand Up @@ -161,17 +209,7 @@ Author: Gabriele Musco
</packing>
</child>
<child>
<object class="GtkStackSwitcher" id="mainStackSwitcher">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="stack">mainStack</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
<placeholder/>
</child>
<child>
<object class="GtkStack" id="mainStack">
Expand Down Expand Up @@ -284,42 +322,20 @@ Author: Gabriele Musco
<object class="GtkHeaderBar" id="headerbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_subtitle">False</property>
<property name="show_close_button">True</property>
<child>
<object class="GtkToggleButton" id="wallpapersFoldersToggle">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Wallpapers folders</property>
<property name="always_show_image">True</property>
<signal name="toggled" handler="on_wallpapersFoldersToggle_toggled" swapped="no"/>
<child>
<object class="GtkBox">
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Wallpapers folders</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkArrow">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="arrow_type">down</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<property name="icon_name">open-menu-symbolic</property>
</object>
</child>
</object>
Expand All @@ -335,33 +351,36 @@ Author: Gabriele Musco
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">go-bottom</property>
<property name="icon_name">go-bottom-symbolic</property>
</object>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkSpinner" id="applySpinner">
<property name="width_request">32</property>
<child type="title">
<object class="GtkStackSwitcher" id="mainStackSwitcher">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="halign">center</property>
<property name="stack">mainStack</property>
</object>
<packing>
<property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="applyButton">
<property name="label">gtk-apply</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_applyButton_clicked" swapped="no"/>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Apply</property>
<property name="icon_name">object-select-symbolic</property>
</object>
</child>
<style>
<class name="suggested-action"/>
</style>
Expand All @@ -371,6 +390,17 @@ Author: Gabriele Musco
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkSpinner" id="applySpinner">
<property name="width_request">32</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
</object>
<packing>
<property name="pack_type">end</property>
<property name="position">3</property>
</packing>
</child>
</object>
</child>
</object>
Expand Down Expand Up @@ -417,6 +447,137 @@ Author: Gabriele Musco
<placeholder/>
</child>
</object>
<object class="GtkFileChooserDialog" id="addFolderFileChooserDialog">
<property name="can_focus">False</property>
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<property name="transient_for">window</property>
<property name="action">select-folder</property>
<property name="filter">filefilterFolders</property>
<property name="preview_widget_active">False</property>
<property name="use_preview_label">False</property>
<child internal-child="vbox">
<object class="GtkBox">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkButtonBox">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkRevealer" id="pathAlreadyAddedInfobarLikeRevealer">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="reveal_child">True</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="label" translatable="yes">Selected path has already been added</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="pathAlreadyAddedInfobarLikeRevealerCloseButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Close
</property>
<property name="margin_left">12</property>
<property name="margin_right">12</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="relief">none</property>
<signal name="clicked" handler="on_pathAlreadyAddedInfobarLikeRevealerCloseButton_clicked" swapped="no"/>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">button_cancel</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<style>
<class name="info"/>
</style>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<child type="titlebar">
<object class="GtkHeaderBar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title">Add a wallpapers folder</property>
<child>
<object class="GtkButton" id="addFolderFileChooserDialogCancelButton">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_addFolderFileChooserDialogCancelButton_clicked" swapped="no"/>
</object>
</child>
<child>
<object class="GtkButton" id="addFolderFileChooserDialogOpenButton">
<property name="label">gtk-open</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_addFolderFileChooserDialogOpenButton_clicked" swapped="no"/>
<style>
<class name="suggested-action"/>
</style>
</object>
<packing>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<object class="GtkWindow" id="settingsWindow">
<property name="can_focus">False</property>
<property name="resizable">False</property>
Expand Down Expand Up @@ -619,7 +780,7 @@ Author: Gabriele Musco
<object class="GtkListBox" id="wallpapersFoldersPopoverListbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="selection_mode">none</property>
<signal name="row-selected" handler="on_wallpapersFoldersPopoverListbox_row_selected" swapped="no"/>
</object>
</child>
</object>
Expand All @@ -632,42 +793,14 @@ Author: Gabriele Musco
</packing>
</child>
<child>
<object class="GtkBox">
<object class="GtkActionBar" id="wallpapersFoldersActionbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_right">6</property>
<property name="label" translatable="yes">Add folder</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFileChooserButton" id="newWallpapersFolderFileChooserButton">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action">select-folder</property>
<property name="create_folders">False</property>
<property name="title" translatable="yes">Select a new wallpapers folder</property>
<signal name="file-set" handler="on_newWallpapersFolderFileChooserButton_file_set" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">2</property>
</packing>
</child>
</object>
Expand Down
Loading

0 comments on commit 26b5a7b

Please sign in to comment.