McSinyx
/
megapixels
mirror of https://git.sr.ht/~martijnbraam/megapixels
1
1
Fork 0
Code Issues Releases Wiki Activity

More progress on GTK4 port

This commit is contained in:
Benjamin Schaaf 2021-04-20 23:50:26 +10:00
parent d42ee3e1c0
commit ea0fd24cc8
6 changed files with 61 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/camera.css
View File

@ -6,3 +6,7 @@
.controlbox { .controlbox {
background: rgba(0,0,0,0.2); background: rgba(0,0,0,0.2);
} }
.button-overlay {
opacity: 0.9;
}

43
data/camera.ui
View File

@ -68,7 +68,7 @@
</object> </object>
</child> </child>
<child type="overlay"> <child type="overlay">
<object class="GtkBox" id="controls_box"> <object class="GtkBox">
<property name="orientation">horizontal</property> <property name="orientation">horizontal</property>
<property name="hexpand">1</property> <property name="hexpand">1</property>
<property name="valign">end</property> <property name="valign">end</property>
@ -84,23 +84,25 @@
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="spacing">5</property> <property name="spacing">5</property>
<child> <child>
<object class="GtkButton" id="settings"> <object class="GtkButton">
<property name="action-name">app.open-settings</property>
<property name="receives-default">1</property> <property name="receives-default">1</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
<property name="can-focus">0</property> <property name="can-focus">0</property>
<property name="resource">/org/postmarketos/Megapixels/settings-symbolic.svg</property> <property name="icon-name">settings-symbolic</property>
</object> </object>
</child> </child>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton" id="switch_camera"> <object class="GtkButton">
<property name="action-name">app.switch-camera</property>
<property name="receives-default">1</property> <property name="receives-default">1</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
<property name="can-focus">0</property> <property name="can-focus">0</property>
<property name="resource">/org/postmarketos/Megapixels/switch-camera.svg</property> <property name="icon-name">switch-camera-symbolic</property>
</object> </object>
</child> </child>
</object> </object>
@ -115,7 +117,7 @@
<object class="GtkImage"> <object class="GtkImage">
<property name="pixel-size">60</property> <property name="pixel-size">60</property>
<property name="can-focus">0</property> <property name="can-focus">0</property>
<property name="resource">/org/postmarketos/Megapixels/shutter-button.svg</property> <property name="icon-name">shutter-button-symbolic</property>
</object> </object>
</child> </child>
<style> <style>
@ -133,18 +135,8 @@
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="spacing">5</property> <property name="spacing">5</property>
<child> <child>
<object class="GtkButton" id="open_directory"> <object class="GtkButton">
<property name="receives-default">1</property> <property name="action-name">app.open-last</property>
<child>
<object class="GtkImage">
<property name="can-focus">0</property>
<property name="resource">/org/postmarketos/Megapixels/folder-symbolic.svg</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkButton" id="open_last">
<property name="receives-default">1</property> <property name="receives-default">1</property>
<child> <child>
<object class="GtkStack" id="open_last_stack"> <object class="GtkStack" id="open_last_stack">
@ -167,8 +159,23 @@
</child> </child>
</object> </object>
</child> </child>
<child>
<object class="GtkButton">
<property name="action-name">app.open-photos</property>
<property name="receives-default">1</property>
<child>
<object class="GtkImage">
<property name="can-focus">0</property>
<property name="icon-name">folder-symbolic</property>
</object>
</child>
</object>
</child>
</object> </object>
</child> </child>
<style>
<class name="button-overlay"/>
</style>
</object> </object>
</child> </child>
<child type="overlay"> <child type="overlay">

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

@ -3,8 +3,8 @@
<gresource prefix="/org/postmarketos/Megapixels"> <gresource prefix="/org/postmarketos/Megapixels">
<file preprocess="xml-stripblanks">camera.ui</file> <file preprocess="xml-stripblanks">camera.ui</file>
<file>camera.css</file> <file>camera.css</file>
<file preprocess="xml-stripblanks">switch-camera.svg</file> <file preprocess="xml-stripblanks">switch-camera-symbolic.svg</file>
<file preprocess="xml-stripblanks">shutter-button.svg</file> <file preprocess="xml-stripblanks">shutter-button-symbolic.svg</file>
<file preprocess="xml-stripblanks">folder-symbolic.svg</file> <file preprocess="xml-stripblanks">folder-symbolic.svg</file>
<file preprocess="xml-stripblanks">settings-symbolic.svg</file> <file preprocess="xml-stripblanks">settings-symbolic.svg</file>
<file>blit.vert</file> <file>blit.vert</file>

0
data/shutter-button.svg → data/shutter-button-symbolic.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
data/switch-camera.svg → data/switch-camera-symbolic.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

70
src/main.c
View File

@ -473,7 +473,7 @@ preview_resize(GtkWidget *widget, int width, int height, gpointer data)
} }
void void
on_open_last_clicked(GtkWidget *widget, gpointer user_data) run_open_last_action(GSimpleAction *action, GVariant *param, gpointer user_data)
{ {
char uri[275]; char uri[275];
GError *error = NULL; GError *error = NULL;
@ -488,7 +488,7 @@ on_open_last_clicked(GtkWidget *widget, gpointer user_data)
} }
void void
on_open_directory_clicked(GtkWidget *widget, gpointer user_data) run_open_photos_action(GSimpleAction *action, GVariant *param, gpointer user_data)
{ {
char uri[270]; char uri[270];
GError *error = NULL; GError *error = NULL;
@ -663,7 +663,7 @@ on_error_close_clicked(GtkWidget *widget, gpointer user_data)
} }
void void
on_camera_switch_clicked(GtkWidget *widget, gpointer user_data) run_camera_switch_action(GSimpleAction *action, GVariant *param, gpointer user_data)
{ {
size_t next_index = camera->index + 1; size_t next_index = camera->index + 1;
const struct mp_camera_config *next_camera = const struct mp_camera_config *next_camera =
@ -679,7 +679,7 @@ on_camera_switch_clicked(GtkWidget *widget, gpointer user_data)
} }
void void
on_settings_btn_clicked(GtkWidget *widget, gpointer user_data) run_open_settings_action(GSimpleAction *action, GVariant *param, gpointer user_data)
{ {
gtk_stack_set_visible_child_name(GTK_STACK(main_stack), "settings"); gtk_stack_set_visible_child_name(GTK_STACK(main_stack), "settings");
} }
@ -778,30 +778,39 @@ on_realize(GtkWidget *window, gpointer *data)
update_io_pipeline(); update_io_pipeline();
} }
static GSimpleAction *create_simple_action(GtkApplication *app, const char *name, GCallback callback)
{
GSimpleAction *action = g_simple_action_new(name, NULL);
g_signal_connect(action, "activate", callback, NULL);
g_action_map_add_action(G_ACTION_MAP(app), G_ACTION(action));
return action;
}
static void static void
activate(GtkApplication *app, gpointer data) activate(GtkApplication *app, gpointer data)
{ {
g_object_set(gtk_settings_get_default(), "gtk-application-prefer-dark-theme", g_object_set(gtk_settings_get_default(), "gtk-application-prefer-dark-theme",
TRUE, NULL); TRUE, NULL);
assert(g_resources_lookup_data("/org/postmarketos/Megapixels/camera.ui", 0, NULL) != NULL); GdkDisplay *display = gdk_display_get_default();
GtkIconTheme *icon_theme = gtk_icon_theme_get_for_display(display);
gtk_icon_theme_add_resource_path(icon_theme, "/org/postmarketos/Megapixels");
GtkCssProvider *provider = gtk_css_provider_new();
gtk_css_provider_load_from_resource(
provider, "/org/postmarketos/Megapixels/camera.css");
gtk_style_context_add_provider_for_display(
display, GTK_STYLE_PROVIDER(provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
GtkBuilder *builder = gtk_builder_new_from_resource( GtkBuilder *builder = gtk_builder_new_from_resource(
"/org/postmarketos/Megapixels/camera.ui"); "/org/postmarketos/Megapixels/camera.ui");
GtkWidget *window = GTK_WIDGET(gtk_builder_get_object(builder, "window")); GtkWidget *window = GTK_WIDGET(gtk_builder_get_object(builder, "window"));
GtkWidget *switch_btn =
GTK_WIDGET(gtk_builder_get_object(builder, "switch_camera"));
GtkWidget *settings_btn =
GTK_WIDGET(gtk_builder_get_object(builder, "settings"));
GtkWidget *settings_back = GtkWidget *settings_back =
GTK_WIDGET(gtk_builder_get_object(builder, "settings_back")); GTK_WIDGET(gtk_builder_get_object(builder, "settings_back"));
GtkWidget *error_close = GtkWidget *error_close =
GTK_WIDGET(gtk_builder_get_object(builder, "error_close")); GTK_WIDGET(gtk_builder_get_object(builder, "error_close"));
GtkWidget *open_last =
GTK_WIDGET(gtk_builder_get_object(builder, "open_last"));
GtkWidget *open_directory =
GTK_WIDGET(gtk_builder_get_object(builder, "open_directory"));
preview = GTK_WIDGET(gtk_builder_get_object(builder, "preview")); preview = GTK_WIDGET(gtk_builder_get_object(builder, "preview"));
error_box = GTK_WIDGET(gtk_builder_get_object(builder, "error_box")); error_box = GTK_WIDGET(gtk_builder_get_object(builder, "error_box"));
error_message = GTK_WIDGET(gtk_builder_get_object(builder, "error_message")); error_message = GTK_WIDGET(gtk_builder_get_object(builder, "error_message"));
@ -817,16 +826,8 @@ activate(GtkApplication *app, gpointer data)
g_signal_connect(window, "realize", G_CALLBACK(on_realize), NULL); g_signal_connect(window, "realize", G_CALLBACK(on_realize), NULL);
g_signal_connect(error_close, "clicked", G_CALLBACK(on_error_close_clicked), g_signal_connect(error_close, "clicked", G_CALLBACK(on_error_close_clicked),
NULL); NULL);
g_signal_connect(switch_btn, "clicked", G_CALLBACK(on_camera_switch_clicked),
NULL);
g_signal_connect(settings_btn, "clicked",
G_CALLBACK(on_settings_btn_clicked), NULL);
g_signal_connect(settings_back, "clicked", G_CALLBACK(on_back_clicked), g_signal_connect(settings_back, "clicked", G_CALLBACK(on_back_clicked),
NULL); NULL);
g_signal_connect(open_last, "clicked", G_CALLBACK(on_open_last_clicked),
NULL);
g_signal_connect(open_directory, "clicked",
G_CALLBACK(on_open_directory_clicked), NULL);
g_signal_connect(preview, "realize", G_CALLBACK(preview_realize), NULL); g_signal_connect(preview, "realize", G_CALLBACK(preview_realize), NULL);
g_signal_connect(preview, "render", G_CALLBACK(preview_draw), NULL); g_signal_connect(preview, "render", G_CALLBACK(preview_draw), NULL);
@ -840,29 +841,18 @@ activate(GtkApplication *app, gpointer data)
g_signal_connect(control_slider, "value-changed", g_signal_connect(control_slider, "value-changed",
G_CALLBACK(on_control_slider_changed), NULL); G_CALLBACK(on_control_slider_changed), NULL);
GtkCssProvider *provider = gtk_css_provider_new(); // Setup actions
gtk_css_provider_load_from_resource( create_simple_action(app, "capture", G_CALLBACK(run_capture_action));
provider, "/org/postmarketos/Megapixels/camera.css"); create_simple_action(app, "camera-switch", G_CALLBACK(run_camera_switch_action));
GtkStyleContext *context = gtk_widget_get_style_context(error_box); create_simple_action(app, "open-settings", G_CALLBACK(run_open_settings_action));
gtk_style_context_add_provider(context, GTK_STYLE_PROVIDER(provider), create_simple_action(app, "open-last", G_CALLBACK(run_open_last_action));
GTK_STYLE_PROVIDER_PRIORITY_USER); create_simple_action(app, "open-photos", G_CALLBACK(run_open_photos_action));
context = gtk_widget_get_style_context(control_box); create_simple_action(app, "quit", G_CALLBACK(run_quit_action));
gtk_style_context_add_provider(context, GTK_STYLE_PROVIDER(provider),
GTK_STYLE_PROVIDER_PRIORITY_USER);
// Setup capture action
GSimpleAction *capture_action = g_simple_action_new("capture", NULL);
g_signal_connect(capture_action, "activate", G_CALLBACK(run_capture_action), NULL);
g_action_map_add_action(G_ACTION_MAP(app), G_ACTION(capture_action));
// Setup shortcuts
const char *capture_accels[] = { "space", NULL }; const char *capture_accels[] = { "space", NULL };
gtk_application_set_accels_for_action(app, "app.capture", capture_accels); gtk_application_set_accels_for_action(app, "app.capture", capture_accels);
// Setup quit action
GSimpleAction *quit_action = g_simple_action_new("quit", NULL);
g_signal_connect(quit_action, "activate", G_CALLBACK(run_quit_action), app);
g_action_map_add_action(G_ACTION_MAP(app), G_ACTION(quit_action));
const char *quit_accels[] = { "<Ctrl>q", "<Ctrl>w", NULL }; const char *quit_accels[] = { "<Ctrl>q", "<Ctrl>w", NULL };
gtk_application_set_accels_for_action(app, "app.quit", quit_accels); gtk_application_set_accels_for_action(app, "app.quit", quit_accels);