Skip to content
Snippets Groups Projects
Verified Commit 3feb5267 authored by Bruce Cowan's avatar Bruce Cowan :airplane:
Browse files

Introduce adwaita

parent 81d61d4e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
data/prefs.ui
+ 46
− 99
View file @ 3feb5267
......@@ -6,120 +6,67 @@
-->
<interface>
<requires lib="gtk" version="4.0"/>
<object class="GtkAdjustment" id="try_adjustment">
<property name="lower">1</property>
<property name="upper">7</property>
<property name="value">7</property>
<property name="step_increment">1</property>
<property name="page_increment">1</property>
</object>
<object class="GtkAdjustment" id="utry_adjustment">
<property name="lower">1</property>
<property name="upper">5</property>
<property name="value">5</property>
<property name="step_increment">1</property>
<property name="page_increment">1</property>
</object>
<object class="GtkAdjustment" id="kick_adjustment">
<property name="lower">1</property>
<property name="upper">4</property>
<property name="value">3</property>
<property name="step_increment">1</property>
<property name="page_increment">1</property>
</object>
<template class="RugbyPrefWindow" parent="GtkWindow">
<requires lib="libadwaita" version="1.0"/>
<template class="RugbyPrefWindow" parent="AdwPreferencesWindow">
<property name="default-height">300</property>
<property name="default-width">400</property>
<property name="title">Preferences</property>
<property name="modal">True</property>
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<property name="margin_start">60</property>
<property name="margin_end">60</property>
<property name="margin_top">30</property>
<property name="margin_bottom">30</property>
<object class="AdwPreferencesPage">
<child>
<object class="GtkLabel">
<property name="label" translatable="yes">Scoring</property>
<property name="xalign">0</property>
<property name="margin_bottom">10</property>
<style>
<class name="title-4"/>
</style>
</object>
</child>
<child>
<object class="GtkFrame">
<object class="AdwPreferencesGroup">
<property name="title" translatable="yes">Scoring</property>
<child>
<object class="GtkListBox">
<property name="selection_mode">none</property>
<property name="show_separators">1</property>
<style>
<class name="rich-list"/>
</style>
<object class="AdwActionRow">
<property name="title" translatable="yes">Points for a converted try</property>
<child>
<object class="GtkListBoxRow">
<child>
<object class="GtkBox">
<child>
<object class="GtkLabel">
<property name="label" translatable="yes">Points for a converted try</property>
<property name="xalign">0</property>
<property name="halign">start</property>
<property name="valign">center</property>
<property name="hexpand">1</property>
</object>
</child>
<child>
<object class="GtkSpinButton" id="try_spin">
<property name="adjustment">try_adjustment</property>
</object>
</child>
<object class="GtkSpinButton" id="try_spin">
<property name="adjustment">
<object class="GtkAdjustment">
<property name="lower">1</property>
<property name="upper">7</property>
<property name="step_increment">1</property>
</object>
</child>
</property>
<property name="max-width-chars">3</property>
<property name="valign">center</property>
</object>
</child>
</object>
</child>
<child>
<object class="AdwActionRow">
<property name="title" translatable="yes">Points for a unconverted try</property>
<child>
<object class="GtkListBoxRow">
<child>
<object class="GtkBox">
<child>
<object class="GtkLabel">
<property name="label" translatable="yes">Points for an unconverted try</property>
<property name="xalign">0</property>
<property name="halign">start</property>
<property name="valign">center</property>
<property name="hexpand">1</property>
</object>
</child>
<child>
<object class="GtkSpinButton" id="utry_spin">
<property name="adjustment">utry_adjustment</property>
</object>
</child>
<object class="GtkSpinButton" id="utry_spin">
<property name="adjustment">
<object class="GtkAdjustment">
<property name="lower">1</property>
<property name="upper">5</property>
<property name="step_increment">1</property>
</object>
</child>
</property>
<property name="max-width-chars">3</property>
<property name="valign">center</property>
</object>
</child>
</object>
</child>
<child>
<object class="AdwActionRow">
<property name="title" translatable="yes">Points for a kick</property>
<child>
<object class="GtkListBoxRow">
<child>
<object class="GtkBox">
<child>
<object class="GtkLabel">
<property name="label" translatable="yes">Points for a kick</property>
<property name="xalign">0</property>
<property name="halign">start</property>
<property name="valign">center</property>
<property name="hexpand">1</property>
</object>
</child>
<child>
<object class="GtkSpinButton" id="kick_spin">
<property name="adjustment">kick_adjustment</property>
</object>
</child>
<object class="GtkSpinButton" id="kick_spin">
<property name="adjustment">
<object class="GtkAdjustment">
<property name="lower">1</property>
<property name="upper">3</property>
<property name="step_increment">1</property>
</object>
</child>
</property>
<property name="max-width-chars">3</property>
<property name="valign">center</property>
</object>
</child>
</object>
......
meson.build
+ 1
− 0
View file @ 3feb5267
......@@ -20,6 +20,7 @@ gnome = import('gnome')
gio_dep = dependency('gio-2.0', version: '>= 2.66')
gtk_dep = dependency('gtk4', version: '>= 4.0')
libadwaita_dep = dependency('libadwaita-1')
conf = configuration_data()
conf.set_quoted('VERSION','@VCS_TAG@')
......
src/main.c
+ 2
− 2
View file @ 3feb5267
......@@ -73,8 +73,8 @@ int
main (int argc,
char **argv)
{
GtkApplication *app = gtk_application_new ("uk.me.bcowan.Rugby",
G_APPLICATION_FLAGS_NONE);
g_autoptr (AdwApplication) app = adw_application_new ("uk.me.bcowan.Rugby",
G_APPLICATION_FLAGS_NONE);
g_signal_connect (app, "startup",
G_CALLBACK (on_startup), NULL);
......
src/meson.build
+ 2
− 2
View file @ 3feb5267
# SPDX-FileCopyrightText: 2016-2021 Bruce Cowan <bruce@bcowan.me.uk>
# SPDX-FileCopyrightText: 2016-2022 Bruce Cowan <bruce@bcowan.me.uk>
#
# SPDX-License-Identifier: CC0-1.0
sources = [
......@@ -12,6 +12,6 @@ sources = [
executable('rugby',
sources, config_h, resources, compiled_schemas,
dependencies: [gio_dep, gtk_dep],
dependencies: [gio_dep, gtk_dep, libadwaita_dep],
install_dir: get_option('bindir'),
install: true)
src/rugby-pref-window.c
+ 3
− 3
View file @ 3feb5267
/*
* SPDX-FileCopyrightText: 2020 Bruce Cowan <bruce@bcowan.me.uk>
* SPDX-FileCopyrightText: 2020-2021 Bruce Cowan <bruce@bcowan.me.uk>
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
......@@ -8,7 +8,7 @@
struct _RugbyPrefWindow
{
GtkWindow parent_instance;
AdwPreferencesWindow parent_instance;
GtkWidget *try_spin;
GtkWidget *utry_spin;
......@@ -17,7 +17,7 @@ struct _RugbyPrefWindow
GSettings *settings;
};
G_DEFINE_TYPE (RugbyPrefWindow, rugby_pref_window, GTK_TYPE_WINDOW)
G_DEFINE_TYPE (RugbyPrefWindow, rugby_pref_window, ADW_TYPE_PREFERENCES_WINDOW)
static void
rugby_pref_window_dispose (GObject *object)
......
src/rugby-pref-window.h
+ 3
− 2
View file @ 3feb5267
/*
* SPDX-FileCopyrightText: 2020 Bruce Cowan <bruce@bcowan.me.uk>
* SPDX-FileCopyrightText: 2020-2021 Bruce Cowan <bruce@bcowan.me.uk>
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
......@@ -9,12 +9,13 @@
#include "rugby-app-window.h"
#include <gtk/gtk.h>
#include <adwaita.h>
G_BEGIN_DECLS
#define RUGBY_TYPE_PREF_WINDOW (rugby_pref_window_get_type())
G_DECLARE_FINAL_TYPE (RugbyPrefWindow, rugby_pref_window, RUGBY, PREF_WINDOW, GtkWindow)
G_DECLARE_FINAL_TYPE (RugbyPrefWindow, rugby_pref_window, RUGBY, PREF_WINDOW, AdwPreferencesWindow)
RugbyPrefWindow *rugby_pref_window_new (RugbyAppWindow *window);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment