diff --git a/src/calls-application.c b/src/calls-application.c index 756c7e1..3e2dd37 100644 --- a/src/calls-application.c +++ b/src/calls-application.c @@ -158,6 +158,28 @@ static const GActionEntry actions[] = }; +static void +css_setup () +{ + GtkCssProvider *provider; + GFile *file; + GError *error = NULL; + + provider = gtk_css_provider_new (); + file = g_file_new_for_uri ("resource:///sm/puri/calls/style.css"); + + if (!gtk_css_provider_load_from_file (provider, file, &error)) { + g_warning ("Failed to load CSS file: %s", error->message); + g_clear_error (&error); + g_object_unref (file); + return; + } + gtk_style_context_add_provider_for_screen (gdk_screen_get_default (), + GTK_STYLE_PROVIDER (provider), 600); + g_object_unref (file); +} + + static void startup (GApplication *application) { @@ -175,6 +197,8 @@ startup (GApplication *application) actions, G_N_ELEMENTS (actions), application); + + css_setup (); } diff --git a/src/calls-new-call-box.c b/src/calls-new-call-box.c index cfaaee8..2753f21 100644 --- a/src/calls-new-call-box.c +++ b/src/calls-new-call-box.c @@ -298,24 +298,6 @@ calls_new_call_box_init (CallsNewCallBox *self) } -static void -constructed (GObject *object) -{ - GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT); - CallsNewCallBox *self = CALLS_NEW_CALL_BOX (object); - GtkWidget *entry = hdy_keypad_get_entry (self->keypad); - PangoAttrList *attrs; - - // Increase the size of the number entry text - attrs = pango_attr_list_new (); - pango_attr_list_insert (attrs, pango_attr_scale_new (1.2)); - gtk_entry_set_attributes (GTK_ENTRY (entry), attrs); - pango_attr_list_unref (attrs); - - parent_class->constructed (object); -} - - static void dispose (GObject *object) { @@ -340,7 +322,6 @@ calls_new_call_box_class_init (CallsNewCallBoxClass *klass) GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); object_class->set_property = set_property; - object_class->constructed = constructed; object_class->dispose = dispose; diff --git a/src/calls.gresources.xml b/src/calls.gresources.xml index f76110d..7266df8 100644 --- a/src/calls.gresources.xml +++ b/src/calls.gresources.xml @@ -13,6 +13,7 @@ call-record-row.ui + style.css new-call-symbolic.svg call-arrow-incoming-symbolic.svg call-arrow-incoming-missed-symbolic.svg diff --git a/src/style.css b/src/style.css new file mode 100644 index 0000000..9fe7b51 --- /dev/null +++ b/src/style.css @@ -0,0 +1,16 @@ +hdykeypad > button, .dial-button, .delete-button { + border-radius: 9999px; + -gtk-outline-radius: 9999px; +} + +.dial-button { + padding: 19px 42px +} + +.delete-button { + padding: 8px 12px; +} + +.phone-number-entry { + font-size: 24px; +} diff --git a/src/ui/call-display.ui b/src/ui/call-display.ui index 5aea0dd..35cb5c6 100644 --- a/src/ui/call-display.ui +++ b/src/ui/call-display.ui @@ -404,6 +404,9 @@ 0.5 + diff --git a/src/ui/new-call-box.ui b/src/ui/new-call-box.ui index 2edf88f..21db7d1 100644 --- a/src/ui/new-call-box.ui +++ b/src/ui/new-call-box.ui @@ -53,26 +53,9 @@ True 0.5 6 - - - - - True - True - True - False - - - - Backspace through number - - - - - True - edit-clear-symbolic - - + @@ -97,49 +80,82 @@ - - True - True - center - 65 - True - start + True - 150 - - - - - Dial + False + horizontal + + + True + True + True + True + + + + + Dial + + + + + True + call-start-symbolic + 5 + + + + False + True + - + + True + True True - call-start-symbolic - 5 + False + 15 + center + center + + + + Backspace through number + + + + + + True + edit-clear-symbolic + + + + end + - - False - True - True False True - - - False - True - 16 - - + + + False + True + 16 + +