diff -Nru unity-control-center-14.04.3+14.04.20140328/debian/changelog unity-control-center-14.04.3+14.04.20140410/debian/changelog --- unity-control-center-14.04.3+14.04.20140328/debian/changelog 2014-04-10 14:40:17.000000000 +0000 +++ unity-control-center-14.04.3+14.04.20140410/debian/changelog 2014-04-10 14:40:17.000000000 +0000 @@ -1,3 +1,38 @@ +unity-control-center (14.04.3+14.04.20140410-0ubuntu1) trusty; urgency=low + + [ Sebastien Bacher ] + * shell: set XDG_CURRENT_DESKTOP to Unity so the correct list of + panels is included in the grid. The gnome-menus api respects + OnlyShowIn, without that we end up missing most of the panels in + other environment (e.g ubiquity). We can't change the .desktop keys + since that would lead to wrong behaviour in e.g the Unity dash + + -- Ubuntu daily release Thu, 10 Apr 2014 14:27:11 +0000 + +unity-control-center (14.04.3+14.04.20140407-0ubuntu1) trusty; urgency=low + + [ Sebastien Bacher ] + * user-accounts: Mark some strings as translatable + + -- Ubuntu daily release Mon, 07 Apr 2014 14:10:58 +0000 + +unity-control-center (14.04.3+14.04.20140404.2-0ubuntu1) trusty; urgency=low + + [ Sebastien Bacher ] + * Conflicts/Replaces/Provides gnome-control-center-unity (LP: + #1301156) + * Depends on the indicators which are controlled by the settings, + since gsettings abort on missing schemas. Note that the depends + could be lowered to a recommends or suggest if somebody was to make + the code handling those cases. (LP: #1295557) + + [ Eleni Maria Stea ] + * When the u-c-c starts the UI scale is clamped to a reasonable value + in order to make sure that the user can always see the slider. (LP: + #1296978) + + -- Ubuntu daily release Fri, 04 Apr 2014 12:37:52 +0000 + unity-control-center (14.04.3+14.04.20140328-0ubuntu1) trusty; urgency=low [ Robert Ancell ] diff -Nru unity-control-center-14.04.3+14.04.20140328/debian/control unity-control-center-14.04.3+14.04.20140410/debian/control --- unity-control-center-14.04.3+14.04.20140328/debian/control 2014-04-10 14:40:17.000000000 +0000 +++ unity-control-center-14.04.3+14.04.20140410/debian/control 2014-04-10 14:40:17.000000000 +0000 @@ -74,6 +74,11 @@ gsettings-desktop-schemas (>= 3.5.91), gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140224), ibus, + indicator-bluetooth, + indicator-datetime, + indicator-keyboard, + indicator-power, + indicator-sound, Recommends: cups-pk-helper, gnome-session-bin, ubuntu-system-service, @@ -85,8 +90,10 @@ system-config-printer-gnome, gnome-control-center-shared-data Conflicts: gnome-control-center (<< 1:3.6.3-0ubuntu50), + gnome-control-center-unity, unity-control-center-datetime Replaces: gnome-bluetooth (<< 3.4.0), + gnome-control-center-unity, unity-control-center-datetime Breaks: gnome-power-manager (<< 3.0), gnome-session (<< 3.0), @@ -100,7 +107,8 @@ gstreamer0.10-pulseaudio, libcanberra-gtk-module, x11-xserver-utils -Provides: unity-control-center-datetime +Provides: unity-control-center-datetime, + gnome-control-center-unity, Description: utilities to configure the GNOME desktop This package contains configuration applets for the GNOME desktop, allowing to set accessibility configuration, desktop fonts, keyboard diff -Nru unity-control-center-14.04.3+14.04.20140328/panels/display/cc-display-panel.c unity-control-center-14.04.3+14.04.20140410/panels/display/cc-display-panel.c --- unity-control-center-14.04.3+14.04.20140328/panels/display/cc-display-panel.c 2014-03-28 12:57:57.000000000 +0000 +++ unity-control-center-14.04.3+14.04.20140410/panels/display/cc-display-panel.c 2014-04-10 14:26:50.000000000 +0000 @@ -20,6 +20,7 @@ */ #include +#include #include #include #include @@ -597,6 +598,42 @@ return g_variant_builder_end (&builder); } +static int +get_ui_scale_from_monitor (CcDisplayPanel *self, const char *monitor_name) +{ + int value; + GVariant *dict; + + dict = g_settings_get_value (self->priv->desktop_settings, "scale-factor"); + if (!g_variant_lookup (dict, monitor_name, "i", &value)) + value = UI_SCALE_DEFAULT; + + return value; +} + +static int +calculate_max_ui_scale (CcDisplayPanel *self) +{ + int win_max_dimension; + int output_width, output_height; + float max_scale; + + GnomeRROutputInfo *output = self->priv->current_output; + const char *monitor_name = gnome_rr_output_info_get_name (output); + int current_ui_scale = get_ui_scale_from_monitor (self, monitor_name); + float current_scale_factor = (float)current_ui_scale / 8.0; + float win_scale_factor = current_scale_factor > 1 ? floor (current_scale_factor) : 1; + + get_geometry (output, &output_width, &output_height); + + /* only the integer part of the scale-factor contributes to the window size */ + + win_max_dimension = MINIMUM_HEIGHT / win_scale_factor; + max_scale = (float)output_height / (float)win_max_dimension; + + return (int)(max_scale * 8.0); +} + static void rebuild_ui_scale (CcDisplayPanel *self) { @@ -615,7 +652,7 @@ } gtk_adjustment_set_step_increment (adj, UI_SCALE_STEP); - gtk_adjustment_set_upper (adj, UI_SCALE_MAX); + gtk_adjustment_set_upper (adj, calculate_max_ui_scale(self)); gtk_adjustment_set_lower (adj, UI_SCALE_MIN); gtk_scale_set_digits (GTK_SCALE(self->priv->ui_scale), 0); gtk_scale_add_mark (GTK_SCALE(self->priv->ui_scale), UI_SCALE_DEFAULT, GTK_POS_TOP, NULL); diff -Nru unity-control-center-14.04.3+14.04.20140328/panels/user-accounts/um-history-dialog.c unity-control-center-14.04.3+14.04.20140410/panels/user-accounts/um-history-dialog.c --- unity-control-center-14.04.3+14.04.20140328/panels/user-accounts/um-history-dialog.c 2014-03-28 12:57:32.000000000 +0000 +++ unity-control-center-14.04.3+14.04.20140410/panels/user-accounts/um-history-dialog.c 2014-04-10 14:26:50.000000000 +0000 @@ -92,15 +92,23 @@ } else { date = g_date_time_add_days (um->week, 6); - from = g_date_time_format (um->week, "%b %e"); + /* Translators: This is a date format string in the style of "Feb 18", + shown as the first day of a week on login history dialog. */ + from = g_date_time_format (um->week, C_("login history week label","%b %e")); if (g_date_time_get_year (um->week) == g_date_time_get_year (um->current_week)) { - to = g_date_time_format (date, "%b %e"); + /* Translators: This is a date format string in the style of "Feb 24", + shown as the last day of a week on login history dialog. */ + to = g_date_time_format (date, C_("login history week label","%b %e")); } else { - to = g_date_time_format (date, "%b %e, %Y"); + /* Translators: This is a date format string in the style of "Feb 24, 2013", + shown as the last day of a week on login history dialog. */ + to = g_date_time_format (date, C_("login history week label","%b %e, %Y")); } - label = g_strconcat (from, " - ", to, NULL); + /* Translators: This indicates a week label on a login history. + The first %s is the first day of a week, and the second %s the last day. */ + label = g_strdup_printf(C_("login history week label", "%s - %s"), from, to); g_date_time_unref (date); g_free (from); @@ -182,8 +190,12 @@ GtkWidget *label; date = get_smart_date (datetime); - time = g_date_time_format (datetime, "%k:%M"); - str = g_strconcat (date, ", ", time, NULL); + /* Translators: This is a time format string in the style of "22:58". + It indicates a login time which follows a date. */ + time = g_date_time_format (datetime, C_("login date-time", "%k:%M")); + /* Translators: This indicates a login date-time. + The first %s is a date, and the second %s a time. */ + str = g_strdup_printf(C_("login date-time", "%s, %s"), date, time); label = gtk_label_new (str); gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_grid_attach (GTK_GRID (grid), label, 1, line, 1, 1); @@ -244,13 +256,13 @@ if (history.logout_time > 0 && history.logout_time < to) { datetime = g_date_time_new_from_unix_local (history.logout_time); - add_record (grid, datetime, "Session Ended", line); + add_record (grid, datetime, _("Session Ended"), line); line++; } if (history.login_time >= from) { datetime = g_date_time_new_from_unix_local (history.login_time); - add_record (grid, datetime, "Session Started", line); + add_record (grid, datetime, _("Session Started"), line); line++; } } diff -Nru unity-control-center-14.04.3+14.04.20140328/panels/user-accounts/um-user-panel.c unity-control-center-14.04.3+14.04.20140410/panels/user-accounts/um-user-panel.c --- unity-control-center-14.04.3+14.04.20140328/panels/user-accounts/um-user-panel.c 2014-03-28 12:57:32.000000000 +0000 +++ unity-control-center-14.04.3+14.04.20140410/panels/user-accounts/um-user-panel.c 2014-04-10 14:26:50.000000000 +0000 @@ -619,9 +619,13 @@ else if (time > 0) { date_time = g_date_time_new_from_unix_local (time); date_str = get_smart_date (date_time); - time_str = g_date_time_format (date_time, "%k:%M"); + /* Translators: This is a time format string in the style of "22:58". + It indicates a login time which follows a date. */ + time_str = g_date_time_format (date_time, C_("login date-time", "%k:%M")); - text = g_strconcat (date_str, ", ", time_str, NULL); + /* Translators: This indicates a login date-time. + The first %s is a date, and the second %s a time. */ + text = g_strdup_printf(C_("login date-time", "%s, %s"), date_str, time_str); g_date_time_unref (date_time); g_free (date_str); diff -Nru unity-control-center-14.04.3+14.04.20140328/panels/user-accounts/um-utils.c unity-control-center-14.04.3+14.04.20140410/panels/user-accounts/um-utils.c --- unity-control-center-14.04.3+14.04.20140328/panels/user-accounts/um-utils.c 2014-03-28 12:57:32.000000000 +0000 +++ unity-control-center-14.04.3+14.04.20140410/panels/user-accounts/um-utils.c 2014-04-10 14:26:50.000000000 +0000 @@ -819,10 +819,12 @@ } else { if (g_date_time_get_year (date) == g_date_time_get_year (today)) { - label = g_date_time_format (date, "%b %e"); + /* Translators: This is a date format string in the style of "Feb 24". */ + label = g_date_time_format (date, _("%b %e")); } else { - label = g_date_time_format (date, "%b %e, %Y"); + /* Translators: This is a date format string in the style of "Feb 24, 2013". */ + label = g_date_time_format (date, _("%b %e, %Y")); } } diff -Nru unity-control-center-14.04.3+14.04.20140328/shell/control-center.c unity-control-center-14.04.3+14.04.20140410/shell/control-center.c --- unity-control-center-14.04.3+14.04.20140328/shell/control-center.c 2014-03-28 12:57:32.000000000 +0000 +++ unity-control-center-14.04.3+14.04.20140410/shell/control-center.c 2014-04-10 14:27:00.000000000 +0000 @@ -329,6 +329,7 @@ gtk_icon_size_register ("cc-sidebar-list", 24, 24); notify_init ("gnome-control-center"); + g_setenv ("XDG_CURRENT_DESKTOP", "Unity", TRUE); shell = gnome_control_center_new ();