Merge pull request #183 from fkinoshita/newer_widgets

window: Use newer libadwaita widgets
This commit is contained in:
Hugo Posnic 2023-10-05 16:49:19 +02:00 committed by GitHub
commit 0e24fdda76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 112 additions and 103 deletions

View File

@ -1,9 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface domain="curtail">
<template class="CurtailWindow" parent="GtkApplicationWindow">
<template class="CurtailWindow" parent="AdwApplicationWindow">
<property name="title" translatable="yes">Curtail</property>
<property name="default-width">650</property>
<property name="content">
<object class="AdwToolbarView">
<child type="top">
<object class="AdwHeaderBar" id="headerbar">
<child>
<object class="GtkBox">
<child>
<object class="GtkButton" id="filechooser_button_headerbar">
<property name="icon-name">document-open-symbolic</property>
<property name="action-name">win.select-file</property>
<property name="tooltip-text" translatable="yes">Browse Files</property>
</object>
</child>
<child>
<object class="GtkButton" id="clear_button_headerbar">
<property name="icon-name">view-refresh-symbolic</property>
<property name="action-name">win.clear-results</property>
<property name="tooltip-text" translatable="yes">Clear Results</property>
</object>
</child>
</object>
</child>
<child type="title">
<object class="AdwWindowTitle" id="window_title">
<property name="title" translatable="yes">Curtail</property>
</object>
</child>
<child type="end">
<object class="GtkMenuButton" id="menu_button">
<property name="icon-name">open-menu-symbolic</property>
<property name="primary">true</property>
<property name="tooltip-text" translatable="yes">Main Menu</property>
</object>
</child>
</object>
</child>
<property name="content">
<object class="GtkBox" id="mainbox">
<property name="orientation">vertical</property>
<child>
@ -96,41 +135,11 @@
</object>
</child>
</object>
</child>
<child type="titlebar">
<object class="AdwHeaderBar" id="headerbar">
<child>
<object class="GtkBox">
<child>
<object class="GtkButton" id="filechooser_button_headerbar">
<property name="icon-name">document-open-symbolic</property>
<property name="action-name">win.select-file</property>
<property name="tooltip-text" translatable="yes">Browse Files</property>
</property>
</object>
</child>
<child>
<object class="GtkButton" id="clear_button_headerbar">
<property name="icon-name">view-refresh-symbolic</property>
<property name="action-name">win.clear-results</property>
<property name="tooltip-text" translatable="yes">Clear Results</property>
</object>
</child>
</object>
</child>
<child type="title">
<object class="AdwWindowTitle" id="window_title">
<property name="title" translatable="yes">Curtail</property>
</object>
</child>
<child type="end">
<object class="GtkMenuButton" id="menu_button">
<property name="icon-name">open-menu-symbolic</property>
<property name="primary">true</property>
<property name="tooltip-text" translatable="yes">Main Menu</property>
</object>
</child>
</object>
</child>
</property>
</template>
</interface>

View File

@ -30,7 +30,7 @@ SETTINGS_SCHEMA = 'com.github.huluti.Curtail'
@Gtk.Template(resource_path=CURTAIL_PATH + 'ui/window.ui')
class CurtailWindow(Gtk.ApplicationWindow):
class CurtailWindow(Adw.ApplicationWindow):
__gtype_name__ = 'CurtailWindow'
_settings = Gio.Settings.new(SETTINGS_SCHEMA)