colin/Megapixels
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Progress on controls

Browse Source
This commit is contained in:
Benjamin Schaaf
2021-04-22 01:41:23 +10:00
parent ea0fd24cc8
commit f9e6576266
5 changed files with 306 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

239
data/camera.ui
View File

@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<object class="GtkAdjustment" id="control_adj">
<property name="upper">100</property>
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
<object class="GtkWindow" id="window">
<property name="can-focus">0</property>
<property name="default-width">360</property>
@@ -18,7 +13,7 @@
<object class="GtkStackPage">
<property name="name">main</property>
<property name="child">
<object class="GtkOverlay" id="page_main">
<object class="GtkOverlay">
<property name="can-focus">0</property>
<child>
<object class="GtkGLArea" id="preview">
@@ -27,101 +22,66 @@
<property name="use-es">1</property>
</object>
</child>
<child type="overlay">
<object class="GtkBox" id="control_box">
<property name="visible">0</property>
<property name="can-focus">0</property>
<child>
<object class="GtkBox">
<property name="hexpand">1</property>
<property name="can-focus">0</property>
<property name="margin-start">10</property>
<property name="margin-end">10</property>
<property name="margin-top">10</property>
<property name="margin-bottom">10</property>
<child>
<object class="GtkLabel" id="control_name">
<property name="can-focus">0</property>
<property name="margin-end">10</property>
<property name="label" translatable="yes">ISO</property>
</object>
</child>
<child>
<object class="GtkScale" id="control_slider">
<property name="hexpand">1</property>
<property name="adjustment">control_adj</property>
<property name="round-digits">1</property>
</object>
</child>
<child>
<object class="GtkToggleButton" id="control_auto">
<property name="label" translatable="yes">Auto</property>
<property name="receives-default">1</property>
<property name="margin-start">10</property>
</object>
</child>
</object>
</child>
<style>
<class name="controlbox"/>
</style>
</object>
</child>
<child type="overlay">
<object class="GtkBox">
<property name="orientation">horizontal</property>
<property name="orientation">vertical</property>
<property name="vexpand">1</property>
<property name="hexpand">1</property>
<property name="valign">end</property>
<property name="homogeneous">0</property>
<property name="spacing">5</property>
<property name="can-focus">0</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-bottom">5</property>
<property name="margin-top">5</property>
<child>
<object class="GtkBox">
<property name="orientation">horizontal</property>
<property name="hexpand">1</property>
<property name="valign">end</property>
<property name="valign">start</property>
<property name="can-focus">0</property>
<property name="margin-start">5</property>
<property name="spacing">5</property>
<child>
<object class="GtkButton">
<property name="action-name">app.open-settings</property>
<property name="receives-default">1</property>
<child>
<object class="GtkImage">
<property name="can-focus">0</property>
<property name="icon-name">settings-symbolic</property>
</object>
</child>
<object class="GtkButton" id="iso-controls-button">
<property name="valign">start</property>
<property name="label">ISO</property>
<style>
<class name="circular"/>
</style>
</object>
</child>
<child>
<object class="GtkButton">
<property name="action-name">app.switch-camera</property>
<property name="receives-default">1</property>
<child>
<object class="GtkImage">
<property name="can-focus">0</property>
<property name="icon-name">switch-camera-symbolic</property>
</object>
</child>
<object class="GtkButton" id="shutter-controls-button">
<property name="valign">start</property>
<property name="icon-name">shutter-symbolic</property>
<style>
<class name="circular"/>
</style>
</object>
</child>
</object>
</child>
<child>
<object class="GtkButton">
<property name="action-name">app.capture</property>
<property name="receives-default">1</property>
<property name="visible">0</property>
<property name="halign">start</property>
<child>
<object class="GtkImage">
<property name="pixel-size">60</property>
<property name="can-focus">0</property>
<property name="icon-name">shutter-button-symbolic</property>
<object class="GtkBox">
<property name="orientation">horizontal</property>
<property name="spacing">10</property>
<child>
<object class="GtkLabel">
<property name="label">Error</property>
</object>
</child>
<child>
<object class="GtkImage">
<property name="icon-name">dialog-warning-symbolic</property>
</object>
</child>
</object>
</child>
<style>
<class name="circular"/>
<class name="destructive-action"/>
</style>
</object>
</child>
@@ -129,43 +89,80 @@
<object class="GtkBox">
<property name="orientation">horizontal</property>
<property name="hexpand">1</property>
<property name="halign">end</property>
<property name="vexpand">1</property>
<property name="valign">end</property>
<property name="can-focus">0</property>
<property name="margin-end">5</property>
<property name="spacing">5</property>
<child>
<object class="GtkButton">
<property name="action-name">app.open-last</property>
<property name="receives-default">1</property>
<object class="GtkBox">
<property name="orientation">horizontal</property>
<property name="hexpand">1</property>
<property name="valign">end</property>
<property name="can-focus">0</property>
<property name="spacing">5</property>
<child>
<object class="GtkStack" id="open_last_stack">
<property name="can-focus">0</property>
<child>
<object class="GtkImage" id="thumb_last">
<property name="width-request">24</property>
<property name="height-request">24</property>
<property name="can-focus">0</property>
</object>
</child>
<child>
<object class="GtkSpinner" id="process_spinner">
<property name="width-request">24</property>
<property name="height-request">24</property>
<property name="can-focus">0</property>
</object>
</child>
<object class="GtkButton">
<property name="action-name">app.open-settings</property>
<property name="icon-name">settings-symbolic</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="action-name">app.switch-camera</property>
<property name="icon-name">switch-camera-symbolic</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkButton">
<property name="action-name">app.open-photos</property>
<property name="receives-default">1</property>
<property name="action-name">app.capture</property>
<child>
<object class="GtkImage">
<property name="pixel-size">60</property>
<property name="can-focus">0</property>
<property name="icon-name">shutter-button-symbolic</property>
</object>
</child>
<style>
<class name="circular"/>
</style>
</object>
</child>
<child>
<object class="GtkBox">
<property name="orientation">horizontal</property>
<property name="hexpand">1</property>
<property name="halign">end</property>
<property name="valign">end</property>
<property name="can-focus">0</property>
<property name="spacing">5</property>
<child>
<object class="GtkButton">
<property name="action-name">app.open-last</property>
<child>
<object class="GtkStack" id="open_last_stack">
<property name="can-focus">0</property>
<child>
<object class="GtkImage" id="thumb_last">
<property name="width-request">24</property>
<property name="height-request">24</property>
<property name="can-focus">0</property>
</object>
</child>
<child>
<object class="GtkSpinner" id="process_spinner">
<property name="width-request">24</property>
<property name="height-request">24</property>
<property name="can-focus">0</property>
</object>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkButton">
<property name="action-name">app.open-photos</property>
<property name="icon-name">folder-symbolic</property>
</object>
</child>
@@ -178,40 +175,6 @@
</style>
</object>
</child>
<child type="overlay">
<object class="GtkBox" id="error_box">
<property name="visible">0</property>
<property name="can-focus">0</property>
<child>
<object class="GtkBox">
<property name="hexpand">1</property>
<property name="can-focus">0</property>
<property name="margin-start">10</property>
<property name="margin-end">10</property>
<property name="margin-top">10</property>
<property name="margin-bottom">10</property>
<property name="spacing">10</property>
<child>
<object class="GtkLabel" id="error_message">
<property name="hexpand">1</property>
<property name="can-focus">0</property>
<property name="halign">start</property>
<property name="label" translatable="yes">No error</property>
</object>
</child>
<child>
<object class="GtkButton" id="error_close">
<property name="label">gtk-close</property>
<property name="receives-default">1</property>
</object>
</child>
</object>
</child>
<style>
<class name="errorbox"/>
</style>
</object>
</child>
</object>
</property>
</object>
@@ -221,7 +184,7 @@
<property name="name">settings</property>
<property name="title" translatable="yes">page1</property>
<property name="child">
<object class="GtkScrolledWindow" id="page_settings">
<object class="GtkScrolledWindow">
<property name="child">
<object class="GtkViewport">
<property name="can-focus">0</property>
@@ -238,11 +201,11 @@
<object class="GtkBox">
<property name="can-focus">0</property>
<child>
<object class="GtkButton" id="settings_back">
<object class="GtkButton">
<property name="label" translatable="yes">Back</property>
<property name="receives-default">1</property>
<property name="margin-start">10</property>
<property name="margin-end">10</property>
<property name="action-name">app.close-settings</property>
<style>
<class name="suggested-action"/>
</style>
@@ -251,7 +214,7 @@
<child>
<object class="GtkLabel">
<property name="can-focus">0</property>
<property name="label" translatable="yes">Settings aren&apos;t functional yet</property>
<property name="label" translatable="yes">Settings aren't functional yet</property>
</object>
</child>
</object>

42
data/controls-popover.ui Normal file
View File

@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<object class="GtkPopover" id="controls">
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<property name="hexpand">1</property>
<property name="spacing">5</property>
<child>
<object class="GtkLabel" id="title">
</object>
</child>
<child>
<object class="GtkBox">
<property name="orientation">horizontal</property>
<property name="hexpand">1</property>
<property name="spacing">5</property>
<child>
<object class="GtkScale" id="scale">
<property name="orientation">horizontal</property>
<property name="draw-value">0</property>
<property name="width-request">150</property>
</object>
</child>
<child>
<object class="GtkLabel" id="value-label">
</object>
</child>
<child>
<object class="GtkToggleButton" id="auto-button">
<property name="valign">center</property>
<property name="label">auto</property>
<property name="margin-start">5</property>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
</interface>

2
data/org.postmarketos.Megapixels.gresource.xml
View File

@@ -2,11 +2,13 @@
<gresources>
<gresource prefix="/org/postmarketos/Megapixels">
<file preprocess="xml-stripblanks">camera.ui</file>
<file preprocess="xml-stripblanks">controls-popover.ui</file>
<file>camera.css</file>
<file preprocess="xml-stripblanks">switch-camera-symbolic.svg</file>
<file preprocess="xml-stripblanks">shutter-button-symbolic.svg</file>
<file preprocess="xml-stripblanks">folder-symbolic.svg</file>
<file preprocess="xml-stripblanks">settings-symbolic.svg</file>
<file preprocess="xml-stripblanks">shutter-symbolic.svg</file>
<file>blit.vert</file>
<file>blit.frag</file>
<file>debayer.vert</file>

32
data/shutter-symbolic.svg Normal file
View File

@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
width="32"
height="32"
viewBox="0 0 8.4666665 8.466667"
version="1.1"
id="svg8">
<defs
id="defs2" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<path
style="fill:#bebebe;fill-opacity:1;stroke-width:1"
d="M 16 0 A 16.000001 16.000001 0 0 0 8.5097656 1.8730469 L 11.611328 13.443359 L 19.189453 0.3203125 A 16.000001 16.000001 0 0 0 16 0 z M 20.699219 0.70703125 L 14.705078 11.087891 L 29.330078 7.1679688 A 16.000001 16.000001 0 0 0 20.699219 0.70703125 z M 7.1679688 2.6699219 A 16.000001 16.000001 0 0 0 0.70703125 11.300781 L 11.087891 17.294922 L 7.1679688 2.6699219 z M 30.126953 8.5117188 L 18.558594 11.611328 L 31.679688 19.189453 A 16.000001 16.000001 0 0 0 32 16 A 16.000001 16.000001 0 0 0 30.126953 8.5117188 z M 0.3203125 12.810547 A 16.000001 16.000001 0 0 0 0 16 A 16.000001 16.000001 0 0 0 1.8730469 23.490234 L 13.443359 20.388672 L 0.3203125 12.810547 z M 20.912109 14.705078 L 24.832031 29.330078 A 16.000001 16.000001 0 0 0 31.292969 20.699219 L 20.912109 14.705078 z M 20.388672 18.558594 L 12.8125 31.679688 A 16.000001 16.000001 0 0 0 16 32 A 16.000001 16.000001 0 0 0 23.490234 30.126953 L 20.388672 18.558594 z M 17.294922 20.912109 L 2.6699219 24.832031 A 16.000001 16.000001 0 0 0 11.300781 31.292969 L 17.294922 20.912109 z "
transform="scale(0.26458334)"
id="path4537" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB