Merge pull request #143 from aaronfranke/format-and-oxipng

Trivial file formatting and optimize PNG and SVG images

.gitattributes

@@ -0,0 +1,2 @@
+# Normalize EOL for all files that Git considers text files.
+* text=auto eol=lf

.gitignore

@@ -1,4 +1,5 @@
 /subprojects/blueprint-compiler
 .flatpak
 .flatpak-builder
-.vscode
+.vscode
+.DS_Store

GNOME Circle.md

@@ -6,4 +6,4 @@
 - [ ] Fix the reload lag
 - [x] Do not allow uninstallation of Warehouse
 - [x] Add tooltip text to Snapshot Window's row buttons
-- [ ] Fix subtitle issue in Leftover Data Window
+- [ ] Fix subtitle issue in Leftover Data Window

data/icons/hicolor/scalable/apps/io.github.flattool.Warehouse.svg

@@ -1,28 +1 @@
-<svg width="128" height="128" viewBox="0 0 128 128" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M20 91H108V112C108 116.418 104.418 120 100 120H28C23.5817 120 20 116.418 20 112V91Z" fill="url(#paint0_linear_3_59)"/>
-<rect x="20" y="8" width="88" height="96" rx="8" fill="#62A0EA"/>
-<rect x="28" y="16" width="72" height="80" fill="#3368AA"/>
-<rect x="71" y="32" width="29" height="20" fill="#B5835A"/>
-<rect opacity="0.5" x="75" y="35" width="18" height="5" fill="white"/>
-<rect opacity="0.5" x="75" y="42" width="12" height="3" fill="white"/>
-<rect x="28" y="76" width="29" height="20" fill="#B5835A"/>
-<rect opacity="0.5" x="32" y="79" width="18" height="5" fill="white"/>
-<rect opacity="0.5" x="32" y="86" width="12" height="3" fill="white"/>
-<rect x="28" y="52" width="72" height="7" fill="#62A0EA"/>
-<rect x="28" y="24" width="43" height="28" fill="#D4A782"/>
-<rect opacity="0.5" x="31" y="27" width="20" height="5" fill="white"/>
-<rect opacity="0.5" x="31" y="34" width="15" height="3" fill="white"/>
-<rect width="43" height="28" transform="matrix(-1 0 0 1 100 68)" fill="#D4A782"/>
-<rect opacity="0.5" x="60" y="71" width="20" height="5" fill="white"/>
-<rect opacity="0.5" x="60" y="78" width="15" height="3" fill="white"/>
-<defs>
-<linearGradient id="paint0_linear_3_59" x1="20" y1="120" x2="108" y2="120" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3574BF"/>
-<stop offset="0.0625" stop-color="#62A0EA"/>
-<stop offset="0.125" stop-color="#2C6DBB"/>
-<stop offset="0.875" stop-color="#2467B8"/>
-<stop offset="0.9375" stop-color="#62A0EA"/>
-<stop offset="1" stop-color="#1A5FB4"/>
-</linearGradient>
-</defs>
-</svg>
+<svg fill="none" height="128" viewBox="0 0 128 128" width="128" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="20" x2="108" y1="120" y2="120"><stop offset="0" stop-color="#3574bf"/><stop offset=".0625" stop-color="#62a0ea"/><stop offset=".125" stop-color="#2c6dbb"/><stop offset=".875" stop-color="#2467b8"/><stop offset=".9375" stop-color="#62a0ea"/><stop offset="1" stop-color="#1a5fb4"/></linearGradient><path d="m20 91h88v21c0 4.418-3.582 8-8 8h-72c-4.4183 0-8-3.582-8-8z" fill="url(#a)"/><rect fill="#62a0ea" height="96" rx="8" width="88" x="20" y="8"/><path d="m28 16h72v80h-72z" fill="#3368aa"/><path d="m71 32h29v20h-29z" fill="#b5835a"/><path d="m75 35h18v5h-18z" fill="#fff" opacity=".5"/><path d="m75 42h12v3h-12z" fill="#fff" opacity=".5"/><path d="m28 76h29v20h-29z" fill="#b5835a"/><path d="m32 79h18v5h-18z" fill="#fff" opacity=".5"/><path d="m32 86h12v3h-12z" fill="#fff" opacity=".5"/><path d="m28 52h72v7h-72z" fill="#62a0ea"/><path d="m28 24h43v28h-43z" fill="#d4a782"/><path d="m31 27h20v5h-20z" fill="#fff" opacity=".5"/><path d="m31 34h15v3h-15z" fill="#fff" opacity=".5"/><path d="m0 0h43v28h-43z" fill="#d4a782" transform="matrix(-1 0 0 1 100 68)"/><g fill="#fff"><path d="m60 71h20v5h-20z" opacity=".5"/><path d="m60 78h15v3h-15z" opacity=".5"/></g></svg>

data/icons/hicolor/symbolic/apps/io.github.flattool.Warehouse-symbolic.svg

@@ -1,5 +1 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4 8H9V9H4V8Z" fill="black"/>
-<path d="M4 10H7V11H4V10Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 3C3.44772 3 3 3.44772 3 4C3 4.55228 3.44772 5 4 5H7V3H4ZM9 3V5H12C12.5523 5 13 4.55228 13 4C13 3.44772 12.5523 3 12 3H9ZM9 7H7H4C3.64936 7 3.31278 6.93985 3 6.82929V12C3 12.5523 3.44772 13 4 13H12C12.5523 13 13 12.5523 13 12V6.82929C12.6872 6.93985 12.3506 7 12 7H9ZM4 1C2.34315 1 1 2.34315 1 4V12C1 13.6569 2.34315 15 4 15H12C13.6569 15 15 13.6569 15 12V4C15 2.34315 13.6569 1 12 1H4Z" fill="black"/>
-</svg>
+<svg fill="none" height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><g fill="#000"><path d="m4 8h5v1h-5z"/><path d="m4 10h3v1h-3z"/><path clip-rule="evenodd" d="m4 3c-.55228 0-1 .44772-1 1s.44772 1 1 1h3v-2zm5 0v2h3c.5523 0 1-.44772 1-1s-.4477-1-1-1zm0 4h-2-3c-.35064 0-.68722-.06015-1-.17071v5.17071c0 .5523.44772 1 1 1h8c.5523 0 1-.4477 1-1v-5.17071c-.3128.11056-.6494.17071-1 .17071zm-5-6c-1.65685 0-3 1.34315-3 3v8c0 1.6569 1.34315 3 3 3h8c1.6569 0 3-1.3431 3-3v-8c0-1.65685-1.3431-3-3-3z" fill-rule="evenodd"/></g></svg>

io.github.flattool.Warehouse.json

@@ -1,10 +1,10 @@
 {
-    "id" : "io.github.flattool.Warehouse",
-    "runtime" : "org.gnome.Platform",
-    "runtime-version" : "47",
-    "sdk" : "org.gnome.Sdk",
-    "command" : "warehouse",
-    "finish-args" : [
+    "id": "io.github.flattool.Warehouse",
+    "runtime": "org.gnome.Platform",
+    "runtime-version": "47",
+    "sdk": "org.gnome.Sdk",
+    "command": "warehouse",
+    "finish-args": [
         "--share=ipc",
         "--socket=fallback-x11",
         "--device=dri",
@@ -32,19 +32,19 @@
             "buildsystem": "meson",
             "sources": [
                 {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/jwestman/blueprint-compiler",
-                    "tag" : "v0.14.0"
+                    "type": "git",
+                    "url": "https://gitlab.gnome.org/jwestman/blueprint-compiler",
+                    "tag": "v0.14.0"
                 }
             ],
             "cleanup": ["*"]
         },
         {
-            "name" : "warehouse",
-            "builddir" : true,
-            "buildsystem" : "meson",
-            "config-opts": [ "-Dprofile=development" ],
-            "sources" : [
+            "name": "warehouse",
+            "builddir": true,
+            "buildsystem": "meson",
+            "config-opts": ["-Dprofile=development"],
+            "sources": [
                 {
                     "type": "dir",
                     "path": "."

meson_options.txt

@@ -6,4 +6,4 @@ option(
     'development'
   ],
   value: 'default'
-)
+)

src/change_version_page/change_version_page.blp

@@ -57,4 +57,4 @@ Adw.Clamp versions_clamp {
             description: _("This will uninstall the current release and install the chosen one instead. Note that downgrading can cause issues.");
         }
     }
-}
+}

src/change_version_page/change_version_page.py

@@ -122,4 +122,3 @@ class ChangeVersionPage(Adw.NavigationPage):
         # Connections
         self.root_group_check_button.connect("toggled", lambda *_: self.action_bar.set_revealed(True))
         self.apply_button.connect("clicked", self.on_apply)
-

src/const.py.in

@@ -5,4 +5,4 @@ class Config:
     DEVEL = '@DEVEL@' == 'Development'
     PROFILE = '@DEVEL@'
     APP_ID = '@APPID@'
-    VERSION = '@VERSION@'
+    VERSION = '@VERSION@'

src/gtk/app_row.blp

@@ -40,4 +40,4 @@ template $AppRow : Adw.ActionRow {
         styles["selection-mode"]
         visible: false;
     }
-}
+}

src/gtk/installation_chooser.blp

@@ -37,4 +37,4 @@ template $InstallationChooser : Adw.PreferencesGroup {
 		title: _("Other Installation");
 		subtitle: _("Choose a custom installation");
 	}
-}
+}

src/install_page/result_row.py

@@ -67,4 +67,3 @@ class ResultRow(Adw.ActionRow):
         # Apply
         GLib.idle_add(self.idle_stuff)
         self.set_state(package_state)
-

src/packages_page/filters_page.blp

@@ -115,4 +115,4 @@ template $FiltersPage : Adw.NavigationPage {
             }
         }
     }
-}
+}

src/packages_page/uninstall_dialog.blp

@@ -24,4 +24,4 @@ template $UninstallDialog : Adw.AlertDialog {
             }
         }
     ;
-}
+}