Commit c44168a1 authored by Guido Gunther's avatar Guido Gunther

Merge branch 'adaptive-ui' into 'pureos/sloppy'

Adaptive ui

See merge request !2
parents 9bf83a78 5d383c3e
Pipeline #59774 passed with stages
in 12 minutes and 8 seconds
......@@ -700,7 +700,6 @@ refresh_account (GoaProvider *provider,
NULL);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
gtk_box_set_spacing (GTK_BOX (vbox), 12);
......
......@@ -1188,7 +1188,6 @@ refresh_account (GoaProvider *provider,
NULL);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
gtk_box_set_spacing (GTK_BOX (vbox), 12);
......@@ -1461,8 +1460,8 @@ show_account (GoaProvider *provider,
grid = gtk_grid_new ();
gtk_widget_set_halign (grid, GTK_ALIGN_CENTER);
gtk_widget_set_hexpand (grid, TRUE);
gtk_widget_set_margin_end (grid, 72);
gtk_widget_set_margin_start (grid, 72);
gtk_widget_set_margin_end (grid, 24);
gtk_widget_set_margin_start (grid, 24);
gtk_widget_set_margin_top (grid, 24);
gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
......
......@@ -792,7 +792,6 @@ refresh_account (GoaProvider *provider,
NULL);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
gtk_box_set_spacing (GTK_BOX (vbox), 12);
......
......@@ -394,7 +394,7 @@ create_account_details_ui (GoaProvider *provider,
gtk_container_add (GTK_CONTAINER (grid0), grid1);
row = 0;
add_email_entry (grid1, row++, _("_Librem One Address"), &data->username);
add_email_entry (grid1, row++, _("_Address"), &data->username);
add_entry (grid1, row++, _("_Password"), &data->password);
gtk_entry_set_visibility (GTK_ENTRY (data->password), FALSE);
......@@ -669,7 +669,6 @@ refresh_account (GoaProvider *provider,
NULL);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
gtk_box_set_spacing (GTK_BOX (vbox), 12);
......
......@@ -1224,7 +1224,6 @@ goa_oauth2_provider_refresh_account (GoaProvider *provider,
NULL,
NULL);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
gtk_widget_show_all (dialog);
account = goa_object_peek_account (object);
......
......@@ -1153,7 +1153,6 @@ goa_oauth_provider_refresh_account (GoaProvider *_provider,
NULL,
NULL);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
gtk_widget_show_all (dialog);
account = goa_object_peek_account (object);
......
......@@ -838,7 +838,6 @@ refresh_account (GoaProvider *provider,
NULL);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
gtk_box_set_spacing (GTK_BOX (vbox), 12);
......
......@@ -553,8 +553,8 @@ goa_provider_show_account_real (GoaProvider *provider,
grid = gtk_grid_new ();
gtk_widget_set_halign (grid, GTK_ALIGN_CENTER);
gtk_widget_set_hexpand (grid, TRUE);
gtk_widget_set_margin_end (grid, 72);
gtk_widget_set_margin_start (grid, 72);
gtk_widget_set_margin_end (grid, 24);
gtk_widget_set_margin_start (grid, 24);
gtk_widget_set_margin_top (grid, 24);
gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment