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 2023-12-03 20:48:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon-control-center (Old)
and /work/SRC/openSUSE:Factory/.cinnamon-control-center.new.25432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-control-center"
Sun Dec 3 20:48:37 2023 rev:29 rq:1128873 version:6.0.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/cinnamon-control-center/cinnamon-control-center.changes
2023-06-04 00:12:57.269660254 +0200
+++
/work/SRC/openSUSE:Factory/.cinnamon-control-center.new.25432/cinnamon-control-center.changes
2023-12-03 20:48:55.802033379 +0100
@@ -1,0 +2,16 @@
+Sat Nov 25 18:56:25 UTC 2023 - Dirk Müller <[email protected]>
+
+- update to 6.0.0:
+ * display: Increase the number of available fractional scale
+ buttons to allow 75 - 200
+ * Fix meson.build deprecations up to 0.56.0
+ * wacom: Add "disabled" to stylus button actions.
+ * display: Add wayland compatibility
+ * display module: Fix color selection for monitor labels.
+ * display module: Fix some memory leaks.
+ * l10n: Update files
+ * Mark fractional scaling settings key obsolete.
+ * Delete cs-online-accounts icons.
+ * l10n: Generate additional files
+
+-------------------------------------------------------------------
Old:
----
cinnamon-control-center-5.8.0.tar.gz
New:
----
cinnamon-control-center-6.0.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon-control-center.spec ++++++
--- /var/tmp/diff_new_pack.Rkdy7o/_old 2023-12-03 20:48:56.462057617 +0100
+++ /var/tmp/diff_new_pack.Rkdy7o/_new 2023-12-03 20:48:56.466057764 +0100
@@ -19,7 +19,7 @@
%define soname libcinnamon-control-center
%define sover 1
Name: cinnamon-control-center
-Version: 5.8.0
+Version: 6.0.0
Release: 0
Summary: Utilities to configure the Cinnamon desktop
License: GPL-2.0-only AND GPL-3.0-or-later AND MIT
++++++ cinnamon-control-center-5.8.0.tar.gz ->
cinnamon-control-center-6.0.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-control-center-5.8.0/debian/changelog
new/cinnamon-control-center-6.0.0/debian/changelog
--- old/cinnamon-control-center-5.8.0/debian/changelog 2023-06-01
14:57:58.000000000 +0200
+++ new/cinnamon-control-center-6.0.0/debian/changelog 2023-11-19
14:39:53.000000000 +0100
@@ -1,3 +1,38 @@
+cinnamon-control-center (6.0.0) virginia; urgency=medium
+
+ [ Michael Webster ]
+ * display: Increase the number of available fractional scale buttons to
allow 75 - 200
+
+ [ Rick Calixte ]
+ * Fix meson.build deprecations up to 0.56.0 (#318)
+
+ [ Michael Webster ]
+ * wacom: Add "disabled" to stylus button actions.
+ * display: Add wayland compatibility
+ * display module: Fix color selection for monitor labels.
+ * display module: Fix some memory leaks.
+
+ [ Clement Lefebvre ]
+ * l10n: Update files
+
+ -- Clement Lefebvre <[email protected]> Sun, 19 Nov 2023 13:39:32 +0000
+
+cinnamon-control-center (5.8.2) victoria; urgency=medium
+
+ [ Michael Webster ]
+ * Mark fractional scaling settings key obsolete.
+
+ [ fredcw ]
+ * Delete cs-online-accounts icons. (#315)
+
+ -- Clement Lefebvre <[email protected]> Fri, 07 Jul 2023 15:18:44 +0200
+
+cinnamon-control-center (5.8.1) victoria; urgency=medium
+
+ * l10n: Generate additional files
+
+ -- Clement Lefebvre <[email protected]> Thu, 08 Jun 2023 12:59:42 +0100
+
cinnamon-control-center (5.8.0) victoria; urgency=medium
[ Oliver Kästner ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-control-center-5.8.0/meson.build
new/cinnamon-control-center-6.0.0/meson.build
--- old/cinnamon-control-center-5.8.0/meson.build 2023-06-01
14:57:58.000000000 +0200
+++ new/cinnamon-control-center-6.0.0/meson.build 2023-11-19
14:39:53.000000000 +0100
@@ -1,6 +1,6 @@
project('cinnamon-control-center', 'c',
- version: '5.8.0',
- meson_version: '>=0.49.0',
+ version: '6.0.0',
+ meson_version: '>=0.56.0',
)
i18n = import('i18n')
@@ -46,7 +46,7 @@
# This is a hard-dependency for the region and user-accounts panels
isocodes = dependency('iso-codes')
-config.set_quoted('ISO_CODES_PREFIX',
isocodes.get_pkgconfig_variable('prefix'))
+config.set_quoted('ISO_CODES_PREFIX', isocodes.get_variable(pkgconfig:
'prefix'))
###############################################################################
# Network Manager stuff
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-5.8.0/panels/color/cinnamon-color-panel.desktop
new/cinnamon-control-center-6.0.0/panels/color/cinnamon-color-panel.desktop
--- old/cinnamon-control-center-5.8.0/panels/color/cinnamon-color-panel.desktop
2023-06-01 14:57:58.000000000 +0200
+++ new/cinnamon-control-center-6.0.0/panels/color/cinnamon-color-panel.desktop
2023-11-19 14:39:53.000000000 +0100
@@ -40,6 +40,7 @@
Name[is]=Litur
Name[it]=Colore
Name[ja]=è²
+Name[ka]=á¤áá á
Name[kab]=Ini
Name[kk]=ТүÑ
Name[km]=ááá
@@ -58,6 +59,7 @@
Name[pt_BR]=Cor
Name[ro]=Culoare
Name[ru]=ЦвеÑ
+Name[rue]=ЦвÑÑ
Name[sc]=Colores
Name[sk]=Farba
Name[sl]=Barva
@@ -157,19 +159,29 @@
Keywords[da]=Farve;ICC;Profil;Kalibrere;Printer;Skærm;
Keywords[de]=Color;ICC;Profile;Calibrate;Printer;Display;Farbe;Kalibrieren;Drucker;Bildschirm;Anzeige;
Keywords[el]=ΧÏÏμα;ICC;Î ÏοÏίλ;ÎαθμονÏμηÏη;ÎκÏÏ
ÏÏÏήÏ;ÎθÏνη;
+Keywords[en_GB]=Colour;ICC;Profile;Calibrate;Printer;Display;
Keywords[es]=Color;ICC;Perfil;Calibrar;Impresora;Pantalla;
+Keywords[et]=Värv;ICC;profiil;kalibreerimine;printer;ekraan;
Keywords[eu]=Kolorea;ICC;Profila;Kalibratu;Inprimagailua;Pantaila;
Keywords[fi]=Väri;ICC;Profiili;Kalibrointi;Tulostin;Näyttö;
Keywords[fr]=Couleur;ICC;Profil;Calibrer;Imprimante;Affichage;
Keywords[fr_CA]=Couleur;ICC;Profil;Calibrer;Imprimante;Affichage;
+Keywords[he]=צ××¢;ICC;פר×פ××;××××;××פסת;תצ×××;
Keywords[hr]=Boja;ICC;Profil;Kalibracija;PisaÄ;Zaslon;
Keywords[hu]=SzÃn;ICC;SzÃnek;Profilozás;Kalibrálás;Nyomtató;KijelzÅ;Color;Profile;Calibrate;Printer;Display;
+Keywords[is]=Litur;ICC;Litasnið;Kvarða;Prentari;Skjár;
Keywords[it]=Colore;ICC;Profilo;Calibrazione;Stampante;Schermo;
+Keywords[ko]=ìì;ICC;íë¡í;ë³´ì ;í린í°;ëì¤íë ì´;
Keywords[nl]=Kleur;ICC;Profiel;Calibreren;Printer;Beeldscherm;
+Keywords[oc]=Color;ICC;Perfil;Calibrar;Imprimenta;Afichatge;
Keywords[pl]=Kolor;ICC;Profil;Kalibracja;Drukarka;WyÅwietlacz;
Keywords[pt]=Cor;ICC;Perfil;Calibrar;Impressora;Ecrã;
Keywords[pt_BR]=Cor;ICC;Perfil;Calibrar;Impressora;Exibir;
+Keywords[ro]=Culoare;ICC;Profil;Calibrare;ImprimantÄ;AfiÈare;
Keywords[ru]=ЦвеÑ;ICC;ÐÑоÑилÑ;ÐалибÑоваÑÑ;ÐÑинÑеÑ;ÐкÑан;
+Keywords[rue]=ЦвÑÑ;ICC;ÐÑоÑÑл;ÐÑÑÑÑоваÑи;ÐÑÑнÑеÑ;ÐкÑан;
+Keywords[sk]=Farba;ICC;Profil;Kalibrácia;TlaÄiareÅ;Displej;
+Keywords[sl]=Barva;ICC;profil;kalibriraj;tiskalnik;zaslon;
Keywords[sv]=Färg;ICC;Profil;Kalibrera;Skrivare;Skärm;
Keywords[tr]=Renk;ICC;Profil;Kalibrasyon;Yazıcı;Görüntü;
Keywords[uk]=ÐолÑÑ;ICC;ÐÑоÑÑлÑ;ÐалÑбÑÑваннÑ;ÐÑинÑеÑ;ÐиÑплей;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-5.8.0/panels/display/cc-display-arrangement.c
new/cinnamon-control-center-6.0.0/panels/display/cc-display-arrangement.c
--- old/cinnamon-control-center-5.8.0/panels/display/cc-display-arrangement.c
2023-06-01 14:57:58.000000000 +0200
+++ new/cinnamon-control-center-6.0.0/panels/display/cc-display-arrangement.c
2023-11-19 14:39:53.000000000 +0100
@@ -551,8 +551,8 @@
static gint
sort_outputs_by_disabled (gconstpointer a, gconstpointer b)
{
- CcDisplayMonitor *ma = CC_DISPLAY_MONITOR (a);
- CcDisplayMonitor *mb = CC_DISPLAY_MONITOR (b);
+ CcDisplayMonitor *ma = CC_DISPLAY_MONITOR ((gpointer) a);
+ CcDisplayMonitor *mb = CC_DISPLAY_MONITOR ((gpointer) b);
if (!cc_display_monitor_is_active (ma) && cc_display_monitor_is_active
(mb))
return -1;
@@ -561,7 +561,7 @@
if (cc_display_monitor_is_active (ma) && !cc_display_monitor_is_active
(mb))
return 1;
- return cc_display_monitor_get_ui_number (a) <
cc_display_monitor_get_ui_number (b) ? -1 : 1;
+ return cc_display_monitor_get_ui_number ((gpointer) a) <
cc_display_monitor_get_ui_number ((gpointer) b) ? -1 : 1;
}
static gboolean
@@ -626,9 +626,6 @@
if (cc_display_monitor_is_primary (output) ||
cc_display_config_is_cloning (self->config))
gtk_style_context_add_class (context, "primary");
- /* Set in cc-display-panel.c */
- num = cc_display_monitor_get_ui_number (output);
-
monitor_get_drawing_rect (self, output, &x1, &y1, &x2, &y2);
w = x2 - x1;
h = y2 - y1;
@@ -656,9 +653,11 @@
cairo_save (cr);
+ /* Set in cc-display-panel.c */
+ num = cc_display_monitor_get_ui_number (output) - 1; // ui_numbers start
at 1, our color index is 0-based.
gchar *rgba_str;
- g_signal_emit_by_name (G_OBJECT (widget), "get-output-color", output,
&rgba_str);
+ g_signal_emit_by_name (G_OBJECT (widget), "get-output-color", num,
&rgba_str);
if (gdk_rgba_parse (&bg_rgba, rgba_str))
{
@@ -707,6 +706,7 @@
gtk_style_context_get (context, state, "font", &font, NULL);
layout = gtk_widget_create_pango_layout (GTK_WIDGET (self),
number_str);
pango_layout_set_font_description (layout, font);
+ pango_font_description_free (font);
pango_layout_get_extents (layout, NULL, &extents);
h = (extents.height - extents.y) / PANGO_SCALE;
@@ -970,7 +970,7 @@
CC_TYPE_DISPLAY_ARRANGEMENT,
G_SIGNAL_RUN_LAST,
0, NULL, NULL, NULL,
- G_TYPE_STRING, 1, CC_TYPE_DISPLAY_MONITOR);
+ G_TYPE_STRING, 1, G_TYPE_INT);
}
static void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-5.8.0/panels/display/cc-display-labeler.c
new/cinnamon-control-center-6.0.0/panels/display/cc-display-labeler.c
--- old/cinnamon-control-center-5.8.0/panels/display/cc-display-labeler.c
2023-06-01 14:57:58.000000000 +0200
+++ new/cinnamon-control-center-6.0.0/panels/display/cc-display-labeler.c
2023-11-19 14:39:53.000000000 +0100
@@ -37,28 +37,32 @@
#include "cc-display-labeler.h"
-struct _CcDisplayLabelerPrivate {
+typedef struct {
CcDisplayConfig *config;
int num_outputs;
- GdkRGBA *palette;
GtkWidget **windows;
GdkScreen *screen;
Atom workarea_atom;
+} CcDisplayLabelerPrivate;
+
+struct _CcDisplayLabeler
+{
+ GObject parent;
+ CcDisplayLabelerPrivate *priv;
};
+G_DEFINE_TYPE_WITH_PRIVATE (CcDisplayLabeler, cc_display_labeler,
G_TYPE_OBJECT)
+
enum {
PROP_0,
PROP_CONFIG,
PROP_LAST
};
-G_DEFINE_TYPE (CcDisplayLabeler, cc_display_labeler, G_TYPE_OBJECT);
-
static void cc_display_labeler_finalize (GObject *object);
-static void setup_from_config (CcDisplayLabeler *labeler);
static GdkFilterReturn
screen_xevent_filter (GdkXEvent *xevent,
@@ -86,14 +90,13 @@
{
GdkWindow *gdkwindow;
- labeler->priv = G_TYPE_INSTANCE_GET_PRIVATE (labeler,
GNOME_TYPE_RR_LABELER, CcDisplayLabelerPrivate);
+ labeler->priv = cc_display_labeler_get_instance_private (labeler);
labeler->priv->workarea_atom = XInternAtom (GDK_DISPLAY_XDISPLAY
(gdk_display_get_default ()),
"_NET_WORKAREA",
True);
labeler->priv->screen = gdk_screen_get_default ();
- /* code is not really designed to handle multiple screens so *shrug* */
gdkwindow = gdk_screen_get_root_window (labeler->priv->screen);
gdk_window_add_filter (gdkwindow, (GdkFilterFunc) screen_xevent_filter,
labeler);
gdk_window_set_events (gdkwindow, gdk_window_get_events (gdkwindow) |
GDK_PROPERTY_CHANGE_MASK);
@@ -113,28 +116,15 @@
}
}
-static GObject *
-cc_display_labeler_constructor (GType type, guint n_construct_properties,
GObjectConstructParam *construct_properties)
-{
- CcDisplayLabeler *self = (CcDisplayLabeler*) G_OBJECT_CLASS
(cc_display_labeler_parent_class)->constructor (type, n_construct_properties,
construct_properties);
-
- setup_from_config (self);
-
- return (GObject*) self;
-}
-
static void
cc_display_labeler_class_init (CcDisplayLabelerClass *klass)
{
GObjectClass *object_class;
- g_type_class_add_private (klass, sizeof (CcDisplayLabelerPrivate));
-
object_class = (GObjectClass *) klass;
object_class->set_property = cc_display_labeler_set_property;
object_class->finalize = cc_display_labeler_finalize;
- object_class->constructor = cc_display_labeler_constructor;
g_object_class_install_property (object_class, PROP_CONFIG,
g_param_spec_object ("config",
"Configuration",
@@ -142,6 +132,11 @@
CC_TYPE_DISPLAY_CONFIG,
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
+ g_signal_new ("get-output-color",
+ CC_TYPE_DISPLAY_LABELER,
+ G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL, NULL,
+ G_TYPE_STRING, 1, G_TYPE_INT);
}
static void
@@ -152,8 +147,8 @@
labeler = CC_DISPLAY_LABELER (object);
- gdkwindow = gdk_screen_get_root_window (labeler->priv->screen);
- gdk_window_remove_filter (gdkwindow, (GdkFilterFunc)
screen_xevent_filter, labeler);
+ gdkwindow = gdk_screen_get_root_window (labeler->priv->screen);
+ gdk_window_remove_filter (gdkwindow, (GdkFilterFunc) screen_xevent_filter,
labeler);
if (labeler->priv->config != NULL) {
g_object_unref (labeler->priv->config);
@@ -164,8 +159,6 @@
g_free (labeler->priv->windows);
}
- g_free (labeler->priv->palette);
-
G_OBJECT_CLASS (cc_display_labeler_parent_class)->finalize (object);
}
@@ -181,41 +174,6 @@
}
static void
-make_palette (CcDisplayLabeler *labeler)
-{
- /* The idea is that we go around an hue color wheel. We want to start
- * at red, go around to green/etc. and stop at blue.
- *
- */
- double start_hue;
- double end_hue;
- int i;
-
- g_assert (labeler->priv->num_outputs > 0);
-
- labeler->priv->palette = g_new (GdkRGBA, labeler->priv->num_outputs);
-
- start_hue = 0.0; /* red */
- end_hue = 2.0/3; /* blue */
-
- for (i = 0; i < labeler->priv->num_outputs; i++) {
- double h, s, v;
- double r, g, b;
-
- h = start_hue + (end_hue - start_hue) /
labeler->priv->num_outputs * i;
- s = 0.6;
- v = 1.0;
-
- gtk_hsv_to_rgb (h, s, v, &r, &g, &b);
-
- labeler->priv->palette[i].red = r;
- labeler->priv->palette[i].green = g;
- labeler->priv->palette[i].blue = b;
- labeler->priv->palette[i].alpha = 1.0;
- }
-}
-
-static void
rounded_rectangle (cairo_t *cr,
gint x,
gint y,
@@ -262,10 +220,11 @@
static void
label_draw_background_and_frame (GtkWidget *widget, cairo_t *cr)
{
- GdkRGBA *rgba;
+ GdkRGBA rgba;
GtkAllocation allocation;
+ gchar *rgba_str;
- rgba = g_object_get_data (G_OBJECT (widget), "rgba");
+ rgba_str = g_object_get_data (G_OBJECT (widget), "rgba");
gtk_widget_get_allocation (widget, &allocation);
cairo_save (cr);
@@ -284,8 +243,9 @@
cairo_stroke (cr);
/* fill */
- rgba->alpha = 0.90;
- gdk_cairo_set_source_rgba (cr, rgba);
+ gdk_rgba_parse (&rgba, rgba_str);
+ rgba.alpha = 0.90;
+ gdk_cairo_set_source_rgba (cr, &rgba);
rounded_rectangle (cr,
LABEL_WINDOW_EDGE_THICKNESS,
@@ -364,7 +324,7 @@
}
static GtkWidget *
-create_label_window (CcDisplayLabeler *labeler, CcDisplayMonitor *output,
GdkRGBA *rgba, gint num)
+create_label_window (CcDisplayLabeler *labeler, CcDisplayMonitor *output,
gchar *rgba_str, gint num)
{
GtkWidget *window;
GtkWidget *widget;
@@ -390,7 +350,8 @@
* array. Note that in cc_display_labeler_finalize(), we are careful to
* free the palette only after we free the windows.
*/
- g_object_set_data (G_OBJECT (window), "rgba", rgba);
+
+ g_object_set_data_full (G_OBJECT (window), "rgba", rgba_str,
(GDestroyNotify) g_free);
g_signal_connect (window, "draw",
G_CALLBACK (label_window_draw_event_cb), labeler);
@@ -431,16 +392,6 @@
return window;
}
-static void
-setup_from_config (CcDisplayLabeler *labeler)
-{
- labeler->priv->num_outputs = count_outputs (labeler->priv->config);
-
- make_palette (labeler);
-
- cc_display_labeler_show (labeler);
-}
-
/**
* cc_display_labeler_new:
* @config: Configuration of the screens to label
@@ -457,7 +408,7 @@
{
g_return_val_if_fail (CC_IS_DISPLAY_CONFIG (config), NULL);
- return g_object_new (GNOME_TYPE_RR_LABELER, "config", config, NULL);
+ return g_object_new (CC_TYPE_DISPLAY_LABELER, "config", config, NULL);
}
/**
@@ -473,11 +424,12 @@
gboolean created_window_for_clone;
GList *outputs, *l;
- g_return_if_fail (GNOME_IS_RR_LABELER (labeler));
+ g_return_if_fail (CC_IS_DISPLAY_LABELER (labeler));
if (labeler->priv->windows != NULL)
return;
+ labeler->priv->num_outputs = count_outputs (labeler->priv->config);
labeler->priv->windows = g_new (GtkWidget *,
labeler->priv->num_outputs);
created_window_for_clone = FALSE;
@@ -488,7 +440,10 @@
CcDisplayMonitor *output = CC_DISPLAY_MONITOR (l->data);
if (!created_window_for_clone) {
- labeler->priv->windows[i] = create_label_window
(labeler, output, labeler->priv->palette + i, i + 1);
+ gchar *rgba_str;
+
+ g_signal_emit_by_name (G_OBJECT (labeler), "get-output-color", i,
&rgba_str);
+ labeler->priv->windows[i] = create_label_window
(labeler, output, rgba_str, i + 1);
if (cc_display_config_is_cloning
(labeler->priv->config))
created_window_for_clone = TRUE;
@@ -509,7 +464,7 @@
int i;
CcDisplayLabelerPrivate *priv;
- g_return_if_fail (GNOME_IS_RR_LABELER (labeler));
+ g_return_if_fail (CC_IS_DISPLAY_LABELER (labeler));
priv = labeler->priv;
@@ -525,39 +480,3 @@
priv->windows = NULL;
}
-/**
- * cc_display_labeler_get_rgba_for_output:
- * @labeler: A #CcDisplayLabeler
- * @output: Output device (i.e. monitor) to query
- * @rgba_out: (out): Color of selected monitor.
- *
- * Get the color used for the label on a given output (monitor).
- */
-void
-cc_display_labeler_get_rgba_for_output (CcDisplayLabeler *labeler,
CcDisplayMonitor *output, GdkRGBA *rgba_out)
-{
- int i;
- GList *outputs, *l;
-
- g_return_if_fail (GNOME_IS_RR_LABELER (labeler));
- g_return_if_fail (CC_IS_DISPLAY_MONITOR (output));
- g_return_if_fail (rgba_out != NULL);
-
- outputs = cc_display_config_get_ui_sorted_monitors
(labeler->priv->config);
-
- for (l = outputs, i = 0; l != NULL; l = l->next, i++) {
- CcDisplayMonitor *o = CC_DISPLAY_MONITOR (l->data);
-
- if (o == output) {
- *rgba_out = labeler->priv->palette[i];
- return;
- }
- }
-
- g_warning ("trying to get the color for unknown CcDisplayMonitor %p;
returning magenta!", output);
-
- rgba_out->red = 1.0;
- rgba_out->green = 0;
- rgba_out->blue = 1.0;
- rgba_out->alpha = 1.0;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-5.8.0/panels/display/cc-display-labeler.h
new/cinnamon-control-center-6.0.0/panels/display/cc-display-labeler.h
--- old/cinnamon-control-center-5.8.0/panels/display/cc-display-labeler.h
2023-06-01 14:57:58.000000000 +0200
+++ new/cinnamon-control-center-6.0.0/panels/display/cc-display-labeler.h
2023-11-19 14:39:53.000000000 +0100
@@ -22,43 +22,18 @@
*
* Author: Federico Mena-Quintero <[email protected]>
*/
+#pragma once
-#ifndef CC_DISPLAY_LABELER_H
-#define CC_DISPLAY_LABELER_H
-
-#define GNOME_DESKTOP_USE_UNSTABLE_API
+// #define GNOME_DESKTOP_USE_UNSTABLE_API
#include "cc-display-config.h"
-#define GNOME_TYPE_RR_LABELER (cc_display_labeler_get_type ())
-#define CC_DISPLAY_LABELER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
GNOME_TYPE_RR_LABELER, CcDisplayLabeler))
-#define CC_DISPLAY_LABELER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
GNOME_TYPE_RR_LABELER, CcDisplayLabelerClass))
-#define GNOME_IS_RR_LABELER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
GNOME_TYPE_RR_LABELER))
-#define GNOME_IS_RR_LABELER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
GNOME_TYPE_RR_LABELER))
-#define CC_DISPLAY_LABELER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
GNOME_TYPE_RR_LABELER, CcDisplayLabelerClass))
-
-typedef struct _CcDisplayLabeler CcDisplayLabeler;
-typedef struct _CcDisplayLabelerClass CcDisplayLabelerClass;
-typedef struct _CcDisplayLabelerPrivate CcDisplayLabelerPrivate;
-
-struct _CcDisplayLabeler {
- GObject parent;
-
- /*< private >*/
- CcDisplayLabelerPrivate *priv;
-};
+G_BEGIN_DECLS
-struct _CcDisplayLabelerClass {
- GObjectClass parent_class;
-};
-
-GType cc_display_labeler_get_type (void);
+#define CC_TYPE_DISPLAY_LABELER (cc_display_labeler_get_type ())
+G_DECLARE_FINAL_TYPE (CcDisplayLabeler, cc_display_labeler, CC,
DISPLAY_LABELER, GObject)
CcDisplayLabeler *cc_display_labeler_new (CcDisplayConfig *config);
-
void cc_display_labeler_show (CcDisplayLabeler *labeler);
-
void cc_display_labeler_hide (CcDisplayLabeler *labeler);
-void cc_display_labeler_get_rgba_for_output (CcDisplayLabeler *labeler,
CcDisplayMonitor *output, GdkRGBA *rgba_out);
-
-#endif
+G_END_DECLS
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-5.8.0/panels/display/cc-display-panel.c
new/cinnamon-control-center-6.0.0/panels/display/cc-display-panel.c
--- old/cinnamon-control-center-5.8.0/panels/display/cc-display-panel.c
2023-06-01 14:57:58.000000000 +0200
+++ new/cinnamon-control-center-6.0.0/panels/display/cc-display-panel.c
2023-11-19 14:39:53.000000000 +0100
@@ -23,8 +23,12 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <stdlib.h>
+#include <sys/types.h>
+#include <unistd.h>
+
#include <libcinnamon-desktop/cdesktop-enums.h>
#include <math.h>
+#include <gdk/gdkwayland.h>
#include <libupower-glib/upower.h>
@@ -65,6 +69,8 @@
CcDisplayConfig *current_config;
CcDisplayMonitor *current_output;
+ GDBusProxy *cinnamon_proxy;
+
gint rebuilding_counter;
CcDisplayArrangement *arrangement;
@@ -86,6 +92,8 @@
GtkWidget *cancel_button;
GtkListStore *output_selection_list;
+ GdkRGBA *palette;
+ gint n_outputs;
GtkWidget *arrangement_frame;
GtkWidget *arrangement_bin;
@@ -106,19 +114,18 @@
CC_PANEL_REGISTER (CcDisplayPanel, cc_display_panel)
-static void
-update_bottom_buttons (CcDisplayPanel *panel);
-static void
-apply_current_configuration (CcDisplayPanel *self);
-static void
-reset_current_config (CcDisplayPanel *panel);
-static void
-rebuild_ui (CcDisplayPanel *panel);
-static void
-set_current_output (CcDisplayPanel *panel,
- CcDisplayMonitor *output,
- gboolean force);
+#define WAYLAND_SESSION() (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default()))
+static void update_bottom_buttons (CcDisplayPanel *panel);
+static void apply_current_configuration (CcDisplayPanel *self);
+static void reset_current_config (CcDisplayPanel *panel);
+static void rebuild_ui (CcDisplayPanel *panel);
+static void regenerate_palette (CcDisplayPanel *panel, gint n_outputs);
+static void set_current_output (CcDisplayPanel *panel,
+ CcDisplayMonitor *output,
+ gboolean force);
+static gchar *get_color_string_for_output (CcDisplayPanel *panel, gint index);
+static gchar *get_output_color (GObject *source, gint index, CcDisplayPanel
*self);
static CcDisplayConfigType
config_get_current_type (CcDisplayPanel *panel)
@@ -329,29 +336,126 @@
}
static void
-ensure_monitor_labels (CcDisplayPanel *self)
+hide_labels_dbus (CcDisplayPanel *self)
{
- if (self->labeler) {
- cc_display_labeler_hide (self->labeler);
- g_object_unref (self->labeler);
- }
+ if (!self->cinnamon_proxy)
+ return;
+
+ g_dbus_proxy_call (self->cinnamon_proxy,
+ "HideMonitorLabels",
+ NULL, G_DBUS_CALL_FLAGS_NONE,
+ -1, NULL, NULL, NULL);
+}
+
+static void
+show_labels_dbus (CcDisplayPanel *self)
+{
+ GList *outputs, *l;
+ GVariantBuilder builder;
+ gint number = 0;
+
+ if (!self->cinnamon_proxy || !self->current_config)
+ return;
+
+ outputs = cc_display_config_get_ui_sorted_monitors (self->current_config);
+ if (!outputs)
+ return;
+
+ g_variant_builder_init (&builder, G_VARIANT_TYPE_TUPLE);
+ g_variant_builder_open (&builder, G_VARIANT_TYPE_ARRAY);
+
+ gint color_index = 0;
+
+ for (l = outputs, color_index = 0; l != NULL; l = l->next, color_index++)
+ {
+ CcDisplayMonitor *output = l->data;
+
+ number = cc_display_monitor_get_ui_number (output);
+ if (number == 0)
+ continue;
+
+ GVariant *var;
+
+ var = g_variant_new ("(ibss)",
+ number,
+ cc_display_config_is_cloning (self->current_config),
+ cc_display_monitor_get_display_name (output),
+ self->palette[color_index]);
+
+ g_variant_builder_add (&builder, "{sv}",
+ cc_display_monitor_get_connector_name (output),
+ var);
+ }
+
+ g_variant_builder_close (&builder);
+
+ if (number < 1)
+ {
+ g_variant_builder_clear (&builder);
+ return;
+ }
+
+ g_dbus_proxy_call (self->cinnamon_proxy,
+ "ShowMonitorLabels",
+ g_variant_builder_end (&builder),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1, NULL, NULL, NULL);
+}
+
+static void
+hide_labels (CcDisplayPanel *self)
+{
+ if (WAYLAND_SESSION ())
+ {
+ hide_labels_dbus (self);
+ }
+ else
+ {
+ if (self->labeler) {
+ cc_display_labeler_hide (self->labeler);
+ }
+ }
+}
+
+static void
+show_labels (CcDisplayPanel *self)
+{
+ if (WAYLAND_SESSION ())
+ {
+ show_labels_dbus (self);
+ }
+ else
+ {
+ if (self->labeler) {
+ cc_display_labeler_hide (self->labeler);
+ g_object_unref (self->labeler);
+ }
- self->labeler = cc_display_labeler_new (self->current_config);
+ self->labeler = cc_display_labeler_new (self->current_config);
- cc_display_labeler_show (self->labeler);
+ g_signal_connect_object (self->labeler, "get-output-color",
+ G_CALLBACK (get_output_color), self, 0);
+
+ cc_display_labeler_show (self->labeler);
+ }
}
static void
widget_visible_changed (GtkWidget *widget,
gpointer user_data)
{
- if (CC_DISPLAY_PANEL(widget)->labeler == NULL)
- return;
- if (gtk_widget_get_visible (widget)) {
- cc_display_labeler_show (CC_DISPLAY_PANEL (widget)->labeler);
- } else {
- cc_display_labeler_hide (CC_DISPLAY_PANEL (widget)->labeler);
- }
+ CcDisplayPanel *self = CC_DISPLAY_PANEL (widget);
+ if (gtk_widget_get_visible (widget) && self->current_config != NULL) {
+ show_labels (self);
+ } else {
+ hide_labels (self);
+ }
+}
+
+static void
+ensure_monitor_labels (CcDisplayPanel *self)
+{
+ widget_visible_changed (GTK_WIDGET (self), self);
}
static void
@@ -370,9 +474,14 @@
g_clear_object (&self->manager);
g_clear_object (&self->current_config);
g_clear_object (&self->up_client);
+ g_clear_object (&self->cinnamon_proxy);
g_clear_object (&self->muffin_settings);
g_clear_object (&self->labeler);
+ g_clear_pointer (&self->palette, g_free);
+
+ g_clear_object (&self->output_selection_list);
+ g_clear_object (&self->builder);
g_signal_handlers_disconnect_by_func (self, widget_visible_changed, NULL);
@@ -584,6 +693,7 @@
GList *outputs, *l;
CcDisplayConfigType type;
gboolean cloned = FALSE;
+ gint index = 0;
panel->rebuilding_counter++;
@@ -595,14 +705,16 @@
return;
}
- ensure_monitor_labels (panel);
-
cloned = config_get_current_type (panel);
n_active_outputs = 0;
n_usable_outputs = 0;
outputs = cc_display_config_get_ui_sorted_monitors (panel->current_config);
- for (l = outputs; l; l = l->next)
+
+ regenerate_palette (panel, g_list_length (outputs));
+ ensure_monitor_labels (panel);
+
+ for (l = outputs, index = 0; l; l = l->next, index++)
{
GtkTreeIter iter;
CcDisplayMonitor *output = l->data;
@@ -612,7 +724,11 @@
const gchar *label;
pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, 20, 20);
- cc_display_labeler_get_rgba_for_output (panel->labeler, output, &color);
+
+ gchar *color_string = get_color_string_for_output (panel, index);
+
+ gdk_rgba_parse (&color, color_string);
+ g_free (color_string);
pixel = pixel + ((int) (color.red * 255) << 24);
pixel = pixel + ((int) (color.green * 255) << 16);
@@ -639,6 +755,8 @@
2, pixbuf,
-1);
+ g_object_unref (pixbuf);
+
if (!cc_display_monitor_is_usable (output))
continue;
@@ -749,8 +867,6 @@
if (!panel->current_config)
return;
-
- ensure_monitor_labels (panel);
}
static void
@@ -893,6 +1009,23 @@
}
static void
+cinnamon_proxy_ready (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ CcDisplayPanel *self = CC_DISPLAY_PANEL (user_data);
+ GError *error = NULL;
+
+ self->cinnamon_proxy = g_dbus_proxy_new_finish (res, &error);
+
+ if (self->cinnamon_proxy == NULL)
+ {
+ g_critical ("Can't connect to Cinnamon, monitor labeler will be
unavailable: %s", error->message);
+ g_clear_error (&error);
+ }
+}
+
+static void
session_bus_ready (GObject *source,
GAsyncResult *res,
CcDisplayPanel *self)
@@ -915,6 +1048,21 @@
G_CALLBACK (on_screen_changed),
self,
G_CONNECT_SWAPPED);
+
+ if (WAYLAND_SESSION ())
+ {
+ g_dbus_proxy_new (bus,
+ G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START |
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
+ G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
+ NULL,
+ "org.Cinnamon",
+ "/org/Cinnamon",
+ "org.Cinnamon",
+ NULL,
+ (GAsyncReadyCallback) cinnamon_proxy_ready,
+ self);
+ }
}
static void
@@ -1022,18 +1170,57 @@
}
}
-static gchar *
-get_output_color (CcDisplayArrangement *arrangement, CcDisplayMonitor *output,
CcDisplayPanel *self)
+static void
+regenerate_palette (CcDisplayPanel *panel, gint n_outputs)
{
- GdkRGBA color;
+ /* The idea is that we go around an hue color wheel. We want to start
+ * at red, go around to green/etc. and stop at blue.
+ *
+ */
+ double start_hue;
+ double end_hue;
+ int i;
- if (self->labeler != NULL)
- {
- cc_display_labeler_get_rgba_for_output (self->labeler, output, &color);
- return gdk_rgba_to_string (&color);
+ g_clear_pointer (&panel->palette, g_free);
+ panel->palette = g_new (GdkRGBA, n_outputs);
+
+ start_hue = 0.0; /* red */
+ end_hue = 2.0/3; /* blue */
+
+ for (i = 0; i < n_outputs; i++) {
+ double h, s, v;
+ double r, g, b;
+
+ h = start_hue + (end_hue - start_hue) / n_outputs * i;
+ s = 0.6;
+ v = 1.0;
+
+ gtk_hsv_to_rgb (h, s, v, &r, &g, &b);
+
+ panel->palette[i].red = r;
+ panel->palette[i].green = g;
+ panel->palette[i].blue = b;
+ panel->palette[i].alpha = 1.0;
}
- return g_strdup ("white");
+ panel->n_outputs = n_outputs;
+}
+
+static gchar *
+get_color_string_for_output (CcDisplayPanel *panel, gint index)
+{
+ if (index < 0 || index > panel->n_outputs - 1)
+ {
+ return g_strdup ("white");
+ }
+
+ return gdk_rgba_to_string (&panel->palette[index]);
+}
+
+static gchar *
+get_output_color (GObject *source, gint index, CcDisplayPanel *self)
+{
+ return get_color_string_for_output (self, index);
}
static void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-5.8.0/panels/display/cc-display-settings.c
new/cinnamon-control-center-6.0.0/panels/display/cc-display-settings.c
--- old/cinnamon-control-center-5.8.0/panels/display/cc-display-settings.c
2023-06-01 14:57:58.000000000 +0200
+++ new/cinnamon-control-center-6.0.0/panels/display/cc-display-settings.c
2023-11-19 14:39:53.000000000 +0100
@@ -24,7 +24,7 @@
#include "cc-display-settings.h"
#include "cc-display-config.h"
-#define MAX_SCALE_BUTTONS 5
+#define MAX_SCALE_BUTTONS 6
#define WID(s) GTK_WIDGET (gtk_builder_get_object (self->builder, s))
@@ -414,6 +414,8 @@
1, l->data,
-1);
+ g_free (resolution_string);
+
if (current_mode == l->data)
{
gtk_combo_box_set_active_iter (GTK_COMBO_BOX
(self->resolution_combo), &iter);
@@ -678,6 +680,7 @@
g_clear_object (&self->orientation_list);
g_clear_object (&self->refresh_rate_list);
g_clear_object (&self->resolution_list);
+ g_clear_object (&self->builder);
if (self->idle_udpate_id)
g_source_remove (self->idle_udpate_id);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-5.8.0/panels/display/cinnamon-display-panel.desktop
new/cinnamon-control-center-6.0.0/panels/display/cinnamon-display-panel.desktop
---
old/cinnamon-control-center-5.8.0/panels/display/cinnamon-display-panel.desktop
2023-06-01 14:57:58.000000000 +0200
+++
new/cinnamon-control-center-6.0.0/panels/display/cinnamon-display-panel.desktop
2023-11-19 14:39:53.000000000 +0100
@@ -42,6 +42,7 @@
Name[is]=Skjár
Name[it]=Monitor
Name[ja]=ãã£ã¹ãã¬ã¤
+Name[ka]=áá ááá¡ á©áááááá
Name[kab]=Sken
Name[kk]=ÐиÑплей
Name[ko]=ëì¤íë ì´
@@ -56,6 +57,7 @@
Name[pt_BR]=Monitor
Name[ro]=AfiÈare
Name[ru]=ÐониÑоÑ
+Name[rue]=ÐÑÑплей
Name[sc]=Ischermu
Name[sk]=Obrazovka
Name[sl]=Zaslon
@@ -152,18 +154,26 @@
Keywords[de]=Panel;Projector;xrandr;Screen;Resolution;Refresh;Paneel;Projektor;xrandr;Bildschirm;Auflösung;Aktualisieren;Auffrischen;
Keywords[el]=ΠίνακαÏ;Î ÏοβολÎαÏ;xrandr;ÎθÏνη;ÎνάλÏ
Ïη;ÎνανÎÏÏη;
Keywords[es]=Panel;Proyector;xrandr;Pantalla;Resolución;Refresco;
+Keywords[et]=Paneel;projektor;xrandr;ekraan;eraldusvõime;värskendus;
Keywords[eu]=Panela;Proiektagailua;xrandr;Pantaila;Bereizmena;Freskatu;
Keywords[fi]=Paneeli;Projektori;xrandr;Näyttö;Resoluutio;Virkistys;
Keywords[fr]=Paneau;Projecteur;xrandr;Ecran;Résolution;Raffraichir;
Keywords[fr_CA]=Paneau;Projecteur;xrandr;Ecran;Résolution;Raffraichir;
+Keywords[he]=×××;×קר×;xrandr;צ×;×פר××;×¨×¢× ××;
Keywords[hr]=Panel;Projektor;xrandr;Zaslon;RazluÄivost;Osvježavanje;
Keywords[hu]=Panel;Projektor;xrandr;KépernyÅ;Felbontás;FrissÃtés;Monitor;Ãjszakai;fény;redshift;szÃn;napkelte;napnyugta;Panel;Projector;xrandr;Screen;Resolution;Refresh;
+Keywords[is]=Panell;Skjávarpi;xrandr;Skjár;Upplausn;UppfærslutÃðni;
Keywords[it]=Pannello;Proiettore;xrandr;Schermo;Risoluzione;Refresh;
+Keywords[ko]=í¨ë;íë¡ì í°;xrandr;íë©´;í´ìë;ìë¡ ê³ ì¹¨;
Keywords[nl]=Paneel;Projector;xrandr;Scherm;Resolutie;Verversen;
+Keywords[oc]=Panèl;Projector;Xrandr;Ecran;Resolucion;Actualizar;
Keywords[pl]=Panel;Projektor;xrandr;Ekran;RozdzielczoÅÄ;OdÅwieżanie;
Keywords[pt]=Painel;Projetor;xrandr;Ecrã;Resolução;Atualizar;
Keywords[pt_BR]=Painel;Projetor;xrandr;Tela;Resolução;Atualizar;
+Keywords[ro]=Panou;proiector;xrandr;ecran;rezoluÈie;reîmprospÄtare;
Keywords[ru]=ÐанелÑ;ÐÑоекÑоÑ;xrandr;ÐкÑан;Ð
азÑеÑение;ÐбновиÑÑ;
+Keywords[sk]=Panel;Projektor;xrandr;Obrazovka;RozlÃÅ¡enie;ObnoviÅ¥;
+Keywords[sl]=PloÅ¡Äa;projektor;xrandr;zaslon;loÄljivost;osveževanje;
Keywords[sv]=Panel;Projektor;xrandr;Skärm;Upplösning;Uppdatera;
Keywords[tr]=Panel;Projektör;xrandr;Ekran;Ãözünürlük;Tazeleme;
Keywords[uk]=ÐанелÑ;ÐÑоекÑоÑ;xrandr;ÐкÑан;Ð
оздÑлÑна здаÑнÑÑÑÑ;ÐновиÑи;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-5.8.0/panels/display/org.cinnamon.control-center.display.gschema.xml
new/cinnamon-control-center-6.0.0/panels/display/org.cinnamon.control-center.display.gschema.xml
---
old/cinnamon-control-center-5.8.0/panels/display/org.cinnamon.control-center.display.gschema.xml
2023-06-01 14:57:58.000000000 +0200
+++
new/cinnamon-control-center-6.0.0/panels/display/org.cinnamon.control-center.display.gschema.xml
2023-11-19 14:39:53.000000000 +0100
@@ -2,7 +2,7 @@
<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>
+ <summary>no longer used - see
org.cinnamon.muffin:experimental-features</summary>
</key>
</schema>
</schemalist>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-5.8.0/panels/network/cinnamon-network-panel.desktop
new/cinnamon-control-center-6.0.0/panels/network/cinnamon-network-panel.desktop
---
old/cinnamon-control-center-5.8.0/panels/network/cinnamon-network-panel.desktop
2023-06-01 14:57:58.000000000 +0200
+++
new/cinnamon-control-center-6.0.0/panels/network/cinnamon-network-panel.desktop
2023-11-19 14:39:53.000000000 +0100
@@ -43,6 +43,7 @@
Name[is]=Netkerfi
Name[it]=Rete
Name[ja]=ãããã¯ã¼ã¯
+Name[ka]=á¥á¡ááá
Name[kab]=Aáºeá¸á¸a
Name[kk]=ÐелÑ
Name[km]=ááááá¶á
@@ -63,6 +64,7 @@
Name[pt_BR]=Rede
Name[ro]=ReÈea
Name[ru]=СеÑÑ
+Name[rue]=ÐÑежа
Name[sc]=Retza
Name[sk]=Sieť
Name[sl]=Omrežje
@@ -118,6 +120,7 @@
Comment[is]=Netstillingar
Comment[it]=Impostazioni di rete
Comment[ja]=ãããã¯ã¼ã¯ã®è¨å®
+Comment[ka]=á¥á¡áááá¡ ááá áááá
Comment[kab]=IÉ£ewwaren uzeá¹á¹a
Comment[kk]=ÐÐµÐ»Ñ Ð±Ð°Ð¿ÑаÑлаÑÑ
Comment[ko]=ë¤í¸ìí¬ ì¤ì
@@ -166,18 +169,26 @@
Keywords[de]=Network;Wireless;IP;LAN;Proxy;Internet;WiFi;Netzwerk;drahtlos;Vermittlung;WLAN;
Keywords[el]=ÎίκÏÏ
ο;ÎÏÏÏμαÏο;IP;LAN;Proxy;ÎιαδίκÏÏ
ο;WiFi;
Keywords[es]=Red;Inalámbrico;IP;LAN;Proxy;Internet;WiFi;
+Keywords[et]=Võrk;traadita ühendus;IP;LAN;puhverserver;Internet;WiFi;
Keywords[eu]=Sarea;Haririk gabekoa;IP;LAN;Proxy;Internet;WiFi;
Keywords[fi]=Verkko;Langaton;IP;LAN;Välityspalvelin;Internet;WiFi;
Keywords[fr]=Réseau;Sans-fil;IP;LAN;Proxy;Internet;WiFi;
Keywords[fr_CA]=Réseau;Sans-fil;IP;LAN;Proxy;Internet;WiFi;
+Keywords[he]=רשת;××Ö¾××××;IP;LN;×ת×××;×רשתת;WiFi;
Keywords[hr]=Mreža;BežiÄna mreža;IP;LAN;Proxy;Internet;WiFi;
Keywords[hu]=Hálózat;Vezeték nélküli;Wi-Fi;Wifi;IP;LAN;Széles
sáv;Szélessáv;DNS;Network;Wireless;IP;LAN;Proxy;Internet;
+Keywords[is]=Netkerfi;Ãráðlaust;IP;LAN;Milliþjónn;Internet;WiFi;
Keywords[it]=Rete;Wireless;IP;LAN;Proxy;Internet;WiFi;
+Keywords[ko]=ë¤í¸ìí¬;무ì ;IP;LAN;íë¡ì;ì¸í°ë·;WiFi;
Keywords[nl]=Netwerk;Draadloos;IP;LAN;Proxy;Internet;WiFi;
+Keywords[oc]=Ret;Sens fil;LAN;Proxy;Internet;WiFi;
Keywords[pl]=SieÄ;Bezprzewodowa;IP;LAN;Proxy;Internet;WiFi;
Keywords[pt]=Rede;Sem fios;IP;LAN;Proxy;Internet;WiFi;
Keywords[pt_BR]=Rede;Sem fio;IP;LAN;Proxy;Internet;WiFi;
+Keywords[ro]=ReÈea;Wireless;IP;LAN;Proxy;Internet;WiFi;
Keywords[ru]=СеÑÑ;ÐеÑпÑоводнаÑ
ÑвÑзÑ;IP;ÐокалÑнаÑ
ÑеÑÑ;ÐÑокÑи;инÑеÑнеÑ;ÐеÑпÑÐ¾Ð²Ð¾Ð´Ð½Ð°Ñ ÑеÑÑ;
+Keywords[sk]=Sieť;Bezdrôtové pripojenie;IP;LAN;Proxy;Internet;WiFi;
+Keywords[sl]=Omrežje;brezžiÄno;IP;LAN;internet;wifi;posredovalni strežnik;
Keywords[sv]=Nätverk;Trådlöst;IP;LAN;Proxy;Internet;Trådlöst nätverk;
Keywords[tr]=AÄ;Kablosuz;IP;LAN;Vekil;Internet;Kablosuz aÄ;
Keywords[uk]=ÐеÑежа;ÐездÑоÑовÑ
меÑежÑ;IP;ÐокалÑна
меÑежа;ÐÑокÑÑ;ÐнÑеÑнеÑ;WiFi;
Binary files
old/cinnamon-control-center-5.8.0/panels/online-accounts/icons/16x16/cs-online-accounts.png
and
new/cinnamon-control-center-6.0.0/panels/online-accounts/icons/16x16/cs-online-accounts.png
differ
Binary files
old/cinnamon-control-center-5.8.0/panels/online-accounts/icons/22x22/cs-online-accounts.png
and
new/cinnamon-control-center-6.0.0/panels/online-accounts/icons/22x22/cs-online-accounts.png
differ
Binary files
old/cinnamon-control-center-5.8.0/panels/online-accounts/icons/24x24/cs-online-accounts.png
and
new/cinnamon-control-center-6.0.0/panels/online-accounts/icons/24x24/cs-online-accounts.png
differ
Binary files
old/cinnamon-control-center-5.8.0/panels/online-accounts/icons/256x256/cs-online-accounts.png
and
new/cinnamon-control-center-6.0.0/panels/online-accounts/icons/256x256/cs-online-accounts.png
differ
Binary files
old/cinnamon-control-center-5.8.0/panels/online-accounts/icons/32x32/cs-online-accounts.png
and
new/cinnamon-control-center-6.0.0/panels/online-accounts/icons/32x32/cs-online-accounts.png
differ
Binary files
old/cinnamon-control-center-5.8.0/panels/online-accounts/icons/48x48/cs-online-accounts.png
and
new/cinnamon-control-center-6.0.0/panels/online-accounts/icons/48x48/cs-online-accounts.png
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-5.8.0/panels/online-accounts/icons/meson.build
new/cinnamon-control-center-6.0.0/panels/online-accounts/icons/meson.build
--- old/cinnamon-control-center-5.8.0/panels/online-accounts/icons/meson.build
2023-06-01 14:57:58.000000000 +0200
+++ new/cinnamon-control-center-6.0.0/panels/online-accounts/icons/meson.build
1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-
-sizes = [
- '16x16',
- '22x22',
- '24x24',
- '32x32',
- '48x48',
- '64x64',
- '256x256',
- 'scalable',
-]
-
-foreach size : sizes
- install_subdir(size,
- strip_directory: true,
- install_dir:
- get_option('datadir') / 'icons' / 'hicolor' / size / 'apps',
- )
-endforeach
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-5.8.0/panels/online-accounts/meson.build
new/cinnamon-control-center-6.0.0/panels/online-accounts/meson.build
--- old/cinnamon-control-center-5.8.0/panels/online-accounts/meson.build
2023-06-01 14:57:58.000000000 +0200
+++ new/cinnamon-control-center-6.0.0/panels/online-accounts/meson.build
2023-11-19 14:39:53.000000000 +0100
@@ -1,5 +1,3 @@
-subdir('icons')
-
panel_online_accounts_sources = [
'cc-online-accounts-panel.c',
'online-accounts-module.c',
@@ -36,4 +34,4 @@
install_data(
'cinnamon-online-accounts.desktop',
install_dir: panel_def_dir
-)
\ No newline at end of file
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-5.8.0/panels/region/cinnamon-region-panel.desktop
new/cinnamon-control-center-6.0.0/panels/region/cinnamon-region-panel.desktop
---
old/cinnamon-control-center-5.8.0/panels/region/cinnamon-region-panel.desktop
2023-06-01 14:57:58.000000000 +0200
+++
new/cinnamon-control-center-6.0.0/panels/region/cinnamon-region-panel.desktop
2023-11-19 14:39:53.000000000 +0100
@@ -62,6 +62,7 @@
Name[pt_BR]=Região & Idioma
Name[ro]=Regiune Èi limbÄ
Name[ru]=Регион и ÑзÑк
+Name[rue]=РеÒÑон Ñай биÑÑда
Name[sc]=Limba e regione
Name[sk]=Oblasť a jazyk
Name[sl]=PodroÄje in jezik
@@ -133,6 +134,7 @@
Comment[pt_BR]=Alterar suas configurações de região e idioma
Comment[ro]=SchimbaÈi setÄrile de regiune Èi limbÄ
Comment[ru]=ÐзмениÑÑ ÑегионалÑнÑе и ÑзÑковÑе
наÑÑÑойки
+Comment[rue]=ÐеÑемÑниÑи ÑвÑй ÑеÒÑон Ñай биÑÑдÑ
Comment[sk]=Zmeniť regionálne a jazykové nastavenia
Comment[sl]=Spremeni svoje podroÄne in jezikovne nastavitve
Comment[sq]=Ndërro parametrat e krahinës dhe të gjuhës
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-5.8.0/panels/wacom/cinnamon-wacom-panel.desktop
new/cinnamon-control-center-6.0.0/panels/wacom/cinnamon-wacom-panel.desktop
--- old/cinnamon-control-center-5.8.0/panels/wacom/cinnamon-wacom-panel.desktop
2023-06-01 14:57:58.000000000 +0200
+++ new/cinnamon-control-center-6.0.0/panels/wacom/cinnamon-wacom-panel.desktop
2023-11-19 14:39:53.000000000 +0100
@@ -43,6 +43,7 @@
Name[is]=Teiknitafla
Name[it]=Tavoletta grafica
Name[ja]=ã°ã©ãã£ãã¯ã¿ãã¬ãã
+Name[ka]=áá áá¤ááá£áá á¢ááááá¢á
Name[kab]=Tafelwit tudlift
Name[kk]=ÐÑаÑикалÑÒ ÐланÑеÑ
Name[ko]=ê·¸ëí½ íë¸ë¦¿
@@ -121,7 +122,7 @@
Comment[pt_BR]=Definir botões e ajustar sensibilidade da caneta para mesas
digitalizadoras
Comment[ro]=SetaÈi alocarea butoanelor Èi ajustaÈi sensibilitatea
stylusului tabletei grafice
Comment[ru]=УÑÑановка пÑивÑзки кнопок и
наÑÑÑойка ÑÑвÑÑвиÑелÑноÑÑи пеÑа длÑ
гÑаÑиÑеÑкиÑ
планÑеÑов
-Comment[sk]=Nastavuje mapovanie tlaÄidiel a upravuje citlivosÅ¥ pera
grafických tabletov
+Comment[sk]=Nastavuje priradenie tlaÄidiel a upravuje citlivosÅ¥ pera
grafických tabletov
Comment[sl]=Nastavite preslikave gumbov in prilagodite obÄutljivost pisala za
grafiÄne tablice
Comment[sr]=ÐодеÑи пÑеÑиÑе дÑгмади и оÑеÑÑивоÑÑ
пиÑаÑке гÑаÑиÑким ÑаблиÑама
Comment[sr@latin]=Postavite mapiranje dugmadi i podesite osetljivost digitalne
olovke grafiÄkih tabli
@@ -146,18 +147,26 @@
Keywords[de]=Tablet;Wacom;Stylus;Eraser;Mouse;Maus;
Keywords[el]=ΤαμÏλÎÏα;Wacom;Î Îνα;ÎÏμα;ΠονÏίκι;
Keywords[es]=Tableta;Wacom;Lápiz táctil;Borrador;Ratón;
+Keywords[et]=Tahvelarvuti;Wacom;Stylus;Kustutaja;Hiir;
Keywords[eu]=Tableta;Wacom;Arkatz optikoa;Borragoma;Sagua;
Keywords[fi]=Piirtoalusta;Wacom;Kynä;Pyyhekumi;Hiiri;
Keywords[fr]=Tablette;Wacom;Stylet;Gomme;Souris;
Keywords[fr_CA]=Tablette;Wacom;Stylet;Gomme;Souris;
+Keywords[he]=××ש×Ö¾×××;Wacom;ס××××ס;××ק;×¢××ר;
Keywords[hr]=Tablet;Wacom;Pisaljak;Brisaljka;Miš;
Keywords[hu]=Rajztábla;Wacom;Toll;RadÃr;Egér;Tablet;Stylus;Eraser;Mouse;
+Keywords[is]=Tafla;Wacom;Teiknipenni;Ãtstrokari;Mús;
Keywords[it]=Tavoletta;Wacom;Penna;Gomma;Mouse;
+Keywords[ko]=íë¸ë¦¿;Wacom;ì¤íì¼ë¬ì¤;ì§ì°ê°;ë§ì°ì¤;
Keywords[nl]=Tablet;Wacom;Pen;Eraser;Muis;
+Keywords[oc]=Tauleta;Wacom;Estilet;Goma;Mirga;
Keywords[pl]=Tablet;Wacom;Rysik;Gumka;Mysz;
Keywords[pt]=Tablet;Wacom;Caneta;Borracha;Rato;
Keywords[pt_BR]=Tablet;Wacom;Stylus;Apagar;Mouse;
+Keywords[ro]=TabletÄ;Wacom;Stylus;RadierÄ;Mouse;
Keywords[ru]=ÐланÑеÑ;Wacom;СÑилÑÑ;СÑÑÑка;ÐÑÑÑ;ÐлекÑÑонное
пеÑо;Ð ÑÑка;
+Keywords[sk]=Tablet;Wacom;stylus;guma;myš;
+Keywords[sl]=Tablica;Wacom;pisalo;radirka;miška;
Keywords[sv]=Ritplatta;Wacom;Stylus;Raderare;Mus;
Keywords[tr]=Tablet;Wacom;TuÅ Kalemi;Silici;Fare;
Keywords[uk]=ÐланÑеÑ;Wacom;СÑилÑÑ;СÑиÑаÑ;ÐиÑа;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-5.8.0/panels/wacom/wacom-stylus-page.ui
new/cinnamon-control-center-6.0.0/panels/wacom/wacom-stylus-page.ui
--- old/cinnamon-control-center-5.8.0/panels/wacom/wacom-stylus-page.ui
2023-06-01 14:57:58.000000000 +0200
+++ new/cinnamon-control-center-6.0.0/panels/wacom/wacom-stylus-page.ui
2023-11-19 14:39:53.000000000 +0100
@@ -40,6 +40,10 @@
<col id="0">4</col>
<col id="1" translatable="yes">Forward</col>
</row>
+ <row>
+ <col id="0">5</col>
+ <col id="1" translatable="yes">Disabled</col>
+ </row>
</data>
</object>
<object class="GtkNotebook" id="stylus-notebook">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-5.8.0/shell/cc-shell-item-view.c
new/cinnamon-control-center-6.0.0/shell/cc-shell-item-view.c
--- old/cinnamon-control-center-5.8.0/shell/cc-shell-item-view.c
2023-06-01 14:57:58.000000000 +0200
+++ new/cinnamon-control-center-6.0.0/shell/cc-shell-item-view.c
2023-11-19 14:39:53.000000000 +0100
@@ -166,6 +166,8 @@
break;
}
}
+
+ g_list_free (cells);
}
static void
