Skip to content

Commit

Permalink
refactor: Port to Blueprint (#2050)
Browse files Browse the repository at this point in the history
Port the old UI/xml spec to the new Blueprint markup language for user interfaces.

Co-authored-by: TheEvilSkeleton <theevilskeleton@riseup.net>
  • Loading branch information
jannuary and TheEvilSkeleton committed Sep 11, 2022
1 parent 6dbe0b7 commit 94bc8ff
Show file tree
Hide file tree
Showing 103 changed files with 5,318 additions and 6,127 deletions.
17 changes: 17 additions & 0 deletions bottles/frontend/ui/about.blp
@@ -0,0 +1,17 @@
using Gtk 4.0;

.AdwAboutWindow about_window {
application-name: "Bottles";
modal: "True";
version: "2022.8.28-brescia-2";
copyright: _("© 2017-2022 - Bottles Developers");
comments: _("Easily manage different Wine prefixes");
website: "https://usebottles.com";
issue-url: "https://github.com/bottlesdevs/Bottles/issues";
application-icon: "com.usebottles.bottles";
license-type: "gpl-3-0-only";
developer-name: "Bottles Developers";
developers: "Mirko Brombin https://github.com/mirkobrombin/\nhthre7 https://github.com/hthre7\nKekun https://github.com/Kekun\nSonny Piers https://github.com/sonnyp\nBrainBlasted https://github.com/BrainBlasted\nFrancesco Masala <mail@francescomasala.me>\nHari Rana (TheEvilSkeleton) https://theevilskeleton.gitlab.io/\naxtlos https://axtloss.github.io/\nOro https://github.com/orowith2os";
translator-credits: "Lahfa Samy <samy@lahfa.xyz>\nFilipe de Almeida Garrett https://github.com/filipegarrett\nAllan Nordhøy https://github.com/comradekingu\nLeandro Stanger https://github.com/LeandroStanger\nFábio Rodrigues Ribeiro https://github.com/farribeiro>\nGabriel Mattoso https://github.com/realgrm\nGündüzhan Gündüz https://github.com/gunduzhan\nYannick A. https://github.com/yannicka\nbloomvdomino https://github.com/bloomvdomino\nÅke Engelbrektson https://github.com/eson57\nAdolfo Jayme-Barrientos https://github.com/fitojb\nGündüzhan Gündüz https://github.com/gunduzhan\nReza https://github.com/rezaalmanda\nJakub Fabijan https://github.com/jakubfabijan\nAndrey Ilin https://github.com/mclvren\nRens Oliemans https://github.com/RensOliemans\nFábio Rodrigues Ribeiro <farribeiro@gmail.com>\nsoheil https://github.com/soheilkhanalipur\nliimee https://github.com/liimee\ncatsout https://github.com/catsout\nSeaDve https://github.com/SeaDve\nt4llkr https://github.com/t4llkr\nluxmaroc https://github.com/luxmaroc\nRicky-Tigg https://github.com/Ricky-Tigg\nYuzaihhhh https://github.com/Yuzaihhhh\nSCOTT-HAMILTON https://github.com/SCOTT-HAMILTON\nSantosSi https://github.com/SantosSi\nvitor180396 https://github.com/vitor180396\njulroy67 https://github.com/julroy67\nMartinIIOT https://github.com/MartinIIOT\nthericosanto https://github.com/thericosanto\nphlostically https://github.com/phlostically\njatin-cbs https://github.com/jatin-cbs\nduhow https://github.com/duhow\nmilotype https://github.com/milotype\nrffontenelle https://github.com/rffontenelle\nudopton https://github.com/udopton\noscfdezdz https://github.com/oscfdezdz\nFlywater Zh https://github.com/bottlesdevs/Bottles/blob/master/po/README.md\nrmnscnce https://github.com/rmnscnce\npanmourovaty https://github.com/panmourovaty\nmarchellodev https://github.com/marchellodev\nlaralem https://github.com/laralem\nVojtěch Perník https://github.com/pervoj\nKrzysztof Marcinek https://github.com/bottlesdevs/Bottles/blob/master/po/README.md\ntacitcoast https://github.com/tacitcoast\nblackcat-917 https://github.com/blackcat-917\nkenpb https://github.com/kenpb\nswyknox https://github.com/swyknox\nbittin https://github.com/bittin\nsr093906 https://github.com/sr093906\ndavipatricio https://github.com/davipatricio\nRicardo Porto https://github.com/bottlesdevs/Bottles/blob/master/po/README.md\nhugok79 https://github.com/hugok79\ngauthamkrishna9991 https://github.com/gauthamkrishna9991\nExistingProgrammer https://github.com/ExistingProgrammer\nJiri Grönroos https://github.com/bottlesdevs\nMartinligabue https://github.com/Martinligabue\nLasse Palm https://github.com/bottlesdevs\nSoongVilda https://github.com/SoongVilda\nersen0 https://github.com/ersen0\nCheesersY5 https://github.com/CheesersY5\nseldon1000 https://github.com/seldon1000\nettmetal https://github.com/ettmetal\nXiaoPanPanKevinPan https://github.com/XiaoPanPanKevinPan\nAlexzanDev https://github.com/AlexzanDev\nZSHFan https://github.com/ZSHFan\nGoudronViande24 https://github.com/GoudronViande24\nBloombug https://github.com/Bloombug\nOctopusET https://github.com/OctopusET\nqogusdn1017 https://github.com/qogusdn1017\nredvulps https://github.com/redvulps\nathenasaurav https://github.com/athenasaurav\nAlberto Cañaveras https://github.com/bottlesdevs\nneko https://github.com/bottlesdevs\nMcLutzifer https://github.com/McLutzifer\nTranslator5 https://github.com/Translator5\nHebi-no-Sekigae https://github.com/Hebi-no-Sekigae\nK.B.Dharun Krishna https://github.com/kbdharun";
artists: "Marco Montini https://github.com/marckniack\nNoëlle https://github.com/jannuary\nAlvar Lagerlöf https://github.com/alvarlagerlof\nEzekiel Smith https://github.com/ZekeSmith";
}
108 changes: 0 additions & 108 deletions bottles/frontend/ui/about.ui

This file was deleted.

75 changes: 75 additions & 0 deletions bottles/frontend/ui/component-entry.blp
@@ -0,0 +1,75 @@
using Gtk 4.0;

template ComponentEntry : .AdwActionRow {
title: _("Component version");

Spinner spinner {
visible: false;
}

Button btn_remove {
visible: false;
tooltip-text: _("Uninstall");
valign: center;
icon-name: "user-trash-symbolic";

styles [
"flat",
]
}

Button btn_browse {
visible: false;
tooltip-text: _("Browse files");
valign: center;
icon-name: "folder-open-symbolic";

styles [
"flat",
]
}

Button btn_err {
visible: false;
tooltip-text: _("The installation failed. This may be due to a repository error, partial download or checksum mismatch. Press to try again.");
valign: center;
icon-name: "emblem-important-symbolic";

styles [
"flat",
]
}

Button btn_download {
visible: false;
tooltip-text: _("Download & Install");
valign: center;
icon-name: "document-save-symbolic";

styles [
"flat",
]
}

Box box_download_status {
visible: false;

Label label_task_status {
label: _("0%");
}

Image {
icon-name: "document-save-symbolic";
}
}

Button btn_cancel {
visible: false;
valign: center;
icon-name: "edit-delete-symbolic";

styles [
"flat",
]
}
}
82 changes: 0 additions & 82 deletions bottles/frontend/ui/component-entry.ui

This file was deleted.

99 changes: 99 additions & 0 deletions bottles/frontend/ui/dependency-entry.blp
@@ -0,0 +1,99 @@
using Gtk 4.0;

Popover pop_actions {
styles [
"menu",
]

Box {
margin-top: 6;
margin-bottom: 6;
margin-start: 6;
margin-end: 6;
orientation: vertical;

.GtkModelButton btn_manifest {
text: _("Show Manifest");
}

.GtkModelButton btn_license {
text: _("License");
}

.GtkModelButton btn_reinstall {
text: _("Reinstall");
visible: "False";
}

.GtkModelButton btn_remove {
text: _("Uninstall");
}

Separator {
}

.GtkModelButton btn_report {
text: _("Report a Bug…");
}
}
}

template DependencyEntry : .AdwActionRow {
title: _("Dependency name");
activatable-widget: "btn_install";
subtitle: _("Dependency description");

Box box_actions {
spacing: 6;

Label label_category {
valign: center;
label: _("Category");

styles [
"tag",
"caption",
]
}

Spinner spinner {
visible: false;
}

Button btn_install {
tooltip-text: _("Download & Install this dependency");
valign: center;

Image {
icon-name: "document-save-symbolic";
}

styles [
"flat",
]
}

Button btn_err {
visible: false;
sensitive: false;
tooltip-text: _("An installation error occurred. Restart Bottles to read the Crash Report or run it via terminal to read the output.");
valign: center;
icon-name: "emblem-important-symbolic";
}

Separator {
margin-top: 12;
margin-bottom: 12;
}

MenuButton {
valign: center;
popover: pop_actions;
icon-name: "view-more-symbolic";

styles [
"flat",
]
}
}
}

0 comments on commit 94bc8ff

Please sign in to comment.