lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Exchange libhandy-4 for libadwaita

Browse source 
libhandy-4 is dead. Long live libadwaita.
This commit is contained in:
Christopher Davis 2021-01-14 21:36:30 -08:00
parent 28bf2b9213
commit e34f4055e4
7 changed files with 26 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Cargo.lock generated
View file

@ -501,7 +501,7 @@ dependencies = [
"glib", "glib",
"gtk-macros", "gtk-macros",
"gtk4", "gtk4",
"libhandy4", "libadwaita",
"log", "log",
"pretty_env_logger", "pretty_env_logger",
"zbus", "zbus",
@ -682,15 +682,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]] [[package]]
name = "libc" name = "libadwaita"
version = "0.2.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929"
[[package]]
name = "libhandy4"
version = "0.1.0" version = "0.1.0"
source = "git+https://gitlab.gnome.org/bilelmoussaoui/libhandy4-rs#ea059551d1e0c2f77a483f37ad83eb5b358d4c5d" source = "git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs#b898c11fb6776fc7a9a6b920222fa3173216a80c"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"gdk-pixbuf", "gdk-pixbuf",
@ -699,15 +693,15 @@ dependencies = [
"glib", "glib",
"gtk4", "gtk4",
"lazy_static", "lazy_static",
"libadwaita-sys",
"libc", "libc",
"libhandy4-sys",
"pango", "pango",
] ]
[[package]] [[package]]
name = "libhandy4-sys" name = "libadwaita-sys"
version = "0.1.0" version = "0.1.0"
source = "git+https://gitlab.gnome.org/bilelmoussaoui/libhandy4-rs#ea059551d1e0c2f77a483f37ad83eb5b358d4c5d" source = "git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs#b898c11fb6776fc7a9a6b920222fa3173216a80c"
dependencies = [ dependencies = [
"gdk-pixbuf-sys", "gdk-pixbuf-sys",
"gdk4-sys", "gdk4-sys",
@ -720,6 +714,12 @@ dependencies = [
"system-deps", "system-deps",
] ]
[[package]]
name = "libc"
version = "0.2.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929"
[[package]] [[package]]
name = "locale_config" name = "locale_config"
version = "0.2.3" version = "0.2.3"

5
Cargo.toml
View file

@ -39,6 +39,5 @@ git = "https://github.com/bilelmoussaoui/ashpd"
version = "0.4.4" version = "0.4.4"
features = ["gettext-system"] features = ["gettext-system"]
[dependencies.libhandy] [dependencies.libadwaita]
git = "https://gitlab.gnome.org/bilelmoussaoui/libhandy4-rs" git = "https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs"
package = "libhandy4"

5
build-aux/flatpak/org.gnome.ImageViewer.Devel.json
View file

@ -39,13 +39,12 @@
], ],
"modules" : [ "modules" : [
{ {
"name" : "libhandy4", "name" : "libadwaita",
"buildsystem" : "meson", "buildsystem" : "meson",
"sources" : [ "sources" : [
{ {
"type" : "git", "type" : "git",
"url" : "https://gitlab.gnome.org/exalm/libhandy.git", "url" : "https://gitlab.gnome.org/exalm/libadwaita.git"
"branch" : "gtk4"
} }
] ]
}, },

4
data/gtk/window.ui
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<template class="IvWindow" parent="HdyApplicationWindow"> <template class="IvWindow" parent="AdwApplicationWindow">
<property name="default-width">600</property> <property name="default-width">600</property>
<property name="default-height">498</property> <property name="default-height">498</property>
<property name="width-request">360</property> <property name="width-request">360</property>
@ -31,7 +31,7 @@
<property name="visible-child">status_page</property> <property name="visible-child">status_page</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<child> <child>
<object class="HdyStatusPage" id="status_page"> <object class="AdwStatusPage" id="status_page">
<property name="title" translatable="yes">Image Viewer</property> <property name="title" translatable="yes">Image Viewer</property>
<property name="description" translatable="yes">Click Here Or Drag An Image To View</property> <property name="description" translatable="yes">Click Here Or Drag An Image To View</property>
<child> <child>

4
meson.build
View file

@ -8,8 +8,8 @@ project('gnome-image-viewer',
i18n = import('i18n') i18n = import('i18n')
gnome = import('gnome') gnome = import('gnome')
dependency('gtk4', version: '>=3.99.4') dependency('gtk4', version: '>=4.0.0')
dependency('libhandy-4') dependency('libadwaita-1')
iv_prefix = get_option('prefix') iv_prefix = get_option('prefix')
iv_bindir = join_paths(iv_prefix, get_option('bindir')) iv_bindir = join_paths(iv_prefix, get_option('bindir'))

2
src/main.rs
View file

@ -29,7 +29,7 @@ use application::IvApplication;
fn main() { fn main() {
gtk::init().expect("Failed to initialize GTK."); gtk::init().expect("Failed to initialize GTK.");
libhandy::init(); libadwaita::init();
widgets::init(); widgets::init();
pretty_env_logger::init(); pretty_env_logger::init();

10
src/window.rs
View file

@ -24,7 +24,7 @@ use gtk::prelude::*;
use gtk::subclass::prelude::*; use gtk::subclass::prelude::*;
use gtk::CompositeTemplate; use gtk::CompositeTemplate;
use gtk_macros::*; use gtk_macros::*;
use libhandy::subclass::prelude as hdy; use libadwaita::subclass::prelude::*;
use crate::config; use crate::config;
use crate::widgets::IvImageView; use crate::widgets::IvImageView;
@ -50,7 +50,7 @@ mod imp {
#[template_child] #[template_child]
pub stack: TemplateChild<gtk::Stack>, pub stack: TemplateChild<gtk::Stack>,
#[template_child] #[template_child]
pub status_page: TemplateChild<libhandy::StatusPage>, pub status_page: TemplateChild<libadwaita::StatusPage>,
#[template_child] #[template_child]
pub image_view: TemplateChild<IvImageView>, pub image_view: TemplateChild<IvImageView>,
#[template_child] #[template_child]
@ -60,7 +60,7 @@ mod imp {
impl ObjectSubclass for IvWindow { impl ObjectSubclass for IvWindow {
const NAME: &'static str = "IvWindow"; const NAME: &'static str = "IvWindow";
type Type = super::IvWindow; type Type = super::IvWindow;
type ParentType = libhandy::ApplicationWindow; type ParentType = libadwaita::ApplicationWindow;
type Instance = glib::subclass::simple::InstanceStruct<Self>; type Instance = glib::subclass::simple::InstanceStruct<Self>;
type Class = glib::subclass::simple::ClassStruct<Self>; type Class = glib::subclass::simple::ClassStruct<Self>;
@ -133,12 +133,12 @@ mod imp {
impl WidgetImpl for IvWindow {} impl WidgetImpl for IvWindow {}
impl WindowImpl for IvWindow {} impl WindowImpl for IvWindow {}
impl ApplicationWindowImpl for IvWindow {} impl ApplicationWindowImpl for IvWindow {}
impl hdy::ApplicationWindowImpl for IvWindow {} impl AdwApplicationWindowImpl for IvWindow {}
} }
glib::wrapper! { glib::wrapper! {
pub struct IvWindow(ObjectSubclass<imp::IvWindow>) pub struct IvWindow(ObjectSubclass<imp::IvWindow>)
@extends gtk::Widget, gtk::Window, gtk::ApplicationWindow, libhandy::ApplicationWindow, @extends gtk::Widget, gtk::Window, gtk::ApplicationWindow, libadwaita::ApplicationWindow,
@implements gio::ActionMap, gio::ActionGroup; @implements gio::ActionMap, gio::ActionGroup;
} }