Browse Source

Imported Upstream version 2.2.3

tags/upstream/2.2.3^0
Margarita Manterola 7 years ago
parent
commit
9899203036
100 changed files with 12900 additions and 3485 deletions
  1. +1478
    -1044
      cinnamon.pot
  2. +6
    -5
      configure.ac
  3. +5
    -1
      data/Makefile.am
  4. +115
    -0
      data/icons/Makefile.am
  5. +0
    -0
      data/icons/hicolor_categories_scalable_cs-applets.svg
  6. +1141
    -0
      data/icons/hicolor_categories_scalable_cs-backgrounds.svg
  7. +0
    -0
      data/icons/hicolor_categories_scalable_cs-bluetooth.svg
  8. +0
    -0
      data/icons/hicolor_categories_scalable_cs-cat-admin.svg
  9. +0
    -0
      data/icons/hicolor_categories_scalable_cs-cat-appearance.svg
  10. +0
    -0
      data/icons/hicolor_categories_scalable_cs-cat-hardware.svg
  11. +0
    -0
      data/icons/hicolor_categories_scalable_cs-cat-prefs.svg
  12. +0
    -0
      data/icons/hicolor_categories_scalable_cs-color.svg
  13. +0
    -0
      data/icons/hicolor_categories_scalable_cs-date-time.svg
  14. +0
    -0
      data/icons/hicolor_categories_scalable_cs-default-applications.svg
  15. +0
    -0
      data/icons/hicolor_categories_scalable_cs-desklets.svg
  16. +0
    -0
      data/icons/hicolor_categories_scalable_cs-desktop-effects.svg
  17. +0
    -0
      data/icons/hicolor_categories_scalable_cs-desktop.svg
  18. +0
    -0
      data/icons/hicolor_categories_scalable_cs-details.svg
  19. +0
    -0
      data/icons/hicolor_categories_scalable_cs-display.svg
  20. +0
    -0
      data/icons/hicolor_categories_scalable_cs-drivers.svg
  21. +0
    -0
      data/icons/hicolor_categories_scalable_cs-extensions.svg
  22. +0
    -0
      data/icons/hicolor_categories_scalable_cs-firewall.svg
  23. +0
    -0
      data/icons/hicolor_categories_scalable_cs-fonts.svg
  24. +0
    -0
      data/icons/hicolor_categories_scalable_cs-general.svg
  25. +0
    -0
      data/icons/hicolor_categories_scalable_cs-keyboard.svg
  26. +0
    -0
      data/icons/hicolor_categories_scalable_cs-language.svg
  27. +0
    -0
      data/icons/hicolor_categories_scalable_cs-login.svg
  28. +0
    -0
      data/icons/hicolor_categories_scalable_cs-mouse.svg
  29. +0
    -0
      data/icons/hicolor_categories_scalable_cs-network.svg
  30. +456
    -0
      data/icons/hicolor_categories_scalable_cs-overview.svg
  31. +0
    -0
      data/icons/hicolor_categories_scalable_cs-panel.svg
  32. +0
    -0
      data/icons/hicolor_categories_scalable_cs-power.svg
  33. +0
    -0
      data/icons/hicolor_categories_scalable_cs-printer.svg
  34. +0
    -0
      data/icons/hicolor_categories_scalable_cs-region.svg
  35. +0
    -0
      data/icons/hicolor_categories_scalable_cs-screen.svg
  36. +716
    -0
      data/icons/hicolor_categories_scalable_cs-screensaver.svg
  37. +0
    -0
      data/icons/hicolor_categories_scalable_cs-sound.svg
  38. +0
    -0
      data/icons/hicolor_categories_scalable_cs-sources.svg
  39. +4168
    -0
      data/icons/hicolor_categories_scalable_cs-startup-programs.svg
  40. +2450
    -0
      data/icons/hicolor_categories_scalable_cs-tablet.svg
  41. +0
    -0
      data/icons/hicolor_categories_scalable_cs-themes.svg
  42. +0
    -0
      data/icons/hicolor_categories_scalable_cs-tiling.svg
  43. +0
    -0
      data/icons/hicolor_categories_scalable_cs-universal-access.svg
  44. +0
    -0
      data/icons/hicolor_categories_scalable_cs-user-accounts.svg
  45. +0
    -0
      data/icons/hicolor_categories_scalable_cs-user.svg
  46. +0
    -0
      data/icons/hicolor_categories_scalable_cs-windows.svg
  47. +0
    -0
      data/icons/hicolor_categories_scalable_cs-workspaces.svg
  48. +0
    -0
      data/icons/hicolor_emblems_scalable_cs-xlet-installed.svg
  49. +0
    -0
      data/icons/hicolor_emblems_scalable_cs-xlet-running.svg
  50. +0
    -0
      data/icons/hicolor_emblems_scalable_cs-xlet-system.svg
  51. +0
    -0
      data/icons/hicolor_emblems_scalable_cs-xlet-update.svg
  52. +23
    -14
      data/org.cinnamon.gschema.xml.in
  53. +15
    -1
      data/theme/cinnamon.css
  54. BIN
      data/theme/menu.png
  55. +45
    -0
      data/theme/menu.svg
  56. +2
    -0
      files/Makefile.in
  57. +1
    -0
      files/generate_desktop_files
  58. +1
    -1
      files/usr/bin/cinnamon-settings-users
  59. +11
    -5
      files/usr/lib/cinnamon-desktop-editor/cinnamon-desktop-editor.py
  60. +44
    -39
      files/usr/lib/cinnamon-menu-editor/cme/MainWindow.py
  61. +33
    -33
      files/usr/lib/cinnamon-menu-editor/cme/MenuEditor.py
  62. +22
    -14
      files/usr/lib/cinnamon-menu-editor/cme/util.py
  63. +16
    -17
      files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py
  64. +30
    -30
      files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.ui
  65. +5
    -1
      files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
  66. +114
    -90
      files/usr/lib/cinnamon-settings/bin/ExtensionCore.py
  67. +173
    -36
      files/usr/lib/cinnamon-settings/bin/SettingsWidgets.py
  68. +8
    -4
      files/usr/lib/cinnamon-settings/bin/Spices.py
  69. +19
    -7
      files/usr/lib/cinnamon-settings/bin/XletSettings.py
  70. +125
    -50
      files/usr/lib/cinnamon-settings/bin/XletSettingsWidgets.py
  71. +56
    -128
      files/usr/lib/cinnamon-settings/cinnamon-settings.py
  72. +10
    -92
      files/usr/lib/cinnamon-settings/cinnamon-settings.ui
  73. BIN
      files/usr/lib/cinnamon-settings/data/cinnamon.png
  74. +0
    -46
      files/usr/lib/cinnamon-settings/data/icons/backgrounds.svg
  75. +0
    -147
      files/usr/lib/cinnamon-settings/data/icons/screensaver.svg
  76. +0
    -72
      files/usr/lib/cinnamon-settings/data/icons/startup-programs.svg
  77. +0
    -63
      files/usr/lib/cinnamon-settings/data/icons/workspaces.svg
  78. BIN
      files/usr/lib/cinnamon-settings/data/inactive.png
  79. BIN
      files/usr/lib/cinnamon-settings/data/user.png
  80. +9
    -6
      files/usr/lib/cinnamon-settings/modules/cs_applets.py
  81. +148
    -137
      files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
  82. +24
    -352
      files/usr/lib/cinnamon-settings/modules/cs_calendar.py
  83. +45
    -25
      files/usr/lib/cinnamon-settings/modules/cs_default.py
  84. +12
    -7
      files/usr/lib/cinnamon-settings/modules/cs_desklets.py
  85. +27
    -12
      files/usr/lib/cinnamon-settings/modules/cs_desktop.py
  86. +65
    -56
      files/usr/lib/cinnamon-settings/modules/cs_effects.py
  87. +10
    -5
      files/usr/lib/cinnamon-settings/modules/cs_extensions.py
  88. +52
    -10
      files/usr/lib/cinnamon-settings/modules/cs_fonts.py
  89. +23
    -5
      files/usr/lib/cinnamon-settings/modules/cs_general.py
  90. +114
    -115
      files/usr/lib/cinnamon-settings/modules/cs_hotcorner.py
  91. +24
    -21
      files/usr/lib/cinnamon-settings/modules/cs_info.py
  92. +446
    -337
      files/usr/lib/cinnamon-settings/modules/cs_keyboard.py
  93. +99
    -193
      files/usr/lib/cinnamon-settings/modules/cs_mouse.py
  94. +58
    -50
      files/usr/lib/cinnamon-settings/modules/cs_panel.py
  95. +119
    -0
      files/usr/lib/cinnamon-settings/modules/cs_power.py
  96. +53
    -14
      files/usr/lib/cinnamon-settings/modules/cs_screensaver.py
  97. +35
    -22
      files/usr/lib/cinnamon-settings/modules/cs_themes.py
  98. +39
    -30
      files/usr/lib/cinnamon-settings/modules/cs_tiling.py
  99. +110
    -113
      files/usr/lib/cinnamon-settings/modules/cs_user.py
  100. +100
    -35
      files/usr/lib/cinnamon-settings/modules/cs_windows.py

+ 1478
- 1044
cinnamon.pot
File diff suppressed because it is too large
View File


+ 6
- 5
configure.ac View File

@@ -1,5 +1,5 @@
AC_PREREQ(2.63)
AC_INIT([cinnamon],[2.0.14],[https://bugzilla.gnome.org/enter_bug.cgi?product=cinnamon],[cinnamon])
AC_INIT([cinnamon],[2.2.3],[https://bugzilla.gnome.org/enter_bug.cgi?product=cinnamon],[cinnamon])

AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([src/cinnamon-global.c])
@@ -44,15 +44,15 @@ AC_SUBST(PYTHON)

# We need at least this, since gst_plugin_register_static() was added
# in 0.10.16, but nothing older than 0.10.21 has been tested.
GSTREAMER_MIN_VERSION=0.10.16
GSTREAMER_MIN_VERSION=0.11.92

recorder_modules=
build_recorder=false
AC_MSG_CHECKING([for GStreamer (needed for recording functionality)])
if $PKG_CONFIG --exists gstreamer-0.10 '>=' $GSTREAMER_MIN_VERSION ; then
if $PKG_CONFIG --exists gstreamer-1.0 '>=' $GSTREAMER_MIN_VERSION ; then
AC_MSG_RESULT(yes)
build_recorder=true
recorder_modules="gstreamer-0.10 gstreamer-base-0.10 x11"
recorder_modules="gstreamer-1.0 gstreamer-base-1.0 x11"
PKG_CHECK_MODULES(TEST_CINNAMON_RECORDER, $recorder_modules clutter-1.0 xfixes)
else
AC_MSG_RESULT(no)
@@ -75,7 +75,7 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
gtk+-3.0 >= $GTK_MIN_VERSION
libmuffin >= $MUFFIN_MIN_VERSION
cjs-internals-1.0 >= $GJS_MIN_VERSION
libgnome-menu-3.0 $recorder_modules gconf-2.0
libcinnamon-menu-3.0 $recorder_modules gconf-2.0
gdk-x11-3.0 libsoup-2.4 gl
clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
@@ -222,6 +222,7 @@ AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])
AC_CONFIG_FILES([
Makefile
data/Makefile
data/icons/Makefile
js/Makefile
js/misc/config.js
src/Makefile


+ 5
- 1
data/Makefile.am View File

@@ -32,7 +32,7 @@ dist_theme_DATA = \
theme/close.svg \
theme/close-window.svg \
theme/corner-ripple.png \
theme/menu.png \
theme/menu.svg \
theme/overview-hover.png \
theme/overview.png \
theme/player-paused.svg \
@@ -81,3 +81,7 @@ CLEANFILES = \
$(gsettings_SCHEMAS) \
gschemas.compiled

SUBDIRS = \
icons \
$(NULL)


+ 115
- 0
data/icons/Makefile.am View File

@@ -0,0 +1,115 @@
NULL =

public_icons_themes = \
hicolor \
$(NULL)

public_icons = \
hicolor_categories_scalable_cs-applets.svg \
hicolor_categories_scalable_cs-backgrounds.svg \
hicolor_categories_scalable_cs-bluetooth.svg \
hicolor_categories_scalable_cs-cat-admin.svg \
hicolor_categories_scalable_cs-cat-appearance.svg \
hicolor_categories_scalable_cs-cat-hardware.svg \
hicolor_categories_scalable_cs-cat-prefs.svg \
hicolor_categories_scalable_cs-color.svg \
hicolor_categories_scalable_cs-date-time.svg \
hicolor_categories_scalable_cs-default-applications.svg \
hicolor_categories_scalable_cs-desklets.svg \
hicolor_categories_scalable_cs-desktop-effects.svg \
hicolor_categories_scalable_cs-desktop.svg \
hicolor_categories_scalable_cs-details.svg \
hicolor_categories_scalable_cs-display.svg \
hicolor_categories_scalable_cs-drivers.svg \
hicolor_categories_scalable_cs-extensions.svg \
hicolor_categories_scalable_cs-firewall.svg \
hicolor_categories_scalable_cs-fonts.svg \
hicolor_categories_scalable_cs-general.svg \
hicolor_categories_scalable_cs-keyboard.svg \
hicolor_categories_scalable_cs-language.svg \
hicolor_categories_scalable_cs-login.svg \
hicolor_categories_scalable_cs-mouse.svg \
hicolor_categories_scalable_cs-network.svg \
hicolor_categories_scalable_cs-overview.svg \
hicolor_categories_scalable_cs-panel.svg \
hicolor_categories_scalable_cs-power.svg \
hicolor_categories_scalable_cs-printer.svg \
hicolor_categories_scalable_cs-region.svg \
hicolor_categories_scalable_cs-screensaver.svg \
hicolor_categories_scalable_cs-screen.svg \
hicolor_categories_scalable_cs-sound.svg \
hicolor_categories_scalable_cs-sources.svg \
hicolor_categories_scalable_cs-startup-programs.svg \
hicolor_categories_scalable_cs-tablet.svg \
hicolor_categories_scalable_cs-themes.svg \
hicolor_categories_scalable_cs-tiling.svg \
hicolor_categories_scalable_cs-universal-access.svg \
hicolor_categories_scalable_cs-user-accounts.svg \
hicolor_categories_scalable_cs-user.svg \
hicolor_categories_scalable_cs-windows.svg \
hicolor_categories_scalable_cs-workspaces.svg \
hicolor_emblems_scalable_cs-xlet-installed.svg \
hicolor_emblems_scalable_cs-xlet-running.svg \
hicolor_emblems_scalable_cs-xlet-system.svg \
hicolor_emblems_scalable_cs-xlet-update.svg \
$(NULL)

EXTRA_DIST = \
$(public_icons) \
$(NULL)


###############################################################################

gtk_update_icon_cache = gtk-update-icon-cache -f -t

update-icon-cache:
@-if test -z "$(DESTDIR)"; then \
echo "Updating Gtk icon cache."; \
for theme in $(public_icons_themes); do \
$(gtk_update_icon_cache) $(datadir)/icons/$$theme; \
done; \
else \
echo "*** Icon cache not updated. After (un)install, run this:"; \
for theme in $(public_icons_themes); do \
echo "*** $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \
done; \
fi

install-icons:
for icon in $(public_icons); do \
THEME=`echo $$icon | cut -d_ -f1`; \
CONTEXT=`echo $$icon | cut -d_ -f2`; \
SIZE=`echo $$icon | cut -d_ -f3`; \
ICONFILE=`echo $$icon | cut -d_ -f4`; \
mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
done; \
for icon in $(private_icons); do \
THEME=`echo $$icon | cut -d_ -f1`; \
CONTEXT=`echo $$icon | cut -d_ -f2`; \
SIZE=`echo $$icon | cut -d_ -f3`; \
ICONFILE=`echo $$icon | cut -d_ -f4`; \
mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
done

uninstall-icons:
-for icon in $(public_icons); do \
THEME=`echo $$icon | cut -d_ -f1`; \
CONTEXT=`echo $$icon | cut -d_ -f2`; \
SIZE=`echo $$icon | cut -d_ -f3`; \
ICONFILE=`echo $$icon | cut -d_ -f4`; \
rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
done; \
for icon in $(private_icons); do \
THEME=`echo $$icon | cut -d_ -f1`; \
CONTEXT=`echo $$icon | cut -d_ -f2`; \
SIZE=`echo $$icon | cut -d_ -f3`; \
ICONFILE=`echo $$icon | cut -d_ -f4`; \
rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
done

install-data-local: install-icons update-icon-cache

uninstall-local: uninstall-icons update-icon-cache

files/usr/lib/cinnamon-settings/data/icons/applets.svg → data/icons/hicolor_categories_scalable_cs-applets.svg View File


+ 1141
- 0
data/icons/hicolor_categories_scalable_cs-backgrounds.svg
File diff suppressed because it is too large
View File


files/usr/lib/cinnamon-settings/data/icons/bluetooth.svg → data/icons/hicolor_categories_scalable_cs-bluetooth.svg View File


files/usr/lib/cinnamon-settings/data/icons/cat-admin.svg → data/icons/hicolor_categories_scalable_cs-cat-admin.svg View File


files/usr/lib/cinnamon-settings/data/icons/cat-appearance.svg → data/icons/hicolor_categories_scalable_cs-cat-appearance.svg View File


files/usr/lib/cinnamon-settings/data/icons/cat-hardware.svg → data/icons/hicolor_categories_scalable_cs-cat-hardware.svg View File


files/usr/lib/cinnamon-settings/data/icons/cat-prefs.svg → data/icons/hicolor_categories_scalable_cs-cat-prefs.svg View File


files/usr/lib/cinnamon-settings/data/icons/color.svg → data/icons/hicolor_categories_scalable_cs-color.svg View File


files/usr/lib/cinnamon-settings/data/icons/date-time.svg → data/icons/hicolor_categories_scalable_cs-date-time.svg View File


files/usr/lib/cinnamon-settings/data/icons/default-applications.svg → data/icons/hicolor_categories_scalable_cs-default-applications.svg View File


files/usr/lib/cinnamon-settings/data/icons/desklets.svg → data/icons/hicolor_categories_scalable_cs-desklets.svg View File


files/usr/lib/cinnamon-settings/data/icons/desktop-effects.svg → data/icons/hicolor_categories_scalable_cs-desktop-effects.svg View File


files/usr/lib/cinnamon-settings/data/icons/desktop.svg → data/icons/hicolor_categories_scalable_cs-desktop.svg View File


files/usr/lib/cinnamon-settings/data/icons/details.svg → data/icons/hicolor_categories_scalable_cs-details.svg View File


files/usr/lib/cinnamon-settings/data/icons/display.svg → data/icons/hicolor_categories_scalable_cs-display.svg View File


files/usr/lib/cinnamon-settings/data/icons/drivers.svg → data/icons/hicolor_categories_scalable_cs-drivers.svg View File


files/usr/lib/cinnamon-settings/data/icons/extensions.svg → data/icons/hicolor_categories_scalable_cs-extensions.svg View File


files/usr/lib/cinnamon-settings/data/icons/firewall.svg → data/icons/hicolor_categories_scalable_cs-firewall.svg View File


files/usr/lib/cinnamon-settings/data/icons/fonts.svg → data/icons/hicolor_categories_scalable_cs-fonts.svg View File


files/usr/lib/cinnamon-settings/data/icons/general.svg → data/icons/hicolor_categories_scalable_cs-general.svg View File


files/usr/lib/cinnamon-settings/data/icons/keyboard.svg → data/icons/hicolor_categories_scalable_cs-keyboard.svg View File


files/usr/lib/cinnamon-settings/data/icons/language.svg → data/icons/hicolor_categories_scalable_cs-language.svg View File


files/usr/lib/cinnamon-settings/data/icons/login.svg → data/icons/hicolor_categories_scalable_cs-login.svg View File


files/usr/lib/cinnamon-settings/data/icons/mouse.svg → data/icons/hicolor_categories_scalable_cs-mouse.svg View File


files/usr/lib/cinnamon-settings/data/icons/network.svg → data/icons/hicolor_categories_scalable_cs-network.svg View File


+ 456
- 0
data/icons/hicolor_categories_scalable_cs-overview.svg View File

@@ -0,0 +1,456 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="96"
width="96"
version="1.1"
id="svg2"
inkscape:version="0.48.4 r9939"
sodipodi:docname="overview.svg">
<metadata
id="metadata91">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1023"
id="namedview89"
showgrid="false"
inkscape:zoom="3.4766084"
inkscape:cx="-2.5052882"
inkscape:cy="27.368562"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg2"
inkscape:snap-object-midpoints="true"
inkscape:snap-center="true" />
<defs
id="defs4">
<linearGradient
id="b"
stop-color="#fff">
<stop
offset="0"
id="stop7" />
<stop
stop-opacity="0"
offset="1"
id="stop9" />
</linearGradient>
<linearGradient
id="a"
y2="7.0165"
gradientUnits="userSpaceOnUse"
x2="45.448"
gradientTransform="matrix(1.0059 0 0 .99417 100 0)"
y1="92.54"
x1="45.448">
<stop
offset="0"
id="stop12" />
<stop
stop-opacity=".58824"
offset="1"
id="stop14" />
</linearGradient>
<linearGradient
id="m"
y2="6"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
x2="32.251"
gradientTransform="translate(0,1)"
y1="90"
x1="32.251" />
<linearGradient
id="l"
y2="6"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
x2="32.251"
gradientTransform="matrix(1.0238 0 0 1.0119 -1.1429 .92857)"
y1="90"
x1="32.251" />
<linearGradient
id="k"
y2="90.239"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
x2="32.251"
gradientTransform="matrix(1.0238 0 0 -1.0119 -1.1429 98.071)"
y1="6.1317"
x1="32.251" />
<radialGradient
id="d"
gradientUnits="userSpaceOnUse"
cy="-15.871"
cx="56.066"
gradientTransform="matrix(-.0022616 -1.2346 1.3856 0 70.086 140.27)"
r="35.938">
<stop
stop-color="#80a2c8"
offset="0"
id="stop20" />
<stop
stop-color="#2e4c6d"
offset="1"
id="stop22" />
</radialGradient>
<radialGradient
id="c"
stop-color="#fff"
gradientUnits="userSpaceOnUse"
cy="90.172"
cx="48"
gradientTransform="matrix(1.1573 0 0 .99591 -7.551 .19713)"
r="42">
<stop
offset="0"
id="stop25" />
<stop
stop-opacity="0"
offset="1"
id="stop27" />
</radialGradient>
<linearGradient
id="j"
y2="83.295"
gradientUnits="userSpaceOnUse"
x2="43.179"
gradientTransform="matrix(1.0294 0 0 1.0294 -1.4118 -1.4118)"
y1="13"
x1="43.179">
<stop
stop-color="#919191"
offset="0"
id="stop30" />
<stop
stop-color="#fdfdfd"
offset="1"
id="stop32" />
</linearGradient>
<linearGradient
id="i"
y2="63.893"
xlink:href="#b"
gradientUnits="userSpaceOnUse"
x2="36.357"
y1="6"
x1="36.357" />
<linearGradient
id="h"
y2="5.9877"
gradientUnits="userSpaceOnUse"
x2="48"
y1="90"
x1="48">
<stop
stop-color="#b4b4b4"
offset="0"
id="stop36" />
<stop
stop-color="#e6e6e6"
offset="1"
id="stop38" />
</linearGradient>
<linearGradient
id="g"
y2="69.688"
xlink:href="#b"
gradientUnits="userSpaceOnUse"
x2="65.156"
y1="16.125"
x1="65.156" />
<linearGradient
id="f"
y2="69.688"
gradientUnits="userSpaceOnUse"
x2="65.156"
y1="16.125"
x1="65.156">
<stop
stop-color="#9cb7d2"
offset="0"
id="stop42" />
<stop
stop-color="#e7edf3"
stop-opacity="0"
offset="1"
id="stop44" />
</linearGradient>
<linearGradient
id="e"
stop-color="#fff"
y2="72.766"
gradientUnits="userSpaceOnUse"
x2="76.451"
y1="8.0625"
x1="76.451">
<stop
offset="0"
id="stop47" />
<stop
stop-opacity="0"
offset="1"
id="stop49" />
</linearGradient>
<linearGradient
id="h-8"
y2="72.765999"
stop-color="#fff"
gradientUnits="userSpaceOnUse"
x2="76.450996"
y1="8.0625"
x1="76.450996">
<stop
offset="0"
id="stop48" />
<stop
stop-opacity="0"
offset="1"
id="stop50" />
</linearGradient>
<linearGradient
id="i-9"
y2="69.688004"
gradientUnits="userSpaceOnUse"
x2="65.155998"
y1="16.125"
x1="65.155998">
<stop
stop-color="#b7b7b7"
offset="0"
id="stop43" />
<stop
stop-color="#e7e7e7"
stop-opacity="0"
offset="1"
id="stop45" />
</linearGradient>
<linearGradient
id="j-6"
y2="69.688004"
xlink:href="#a-0"
gradientUnits="userSpaceOnUse"
x2="65.155998"
gradientTransform="translate(1,0)"
y1="16.125"
x1="65.155998" />
<linearGradient
id="a-0"
stop-color="#fff">
<stop
offset="0"
id="stop7-1" />
<stop
stop-opacity="0"
offset="1"
id="stop9-3" />
</linearGradient>
<linearGradient
y2="69.688004"
x2="65.155998"
y1="16.125"
x1="65.155998"
gradientTransform="translate(1,0)"
gradientUnits="userSpaceOnUse"
id="linearGradient3128"
xlink:href="#a-0"
inkscape:collect="always" />
</defs>
<g
id="g51"
fill="url(#k)">
<path
d="m12 95.031c-5.5111 0-10.031-4.52-10.031-10.031v-71c-0.0002-5.5111 4.5199-10.031 10.031-10.031h72c5.5111 0 10.031 4.5202 10.031 10.031v71c0 5.5111-4.5202 10.031-10.031 10.031h-72z"
id="path53"
opacity="0.08" />
<path
d="m12 94.031c-4.9716 0-9.0312-4.059-9.0312-9.031v-71c0-4.9716 4.0596-9.0312 9.0312-9.0312h72c4.9716 0 9.0312 4.0596 9.0312 9.0312v71c0 4.9716-4.0596 9.0312-9.0312 9.0312h-72z"
id="path55"
opacity=".1" />
<path
d="m12 93c-4.4091 0-8-3.591-8-8v-71c0-4.4091 3.5909-8 8-8h72c4.4091 0 8 3.5909 8 8v71c0 4.4091-3.5909 8-8 8h-72z"
id="path57"
opacity=".2" />
</g>
<rect
opacity=".3"
rx="7"
ry="7"
height="85"
width="86"
y="7"
x="5"
fill="url(#l)"
id="rect59" />
<rect
opacity=".45"
rx="6"
ry="6"
height="84"
width="84"
y="7"
x="6"
fill="url(#m)"
id="rect61" />
<path
d="m83.937 83.875v-71.868h-71.937v71.868h71.937z"
id="path63"
fill="url(#d)" />
<path
opacity="0.08"
d="m19 13c-3.2894 0-6 2.7106-6 6v58c0 3.2894 2.7106 6 6 6h58c3.2894 0 6-2.7106 6-6v-58c0-3.2894-2.7106-6-6-6h-58zm0 4h58c1.1426 0 2 0.85741 2 2v58c0 1.1426-0.85741 2-2 2h-58c-1.1426 0-2-0.85741-2-2v-58c0-1.1426 0.85741-2 2-2z"
id="path67" />
<path
opacity=".1"
d="m17 14c-1.662 0-3 1.338-3 3v62c0 1.662 1.338 3 3 3h62c1.662 0 3-1.338 3-3v-62c0-1.662-1.338-3-3-3h-62zm0 1.9375h62c0.61816 0 1.0625 0.44434 1.0625 1.0625v62c0 0.61816-0.44434 1.0625-1.0625 1.0625h-62c-0.61816 0-1.0625-0.44434-1.0625-1.0625v-62c0-0.61816 0.44434-1.0625 1.0625-1.0625z"
id="path69" />
<path
sodipodi:type="arc"
style="fill:#2a922a;fill-opacity:0.27184466;fill-rule:evenodd;stroke:none"
id="path3068"
sodipodi:cx="33.762711"
sodipodi:cy="34.983051"
sodipodi:rx="22.374401"
sodipodi:ry="19.932203"
d="M 56.137112,34.983051 A 22.374401,19.932203 0 0 1 33.354244,54.911933 l 0.408467,-19.928882 z"
sodipodi:start="0"
sodipodi:end="1.5890533"
transform="matrix(1.1412084,0,0,1.3046212,-26.690949,-33.61873)" />
<path
sodipodi:type="arc"
style="fill:#922a2a;fill-opacity:0.43203884;fill-rule:evenodd;stroke:none"
id="path3068-1"
sodipodi:cx="33.762711"
sodipodi:cy="34.983051"
sodipodi:rx="22.374401"
sodipodi:ry="19.932203"
d="M 56.137112,34.983051 A 22.374401,19.932203 0 0 1 33.354244,54.911933 l 0.408467,-19.928882 z"
sodipodi:start="0"
sodipodi:end="1.5890533"
transform="matrix(-1.1412084,0,0,-1.3046212,122.85632,131.83854)" />
<path
opacity=".25"
d="m17 14c-1.662 0-3 1.338-3 3v62c0 1.662 1.338 3 3 3h62c1.662 0 3-1.338 3-3v-62c0-1.662-1.338-3-3-3h-62zm0 0.96875h62c1.1401 0 2.0312 0.89117 2.0312 2.0312v62c0 1.1401-0.89117 2.0312-2.0312 2.0312h-62c-1.1401 0-2.0312-0.89117-2.0312-2.0312v-62c0-1.1401 0.89117-2.0312 2.0312-2.0312z"
id="path71" />
<path
sodipodi:type="arc"
style="fill:#2a922a;fill-opacity:0.41747574;fill-rule:evenodd;stroke:none"
id="path3068-0"
sodipodi:cx="33.762711"
sodipodi:cy="34.983051"
sodipodi:rx="22.374401"
sodipodi:ry="19.932203"
d="M 56.137112,34.983051 A 22.374401,19.932203 0 0 1 33.354244,54.911933 l 0.408467,-19.928882 z"
sodipodi:start="0"
sodipodi:end="1.5890533"
transform="matrix(1.1412084,0,0,1.3046212,-27.064144,-34.794159)" />
<path
sodipodi:type="arc"
style="fill:#2a9242;fill-opacity:0.49029127;fill-rule:evenodd;stroke:none"
id="path3068-0-8"
sodipodi:cx="33.762711"
sodipodi:cy="34.983051"
sodipodi:rx="22.374401"
sodipodi:ry="19.932203"
d="M 56.137112,34.983051 A 22.374401,19.932203 0 0 1 33.354244,54.911933 l 0.408467,-19.928882 z"
sodipodi:start="0"
sodipodi:end="1.5890533"
transform="matrix(1.1412084,0,0,1.3046212,-28.182788,-35.76026)" />
<path
sodipodi:type="arc"
style="fill:#922a2a;fill-opacity:0.43203884;fill-rule:evenodd;stroke:none"
id="path3068-0-0"
sodipodi:cx="33.762711"
sodipodi:cy="34.983051"
sodipodi:rx="22.374401"
sodipodi:ry="19.932203"
d="M 56.137112,34.983051 A 22.374401,19.932203 0 0 1 33.354244,54.911933 l 0.408467,-19.928882 z"
sodipodi:start="0"
sodipodi:end="1.5890533"
transform="matrix(-1.1412084,0,0,-1.3046212,122.48312,130.66312)" />
<g
transform="translate(2.1522733,-2.4406781)"
style="fill-rule:evenodd"
id="g117">
<path
style="opacity:0.28000004;fill:url(#h-8)"
inkscape:connector-curvature="0"
d="m 44.844,8.0625 1.3438,3.875 h 32.812 c 2.754,0 5.0625,2.3085 5.0625,5.0625 v 62 c 2e-6,2.754 -2.3085,5.0625 -5.0625,5.0625 h -7.875 l 1.3438,3.875 h 11.531 c 2.2218,0 3.9375,-1.7157 3.9375,-3.9375 V 12 c 0,-2.2218 -1.716,-3.9375 -3.938,-3.9375 h -39.156 z"
id="path119" />
<path
style="opacity:0.49000005;fill:url(#i-9)"
inkscape:connector-curvature="0"
d="m 48.656,16.125 22.031,63.75 h 8.3125 c 0.5388,0 0.875,-0.3362 0.875,-0.875 V 17 c 0,-0.5388 -0.33619,-0.875 -0.875,-0.875 z"
id="path121" />
<path
style="opacity:0.35;fill:url(#linearGradient3128)"
inkscape:connector-curvature="0"
d="m 48.656,16.125 22.031,63.75 h 1 L 49.656,16.125 h -1 z"
id="path123" />
</g>
<path
sodipodi:type="arc"
style="fill:#922a2a;fill-opacity:0.43203884;fill-rule:evenodd;stroke:none"
id="path3068-0-8-4"
sodipodi:cx="33.762711"
sodipodi:cy="34.983051"
sodipodi:rx="22.374401"
sodipodi:ry="19.932203"
d="M 56.137112,34.983051 A 22.374401,19.932203 0 0 1 33.354244,54.911933 l 0.408467,-19.928882 z"
sodipodi:start="0"
sodipodi:end="1.5890533"
transform="matrix(-1.1412084,0,0,-1.3046212,121.36448,129.69701)" />
<path
d="m12 6c-3.324 0-6 2.676-6 6v72c0 3.324 2.676 6 6 6h72c3.324 0 6-2.676 6-6v-72c0-3.324-2.676-6-6-6h-72zm5 8h1 60 1c1.6838 0 3 1.3162 3 3v1 60 1c0.000001 1.6838-1.3162 3-3 3h-1-60-1c-1.6838 0.000001-3-1.3162-3-3v-1-60-1c0-1.6838 1.3162-3 3-3z"
fill="url(#h)"
id="path73" />
<path
opacity=".7"
d="m12 6c-3.324 0-6 2.676-6 6v2 68 2c0 0.33472 0.04135 0.6507 0.09375 0.96875 0.0487 0.2956 0.09704 0.59692 0.1875 0.875 0.00988 0.03038 0.020892 0.0636 0.03125 0.09375 0.098865 0.28777 0.23488 0.54745 0.375 0.8125 0.14459 0.27351 0.31562 0.53562 0.5 0.78125 0.18438 0.24564 0.37378 0.47347 0.59375 0.6875 0.43995 0.42806 0.94291 0.81453 1.5 1.0938 0.27854 0.13961 0.57347 0.24695 0.875 0.34375-0.2562-0.10022-0.48671-0.23627-0.71875-0.375-0.00741-0.0044-0.023866 0.0045-0.03125 0-0.031933-0.0193-0.062293-0.04251-0.09375-0.0625-0.1204-0.0767-0.23102-0.16351-0.34375-0.25-0.10617-0.0808-0.21328-0.16111-0.3125-0.25-0.1778-0.162-0.3473-0.346-0.4999-0.531-0.1075-0.131-0.2183-0.266-0.3124-0.407-0.0251-0.038-0.0385-0.086-0.0626-0.125-0.0647-0.103-0.1302-0.204-0.1874-0.312-0.1011-0.195-0.2057-0.416-0.2813-0.625-0.008-0.022-0.0236-0.041-0.0313-0.063-0.0318-0.092-0.0358-0.187-0.0624-0.281-0.0304-0.107-0.0704-0.203-0.0938-0.313-0.0729-0.341-0.125-0.698-0.125-1.062v-2-68-2c0-2.782 2.2182-5 5-5h2 68 2c2.7818 0 5 2.2182 5 5v2 68 2c0 0.3643-0.05212 0.72099-0.125 1.0625-0.04415 0.20689-0.08838 0.39766-0.15625 0.59375-0.0077 0.02195-0.0233 0.04069-0.03125 0.0625-0.06274 0.17374-0.13838 0.36745-0.21875 0.53125-0.04158 0.0828-0.07904 0.16995-0.125 0.25-0.0546 0.09721-0.12677 0.18835-0.1875 0.28125-0.09411 0.14096-0.20492 0.276-0.3125 0.40625-0.14317 0.17445-0.30314 0.347-0.46875 0.5-0.01117 0.0102-0.01998 0.02115-0.03125 0.03125-0.13839 0.12556-0.28509 0.23444-0.4375 0.34375-0.10257 0.07315-0.20432 0.15336-0.3125 0.21875-0.0074 0.0045-0.02384-0.0044-0.03125 0-0.23204 0.13873-0.46255 0.27478-0.71875 0.375 0.30153-0.0968 0.59646-0.20414 0.875-0.34375 0.55709-0.27922 1.0601-0.66569 1.5-1.0938 0.21997-0.21403 0.40937-0.44186 0.59375-0.6875s0.35541-0.50774 0.5-0.78125c0.14012-0.26505 0.27614-0.52473 0.375-0.8125 0.01041-0.03078 0.02133-0.06274 0.03125-0.09375 0.09046-0.27808 0.1388-0.5794 0.1875-0.875 0.053-0.318 0.094-0.634 0.094-0.969v-2-68-2c0-3.324-2.676-6-6-6h-72z"
fill="url(#i)"
id="path75" />
<rect
rx="4"
ry="4"
height="70"
width="70"
y="13"
x="13"
id="rect77"
stroke-opacity=".7"
stroke-linejoin="round"
stroke-linecap="square"
stroke-width="2"
stroke="url(#j)"
fill="none" />
<path
d="m12 90c-3.324 0-6-2.676-6-6v-2-68-2c0-0.33472 0.04135-0.6507 0.09375-0.96875 0.0487-0.2956 0.09704-0.59692 0.1875-0.875 0.0099-0.03 0.0209-0.063 0.0313-0.094 0.0989-0.2873 0.2349-0.547 0.375-0.812 0.1446-0.2735 0.3156-0.5356 0.5-0.7812 0.1844-0.2457 0.3738-0.4735 0.5937-0.6876 0.44-0.428 0.943-0.8145 1.5-1.0937 0.2786-0.1396 0.5735-0.2469 0.8748-0.3437-0.256 0.1002-0.4865 0.2362-0.7185 0.375-0.00741 0.0044-0.023866-0.0045-0.03125 0-0.031933 0.0193-0.062293 0.04251-0.09375 0.0625-0.1204 0.0767-0.23102 0.16351-0.34375 0.25-0.10617 0.0808-0.21328 0.16111-0.3125 0.25-0.1779 0.1614-0.3474 0.3453-0.5 0.5312-0.1075 0.1303-0.2183 0.2653-0.3124 0.4063-0.0251 0.0383-0.0385 0.0858-0.0626 0.125-0.0647 0.103-0.1302 0.2045-0.1874 0.3124-0.1011 0.1948-0.2057 0.4158-0.2813 0.625-0.008 0.0219-0.0236 0.0406-0.0313 0.0626-0.0318 0.0919-0.0358 0.1868-0.0624 0.2812-0.0304 0.1066-0.0704 0.203-0.0938 0.3125-0.0729 0.3415-0.125 0.6985-0.125 1.0625v2 68 2c0 2.7818 2.2182 5 5 5h2 68 2c2.7818 0 5-2.2182 5-5v-2-68-2c0-0.364-0.052-0.721-0.125-1.0625-0.044-0.2069-0.088-0.3977-0.156-0.5937-0.008-0.022-0.024-0.0407-0.031-0.0626-0.063-0.1737-0.139-0.3674-0.219-0.5312-0.042-0.0828-0.079-0.17-0.125-0.25-0.055-0.0972-0.127-0.1884-0.188-0.2812-0.094-0.141-0.205-0.276-0.312-0.4063-0.143-0.1745-0.303-0.347-0.469-0.5-0.011-0.0102-0.02-0.0211-0.031-0.0313-0.139-0.1255-0.285-0.2344-0.438-0.3437-0.102-0.0731-0.204-0.1534-0.312-0.2187-0.0074-0.0045-0.02384 0.0044-0.03125 0-0.23204-0.13873-0.46255-0.27478-0.71875-0.375 0.30153 0.0968 0.59646 0.20414 0.875 0.34375 0.55709 0.27922 1.0601 0.66569 1.5 1.0938 0.21997 0.21403 0.40937 0.44186 0.59375 0.6875s0.35541 0.50774 0.5 0.78125c0.14012 0.26505 0.27614 0.52473 0.375 0.8125 0.01041 0.03078 0.02133 0.06274 0.03125 0.09375 0.09046 0.27808 0.1388 0.5794 0.1875 0.875 0.053 0.318 0.094 0.634 0.094 0.969v2 68 2c0 3.324-2.676 6-6 6h-72z"
id="path79"
fill="url(#c)"
opacity=".4" />
</svg>

files/usr/lib/cinnamon-settings/data/icons/panel.svg → data/icons/hicolor_categories_scalable_cs-panel.svg View File


files/usr/lib/cinnamon-settings/data/icons/power.svg → data/icons/hicolor_categories_scalable_cs-power.svg View File


files/usr/lib/cinnamon-settings/data/icons/printer.svg → data/icons/hicolor_categories_scalable_cs-printer.svg View File


files/usr/lib/cinnamon-settings/data/icons/region.svg → data/icons/hicolor_categories_scalable_cs-region.svg View File


files/usr/lib/cinnamon-settings/data/icons/screen.svg → data/icons/hicolor_categories_scalable_cs-screen.svg View File


+ 716
- 0
data/icons/hicolor_categories_scalable_cs-screensaver.svg View File

@@ -0,0 +1,716 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
style="enable-background:new"
height="96"
width="96"
version="1.1"
id="svg2"
inkscape:version="0.48.4 r9939"
sodipodi:docname="screensaver2.svg">
<metadata
id="metadata213">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="806"
inkscape:window-height="722"
id="namedview211"
showgrid="false"
inkscape:zoom="2.4583333"
inkscape:cx="48"
inkscape:cy="48"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="svg2" />
<defs
id="defs4">
<linearGradient
id="h"
stop-color="#fff">
<stop
offset="0"
id="stop7" />
<stop
stop-opacity="0"
offset="1"
id="stop9" />
</linearGradient>
<linearGradient
id="b"
stop-color="#fff">
<stop
offset="0"
id="stop12" />
<stop
stop-opacity=".61719"
offset="0.3"
id="stop14" />
<stop
stop-opacity=".21875"
offset="0.6"
id="stop16" />
<stop
stop-opacity="0"
offset="1"
id="stop18" />
</linearGradient>
<linearGradient
id="g">
<stop
stop-color="#fff"
offset="0"
id="stop21" />
<stop
stop-color="#98b7e5"
offset="1"
id="stop23" />
</linearGradient>
<linearGradient
id="a">
<stop
stop-color="#fff"
stop-opacity="0"
offset="0"
id="stop26" />
<stop
stop-color="#aac2e7"
offset="1"
id="stop28" />
</linearGradient>
<linearGradient
id="c">
<stop
stop-color="#fff"
offset="0"
id="stop31" />
<stop
stop-color="#fff"
offset="0.15"
id="stop33" />
<stop
stop-color="#fff"
stop-opacity=".4375"
offset="0.3"
id="stop35" />
<stop
stop-color="#412788"
stop-opacity="0"
offset="1"
id="stop37" />
</linearGradient>
<clipPath
id="av">
<rect
rx="6"
ry="6"
height="84"
width="84"
y="6"
x="6"
fill="#fff"
id="rect40" />
</clipPath>
<filter
id="j"
height="1.384"
width="1.384"
color-interpolation-filters="sRGB"
y="-.192"
x="-.192">
<feGaussianBlur
stdDeviation="5.28"
id="feGaussianBlur43" />
</filter>
<linearGradient
id="k"
stop-color="#fff"
y2="138.66"
gradientUnits="userSpaceOnUse"
x2="48"
y1="20.221"
x1="48">
<stop
offset="0"
id="stop46" />
<stop
stop-opacity="0"
offset="1"
id="stop48" />
</linearGradient>
<linearGradient
id="f"
y2="7.0165"
gradientUnits="userSpaceOnUse"
x2="45.448"
gradientTransform="matrix(1.0059 0 0 .99417 100 0)"
y1="92.54"
x1="45.448">
<stop
offset="0"
id="stop51" />
<stop
stop-opacity=".58824"
offset="1"
id="stop53" />
</linearGradient>
<radialGradient
id="y"
gradientUnits="userSpaceOnUse"
cy="99.413"
cx="93.877"
gradientTransform="matrix(-.0015832 -.80617 2.4983 -.0049063 -167.36 145.83)"
r="55.625">
<stop
stop-color="#917896"
offset="0"
id="stop56" />
<stop
stop-color="#3c356e"
offset=".5"
id="stop58" />
<stop
stop-color="#121132"
offset="1"
id="stop60" />
</radialGradient>
<linearGradient
id="au"
y2="6"
xlink:href="#f"
gradientUnits="userSpaceOnUse"
x2="32.251"
gradientTransform="translate(0,1)"
y1="90"
x1="32.251" />
<linearGradient
id="at"
y2="5.9996"
xlink:href="#f"
gradientUnits="userSpaceOnUse"
x2="32.251"
gradientTransform="matrix(1.0238 0 0 1.0119 -1.1429 .929)"
y1="90"
x1="32.251" />
<linearGradient
id="as"
y2="90.239"
xlink:href="#f"
gradientUnits="userSpaceOnUse"
x2="32.251"
gradientTransform="matrix(1.0238,0,0,-1.0119,-1.1429,98.071)"
y1="6.1317"
x1="32.251" />
<radialGradient
id="z"
xlink:href="#h"
gradientUnits="userSpaceOnUse"
cy="90.172"
cx="48"
gradientTransform="matrix(1.1573 0 0 .99591 -7.551 .19713)"
r="42" />
<linearGradient
id="ar"
y2="83.295"
gradientUnits="userSpaceOnUse"
x2="43.179"
gradientTransform="matrix(1.0294,0,0,1.0294,-1.4118,-1.4118)"
y1="13"
x1="43.179">
<stop
stop-color="#919191"
offset="0"
id="stop67" />
<stop
stop-color="#fdfdfd"
offset="1"
id="stop69" />
</linearGradient>
<linearGradient
id="aq"
y2="63.893"
xlink:href="#h"
gradientUnits="userSpaceOnUse"
x2="36.357"
y1="6"
x1="36.357" />
<linearGradient
id="ap"
y2="5.9877"
gradientUnits="userSpaceOnUse"
x2="48"
y1="90"
x1="48">
<stop
stop-color="#b4b4b4"
offset="0"
id="stop73" />
<stop
stop-color="#e6e6e6"
offset="1"
id="stop75" />
</linearGradient>
<linearGradient
id="ao"
y2="56.034"
xlink:href="#g"
gradientUnits="userSpaceOnUse"
x2="47.341"
gradientTransform="matrix(.72247 0 0 .72247 1.6229 3.6011)"
y1="49.562"
x1="47.341" />
<radialGradient
id="x"
xlink:href="#b"
gradientUnits="userSpaceOnUse"
cy="34.052"
cx="30.233"
gradientTransform="matrix(.48873 0 0 .48873 17.822 24.107)"
r="4.2476" />
<linearGradient
id="an"
y2="73.28"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
x2="81.455"
gradientTransform="matrix(.87762 0 0 .75531 -22.011 11.235)"
y1="78.777"
x1="81.455" />
<linearGradient
id="am"
y2="73.28"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
x2="81.455"
gradientTransform="matrix(.66544 0 0 .75531 -9.1654 13.04)"
y1="78.777"
x1="81.455" />
<linearGradient
id="al"
y2="92.006"
xlink:href="#g"
gradientUnits="userSpaceOnUse"
x2="66.541"
gradientTransform="matrix(.72247 0 0 .72247 1.6229 6.6011)"
y1="85.295"
x1="66.541" />
<linearGradient
id="ak"
y2="86.233"
xlink:href="#g"
gradientUnits="userSpaceOnUse"
x2="86.142"
gradientTransform="matrix(.72247 0 0 .72247 3.6229 3.6011)"
y1="71.482"
x1="86.142" />
<radialGradient
id="w"
xlink:href="#c"
gradientUnits="userSpaceOnUse"
cy="34.052"
cx="30.233"
gradientTransform="matrix(1.2003,0,0,1.2003,-9.3286,11.135)"
r="4.2476" />
<radialGradient
id="v"
xlink:href="#b"
gradientUnits="userSpaceOnUse"
cy="34.052"
cx="30.233"
gradientTransform="matrix(.48873 0 0 .48873 35.224 11.853)"
r="4.2476" />
<radialGradient
id="u"
xlink:href="#b"
gradientUnits="userSpaceOnUse"
cy="34.052"
cx="30.233"
gradientTransform="matrix(.36464 0 0 .36464 31.549 7.0501)"
r="4.2476" />
<radialGradient
id="t"
xlink:href="#c"
gradientUnits="userSpaceOnUse"
cy="34.052"
cx="30.233"
gradientTransform="matrix(.72247 0 0 .72247 14.172 49.577)"
r="4.2476" />
<radialGradient
id="s"
xlink:href="#c"
gradientUnits="userSpaceOnUse"
cy="34.052"
cx="30.233"
gradientTransform="matrix(1.02,0,0,1.02,34.51,-7.4317)"
r="4.2476" />
<radialGradient
id="r"
xlink:href="#c"
gradientUnits="userSpaceOnUse"
cy="34.052"
cx="30.233"
gradientTransform="matrix(.72247 0 0 .72247 1.6229 .60111)"
r="4.2476" />
<radialGradient
id="q"
gradientUnits="userSpaceOnUse"
cy="65.119"
cx="65.796"
gradientTransform="matrix(.72247 0 0 .8033 -.37705 -4.4626)"
r="16.062">
<stop
stop-color="#ffa727"
offset="0"
id="stop90" />
<stop
stop-color="#ffe680"
offset="1"
id="stop92" />
</radialGradient>
<radialGradient
id="p"
xlink:href="#b"
gradientUnits="userSpaceOnUse"
cy="34.052"
cx="30.233"
gradientTransform="matrix(.36464 0 0 .36464 6.7856 23.985)"
r="4.2476" />
<radialGradient
id="o"
xlink:href="#b"
gradientUnits="userSpaceOnUse"
cy="34.052"
cx="30.233"
gradientTransform="matrix(.36464 0 0 .36464 45.958 9.1828)"
r="4.2476" />
<radialGradient
id="n"
xlink:href="#b"
gradientUnits="userSpaceOnUse"
cy="34.052"
cx="30.233"
gradientTransform="matrix(.36464 0 0 .36464 66.088 26.207)"
r="4.2476" />
<radialGradient
id="m"
xlink:href="#b"
gradientUnits="userSpaceOnUse"
cy="34.052"
cx="30.233"
gradientTransform="matrix(.48873 0 0 .48873 56.205 27.548)"
r="4.2476" />
<radialGradient
id="l"
xlink:href="#b"
gradientUnits="userSpaceOnUse"
cy="34.052"
cx="30.233"
gradientTransform="matrix(.48873 0 0 .48873 4.2831 45.227)"
r="4.2476" />
<linearGradient
id="aj"
y2="73.28"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
x2="81.455"
gradientTransform="matrix(.74149 0 0 .95235 6.5323 -17.396)"
y1="78.777"
x1="81.455" />
<linearGradient
id="ai"
y2="73.28"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
x2="81.455"
gradientTransform="matrix(.72116 0 0 .72247 4.2651 7.031)"
y1="78.777"
x1="81.455" />
<linearGradient
id="ah"
y2="73.28"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
x2="81.455"
gradientTransform="matrix(.95062 0 0 .95235 -10.087 -11.8)"
y1="78.777"
x1="81.455" />
<linearGradient
id="ag"
y2="73.28"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
x2="81.455"
gradientTransform="matrix(.72247 0 0 .72247 2.7204 3.6011)"
y1="78.777"
x1="81.455" />
<linearGradient
id="af"
y2="73.28"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
x2="81.455"
gradientTransform="matrix(.77951 0 0 .95235 -26.581 -35.809)"
y1="78.777"
x1="81.455" />
<linearGradient
id="ae"
y2="73.28"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
x2="81.455"
gradientTransform="matrix(.68445 0 0 .75531 -27.032 -16.316)"
y1="78.777"
x1="81.455" />
<linearGradient
id="ad"
y2="73.28"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
x2="81.455"
gradientTransform="matrix(.57037 0 0 .62395 -7.4502 -6.5091)"
y1="78.777"
x1="81.455" />
<linearGradient
id="ac"
y2="73.28"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
x2="81.455"
gradientTransform="matrix(.95062 0 0 .95235 -43.136 -32.56)"
y1="78.777"
x1="81.455" />
<linearGradient
id="i"
y2="69.688"
xlink:href="#h"
gradientUnits="userSpaceOnUse"
x2="65.156"
y1="16.125"
x1="65.156" />
<linearGradient
id="ab"
stop-color="#fff"
y2="72.766"
gradientUnits="userSpaceOnUse"
x2="76.451"
y1="8.0625"
x1="76.451">
<stop
offset="0"
id="stop109" />
<stop
stop-opacity="0"
offset="1"
id="stop111" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#h"
id="linearGradient3190"
gradientUnits="userSpaceOnUse"
x1="65.156"
y1="16.125"
x2="65.156"
y2="69.688" />
<linearGradient
x1="56"
y1="72"
x2="56"
y2="24"
id="linearGradient3728"
xlink:href="#linearGradient4081"
gradientUnits="userSpaceOnUse" />
<linearGradient
id="linearGradient4081">
<stop
id="stop4083"
style="stop-color:#aaaaaa;stop-opacity:1"
offset="0" />
<stop
id="stop4085"
style="stop-color:#f0f0f0;stop-opacity:1"
offset="1" />
</linearGradient>
</defs>
<g
fill="url(#as)"
id="g113">
<path
opacity="0.08"
d="m12 95.031c-5.5111 0-10.031-4.52-10.031-10.031v-71c0-5.5111 4.5202-10.031 10.031-10.031h72c5.5111 0 10.031 4.5202 10.031 10.031v71c0 5.5111-4.5202 10.031-10.031 10.031h-72z"
id="path115" />
<path
opacity=".1"
d="m12 94.031c-4.9716 0-9.0312-4.0596-9.0312-9.0312v-71c0-4.9718 4.0596-9.0314 9.0312-9.0314h72c4.9716 0 9.0312 4.0596 9.0312 9.0312v71c0 4.9716-4.0596 9.0312-9.0312 9.0312h-72z"
id="path117" />
<path
opacity=".2"
d="m12 93c-4.4091 0-8-3.591-8-8v-71c0-4.4091 3.5909-8 8-8h72c4.4091 0 8 3.5909 8 8v71c0 4.4091-3.5909 8-8 8h-72z"
id="path119" />
</g>
<rect
opacity=".3"
rx="7"
ry="7"
height="85"
width="86"
y="7"
x="5"
fill="url(#at)"
id="rect121" />
<rect
opacity=".45"
rx="6"
ry="6"
height="84"
width="84"
y="7"
x="6"
fill="url(#au)"
id="rect123" />
<rect
rx="5.9134"
ry="5.6609"
height="72"
width="78.722"
y="10.5"
x="8.25"
fill="url(#y)"
id="rect125" />
<path
opacity="0.08"
d="m19 13c-3.2894 0-6 2.7106-6 6v58c0 3.2894 2.7106 6 6 6h58c3.2894 0 6-2.7106 6-6v-58c0-3.2894-2.7106-6-6-6h-58zm0 4h58c1.1426 0 2 0.85741 2 2v58c0 1.1426-0.85741 2-2 2h-58c-1.1426 0-2-0.85741-2-2v-58c0-1.1426 0.85741-2 2-2z"
id="path127" />
<g
style="color:#000000"
id="g129">
<path
opacity=".1"
d="m17 14c-1.662 0-3 1.338-3 3v62c0 1.662 1.338 3 3 3h62c1.662 0 3-1.338 3-3v-62c0-1.662-1.338-3-3-3h-62zm0 1.9375h62c0.61816 0 1.0625 0.44434 1.0625 1.0625v62c0 0.61816-0.44434 1.0625-1.0625 1.0625h-62c-0.61816 0-1.0625-0.44434-1.0625-1.0625v-62c0-0.61816 0.44434-1.0625 1.0625-1.0625z"
id="path131" />
<path
opacity=".25"
d="m17 14c-1.662 0-3 1.338-3 3v62c0 1.662 1.338 3 3 3h62c1.662 0 3-1.338 3-3v-62c0-1.662-1.338-3-3-3h-62zm0 0.96875h62c1.1401 0 2.0312 0.89117 2.0312 2.0312v62c0 1.1401-0.89117 2.0312-2.0312 2.0312h-62c-1.1401 0-2.0312-0.89117-2.0312-2.0312v-62c0-1.1401 0.89117-2.0312 2.0312-2.0312z"
id="path133" />
</g>
<path
d="m12 6c-3.324 0-6 2.676-6 6v72c0 3.324 2.676 6 6 6h72c3.324 0 6-2.676 6-6v-72c0-3.324-2.676-6-6-6h-72zm5 8h62c1.6838 0 3 1.3162 3 3v62c0.000001 1.6838-1.3162 3-3 3h-62c-1.6838 0.000001-3-1.3162-3-3v-62c0-1.6838 1.3162-3 3-3z"
fill="url(#ap)"
id="path135" />
<path
opacity=".7"
d="m12 6c-3.324 0-6 2.676-6 6v72c0 0.33472 0.04135 0.6507 0.09375 0.96875 0.0487 0.2956 0.09704 0.59692 0.1875 0.875 0.00988 0.03038 0.020892 0.0636 0.03125 0.09375 0.098865 0.28777 0.23488 0.54745 0.375 0.8125 0.14459 0.27351 0.31562 0.53562 0.5 0.78125 0.18438 0.24564 0.37378 0.47347 0.59375 0.6875 0.43995 0.42806 0.94291 0.81453 1.5 1.0938 0.27854 0.13961 0.57347 0.24695 0.875 0.34375-0.2562-0.10022-0.48671-0.23627-0.71875-0.375-0.00741-0.0044-0.023866 0.0045-0.03125 0-0.0319-0.019-0.0622-0.042-0.0937-0.062-0.1204-0.077-0.231-0.164-0.3437-0.25-0.1062-0.081-0.2133-0.161-0.3126-0.25-0.1778-0.162-0.3473-0.346-0.4999-0.531-0.1075-0.131-0.2183-0.266-0.3124-0.407-0.0251-0.038-0.0385-0.086-0.0626-0.125-0.0647-0.103-0.1302-0.204-0.1874-0.312-0.1011-0.195-0.2057-0.416-0.2813-0.625-0.008-0.022-0.0236-0.041-0.0313-0.063-0.0318-0.092-0.0358-0.187-0.0624-0.281-0.0304-0.107-0.0704-0.203-0.0938-0.313-0.0729-0.341-0.125-0.698-0.125-1.062v-72c0-2.782 2.2182-5 5-5h72c2.7818 0 5 2.2182 5 5v72c0 0.3643-0.05212 0.72099-0.125 1.0625-0.04415 0.20689-0.08838 0.39766-0.15625 0.59375-0.0077 0.02195-0.0233 0.04069-0.03125 0.0625-0.06274 0.17374-0.13838 0.36745-0.21875 0.53125-0.04158 0.0828-0.07904 0.16995-0.125 0.25-0.0546 0.09721-0.12677 0.18835-0.1875 0.28125-0.09411 0.14096-0.20492 0.276-0.3125 0.40625-0.14317 0.17445-0.30314 0.347-0.46875 0.5-0.01117 0.0102-0.01998 0.02115-0.03125 0.03125-0.13839 0.12556-0.28509 0.23444-0.4375 0.34375-0.10257 0.07315-0.20432 0.15336-0.3125 0.21875-0.0074 0.0045-0.02384-0.0044-0.03125 0-0.23204 0.13873-0.46255 0.27478-0.71875 0.375 0.30153-0.0968 0.59646-0.20414 0.875-0.34375 0.55709-0.27922 1.0601-0.66569 1.5-1.0938 0.21997-0.21403 0.40937-0.44186 0.59375-0.6875s0.35541-0.50774 0.5-0.78125c0.14012-0.26505 0.27614-0.52473 0.375-0.8125 0.01041-0.03078 0.02133-0.06274 0.03125-0.09375 0.09046-0.27808 0.1388-0.5794 0.1875-0.875 0.053-0.318 0.094-0.634 0.094-0.969v-72c0-3.324-2.676-6-6-6h-72z"
fill="url(#aq)"
id="path137" />
<rect
stroke-linejoin="round"
stroke-opacity=".7"
rx="4"
ry="4"
height="70"
width="70"
stroke="url(#ar)"
stroke-linecap="square"
y="13"
x="13"
stroke-width="2"
fill="none"
id="rect139" />
<path
opacity=".4"
d="m12 90c-3.324 0-6-2.676-6-6v-72c0-0.33472 0.04135-0.6507 0.09375-0.96875 0.0487-0.2956 0.09704-0.59692 0.1875-0.875 0.0099-0.03 0.0209-0.063 0.0313-0.094 0.0989-0.2873 0.2349-0.547 0.375-0.812 0.1446-0.2735 0.3156-0.5356 0.5-0.7812 0.1844-0.2457 0.3738-0.4735 0.5937-0.6876 0.44-0.428 0.943-0.8145 1.5-1.0937 0.2786-0.1396 0.5735-0.2469 0.8748-0.3437-0.256 0.1002-0.4865 0.2362-0.7185 0.375-0.00741 0.0044-0.023866-0.0045-0.03125 0-0.031933 0.0193-0.062293 0.04251-0.09375 0.0625-0.1204 0.0767-0.23102 0.16351-0.34375 0.25-0.10617 0.0808-0.21328 0.16111-0.3125 0.25-0.1779 0.1614-0.3474 0.3453-0.5 0.5312-0.1075 0.1303-0.2183 0.2653-0.3124 0.4063-0.0251 0.0383-0.0385 0.0858-0.0626 0.125-0.0647 0.103-0.1302 0.2045-0.1874 0.3124-0.1011 0.1948-0.2057 0.4158-0.2813 0.625-0.008 0.0219-0.0236 0.0406-0.0313 0.0626-0.0318 0.0919-0.0358 0.1868-0.0624 0.2812-0.0304 0.1066-0.0704 0.203-0.0938 0.3125-0.0729 0.3415-0.125 0.6985-0.125 1.0625v72c0 2.7818 2.2182 5 5 5h72c2.7818 0 5-2.2182 5-5v-72c0-0.364-0.052-0.721-0.125-1.0625-0.044-0.2069-0.088-0.3977-0.156-0.5937-0.008-0.022-0.024-0.0407-0.031-0.0626-0.063-0.1737-0.139-0.3674-0.219-0.5312-0.042-0.0828-0.079-0.17-0.125-0.25-0.055-0.0972-0.127-0.1884-0.188-0.2812-0.094-0.141-0.205-0.276-0.312-0.4063-0.143-0.1745-0.303-0.347-0.469-0.5-0.011-0.0102-0.02-0.0211-0.031-0.0313-0.139-0.1255-0.285-0.2344-0.438-0.3437-0.102-0.0731-0.204-0.1534-0.312-0.2187-0.0074-0.0045-0.02384 0.0044-0.03125 0-0.23204-0.13873-0.46255-0.27478-0.71875-0.375 0.30153 0.0968 0.59646 0.20414 0.875 0.34375 0.55709 0.27922 1.0601 0.66569 1.5 1.0938 0.21997 0.21403 0.40937 0.44186 0.59375 0.6875s0.35541 0.50774 0.5 0.78125c0.14012 0.26505 0.27614 0.52473 0.375 0.8125 0.01041 0.03078 0.02133 0.06274 0.03125 0.09375 0.09046 0.27808 0.1388 0.5794 0.1875 0.875 0.053 0.318 0.094 0.634 0.094 0.969v72c0 3.324-2.676 6-6 6h-72z"
fill="url(#z)"
id="path141" />
<rect
opacity=".1"
clip-path="url(#av)"
rx="12"
ry="12"
height="66"
filter="url(#j)"
width="66"
stroke="#fff"
stroke-linecap="round"
y="15"
x="15"
stroke-width=".5"
fill="url(#k)"
id="rect143" />
<g
transform="translate(0,-1)"
id="layer3"
style="display:inline">
<path
inkscape:connector-curvature="0"
d="M 48,22.96875 C 33.645543,22.96875 21.96875,34.645543 21.96875,49 21.96875,63.354457 33.645543,75.03125 48,75.03125 62.354457,75.03125 74.03125,63.354457 74.03125,49 74.03125,34.645543 62.354457,22.96875 48,22.96875 z m -4.53125,23.4375 c 0.0099,0.01093 0.03129,0.03129 0.03125,0.03125 -1.7e-4,-1.7e-4 0.156435,0.125153 0.15625,0.125 -1.85e-4,-1.53e-4 0.156449,0.125134 0.15625,0.125 -1.99e-4,-1.34e-4 0.156461,0.09386 0.15625,0.09375 -2.11e-4,-1.14e-4 0.187721,0.09384 0.1875,0.09375 -2.21e-4,-9.3e-5 0.187729,0.06257 0.1875,0.0625 -2.29e-4,-7.2e-5 0.187735,0.0313 0.1875,0.03125 -2.35e-4,-4.9e-5 0.187739,0.03128 0.1875,0.03125 -2.39e-4,-2.6e-5 0.21899,0.03125 0.21875,0.03125 l 6.125,0 c -2.4e-4,3e-6 0.218989,-0.03128 0.21875,-0.03125 -2.39e-4,2.6e-5 0.187735,-0.0313 0.1875,-0.03125 -2.35e-4,4.9e-5 0.187729,-0.03132 0.1875,-0.03125 -2.29e-4,7.2e-5 0.187721,-0.06259 0.1875,-0.0625 -2.21e-4,9.3e-5 0.187711,-0.09386 0.1875,-0.09375 -2.11e-4,1.14e-4 0.156449,-0.09388 0.15625,-0.09375 -1.99e-4,1.34e-4 0.156435,-0.125153 0.15625,-0.125 -1.85e-4,1.53e-4 0.15642,-0.12517 0.15625,-0.125 -3.7e-5,3.7e-5 0.02132,-0.02032 0.03125,-0.03125 0.0099,0.01093 0.03129,0.03129 0.03125,0.03125 -1.7e-4,-1.7e-4 0.156435,0.125153 0.15625,0.125 -1.85e-4,-1.53e-4 0.156449,0.125134 0.15625,0.125 -1.99e-4,-1.34e-4 0.156461,0.09386 0.15625,0.09375 -2.11e-4,-1.14e-4 0.187721,0.09384 0.1875,0.09375 -2.21e-4,-9.3e-5 0.187729,0.06257 0.1875,0.0625 -2.29e-4,-7.2e-5 0.187735,0.0313 0.1875,0.03125 -2.35e-4,-4.9e-5 0.187739,0.03128 0.1875,0.03125 -2.39e-4,-2.6e-5 0.21899,0.03125 0.21875,0.03125 l 1.96875,0 0,11.9375 -15.9375,0 0,-11.9375 1.96875,0 c -2.4e-4,3e-6 0.218989,-0.03128 0.21875,-0.03125 -2.39e-4,2.6e-5 0.187735,-0.0313 0.1875,-0.03125 -2.35e-4,4.9e-5 0.187729,-0.03132 0.1875,-0.03125 -2.29e-4,7.2e-5 0.187721,-0.06259 0.1875,-0.0625 -2.21e-4,9.3e-5 0.187711,-0.09386 0.1875,-0.09375 -2.11e-4,1.14e-4 0.156449,-0.09388 0.15625,-0.09375 -1.99e-4,1.34e-4 0.156435,-0.125153 0.15625,-0.125 -1.85e-4,1.53e-4 0.15642,-0.12517 0.15625,-0.125 -3.7e-5,3.7e-5 0.02132,-0.02032 0.03125,-0.03125 z"
id="path3931"
style="opacity:0.1;fill:#000000;fill-opacity:1;stroke:none" />
<path
inkscape:connector-curvature="0"
d="M 48,24 C 34.197608,24 23,35.197608 23,49 23,62.802392 34.197608,74 48,74 61.802392,74 73,62.802392 73,49 73,35.197608 61.802392,24 48,24 z m -2,12 4,0 c 1.672228,0 3,1.327772 3,3 l 0,6 a 1.0132725,1.0132725 0 0 0 1,1 l 3,0 0,14 -18,0 0,-14 3,0 a 1.0132725,1.0132725 0 0 0 1,-1 l 0,-6 c 0,-1.672228 1.327772,-3 3,-3 z m 0,0.9375 c -0.545004,0 -1.110322,0.172822 -1.5,0.5625 -0.389678,0.389678 -0.5625,0.954996 -0.5625,1.5 l 0,6 a 1.0132725,1.0132725 0 0 0 1,1 l 6.125,0 a 1.0132725,1.0132725 0 0 0 1,-1 l 0,-6 c 0,-0.545004 -0.172822,-1.110322 -0.5625,-1.5 -0.389678,-0.389678 -0.954996,-0.5625 -1.5,-0.5625 l -4,0 z"
id="path3927"
style="opacity:0.15;fill:#000000;fill-opacity:1;stroke:none" />
<path
inkscape:connector-curvature="0"
d="M 48,25 C 34.745166,25 24,35.745166 24,49 24,62.254834 34.745166,73 48,73 61.254834,73 72,62.254834 72,49 72,35.745166 61.254834,25 48,25 z m -2,10 4,0 c 2.216,0 4,1.784 4,4 l 0,6 3.0625,0 C 57.579567,45 58,45.446 58,46 l 0,14 c 0,0.554 -0.420433,1 -0.9375,1 l -18.125,0 C 38.420433,61 38,60.554 38,60 l 0,-14 c 0,-0.554 0.420433,-1 0.9375,-1 L 42,45 42,39 c 0,-2.216 1.784,-4 4,-4 z m 0,2.9375 c -0.634644,0 -1.0625,0.427856 -1.0625,1.0625 l 0,6 6.125,0 0,-6 c 0,-0.634644 -0.427856,-1.0625 -1.0625,-1.0625 l -4,0 z"
id="path3921"
style="opacity:0.3;fill:#000000;fill-opacity:1;stroke:none" />
<path
inkscape:connector-curvature="0"
d="M 48,24 C 34.745166,24 24,34.745166 24,48 24,61.254834 34.745166,72 48,72 61.254834,72 72,61.254834 72,48 72,34.745166 61.254834,24 48,24 z m -2,10 4,0 c 2.216,0 4,1.784 4,4 l 0,6 3.0625,0 C 57.579567,44 58,44.446 58,45 l 0,14 c 0,0.554 -0.420433,1 -0.9375,1 l -18.125,0 C 38.420433,60 38,59.554 38,59 l 0,-14 c 0,-0.554 0.420433,-1 0.9375,-1 L 42,44 42,38 c 0,-2.216 1.784,-4 4,-4 z m 0,2.9375 c -0.634644,0 -1.0625,0.427856 -1.0625,1.0625 l 0,6 6.125,0 0,-6 c 0,-0.634644 -0.427856,-1.0625 -1.0625,-1.0625 l -4,0 z"
id="path2928"
style="fill:url(#linearGradient3728);fill-opacity:1;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 48,24 c -13.254834,0 -24,10.745166 -24,24 0,0.165582 -0.0033,0.335217 0,0.5 C 24.263839,35.473936 34.910748,25 48,25 61.089252,25 71.736161,35.473936 72,48.5 72.003338,48.335217 72,48.165582 72,48 72,34.745166 61.254834,24 48,24 z m -2,12.9375 c -0.634644,0 -1.0625,0.427856 -1.0625,1.0625 l 0,1 c 0,-0.634644 0.427856,-1.0625 1.0625,-1.0625 l 4,0 c 0.634644,0 1.0625,0.427856 1.0625,1.0625 l 0,-1 c 0,-0.634644 -0.427856,-1.0625 -1.0625,-1.0625 l -4,0 z M 38,59 l 0,1 c 0,0.554 0.420433,1 0.9375,1 l 18.125,0 C 57.579567,61 58,60.554 58,60 l 0,-1 c 0,0.554 -0.420433,1 -0.9375,1 l -18.125,0 C 38.420433,60 38,59.554 38,59 z"
id="path3131"
style="opacity:0.75;fill:#ffffff;fill-opacity:1;stroke:none" />
<path
inkscape:connector-curvature="0"
d="m 46,33 c -2.216,0 -4,1.784 -4,4 l 0,1 c 0,-2.216 1.784,-4 4,-4 l 4,0 c 2.216,0 4,1.784 4,4 l 0,-1 c 0,-2.216 -1.784,-4 -4,-4 l -4,0 z M 38.9375,43 C 38.420433,43 38,43.446 38,44 l 0,1 c 0,-0.554 0.420433,-1 0.9375,-1 L 42,44 l 0,-1 -3.0625,0 z m 6,0 0,1 6.125,0 0,-1 -6.125,0 z M 54,43 l 0,1 3.0625,0 C 57.579567,44 58,44.446 58,45 l 0,-1 c 0,-0.554 -0.420433,-1 -0.9375,-1 L 54,43 z m -30,4.5 c -0.0033,0.164783 0,0.334418 0,0.5 0,13.254834 10.745166,24 24,24 13.254834,0 24,-10.745166 24,-24 0,-0.165582 0.0033,-0.335217 0,-0.5 C 71.736161,60.526064 61.089252,71 48,71 34.910748,71 24.263839,60.526064 24,47.5 z"
id="path3912"
style="opacity:0.15;fill:#000000;fill-opacity:1;stroke:none" />
</g>
<g
id="g203"
style="fill-rule:evenodd">
<path
d="m 44.844,8.0625 1.3438,3.875 h 32.812 c 2.754,0 5.0625,2.3085 5.0625,5.0625 v 62 c 2e-6,2.754 -2.3085,5.0625 -5.0625,5.0625 h -7.875 l 1.3438,3.875 h 11.531 c 2.2218,0 3.9375,-1.7157 3.9375,-3.9375 V 12 c 0,-2.2218 -1.716,-3.9375 -3.938,-3.9375 h -39.156 z"
id="path205"
style="opacity:0.4;fill:url(#ab)"
inkscape:connector-curvature="0" />
<path
d="m 47.656,16.125 22.031,63.75 h 9.3125 c 0.5388,0 0.875,-0.3362 0.875,-0.875 V 17 c 0,-0.5388 -0.33619,-0.875 -0.875,-0.875 h -31.344 z"
id="path207"
style="opacity:0.6;fill:url(#linearGradient3190)"
inkscape:connector-curvature="0" />
<path
d="m 47.656,16.125 22.031,63.75 h 1 L 48.656,16.125 h -1 z"
id="path209"
style="opacity:0.5;fill:url(#i)"
inkscape:connector-curvature="0" />
</g>
</svg>

files/usr/lib/cinnamon-settings/data/icons/sound.svg → data/icons/hicolor_categories_scalable_cs-sound.svg View File


files/usr/lib/cinnamon-settings/data/icons/sources.svg → data/icons/hicolor_categories_scalable_cs-sources.svg View File


+ 4168
- 0
data/icons/hicolor_categories_scalable_cs-startup-programs.svg
File diff suppressed because it is too large
View File


+ 2450
- 0
data/icons/hicolor_categories_scalable_cs-tablet.svg
File diff suppressed because it is too large
View File


files/usr/lib/cinnamon-settings/data/icons/themes.svg → data/icons/hicolor_categories_scalable_cs-themes.svg View File


files/usr/lib/cinnamon-settings/data/icons/tiling.svg → data/icons/hicolor_categories_scalable_cs-tiling.svg View File


files/usr/lib/cinnamon-settings/data/icons/universal-access.svg → data/icons/hicolor_categories_scalable_cs-universal-access.svg View File


files/usr/lib/cinnamon-settings/data/icons/user-accounts.svg → data/icons/hicolor_categories_scalable_cs-user-accounts.svg View File


files/usr/lib/cinnamon-settings/data/icons/user.svg → data/icons/hicolor_categories_scalable_cs-user.svg View File


files/usr/lib/cinnamon-settings/data/icons/windows.svg → data/icons/hicolor_categories_scalable_cs-windows.svg View File


files/usr/lib/cinnamon-settings/data/icons/overview.svg → data/icons/hicolor_categories_scalable_cs-workspaces.svg View File


files/usr/lib/cinnamon-settings/data/installed.svg → data/icons/hicolor_emblems_scalable_cs-xlet-installed.svg View File


files/usr/lib/cinnamon-settings/data/running.svg → data/icons/hicolor_emblems_scalable_cs-xlet-running.svg View File


files/usr/lib/cinnamon-settings/data/system.svg → data/icons/hicolor_emblems_scalable_cs-xlet-system.svg View File


files/usr/lib/cinnamon-settings/data/update.svg → data/icons/hicolor_emblems_scalable_cs-xlet-update.svg View File


+ 23
- 14
data/org.cinnamon.gschema.xml.in View File

@@ -116,7 +116,8 @@
<range min="20" />
<_summary>Panel size</_summary>
<_description>
User-defined panel-height for top panel
User-defined panel-height for top panel. Note, this value may be the true value in use at runtime, depending
on any scaling that may be occurring (for hidpi screens, for instance).
</_description>
</key>
@@ -125,7 +126,8 @@
<range min="20" />
<_summary>Panel size</_summary>
<_description>
User-defined panel-height for bottom panel
User-defined panel-height for bottom panel. Note, this value may be the true value in use at runtime, depending
on any scaling that may be occurring (for hidpi screens, for instance).
</_description>
</key>
@@ -336,7 +338,7 @@
</key>

<key name="overview-corner" type="as">
<default>['expo:true:false', 'scale:false:false', 'scale:false:false', 'scale:false:false']</default>
<default>['expo:false:false', 'scale:false:false', 'scale:false:false', 'scale:false:false']</default>
<_summary>Properties of overview corners</_summary>
<_description>Properties of overview corners, in the form functionality:hover:icon. The order in which properties are displayed is top left, top right, bottom left, bottom right.</_description>
</key>
@@ -534,7 +536,6 @@
<child name="theme" schema="org.cinnamon.theme"/>
<child name="recorder" schema="org.cinnamon.recorder"/>
<child name="keyboard" schema="org.cinnamon.keyboard"/>
<child name="power" schema="org.cinnamon.power" />
<child name="desklets" schema="org.cinnamon.desklets" />
<child name="sounds" schema="org.cinnamon.sounds" />

@@ -577,15 +578,7 @@
</_description>
</key>
</schema>
<schema id="org.cinnamon.power" path="/org/cinnamon/power/" gettext-domain="@GETTEXT_PACKAGE">
<key name="power-label" type="s">
<default>'percent'</default>
<_summary>Display percentage in power applet</_summary>
<_description>Display battery remaining as percentage or time in power applet.</_description>
</key>
</schema>

<schema id="org.cinnamon.recorder" path="/org/cinnamon/recorder/"
gettext-domain="@GETTEXT_PACKAGE@">
<key name="framerate" type="i">
@@ -802,10 +795,26 @@
<key name="login-file" type="s">
<default>""</default>
<summary>Which sound to play when switching windows</summary>
<summary>Which sound to play when logging in</summary>
<description>
Which sound to play during login.
</description>
</key>

<key name="logout-enabled" type="b">
<default>false</default>
<summary>Whether to play a sound during logout</summary>
<description>
Whether to play a sound during logout.
</description>
</key>
<key name="logout-file" type="s">
<default>""</default>
<summary>Which sound to play when logging out</summary>
<description>
Which sound to play during logout.
</description>
</key>

<key name="plug-enabled" type="b">


+ 15
- 1
data/theme/cinnamon.css View File

@@ -1061,7 +1061,13 @@ StScrollBar StButton#vhandle:hover {
padding-right: 30px;
padding-bottom: 10px;
}
.menu-applications-box {
.menu-applications-inner-box {
padding-top: 10px;
padding-left: 10px;
padding-right: 10px;
padding-bottom: 0px;
}
.menu-applications-outer-box {
padding-top: 10px;
padding-left: 10px;
padding-right: 10px;
@@ -1073,6 +1079,10 @@ StScrollBar StButton#vhandle:hover {
padding-right: 7px;
padding-bottom: 7px;
}
.menu-application-button:highlighted {
/* This style is used in menu application buttons for applications which were newly installed */
font-weight: bold;
}
.menu-application-button-selected {
padding-top: 7px;
padding-left: 7px;
@@ -1085,6 +1095,10 @@ StScrollBar StButton#vhandle:hover {
box-shadow: inset 0px 0px 1px 1px rgba(255,255,255,0.06);
border-radius: 4px;
}
.menu-application-button-selected:highlighted {
/* This style is used in menu application buttons for applications which were newly installed */
font-weight: bold;
}
.menu-application-button-label:ltr {
padding-left: 5px;
}


BIN
data/theme/menu.png View File

Before After
Width: 72  |  Height: 72  |  Size: 4.3 KiB

+ 45
- 0
data/theme/menu.svg View File

@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
enable-background="new 0 0 512 512"
height="512px"
id="Layer_1"
version="1.1"
viewBox="0 0 512 512"
width="512px"
xml:space="preserve"
inkscape:version="0.48.4 r9939"
sodipodi:docname="1393093246_FEZ-04.svg"><metadata
id="metadata9"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs7" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="2234"
inkscape:window-height="1483"
id="namedview5"
showgrid="false"
inkscape:zoom="1.3037281"
inkscape:cx="338.31344"
inkscape:cy="217.54557"
inkscape:window-x="0"
inkscape:window-y="45"
inkscape:window-maximized="0"
inkscape:current-layer="Layer_1" /><path
d="m 452.93571,237.3007 c 0,0 -7.27652,-2.73653 -28.32801,-4.67855 -25.7402,-2.37958 -33.50515,-12.02707 -42.06697,-24.03769 h -0.1722 c -1.06612,-2.85474 -2.20816,-5.67344 -3.46527,-8.43501 l 0.0994,-0.0994 c -2.44376,-14.54364 -3.76662,-26.86112 12.7527,-46.74551 13.50257,-16.25475 16.72361,-23.34027 16.72361,-23.34027 -3.16859,-8.04128 -10.78719,-15.65829 -10.78719,-15.65829 0,0 -7.62092,-7.61937 -15.65828,-10.78327 0,0 -7.08552,3.21243 -23.34026,16.72048 -19.88441,16.51776 -32.20266,15.19099 -46.74551,12.75269 l -0.10021,0.0986 c -2.75842,-1.25632 -5.57323,-2.39367 -8.43421,-3.46527 v -0.16751 c -12.01142,-8.55867 -21.65812,-16.33223 -24.03848,-42.072444 -1.94517,-21.041313 -4.67776,-28.327222 -4.67776,-28.327222 -7.92856,-3.448048 -18.69932,-3.448048 -18.69932,-3.448048 0,0 -10.77544,0 -18.69772,3.448048 0,0 -2.7381,7.286692 -4.68012,28.327222 -2.38037,25.740214 -12.03255,33.513774 -24.0377,42.072444 v 0.16751 c -2.85472,1.0716 -5.675,2.20815 -8.435,3.46057 l -0.0955,-0.0939 c -14.54286,2.44768 -26.86112,3.76899 -46.7455,-12.74721 -16.25319,-13.50335 -23.34811,-16.72205 -23.34811,-16.72205 -8.04127,3.17252 -15.64889,10.77936 -15.64889,10.77936 0,0 -7.62015,7.62641 -10.78405,15.66219 0,0 3.20852,7.08631 16.72126,23.33637 16.5162,19.88361 15.17689,32.20187 12.74644,46.74551 l 0.10018,0.0994 c -1.25788,2.76158 -2.39445,5.58028 -3.46682,8.43502 h -0.16675 c -8.55318,12.01532 -16.32753,21.6581 -42.06617,24.03769 -21.042878,1.94593 -28.337398,4.68793 -28.337398,4.68793 C 55.616463,245.2402 55.616463,256 55.616463,256 c 0,0 0,10.77936 3.448048,18.69774 0,0 7.277299,2.742 28.324091,4.67932 25.739418,2.38037 33.504388,12.03881 42.070868,24.03848 h 0.16752 c 1.07239,2.861 2.20817,5.67579 3.46683,8.43501 l -0.10018,0.0994 c 2.44846,14.54521 3.76898,26.86112 -12.74643,46.74551 -13.50414,16.25396 -16.72597,23.34888 -16.72597,23.34888 3.17721,8.03736 10.78248,15.64969 10.78248,15.64969 0,0 7.62564,7.62093 15.66299,10.77934 0,0 7.08161,-3.2046 23.33636,-16.71735 19.88361,-16.51619 32.20657,-15.17689 46.74472,-12.74955 l 0.1002,-0.10019 c 2.76001,1.25633 5.58028,2.38897 8.435,3.46526 v 0.1722 c 12.01454,8.55399 21.65734,16.32755 24.03771,42.06776 1.94516,21.04131 4.68323,28.33583 4.68323,28.33583 7.93326,3.43865 18.69382,3.43865 18.69382,3.43865 0,0 10.77936,0 18.69932,-3.44805 0,0 2.74276,-7.27807 4.67776,-28.32722 2.38036,-25.7402 12.03802,-33.50594 24.03848,-42.06774 v -0.17221 c 2.86098,-1.0763 5.67579,-2.20815 8.43421,-3.46527 l 0.10021,0.10018 c 14.54285,-2.44375 26.86033,-3.76662 46.74551,12.74957 16.25552,13.50492 23.35123,16.72675 23.35123,16.72675 8.03656,-3.178 15.64731,-10.78796 15.64731,-10.78796 0,0 7.6186,-7.62094 10.78719,-15.6583 0,0 -3.21243,-7.08707 -16.72361,-23.34027 -16.51932,-19.88361 -15.18785,-32.2003 -12.7527,-46.74551 l -0.0994,-0.0994 c 1.25632,-2.75922 2.39836,-5.57401 3.46527,-8.43501 h 0.1722 c 8.55398,-12.00828 16.32677,-21.65811 42.06697,-24.03848 21.04132,-1.94515 28.33662,-4.67932 28.33662,-4.67932 C 456.38454,266.77075 456.38454,256 456.38454,256 c 0,0 -7.8e-4,-10.77936 -3.44883,-18.6993 z M 255.99775,349.71724 c -51.75985,0 -93.71802,-41.95738 -93.71802,-93.71724 0,-51.75986 41.95817,-93.71724 93.71802,-93.71724 51.75908,0 93.71725,41.95738 93.71725,93.71724 0,51.75986 -41.95817,93.71724 -93.71725,93.71724 z"
id="path3"
inkscape:connector-curvature="0"
style="fill:#7f7f7f" /></svg>

+ 2
- 0
files/Makefile.in View File

@@ -4,6 +4,8 @@ clean:

distclean:

maintainer-clean:

install:
find -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)/ \;



+ 1
- 0
files/generate_desktop_files View File

@@ -53,6 +53,7 @@ Icon=preferences-system
Terminal=false
Type=Application
Encoding=UTF-8
OnlyShowIn=X-Cinnamon;
Categories=GNOME;GTK;Settings;DesktopSettings;
StartupNotify=false
""")


+ 1
- 1
files/usr/bin/cinnamon-settings-users View File

@@ -2,5 +2,5 @@

import os

os.system("gksu /usr/lib/cinnamon-settings-users/cinnamon-settings-users.py")
os.system("pkexec /usr/lib/cinnamon-settings-users/cinnamon-settings-users.py")


+ 11
- 5
files/usr/lib/cinnamon-desktop-editor/cinnamon-desktop-editor.py View File

@@ -21,6 +21,12 @@ PANEL_LAUNCHER_PATH = os.path.join(home, ".cinnamon", "panel-launchers")

EXTENSIONS = (".png", ".xpm", ".svg")

def escape_space(string):
return string.replace(" ", "\ ")

def unescape_space(string):
return string.replace("\ ", " ")

def try_icon_name(filename):
# Detect if the user picked an icon, and make
# it into an icon name.
@@ -101,7 +107,7 @@ class IconPicker(object):
else:
theme = Gtk.IconTheme.get_default()
icon_info = theme.lookup_icon(fn, 64, 0)
icon_info_fn = icon_info.get_filename()
icon_info_fn = icon_info.get_filename() if icon_info != None else None
if icon_info_fn:
chooser.set_filename(icon_info_fn)
filter = Gtk.FileFilter();
@@ -160,7 +166,7 @@ class ItemEditor(object):
except GLib.GError:
pass
else:
self.builder.get_object(ctl).set_text(val)
self.builder.get_object(ctl).set_text(unescape_space(val))

def set_check(self, ctl, name):
try:
@@ -191,7 +197,7 @@ class ItemEditor(object):
contents, length = self.keyfile.to_data()
need_exec = False
if self.destdir is not None:
self.item_path = os.path.join(self.destdir, (self.builder.get_object('name-entry').get_text() + ".desktop"))
self.item_path = os.path.join(self.destdir, self.builder.get_object('name-entry').get_text() + ".desktop")
need_exec = True

try:
@@ -244,7 +250,7 @@ class LauncherEditor(ItemEditor):

def get_keyfile_edits(self):
return dict(Name=self.builder.get_object('name-entry').get_text(),
Exec=self.builder.get_object('exec-entry').get_text(),
Exec=escape_space(self.builder.get_object('exec-entry').get_text()),
Comment=self.builder.get_object('comment-entry').get_text(),
Terminal=self.builder.get_object('terminal-check').get_active(),
Icon=get_icon_string(self.builder.get_object('icon-image')),
@@ -339,7 +345,7 @@ class PanelLauncherEditor(ItemEditor):

def get_keyfile_edits(self):
return dict(Name=self.builder.get_object('name-entry').get_text(),
Exec=self.builder.get_object('exec-entry').get_text(),
Exec=escape_space(self.builder.get_object('exec-entry').get_text()),
Comment=self.builder.get_object('comment-entry').get_text(),
Terminal=self.builder.get_object('terminal-check').get_active(),
Icon=get_icon_string(self.builder.get_object('icon-image')),


+ 44
- 39
files/usr/lib/cinnamon-menu-editor/cme/MainWindow.py View File

@@ -17,7 +17,7 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA

from gi.repository import Gtk, GObject, Gio, GdkPixbuf, Gdk, GMenu, GLib
from gi.repository import Gtk, GObject, Gio, GdkPixbuf, Gdk, CMenu, GLib
import cgi
import os
import gettext
@@ -78,15 +78,15 @@ class MainWindow(object):
item_id = None
if iter:
update_items = True
if isinstance(items[iter][3], GMenu.TreeEntry):
if isinstance(items[iter][3], CMenu.TreeEntry):
item_id = items[iter][3].get_desktop_file_id()
update_type = GMenu.TreeItemType.ENTRY
elif isinstance(items[iter][3], GMenu.TreeDirectory):
update_type = CMenu.TreeItemType.ENTRY
elif isinstance(items[iter][3], CMenu.TreeDirectory):
item_id = os.path.split(items[iter][3].get_desktop_file_path())[1]
update_type = GMenu.TreeItemType.DIRECTORY
elif isinstance(items[iter][3], GMenu.TreeSeparator):
update_type = CMenu.TreeItemType.DIRECTORY
elif isinstance(items[iter][3], CMenu.TreeSeparator):
item_id = items.get_path(iter)
update_type = GMenu.TreeItemType.SEPARATOR
update_type = CMenu.TreeItemType.SEPARATOR
menus, iter = menu_tree.get_selection().get_selected()
update_menus = False
menu_id = None
@@ -108,13 +108,13 @@ class MainWindow(object):
i = 0
for item in item_tree.get_model():
found = False
if update_type != GMenu.TreeItemType.SEPARATOR:
if isinstance (item[3], GMenu.TreeEntry) and item[3].get_desktop_file_id() == item_id:
if update_type != CMenu.TreeItemType.SEPARATOR:
if isinstance (item[3], CMenu.TreeEntry) and item[3].get_desktop_file_id() == item_id:
found = True
if isinstance (item[3], GMenu.TreeDirectory) and item[3].get_desktop_file_path() and update_type == GMenu.TreeItemType.DIRECTORY:
if isinstance (item[3], CMenu.TreeDirectory) and item[3].get_desktop_file_path() and update_type == CMenu.TreeItemType.DIRECTORY:
if os.path.split(item[3].get_desktop_file_path())[1] == item_id:
found = True
if isinstance(item[3], GMenu.TreeSeparator):
if isinstance(item[3], CMenu.TreeSeparator):
if not isinstance(item_id, tuple):
#we may not skip the increment via "continue"
i += 1
@@ -149,13 +149,13 @@ class MainWindow(object):
return True

def setupMenuTree(self):
self.menu_store = Gtk.TreeStore(GdkPixbuf.Pixbuf, str, bool, object) # bool is unused, just a placeholder
self.menu_store = Gtk.TreeStore(object, str, bool, object) # bool is unused, just a placeholder
menus = self.tree.get_object('menu_tree') # so object is the same index for
column = Gtk.TreeViewColumn(_("Name")) # the menu tree and item tree
column.set_spacing(4)
cell = Gtk.CellRendererPixbuf()
column.pack_start(cell, False)
column.add_attribute(cell, 'pixbuf', 0)
column.set_cell_data_func(cell, self.icon_data_func, 0)
cell = Gtk.CellRendererText()
column.pack_start(cell, True)
column.add_attribute(cell, 'markup', 1)
@@ -176,16 +176,21 @@ class MainWindow(object):
column.set_spacing(4)
cell = Gtk.CellRendererPixbuf()
column.pack_start(cell, False)
column.add_attribute(cell, 'pixbuf', 1)
column.set_cell_data_func(cell, self.icon_data_func, 1)
cell = Gtk.CellRendererText()
column.pack_start(cell, True)
column.add_attribute(cell, 'markup', 2)
items.append_column(column)
self.item_store = Gtk.ListStore(bool, GdkPixbuf.Pixbuf, str, object)
self.item_store = Gtk.ListStore(bool, object, str, object)
items.set_model(self.item_store)

def icon_data_func(self, column, cell, model, iter, data=None):
wrapper = model.get_value(iter, data)
if wrapper:
cell.set_property("surface", wrapper.surface)

def _cell_data_toggle_func(self, tree_column, renderer, model, treeiter, data=None):
if isinstance(model[treeiter][3], GMenu.TreeSeparator):
if isinstance(model[treeiter][3], CMenu.TreeSeparator):
renderer.set_property('visible', False)
else:
renderer.set_property('visible', True)
@@ -207,19 +212,19 @@ class MainWindow(object):
if not show:
name = "<small><i>%s</i></small>" % (name,)

icon = util.getIcon(menu)
icon = util.getIcon(menu, self.main_window)
iters[menu] = self.menu_store.append(iters[parent], (icon, name, False, menu))
self.loadMenu(iters, menu)

def loadItems(self, menu):
self.item_store.clear()
for item, show in self.editor.getItems(menu):
icon = util.getIcon(item)
if isinstance(item, GMenu.TreeDirectory):
icon = util.getIcon(item, self.main_window)
if isinstance(item, CMenu.TreeDirectory):
name = item.get_name()
elif isinstance(item, GMenu.TreeEntry):
elif isinstance(item, CMenu.TreeEntry):
name = item.get_app_info().get_display_name()
elif isinstance(item, GMenu.TreeSeparator):
elif isinstance(item, CMenu.TreeSeparator):
name = '---'
else:
assert False, 'should not be reached'
@@ -285,11 +290,11 @@ class MainWindow(object):
if not iter:
return
item = items[iter][3]
if isinstance(item, GMenu.TreeEntry):
if isinstance(item, CMenu.TreeEntry):
self.editor.deleteItem(item)
elif isinstance(item, GMenu.TreeDirectory):
elif isinstance(item, CMenu.TreeDirectory):
self.editor.deleteMenu(item)
elif isinstance(item, GMenu.TreeSeparator):
elif isinstance(item, CMenu.TreeSeparator):
self.editor.deleteSeparator(item)

def on_edit_properties_activate(self, menu):
@@ -298,13 +303,13 @@ class MainWindow(object):
if not iter:
return
item = items[iter][3]
if not isinstance(item, GMenu.TreeEntry) and not isinstance(item, GMenu.TreeDirectory):
if not isinstance(item, CMenu.TreeEntry) and not isinstance(item, CMenu.TreeDirectory):
return

if isinstance(item, GMenu.TreeEntry):
if isinstance(item, CMenu.TreeEntry):
file_path = os.path.join(util.getUserItemPath(), item.get_desktop_file_id())
file_type = 'launcher'
elif isinstance(item, GMenu.TreeDirectory):
elif isinstance(item, CMenu.TreeDirectory):
file_path = os.path.join(util.getUserDirectoryPath(), os.path.split(item.get_desktop_file_path())[1])
file_type = 'directory'

@@ -322,7 +327,7 @@ class MainWindow(object):
item = items[iter][3]
if not iter:
return
if not isinstance(item, GMenu.TreeEntry):
if not isinstance(item, CMenu.TreeEntry):
return
(self.cut_copy_buffer, self.file_id) = self.editor.cutItem(item)

@@ -332,7 +337,7 @@ class MainWindow(object):
item = items[iter][3]
if not iter:
return
if not isinstance(item, GMenu.TreeEntry):
if not isinstance(item, CMenu.TreeEntry):
return
(self.cut_copy_buffer, self.file_id) = self.editor.copyItem(item)

@@ -345,7 +350,7 @@ class MainWindow(object):
if not iter:
return
item = items[iter][3]
if not isinstance(item, GMenu.TreeDirectory):
if not isinstance(item, CMenu.TreeDirectory):
return
if self.cut_copy_buffer is not None:
success = self.editor.pasteItem(self.cut_copy_buffer, item, self.file_id)
@@ -376,22 +381,22 @@ class MainWindow(object):
self.tree.get_object('cut_button').set_sensitive(False)
self.tree.get_object('copy_button').set_sensitive(False)

can_paste = isinstance(menu, GMenu.TreeDirectory) and self.cut_copy_buffer is not None
can_paste = isinstance(menu, CMenu.TreeDirectory) and self.cut_copy_buffer is not None
self.tree.get_object('edit_paste').set_sensitive(can_paste)
self.tree.get_object('paste_button').set_sensitive(can_paste)

index = menus.get_path(iter).get_indices()[menus.get_path(iter).get_depth() - 1]
parent_iter = menus.iter_parent(iter)
count = menus.iter_n_children(parent_iter)
can_go_up = index > 0 and isinstance(menu, GMenu.TreeDirectory)
can_go_down = index < count - 1 and isinstance(menu, GMenu.TreeDirectory)
can_go_up = index > 0 and isinstance(menu, CMenu.TreeDirectory)
can_go_down = index < count - 1 and isinstance(menu, CMenu.TreeDirectory)
self.tree.get_object('move_up_button').set_sensitive(can_go_up)
self.tree.get_object('move_down_button').set_sensitive(can_go_down)
self.last_tree = "menu_tree"

def on_item_tree_show_toggled(self, cell, path):
item = self.item_store[path][3]
if isinstance(item, GMenu.TreeSeparator):
if isinstance(item, CMenu.TreeSeparator):
return
if self.item_store[path][0]:
self.editor.setVisible(item, False)
@@ -411,24 +416,24 @@ class MainWindow(object):
self.tree.get_object('edit_delete').set_sensitive(True)
self.tree.get_object('delete_button').set_sensitive(True)

can_edit = not isinstance(item, GMenu.TreeSeparator)
can_edit = not isinstance(item, CMenu.TreeSeparator)
self.tree.get_object('edit_properties').set_sensitive(can_edit)
self.tree.get_object('properties_button').set_sensitive(can_edit)

can_cut_copy = not isinstance(item, GMenu.TreeDirectory)
can_cut_copy = not isinstance(item, CMenu.TreeDirectory)
self.tree.get_object('cut_button').set_sensitive(can_cut_copy)
self.tree.get_object('copy_button').set_sensitive(can_cut_copy)
self.tree.get_object('edit_cut').set_sensitive(can_cut_copy)
self.tree.get_object('edit_copy').set_sensitive(can_cut_copy)

can_paste = isinstance(item, GMenu.TreeDirectory) and self.cut_copy_buffer is not None
can_paste = isinstance(item, CMenu.TreeDirectory) and self.cut_copy_buffer is not None

self.tree.get_object('edit_paste').set_sensitive(can_paste)
self.tree.get_object('paste_button').set_sensitive(can_paste)

index = items.get_path(iter).get_indices()[0]
can_go_up = index > 0 and isinstance(item, GMenu.TreeDirectory)
can_go_down = index < len(items) - 1 and isinstance(item, GMenu.TreeDirectory)
can_go_up = index > 0 and isinstance(item, CMenu.TreeDirectory)
can_go_down = index < len(items) - 1 and isinstance(item, CMenu.TreeDirectory)
self.tree.get_object('move_up_button').set_sensitive(can_go_up)
self.tree.get_object('move_down_button').set_sensitive(can_go_down)
self.last_tree = "item_tree"


+ 33
- 33
files/usr/lib/cinnamon-menu-editor/cme/MenuEditor.py View File