Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cinnamon-control-center for
openSUSE:Factory checked in at 2021-08-26 23:15:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon-control-center (Old)
and /work/SRC/openSUSE:Factory/.cinnamon-control-center.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-control-center"
Thu Aug 26 23:15:04 2021 rev:24 rq:914290 version:5.0.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/cinnamon-control-center/cinnamon-control-center.changes
2021-06-22 20:45:04.810832420 +0200
+++
/work/SRC/openSUSE:Factory/.cinnamon-control-center.new.1899/cinnamon-control-center.changes
2021-08-26 23:16:13.784202878 +0200
@@ -1,0 +2,14 @@
+Tue Aug 24 20:42:00 UTC 2021 - andy great <[email protected]>
+
+- Update to version 5.0.2.
+ * Remove calibrate button from UI
+ * cc-color-panel.c: Remove references to removed calibrate button.
+- Update for version 5.0.1.
+ * build: Add a build option to ignore deprecation warnings during
+ the build, and enable it by default.
+ * display panel: Hide the fractional scaling controls by default.
+ * display panel: Forgot to git add the gsettings schema file and
+ install script.
+ * l10n: Update POT
+
+-------------------------------------------------------------------
Old:
----
cinnamon-control-center-5.0.0.tar.gz
New:
----
cinnamon-control-center-5.0.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon-control-center.spec ++++++
--- /var/tmp/diff_new_pack.ijhqxn/_old 2021-08-26 23:16:14.244202489 +0200
+++ /var/tmp/diff_new_pack.ijhqxn/_new 2021-08-26 23:16:14.248202485 +0200
@@ -19,7 +19,7 @@
%define soname libcinnamon-control-center
%define sover 1
Name: cinnamon-control-center
-Version: 5.0.0
+Version: 5.0.2
Release: 0
Summary: Utilities to configure the Cinnamon desktop
License: GPL-2.0-only AND GPL-3.0-or-later AND MIT
@@ -154,6 +154,7 @@
%doc README debian/changelog
%{_bindir}/cinnamon-*
%{_datadir}/applications/cinnamon-*.desktop
+%{_datadir}/glib-2.0/schemas/org.cinnamon.control-center.display.gschema.xml
%files common
%{_datadir}/%{name}/
++++++ cinnamon-control-center-5.0.0.tar.gz ->
cinnamon-control-center-5.0.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-5.0.0/cinnamon-control-center.pot
new/cinnamon-control-center-5.0.2/cinnamon-control-center.pot
--- old/cinnamon-control-center-5.0.0/cinnamon-control-center.pot
2021-05-27 16:33:09.000000000 +0200
+++ new/cinnamon-control-center-5.0.2/cinnamon-control-center.pot
2021-06-25 18:01:54.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-27 15:31+0100\n"
+"POT-Creation-Date: 2021-06-04 12:20+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -306,28 +306,28 @@
msgid "Unspecified"
msgstr ""
-#: panels/display/cc-display-panel.c:620 panels/display/cc-display-panel.c:1229
-#: panels/display/cc-display-panel.c:1236
+#: panels/display/cc-display-panel.c:642 panels/display/cc-display-panel.c:1251
+#: panels/display/cc-display-panel.c:1258
#, c-format
msgid "%d%%"
msgstr ""
-#: panels/display/cc-display-panel.c:687
+#: panels/display/cc-display-panel.c:709
msgctxt "display panel, rotation"
msgid "Normal"
msgstr ""
-#: panels/display/cc-display-panel.c:688
+#: panels/display/cc-display-panel.c:710
msgctxt "display panel, rotation"
msgid "Counterclockwise"
msgstr ""
-#: panels/display/cc-display-panel.c:689
+#: panels/display/cc-display-panel.c:711
msgctxt "display panel, rotation"
msgid "Clockwise"
msgstr ""
-#: panels/display/cc-display-panel.c:690
+#: panels/display/cc-display-panel.c:712
msgctxt "display panel, rotation"
msgid "180 Degrees"
msgstr ""
@@ -343,80 +343,80 @@
#. * Here, "Mirrored" is being used as an adjective. For example,
#. * the Spanish translation could be "Pantallas en Espejo".
#.
-#: panels/display/cc-display-panel.c:835 panels/display/cc-rr-labeler.c:404
+#: panels/display/cc-display-panel.c:857 panels/display/cc-rr-labeler.c:404
msgid "Mirrored Displays"
msgstr ""
-#: panels/display/cc-display-panel.c:859
+#: panels/display/cc-display-panel.c:881
msgid "Monitor"
msgstr ""
-#: panels/display/cc-display-panel.c:963
+#: panels/display/cc-display-panel.c:985
#, c-format
msgid "%d x %d%s (%s)"
msgstr ""
-#: panels/display/cc-display-panel.c:965
+#: panels/display/cc-display-panel.c:987
#, c-format
msgid "%d x %d%s"
msgstr ""
-#: panels/display/cc-display-panel.c:980
+#: panels/display/cc-display-panel.c:1002
#, c-format
msgid "%.2lf Hz"
msgstr ""
-#: panels/display/cc-display-panel.c:1259
+#: panels/display/cc-display-panel.c:1281
msgid "Normal"
msgstr ""
-#: panels/display/cc-display-panel.c:1261
+#: panels/display/cc-display-panel.c:1283
msgid "Double (Hi-DPI)"
msgstr ""
-#: panels/display/cc-display-panel.c:1301
+#: panels/display/cc-display-panel.c:1323
#, c-format
msgid "Automatic (%ux)"
msgstr ""
-#: panels/display/cc-display-panel.c:2482
+#: panels/display/cc-display-panel.c:2510
msgid ""
"Select a monitor to change its properties; drag it to rearrange its "
"placement."
msgstr ""
-#: panels/display/cc-display-panel.c:2931
+#: panels/display/cc-display-panel.c:2959
msgid "DoubleScan"
msgstr ""
-#: panels/display/cc-display-panel.c:2969
+#: panels/display/cc-display-panel.c:2997
msgid "VSync"
msgstr ""
-#: panels/display/cc-display-panel.c:3007
#: panels/display/cc-display-panel.c:3035
+#: panels/display/cc-display-panel.c:3063
msgid "Recommended"
msgstr ""
-#: panels/display/cc-display-panel.c:3070
+#: panels/display/cc-display-panel.c:3098
#, c-format
msgid "<b>scaled resolution: %d x %d</b>"
msgstr ""
-#: panels/display/cc-display-panel.c:3259
-#: panels/display/cc-display-panel.c:3311
+#: panels/display/cc-display-panel.c:3287
+#: panels/display/cc-display-panel.c:3339
msgid "Failed to apply configuration"
msgstr ""
-#: panels/display/cc-display-panel.c:3339
+#: panels/display/cc-display-panel.c:3367
msgid "Could not save the monitor configuration"
msgstr ""
-#: panels/display/cc-display-panel.c:3399
+#: panels/display/cc-display-panel.c:3427
msgid "Could not detect displays"
msgstr ""
-#: panels/display/cc-display-panel.c:3641
+#: panels/display/cc-display-panel.c:3671
msgid "Could not get screen information"
msgstr ""
@@ -1385,38 +1385,38 @@
msgstr ""
#: panels/display/display-capplet.ui.h:5
-msgid "Fractional scaling"
-msgstr ""
-
-#: panels/display/display-capplet.ui.h:6
msgid "Rotation"
msgstr ""
-#: panels/display/display-capplet.ui.h:7
+#: panels/display/display-capplet.ui.h:6
msgid "Refresh Rate"
msgstr ""
-#: panels/display/display-capplet.ui.h:8
+#: panels/display/display-capplet.ui.h:7
msgid "User interface scale"
msgstr ""
-#: panels/display/display-capplet.ui.h:9
+#: panels/display/display-capplet.ui.h:8
msgid ""
"This is the global scaling factor for all monitors. In automatic mode, it is "
"chosen based on the primary monitor."
msgstr ""
-#: panels/display/display-capplet.ui.h:10
+#: panels/display/display-capplet.ui.h:9
msgid "This option may limit resolution options"
msgstr ""
-#: panels/display/display-capplet.ui.h:11
+#: panels/display/display-capplet.ui.h:10
msgid ""
"This feature is experimental and may not work well with all hardware and "
"drivers. Enabling it may impact performance, vsync, resolution or screen "
"ratio."
msgstr ""
+#: panels/display/display-capplet.ui.h:11
+msgid "Fractional scaling"
+msgstr ""
+
#: panels/display/display-capplet.ui.h:12
msgid "_Detect Displays"
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-control-center-5.0.0/debian/changelog
new/cinnamon-control-center-5.0.2/debian/changelog
--- old/cinnamon-control-center-5.0.0/debian/changelog 2021-05-27
16:33:09.000000000 +0200
+++ new/cinnamon-control-center-5.0.2/debian/changelog 2021-06-25
18:01:54.000000000 +0200
@@ -1,3 +1,25 @@
+cinnamon-control-center (5.0.2) uma; urgency=medium
+
+ [ Leigh Scott ]
+ * Remove calibrate button from UI
+
+ [ Michael Webster ]
+ * cc-color-panel.c: Remove references to removed calibrate button.
+
+ -- Clement Lefebvre <[email protected]> Fri, 25 Jun 2021 16:58:05 +0100
+
+cinnamon-control-center (5.0.1) uma; urgency=medium
+
+ [ Michael Webster ]
+ * build: Add a build option to ignore deprecation warnings during the build,
and enable it by default.
+ * display panel: Hide the fractional scaling controls by default.
+ * display panel: Forgot to git add the gsettings schema file and install
script.
+
+ [ Clement Lefebvre ]
+ * l10n: Update POT
+
+ -- Clement Lefebvre <[email protected]> Fri, 04 Jun 2021 12:21:10 +0100
+
cinnamon-control-center (5.0.0) uma; urgency=medium
[ F??lix Pi??dallu ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-5.0.0/debian/cinnamon-control-center-data.install
new/cinnamon-control-center-5.0.2/debian/cinnamon-control-center-data.install
---
old/cinnamon-control-center-5.0.0/debian/cinnamon-control-center-data.install
2021-05-27 16:33:09.000000000 +0200
+++
new/cinnamon-control-center-5.0.2/debian/cinnamon-control-center-data.install
2021-06-25 18:01:54.000000000 +0200
@@ -1,2 +1,3 @@
usr/share/cinnamon-control-center
usr/share/icons/hicolor
+usr/share/glib-2.0/schemas
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-control-center-5.0.0/meson.build
new/cinnamon-control-center-5.0.2/meson.build
--- old/cinnamon-control-center-5.0.0/meson.build 2021-05-27
16:33:09.000000000 +0200
+++ new/cinnamon-control-center-5.0.2/meson.build 2021-06-25
18:01:54.000000000 +0200
@@ -1,5 +1,5 @@
project('cinnamon-control-center', 'c',
- version: '5.0.0',
+ version: '5.0.2',
meson_version: '>=0.49.0',
)
@@ -161,6 +161,19 @@
more_cflags += '-Wp,-D_FORTIFY_SOURCE=2'
endif
+if not get_option('deprecated_warnings')
+ add_global_arguments([
+ '-Wno-deprecated-declarations',
+ '-Wno-deprecated',
+ '-Wno-declaration-after-statement',
+ '-DGLIB_DISABLE_DEPRECATION_WARNINGS',
+ ],
+ language: 'c',
+ )
+endif
+
+meson.add_install_script('meson_install_schemas.py')
+
add_project_arguments(cc.get_supported_arguments(more_cflags), language: 'c')
configure_file(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-5.0.0/meson_install_schemas.py
new/cinnamon-control-center-5.0.2/meson_install_schemas.py
--- old/cinnamon-control-center-5.0.0/meson_install_schemas.py 1970-01-01
01:00:00.000000000 +0100
+++ new/cinnamon-control-center-5.0.2/meson_install_schemas.py 2021-06-25
18:01:54.000000000 +0200
@@ -0,0 +1,10 @@
+#!/usr/bin/python3
+
+import os
+import subprocess
+
+schemadir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share',
'glib-2.0', 'schemas')
+
+if not os.environ.get('DESTDIR'):
+ print('Compiling gsettings schemas...')
+ subprocess.call(['glib-compile-schemas', schemadir])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-control-center-5.0.0/meson_options.txt
new/cinnamon-control-center-5.0.2/meson_options.txt
--- old/cinnamon-control-center-5.0.0/meson_options.txt 2021-05-27
16:33:09.000000000 +0200
+++ new/cinnamon-control-center-5.0.2/meson_options.txt 2021-06-25
18:01:54.000000000 +0200
@@ -3,3 +3,5 @@
option('networkmanager',type: 'boolean', value: 'true', description:
'NetworkManager support')
option('onlineaccounts',type: 'boolean', value: 'true', description: 'Online
Accounts support')
option('wacom', type: 'boolean', value: 'true', description: 'Wacom
Management support')
+option('deprecated_warnings', type : 'boolean', value : false,
+ description: 'Show compiler warnings about deprecated features')
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-5.0.0/panels/color/cc-color-panel.c
new/cinnamon-control-center-5.0.2/panels/color/cc-color-panel.c
--- old/cinnamon-control-center-5.0.0/panels/color/cc-color-panel.c
2021-05-27 16:33:09.000000000 +0200
+++ new/cinnamon-control-center-5.0.2/panels/color/cc-color-panel.c
2021-06-25 18:01:54.000000000 +0200
@@ -340,33 +340,6 @@
}
static void
-gcm_prefs_calibrate_cb (GtkWidget *widget, CcColorPanel *prefs)
-{
- guint xid;
- GPtrArray *argv;
- gchar *calibrater_filename;
- CcColorPanelPrivate *priv = prefs->priv;
-
- /* get xid */
- xid = gdk_x11_window_get_xid (gtk_widget_get_window (GTK_WIDGET
(priv->main_window)));
-
- calibrater_filename = g_build_filename (BINDIR, "gcm-calibrate", NULL);
-
- /* run with modal set */
- argv = g_ptr_array_new_with_free_func (g_free);
- g_ptr_array_add (argv, calibrater_filename);
- g_ptr_array_add (argv, g_strdup ("--device"));
- g_ptr_array_add (argv, g_strdup (cd_device_get_id (priv->current_device)));
- g_ptr_array_add (argv, g_strdup ("--parent-window"));
- g_ptr_array_add (argv, g_strdup_printf ("%i", xid));
- g_ptr_array_add (argv, NULL);
-
- gcm_prefs_run_maybe_install (xid, calibrater_filename, argv);
-
- g_ptr_array_unref (argv);
-}
-
-static void
gcm_prefs_device_add_cb (GtkWidget *widget, CcColorPanel *prefs)
{
CcColorPanelPrivate *priv = prefs->priv;
@@ -943,84 +916,6 @@
}
static void
-gcm_prefs_set_calibrate_button_sensitivity (CcColorPanel *prefs)
-{
- gboolean ret = FALSE;
- GtkWidget *widget;
- const gchar *tooltip;
- CdDeviceKind kind;
- CcColorPanelPrivate *priv = prefs->priv;
-
- /* TRANSLATORS: this is when the button is sensitive */
- tooltip = _("Create a color profile for the selected device");
-
- /* no device selected */
- if (priv->current_device == NULL)
- goto out;
-
- /* are we a display */
- kind = cd_device_get_kind (priv->current_device);
- if (kind == CD_DEVICE_KIND_DISPLAY)
- {
-
- /* find whether we have hardware installed */
- if (priv->sensor == NULL) {
- /* TRANSLATORS: this is when the button is insensitive */
- tooltip = _("The measuring instrument is not detected. Please check it
is turned on and correctly connected.");
- goto out;
- }
-
- /* success */
- ret = TRUE;
-
- }
- else if (kind == CD_DEVICE_KIND_SCANNER ||
- kind == CD_DEVICE_KIND_CAMERA ||
- kind == CD_DEVICE_KIND_WEBCAM)
- {
-
- /* TODO: find out if we can scan using gnome-scan */
- ret = TRUE;
-
- }
- else if (kind == CD_DEVICE_KIND_PRINTER)
- {
-
- /* find whether we have hardware installed */
- if (priv->sensor == NULL)
- {
- /* TRANSLATORS: this is when the button is insensitive */
- tooltip = _("The measuring instrument is not detected. Please check it
is turned on and correctly connected.");
- goto out;
- }
-
- /* find whether we have hardware installed */
- ret = cd_sensor_has_cap (priv->sensor, CD_SENSOR_CAP_PRINTER);
- if (!ret)
- {
- /* TRANSLATORS: this is when the button is insensitive */
- tooltip = _("The measuring instrument does not support printer
profiling.");
- goto out;
- }
-
- /* success */
- ret = TRUE;
-
- }
- else
- {
- /* TRANSLATORS: this is when the button is insensitive */
- tooltip = _("The device type is not currently supported.");
- }
-out:
- /* control the tooltip and sensitivity of the button */
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
- "toolbutton_device_calibrate"));
- gtk_widget_set_tooltip_text (widget, tooltip);
- gtk_widget_set_sensitive (widget, ret);
-}
-
-static void
gcm_prefs_device_clicked (CcColorPanel *prefs, CdDevice *device)
{
GtkWidget *widget;
@@ -1049,9 +944,6 @@
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"toolbutton_device_remove"));
gtk_widget_set_visible (widget, device_mode == CD_DEVICE_MODE_VIRTUAL);
-
- /* can this device calibrate */
- gcm_prefs_set_calibrate_button_sensitivity (prefs);
}
static void
@@ -1137,9 +1029,6 @@
"toolbutton_device_add"));
gtk_widget_set_visible (widget, FALSE);
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
- "toolbutton_device_calibrate"));
- gtk_widget_set_visible (widget, device != NULL);
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"toolbutton_profile_add"));
gtk_widget_set_visible (widget, device != NULL);
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
@@ -1384,7 +1273,6 @@
CcColorPanel *prefs)
{
gcm_prefs_sensor_coldplug (prefs);
- gcm_prefs_set_calibrate_button_sensitivity (prefs);
}
static const gchar *
@@ -2530,11 +2418,6 @@
"toolbutton_device_add"));
g_signal_connect (widget, "clicked",
G_CALLBACK (gcm_prefs_device_add_cb), prefs);
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
- "toolbutton_device_calibrate"));
- g_signal_connect (widget, "clicked",
- G_CALLBACK (gcm_prefs_calibrate_cb), prefs);
-
/* make devices toolbar sexy */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"scrolledwindow_devices"));
@@ -2618,9 +2501,6 @@
G_CALLBACK (gcm_prefs_client_sensor_changed_cb),
prefs);
- /* set calibrate button sensitivity */
- gcm_prefs_set_calibrate_button_sensitivity (prefs);
-
widget = WID (priv->builder, "dialog-vbox1");
gtk_widget_reparent (widget, (GtkWidget *) prefs);
g_signal_connect (widget, "realize",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-control-center-5.0.0/panels/color/color.ui
new/cinnamon-control-center-5.0.2/panels/color/color.ui
--- old/cinnamon-control-center-5.0.0/panels/color/color.ui 2021-05-27
16:33:09.000000000 +0200
+++ new/cinnamon-control-center-5.0.2/panels/color/color.ui 2021-06-25
18:01:54.000000000 +0200
@@ -287,22 +287,7 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkButton"
id="toolbutton_device_calibrate">
- <property name="label"
translatable="yes">Calibrate???</property>
- <property name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text"
translatable="yes">Calibrate the device</property>
- <property
name="use_action_appearance">False</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
+ <child>
<object class="GtkButton"
id="toolbutton_profile_remove">
<property name="label" translatable="yes">Remove
profile</property>
<property name="receives_default">False</property>
@@ -312,7 +297,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -325,7 +310,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-5.0.0/panels/display/cc-display-panel.c
new/cinnamon-control-center-5.0.2/panels/display/cc-display-panel.c
--- old/cinnamon-control-center-5.0.0/panels/display/cc-display-panel.c
2021-05-27 16:33:09.000000000 +0200
+++ new/cinnamon-control-center-5.0.2/panels/display/cc-display-panel.c
2021-06-25 18:01:54.000000000 +0200
@@ -51,8 +51,8 @@
#define MINIMUM_WIDTH 675
#define MINIMUM_HEIGHT 530
-#define INTERFACE_SETTINGS_SCHEMA "org.cinnamon.desktop.interface"
-// #define UPSCALE_SETTINGS_KEY "upscale-fractional-scaling"
+#define PANEL_SETTINGS_SCHEMA "org.cinnamon.control-center.display"
+#define SHOW_FRACTIONAL_CONTROLS_KEY "show-fractional-scaling-controls"
enum {
TEXT_COL,
@@ -83,7 +83,7 @@
GnomeRRConfig *old_configuration;
CcRRLabeler *labeler;
GnomeRROutputInfo *current_output;
- // GSettings *interface_settings;
+ // GSettings *panel_settings;
GtkBuilder *builder;
guint focus_id;
@@ -102,6 +102,10 @@
GtkWidget *scale_combo;
GtkWidget *base_scale_combo;
GtkWidget *fractional_switch;
+ GtkWidget *fractional_box;
+ GtkWidget *fractional_label;
+
+ GSettings *panel_settings;
/* We store the event timestamp when the Apply button is clicked */
guint32 apply_button_clicked_timestamp;
@@ -153,6 +157,24 @@
guint32 timestamp);
static void
+set_fractional_controls_visible (CcDisplayPanel *self,
+ gboolean visible)
+{
+ gtk_widget_set_visible (self->priv->fractional_box, visible);
+ gtk_widget_set_visible (self->priv->fractional_label, visible);
+}
+
+static void
+show_fractional_controls_changed (CcDisplayPanel *self)
+{
+ gboolean show;
+
+ show = g_settings_get_boolean (self->priv->panel_settings,
SHOW_FRACTIONAL_CONTROLS_KEY);
+
+ set_fractional_controls_visible (self, show);
+}
+
+static void
cc_display_panel_get_property (GObject *object,
guint property_id,
GValue *value,
@@ -183,7 +205,7 @@
{
// CcDisplayPanel *panel = CC_DISPLAY_PANEL (object);
- // g_clear_object (&panel->priv->interface_settings);
+ // g_clear_object (&panel->priv->panel_settings);
G_OBJECT_CLASS (cc_display_panel_parent_class)->dispose (object);
}
@@ -1378,6 +1400,13 @@
gtk_switch_set_active (GTK_SWITCH (self->priv->fractional_switch),
fractional_active);
g_signal_handlers_unblock_by_func (self->priv->fractional_switch,
on_fractional_switch_toggled, self);
+ // If the user was already using fractional controls, we need to make sure
they're visible,
+ // regardless of the initial setting state (which defaults to hidden). We'll
update this when
+ // we update the gui for monitor that has a fractional scale set.
+ if (fractional_active) {
+ g_settings_set_boolean (self->priv->panel_settings,
SHOW_FRACTIONAL_CONTROLS_KEY, TRUE);
+ }
+
gtk_widget_set_sensitive (self->priv->fractional_switch,
!gnome_rr_config_get_auto_scale
(self->priv->current_configuration));
@@ -1759,7 +1788,7 @@
return;
if (get_mode (self->priv->scale_combo, NULL, NULL, NULL, &scale, NULL, NULL,
NULL, NULL))
- {g_printerr ("on scale changed, %.2f\n", scale);
+ {
gnome_rr_output_info_set_scale (self->priv->current_output, scale);
}
@@ -1814,7 +1843,6 @@
{
if (gnome_rr_output_info_is_connected (outputs[i]) &&
gnome_rr_output_info_is_active (outputs[i]))
{
- g_printerr ("output %p, scale: %.2f\n",outputs[i], (float)
new_value);
gnome_rr_output_info_set_scale (outputs[i], (float) new_value);
}
}
@@ -3624,6 +3652,8 @@
self = CC_DISPLAY_PANEL (obj);
self->priv = DISPLAY_PANEL_PRIVATE (self);
+ self->priv->panel_settings = g_settings_new (PANEL_SETTINGS_SCHEMA);
+
error = NULL;
self->priv->builder = builder = gtk_builder_new ();
if (!gtk_builder_add_objects_from_file (builder, UIDIR
"/display-capplet.ui", objects, &error))
@@ -3695,6 +3725,15 @@
G_CALLBACK (on_base_scale_changed), self);
self->priv->fractional_switch = WID ("fractional_switch");
+ self->priv->fractional_box = WID ("fractional_box");
+ self->priv->fractional_label = WID ("fractional_label");
+
+ g_signal_connect_swapped (self->priv->panel_settings,
+ "changed::" SHOW_FRACTIONAL_CONTROLS_KEY,
+ G_CALLBACK (show_fractional_controls_changed),
+ self);
+
+ show_fractional_controls_changed (self);
g_signal_connect_swapped (self->priv->fractional_switch, "notify::active",
G_CALLBACK (on_fractional_switch_toggled), self);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-5.0.0/panels/display/display-capplet.ui
new/cinnamon-control-center-5.0.2/panels/display/display-capplet.ui
--- old/cinnamon-control-center-5.0.0/panels/display/display-capplet.ui
2021-05-27 16:33:09.000000000 +0200
+++ new/cinnamon-control-center-5.0.2/panels/display/display-capplet.ui
2021-06-25 18:01:54.000000000 +0200
@@ -180,18 +180,6 @@
</packing>
</child>
<child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Fractional
scaling</property>
- <property name="xalign">1</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
<object class="GtkComboBox" id="rotation_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -293,9 +281,9 @@
</packing>
</child>
<child>
- <object class="GtkBox">
- <property name="visible">True</property>
+ <object class="GtkBox" id="fractional_box">
<property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkSwitch" id="fractional_switch">
@@ -348,6 +336,18 @@
</packing>
</child>
<child>
+ <object class="GtkLabel" id="fractional_label">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="label" translatable="yes">Fractional
scaling</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
<placeholder/>
</child>
</object>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-5.0.0/panels/display/meson.build
new/cinnamon-control-center-5.0.2/panels/display/meson.build
--- old/cinnamon-control-center-5.0.0/panels/display/meson.build
2021-05-27 16:33:09.000000000 +0200
+++ new/cinnamon-control-center-5.0.2/panels/display/meson.build
2021-06-25 18:01:54.000000000 +0200
@@ -42,3 +42,7 @@
install: true,
install_dir: get_option('datadir') / 'applications',
)
+
+install_data('org.cinnamon.control-center.display.gschema.xml',
+ install_dir: join_paths(get_option('datadir'), 'glib-2.0', 'schemas')
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-5.0.0/panels/display/org.cinnamon.control-center.display.gschema.xml
new/cinnamon-control-center-5.0.2/panels/display/org.cinnamon.control-center.display.gschema.xml
---
old/cinnamon-control-center-5.0.0/panels/display/org.cinnamon.control-center.display.gschema.xml
1970-01-01 01:00:00.000000000 +0100
+++
new/cinnamon-control-center-5.0.2/panels/display/org.cinnamon.control-center.display.gschema.xml
2021-06-25 18:01:54.000000000 +0200
@@ -0,0 +1,8 @@
+<schemalist>
+ <schema id="org.cinnamon.control-center.display"
path="/org/cinnamon/control-center/display/">
+ <key name="show-fractional-scaling-controls" type="b">
+ <default>false</default>
+ <summary>Makes the fractional scaling controls visible.</summary>
+ </key>
+ </schema>
+</schemalist>
