Merge branch 'master' into feat/workspace-switcher/show-window-icon

data/theme/cinnamon.css

@@ -1164,6 +1164,86 @@ StScrollBar StButton#vhandle:hover {
     -arrow-rise: 10px;
     -boxpointer-gap: 5px;
 }
+
+/* ===================================================================
+ * Policykit authentication dialog
+ * ===================================================================*/
+.polkit-dialog {
+    /* this is the width of the entire modal popup */
+    width: 500px;
+}
+.polkit-dialog-main-layout {
+    spacing: 10px;
+}
+
+.polkit-dialog-headline {
+    text-align: center;
+    font-size: 1.3em;
+    font-weight: bold;
+    color: white;
+}
+.polkit-dialog-description {
+    text-align: center;
+    font-size: 1em;
+    color: white;
+}
+.polkit-dialog-user-layout {
+    spacing: 10px;
+}
+.polkit-dialog-user-layout:rtl {
+    padding-right: 10px;
+}
+.polkit-dialog-user-root-label {
+    color: #ff0000;
+}
+.polkit-dialog-password-label:ltr {
+    padding-top: 0.5em;
+    padding-right: 0.5em;
+}
+.polkit-dialog-password-label:rtl {
+    padding-left: 0.5em;
+}
+.polkit-dialog-password-entry {
+    padding: 5px;
+    border-radius: 4px;
+    color: rgb(64, 64, 64);
+    border: 2px solid rgba(245,245,245,0.2);
+    background-gradient-start: rgba(5,5,6,0.1);
+    background-gradient-end: rgba(254,254,254,0.1);
+    background-gradient-direction: vertical;
+    selected-color: black;
+    caret-color: rgb(64, 64, 64);
+    caret-size: 1px;
+    width: 21em;
+    height: 1.2em;
+    transition-duration: 300;
+    box-shadow: inset 0px 2px 4px rgba(0,0,0,0.6);
+}
+.polkit-dialog-password-entry:focus {
+    border: 2px solid rgb(136,138,133);
+    background-gradient-start: rgb(80, 80, 80);
+    background-gradient-end: white;
+    background-gradient-direction: vertical;
+}
+.polkit-dialog-password-entry .capslock-warning {
+    icon-size: 16px;
+    warning-color: rgb(64, 64, 64);
+    padding: 0 4px;
+}
+.polkit-dialog-error-label {
+    text-align: center;
+    font-size: 1em;
+    color: #ffff00;
+}
+.polkit-dialog-info-label {
+    font-size: 1em;
+}
+/* intentionally left transparent to avoid dialog changing size */
+.polkit-dialog-null-label {
+    font-size: 10pt;
+    color: rgba(0,0,0,0);
+}
+
 /* ###################################################################
  * Cinnamon Specific Section
  * ###################################################################*/
@@ -1929,10 +2009,9 @@ StScrollBar StButton#vhandle:hover {
     selected-color: black;
     caret-color: rgb(128, 128, 128);
     caret-size: 1px;
-    width: 250px;
-    height: 1em;
+    min-width: 80px;
+    height: 1.4em;
     box-shadow: inset 0px 2px 4px rgba(0,0,0,0.6);
-    text-align: center;
 }
 
 .expo-workspaces-name-entry#selected {
@@ -2105,3 +2184,8 @@ StScrollBar StButton#vhandle:hover {
   -pie-border-color: rgba(200, 200, 200, 0.8);
   -pie-background-color: rgba(140, 140, 140, 0.6);;
 }
+
+.user-icon {
+    border: 2px solid #868686;
+    border-radius: 99px;
+}

debian/control

@@ -58,7 +58,6 @@ Depends:
  gir1.2-edataserver-1.2,
  gir1.2-gdkpixbuf-2.0,
  gir1.2-gkbd-3.0,
- gir1.2-goa-1.0,
  gir1.2-gsound-1.0,
  gir1.2-gtkclutter-1.0,
  gir1.2-ical-3.0,
@@ -113,9 +112,10 @@ Depends:
 Recommends:
  gnome-terminal | x-terminal-emulator,
  gnome-themes-extra | gnome-themes-standard,
+ gnome-online-accounts-gtk,
  touchegg,
 Suggests: cinnamon-doc
-Provides: notification-daemon, x-window-manager
+Provides: notification-daemon, x-window-manager, polkit-1-auth-agent
 Description: Modern Linux desktop
  Cinnamon is a modern Linux desktop which provides advanced innovative
  features and a traditional user experience. It's easy to use, powerful

docs/reference/cinnamon-js/gen_doc.py

@@ -65,11 +65,10 @@
 JS_MISC_DIR = os.path.join(ROOT_DIR, 'js/misc/')
 
 # Allow types like "object/string"
-TYPE_REGEX = r'\w*\.?\w+/?\w*\.?\w*'
 COMMENT_REGEX = re.compile(r'/\*([^*]|(\*[^/]))*\*+/')
-RETURNS_REGEX = re.compile(r'^Returns\s*\(?(' + TYPE_REGEX + ')?\)?:(.*)')
-INHERITS_REGEX = re.compile(r'^Inherits:\s*(' + TYPE_REGEX + ')\s*$')
-PROPERTY_REGEX = re.compile(r'^@(\w+)\s*\(?(' + TYPE_REGEX + ')?\)?:(.*)')
+RETURNS_REGEX = re.compile(r'^Returns\s*\(?(\w*\.?\w+/?\w*\.?\w*)?\)?:(.*)')
+INHERITS_REGEX = re.compile(r'^Inherits:\s*(\w*\.?\w+/?\w*\.?\w*)\s*$')
+PROPERTY_REGEX = re.compile(r'^@(\w+)\s*\(?(\w*\.?\w+/?\w*\.?\w*)?\)?:(.*)')
 FILE_NAME_REGEX = re.compile(r'FILE:\s*(\w+\.js):?')
 SIGNAL_NAME_REGEX = re.compile(r'SIGNAL:\s*([\w-]+):?')
 ENUM_NAME_REGEX = re.compile(r'ENUM:\s*(\w+):?')

docs/reference/cinnamon-js/gen_lib.py

@@ -36,18 +36,18 @@ def get_type_link(typ, file):
             return typ.replace('.', '')
 
 def markup(line, obj):
-    line = re.sub('@(\w*)', '<code>\g<1></code>', line)
-    line = re.sub('`([^`]*)`', '<code>\g<1></code>', line)
-    line = re.sub('\*\*([^*]*)\*\*', '<emphasis role="strong">\g<1></emphasis>', line)
-    line = re.sub('\*([^*]*)\*', '<emphasis>\g<1></emphasis>', line)
+    line = re.sub(r'@(\w*)', r'<code>\g<1></code>', line)
+    line = re.sub(r'`([^`]*)`', r'<code>\g<1></code>', line)
+    line = re.sub(r'\*\*([^*]*)\*\*', r'<emphasis role="strong">\g<1></emphasis>', line)
+    line = re.sub(r'\*([^*]*)\*', r'<emphasis>\g<1></emphasis>', line)
 
     def format_type_link(match):
         res = match.group(1)
         return '<link linkend="{link}"><code>{name}</code></link>'.format(
             link = get_type_link(res, obj.file),
             name = res)
 
-    line = re.sub('#(([\w]*\.)?[\w]+)', format_type_link, line)
+    line = re.sub(r'#(([\w]*\.)?[\w]+)', format_type_link, line)
 
     def format_ext_link(match):
         if match.group(1):
@@ -96,7 +96,7 @@ def format_ext_link(match):
         else:
             return '<code>{name}</code>'.format(name = full)
 
-    line = re.sub('%(([\w]+\.)?[\w]+\.)?([\w]+)(\(\))?', format_ext_link, line)
+    line = re.sub(r'%(([\w]+\.)?[\w]+\.)?([\w]+)(\(\))?', format_ext_link, line)
 
     return line
 

files/usr/bin/cinnamon-xlet-makepot

@@ -285,7 +285,7 @@ def scan_xlet():
             ]
             command_args += js_files
             subprocess.run(command_args)
-            pot_exists = True
+            pot_exists = os.path.exists(pot_path)
 
     if args.python:
         print("Scanning for python files...")

files/usr/share/applications/cinnamon-settings.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=cinnamon-settings
+Exec=env WEBKIT_DISABLE_COMPOSITING_MODE=1 cinnamon-settings
 Icon=preferences-desktop
 Terminal=false
 Type=Application

files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js

@@ -186,7 +186,7 @@ class CinnamonCalendarApplet extends Applet.TextApplet {
     }
 
     on_custom_format_button_pressed() {
-        Util.spawnCommandLine("xdg-open http://www.foragoodstrftime.com/");
+        Util.spawnCommandLine("xdg-open https://cinnamon-spices.linuxmint.com/strftime.php");
     }
 
     _onLaunchSettings() {