diff -Nru cinnamon-control-center-3.2.1/autogen.sh cinnamon-control-center-3.4.0/autogen.sh --- cinnamon-control-center-3.2.1/autogen.sh 2016-12-12 14:31:49.000000000 +0000 +++ cinnamon-control-center-3.4.0/autogen.sh 2017-05-04 12:30:36.000000000 +0000 @@ -22,7 +22,8 @@ echo "" >&2 fi -aclocal --install || exit 1 +mkdir -p m4 + glib-gettextize --force --copy || exit 1 intltoolize --force --copy --automake || exit 1 autoreconf --verbose --force --install || exit 1 diff -Nru cinnamon-control-center-3.2.1/cinnamon-control-center.pot cinnamon-control-center-3.4.0/cinnamon-control-center.pot --- cinnamon-control-center-3.2.1/cinnamon-control-center.pot 2016-12-12 14:31:49.000000000 +0000 +++ cinnamon-control-center-3.4.0/cinnamon-control-center.pot 2017-05-04 12:30:36.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-07 10:07+0000\n" +"POT-Creation-Date: 2017-05-04 13:27+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -333,21 +333,21 @@ msgid "Could not get screen information" msgstr "" -#: panels/network/cc-network-panel.c:367 +#: panels/network/cc-network-panel.c:373 msgid "Air_plane Mode" msgstr "" -#: panels/network/cc-network-panel.c:966 +#: panels/network/cc-network-panel.c:972 msgid "Network Proxy" msgstr "" -#: panels/network/cc-network-panel.c:1145 panels/network/net-vpn.c:278 +#: panels/network/cc-network-panel.c:1151 panels/network/net-vpn.c:278 #: panels/network/net-vpn.c:431 #, c-format msgid "%s VPN" msgstr "" -#: panels/network/cc-network-panel.c:1290 +#: panels/network/cc-network-panel.c:1296 msgid "The system network services are not compatible with this version." msgstr "" @@ -885,7 +885,7 @@ msgid "Switch Modes" msgstr "" -#: panels/wacom/cc-wacom-page.c:753 panels/wacom/cc-wacom-stylus-page.c:373 +#: panels/wacom/cc-wacom-page.c:753 panels/wacom/cc-wacom-stylus-page.c:378 msgid "Button" msgstr "" @@ -901,79 +901,79 @@ msgid "Display Mapping" msgstr "" -#: panels/wacom/csd-wacom-device.c:1082 +#: panels/wacom/csd-wacom-device.c:1086 msgid "Left Ring" msgstr "" -#: panels/wacom/csd-wacom-device.c:1092 +#: panels/wacom/csd-wacom-device.c:1096 #, c-format msgid "Left Ring Mode #%d" msgstr "" -#: panels/wacom/csd-wacom-device.c:1111 +#: panels/wacom/csd-wacom-device.c:1115 msgid "Right Ring" msgstr "" -#: panels/wacom/csd-wacom-device.c:1121 +#: panels/wacom/csd-wacom-device.c:1125 #, c-format msgid "Right Ring Mode #%d" msgstr "" -#: panels/wacom/csd-wacom-device.c:1162 +#: panels/wacom/csd-wacom-device.c:1166 msgid "Left Touchstrip" msgstr "" -#: panels/wacom/csd-wacom-device.c:1172 +#: panels/wacom/csd-wacom-device.c:1176 #, c-format msgid "Left Touchstrip Mode #%d" msgstr "" -#: panels/wacom/csd-wacom-device.c:1191 +#: panels/wacom/csd-wacom-device.c:1195 msgid "Right Touchstrip" msgstr "" -#: panels/wacom/csd-wacom-device.c:1201 +#: panels/wacom/csd-wacom-device.c:1205 #, c-format msgid "Right Touchstrip Mode #%d" msgstr "" -#: panels/wacom/csd-wacom-device.c:1226 +#: panels/wacom/csd-wacom-device.c:1230 msgid "Left Touchring Mode Switch" msgstr "" -#: panels/wacom/csd-wacom-device.c:1228 +#: panels/wacom/csd-wacom-device.c:1232 msgid "Right Touchring Mode Switch" msgstr "" -#: panels/wacom/csd-wacom-device.c:1231 +#: panels/wacom/csd-wacom-device.c:1235 msgid "Left Touchstrip Mode Switch" msgstr "" -#: panels/wacom/csd-wacom-device.c:1233 +#: panels/wacom/csd-wacom-device.c:1237 msgid "Right Touchstrip Mode Switch" msgstr "" -#: panels/wacom/csd-wacom-device.c:1238 +#: panels/wacom/csd-wacom-device.c:1242 #, c-format msgid "Mode Switch #%d" msgstr "" -#: panels/wacom/csd-wacom-device.c:1342 +#: panels/wacom/csd-wacom-device.c:1346 #, c-format msgid "Left Button #%d" msgstr "" -#: panels/wacom/csd-wacom-device.c:1345 +#: panels/wacom/csd-wacom-device.c:1349 #, c-format msgid "Right Button #%d" msgstr "" -#: panels/wacom/csd-wacom-device.c:1348 +#: panels/wacom/csd-wacom-device.c:1352 #, c-format msgid "Top Button #%d" msgstr "" -#: panels/wacom/csd-wacom-device.c:1351 +#: panels/wacom/csd-wacom-device.c:1355 #, c-format msgid "Bottom Button #%d" msgstr "" diff -Nru cinnamon-control-center-3.2.1/configure.ac cinnamon-control-center-3.4.0/configure.ac --- cinnamon-control-center-3.2.1/configure.ac 2016-12-12 14:31:49.000000000 +0000 +++ cinnamon-control-center-3.4.0/configure.ac 2017-05-04 12:30:36.000000000 +0000 @@ -1,4 +1,4 @@ -m4_define([cinnamon_control_center_version], 3.2.1) +m4_define([cinnamon_control_center_version], 3.4.0) AC_INIT([cinnamon-control-center], [cinnamon_control_center_version], [https://github.com/linuxmint/cinnamon-control-center/issues]) @@ -124,7 +124,6 @@ PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES) PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0) -PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.14) PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION libxklavier >= 5.1 libgnomekbdui >= 2.91.91) @@ -132,27 +131,69 @@ #---------------------------------------------- # Network Manager Stuff -PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION - mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION, - [have_networkmanager=yes], have_networkmanager=no) -if test "x$have_networkmanager" = xno ; then - AC_MSG_WARN(*** Network panel will not be built (NetworkManager or ModemManager not found) ***) -else - AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel]) +AC_ARG_ENABLE(networkmanager, + AC_HELP_STRING([--disable-networkmanager], + [build NetworkManager support]), + [case "${enableval}" in + yes) enable_networkmanager=yes ;; + no) enable_networkmanager=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-networkmanager) ;; + esac], + [enable_networkmanager=yes]) dnl Enabled by default + +if test "x$enable_networkmanager" = xyes; then + PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION + libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION + libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION + libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION + libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION, + [have_networkmanager=yes], have_networkmanager=no) + if test "x$have_networkmanager" = xno ; then + AC_MSG_ERROR(*** NetworkManager not found ***) + fi + + AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel]) + + if test x${have_networkmanager} = xyes; then + AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available]) + NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN + NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager` + AC_SUBST(NM_VPN_CONFIG_DIR) + AC_SUBST(NM_VPN_MODULE_DIR) + fi fi + AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes]) -if test x${have_networkmanager} = xyes; then - AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available]) - NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN - NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager` - AC_SUBST(NM_VPN_CONFIG_DIR) - AC_SUBST(NM_VPN_MODULE_DIR) + +AC_ARG_ENABLE(modemmanager, + AC_HELP_STRING([--disable-modemmanager], + [build ModemManager support]), + [case "${enableval}" in + yes) enable_modemmanager=yes ;; + no) enable_modemmanager=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-modemmanager) ;; + esac], + [enable_modemmanager=yes]) dnl Enable by default + +if test "x$enable_modemmanager" = xyes; then + if test "x$enable_networkmanager" = xno; then + AC_MSG_ERROR(*** NetworkManager is required by ModemManager ***) + fi +fi + +if test "x$enable_modemmanager" = xyes; then + PKG_CHECK_MODULES(MODEM_MANAGER, mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION, + [have_modemmanager=yes], have_modemmanager=no) + + if test "x$have_modemmanager" = xno ; then + AC_MSG_ERROR(*** ModemManager not found ***) + fi + + AC_DEFINE(BUILD_MODEM, 1, [Define 1 to build ModemManager support]) fi +AM_CONDITIONAL(BUILD_MODEM, [test x$have_modemmanager = xyes]) + # Work-around for https://bugzilla.gnome.org/show_bug.cgi?id=723769 PKG_CHECK_MODULES(NM_UNSTABLE_CHECK, libnm-util >= 0.9.9.0, nm_unstable=yes, nm_unstable=no) if test x$nm_unstable = xyes; then @@ -195,15 +236,51 @@ AC_SUBST(CUPS_LIBS) fi +build_color=false +AC_ARG_ENABLE(color, + AC_HELP_STRING([--disable-color], + [disable color management panel]), + [case "${enableval}" in + yes) WANT_COLOR=yes ;; + no) WANT_COLOR=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;; + esac], + [WANT_COLOR=yes]) dnl Default value + +if test x$WANT_COLOR = xyes; then + PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.14) + build_color=true +fi +if test "x$build_color" = xtrue ; then + AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel]) +fi +AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue") +AC_SUBST(COLOR_PANEL_CFLAGS) +AC_SUBST(COLOR_PANEL_LIBS) + build_wacom=false -PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES +AC_ARG_ENABLE(wacom, + AC_HELP_STRING([--disable-wacom], + [disable wacom management panel]), + [case "${enableval}" in + yes) WANT_WACOM=yes ;; + no) WANT_WACOM=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;; + esac], + [WANT_WACOM=yes]) dnl Default value + +if test x$WANT_WACOM = xyes; then + PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION cinnamon-desktop - gtk+-3.0 >= 3.8.0], - [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"]) - + gtk+-3.0 >= 3.8.0]) + build_wacom="true" + AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])] +fi AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue") +AC_SUBST(WACOM_PANEL_CFLAGS) +AC_SUBST(WACOM_PANEL_LIBS) # This is a hard-dependency for the region and user-accounts panels PKG_CHECK_MODULES(ISOCODES, iso-codes) @@ -346,11 +423,23 @@ else AC_MSG_NOTICE([ Network panel disabled]) fi +if test "x$have_modemmanager" = "xyes"; then + AC_MSG_NOTICE([** ModemManager support enabled]) +else + AC_MSG_NOTICE([ ModemManager support disabled]) +fi #if test "x$with_systemd" = "xyes"; then # AC_MSG_NOTICE([** systemd (Systemd session tracking)]) #else # AC_MSG_NOTICE([ Using ConsoleKit for session tracking]) #fi + +if test "x$build_color" = "xtrue"; then + AC_MSG_NOTICE([** Colord support (Color management panel)]) +else + AC_MSG_NOTICE([ Colord support disabled]) +fi + if test "x$build_wacom" = "xtrue"; then AC_MSG_NOTICE([** Wacom support (Wacom panel)]) else diff -Nru cinnamon-control-center-3.2.1/debian/changelog cinnamon-control-center-3.4.0/debian/changelog --- cinnamon-control-center-3.2.1/debian/changelog 2017-05-03 22:01:30.000000000 +0000 +++ cinnamon-control-center-3.4.0/debian/changelog 2017-05-08 12:36:05.000000000 +0000 @@ -1,8 +1,30 @@ -cinnamon-control-center (3.2.1-4~zesty0) zesty; urgency=medium +cinnamon-control-center (3.4.0-1~zesty0) zesty; urgency=medium * Package version bump to avoid release clash on Launchpad. - -- embrosyn Thu, 04 May 2017 00:01:30 +0200 + -- embrosyn Mon, 08 May 2017 14:36:05 +0200 + +cinnamon-control-center (3.4.0) zesty; urgency=medium + + [ Garry Filakhtov ] + * making colord optional + * 1. Optional networkmanager/modemmanages + + [ Clement Lefebvre ] + * wacom: do not bail out if the tablet doesn't have an eraser + * wacom: add an icon for stylii without an eraser + * wacom: Allow button mapping if the stylus has one button too + * wacom: Add margins to the UI + * Fix Network module + * display: Fix csd-xrandr DBUS name + + [ leigh123linux ] + * remove aclocal from autogen + + [ Clement Lefebvre ] + * l10n: Generate additional files + + -- Clement Lefebvre Thu, 04 May 2017 13:29:40 +0100 cinnamon-control-center (3.2.1) zesty; urgency=medium diff -Nru cinnamon-control-center-3.2.1/generate_additional_files.py cinnamon-control-center-3.4.0/generate_additional_files.py --- cinnamon-control-center-3.2.1/generate_additional_files.py 2016-12-12 14:31:49.000000000 +0000 +++ cinnamon-control-center-3.4.0/generate_additional_files.py 2017-05-04 12:30:36.000000000 +0000 @@ -7,7 +7,7 @@ sys.path.append('/usr/lib/linuxmint/common') import additionalfiles -os.environ['LANG'] = "en_US.UTF-8" +os.environ['LANGUAGE'] = "en_US.UTF-8" gettext.install(DOMAIN, PATH) prefix = """[Desktop Entry] diff -Nru cinnamon-control-center-3.2.1/panels/color/cinnamon-color-panel.desktop.in.in cinnamon-control-center-3.4.0/panels/color/cinnamon-color-panel.desktop.in.in --- cinnamon-control-center-3.2.1/panels/color/cinnamon-color-panel.desktop.in.in 2016-12-12 14:31:49.000000000 +0000 +++ cinnamon-control-center-3.4.0/panels/color/cinnamon-color-panel.desktop.in.in 2017-05-04 12:30:36.000000000 +0000 @@ -31,6 +31,7 @@ Name[en_GB]=Colour Name[eo]=Koloro Name[et]=Värv +Name[et_EE]=Värv Name[eu]=Kolorea Name[fa]=رنگ Name[fa_AF]=رنگ @@ -52,6 +53,7 @@ Name[id_ID]=Warna Name[is]=Litur Name[it]=Colore +Name[it_CH]=Colore Name[it_IT]=Colore Name[ja]=色 Name[ja_JP]=色 @@ -88,10 +90,10 @@ Name[sr]=Боја Name[sr@Latn]=Боја Name[sr@ije]=Боја -Name[sr@ijekavian]=Боја Name[sr@ijekavianlatin]=Боја Name[sr@latin]=Боја Name[sr_RS]=Боја +Name[sr_RS@latin]=Боја Name[sv]=Färg Name[ta]=வண்ணம் Name[ta_LK]=வண்ணம் @@ -103,7 +105,6 @@ Name[uk]=Колір Name[uk_UA]=Колір Name[ur]=رنگ -Name[ur_PK]=رنگ Name[vi]=Màu sắc Name[vi_VN]=Màu sắc Name[zh_CN]=色彩 @@ -136,7 +137,6 @@ Comment[en_GB]=Colour management settings Comment[eo]=Ŝanĝi administrad-agordojn Comment[es]=Configuración de gestión de color -Comment[es_419]=Configuración de gestión de color Comment[es_AR]=Configuración de gestión de color Comment[es_CL]=Configuración de gestión de color Comment[es_CO]=Configuración de gestión de color @@ -144,18 +144,16 @@ Comment[es_DO]=Configuración de gestión de color Comment[es_EC]=Configuración de gestión de color Comment[es_ES]=Configuración de gestión de color -Comment[es_GT]=Configuración de gestión de color -Comment[es_HN]=Configuración de gestión de color Comment[es_MX]=Configuración de gestión de color Comment[es_NI]=Configuración de gestión de color Comment[es_PA]=Configuración de gestión de color Comment[es_PE]=Configuración de gestión de color Comment[es_PR]=Configuración de gestión de color Comment[es_SV]=Configuración de gestión de color -Comment[es_US]=Configuración de gestión de color Comment[es_UY]=Configuración de gestión de color Comment[es_VE]=Configuración de gestión de color Comment[et]=Värvihalduse seaded +Comment[et_EE]=Värvihalduse seaded Comment[eu]=Kolore-kudeaketaren ezarpenak Comment[fi]=Värien hallinta Comment[fi_FI]=Värien hallinta @@ -173,6 +171,7 @@ Comment[id_ID]=Pengaturan manajemen warna Comment[is]=Stillingar litastýringar Comment[it]=Impostazioni di gestione del colore +Comment[it_CH]=Impostazioni di gestione del colore Comment[it_IT]=Impostazioni di gestione del colore Comment[ja]=カラーマネージメントの設定 Comment[ja_JP]=カラーマネージメントの設定 @@ -206,10 +205,10 @@ Comment[sr]=Подешавања управљања бојом Comment[sr@Latn]=Подешавања управљања бојом Comment[sr@ije]=Подешавања управљања бојом -Comment[sr@ijekavian]=Подешавања управљања бојом Comment[sr@ijekavianlatin]=Подешавања управљања бојом Comment[sr@latin]=Подешавања управљања бојом Comment[sr_RS]=Подешавања управљања бојом +Comment[sr_RS@latin]=Подешавања управљања бојом Comment[sv]=Inställningar för färghantering Comment[ta]=நிற மேலாண்மை அமைப்புகள் Comment[ta_LK]=நிற மேலாண்மை அமைப்புகள் @@ -221,7 +220,6 @@ Comment[uk]=Налаштування керування кольором Comment[uk_UA]=Налаштування керування кольором Comment[ur]=رنگ کے انتظام کی ترتیبات -Comment[ur_PK]=رنگ کے انتظام کی ترتیبات Comment[vi]=Thiết đặt quản lý màu sắc Comment[vi_VN]=Thiết đặt quản lý màu sắc Comment[zh_CN]=色彩管理设置 diff -Nru cinnamon-control-center-3.2.1/panels/datetime/cinnamon-datetime-panel.desktop.in cinnamon-control-center-3.4.0/panels/datetime/cinnamon-datetime-panel.desktop.in --- cinnamon-control-center-3.2.1/panels/datetime/cinnamon-datetime-panel.desktop.in 2016-12-12 14:31:49.000000000 +0000 +++ cinnamon-control-center-3.4.0/panels/datetime/cinnamon-datetime-panel.desktop.in 2017-05-04 12:30:36.000000000 +0000 @@ -33,7 +33,6 @@ Name[de_DE]=Datum & Zeit Name[el]=Ημερομηνία & Ώρα Name[es]=Fecha y hora -Name[es_419]=Fecha y hora Name[es_AR]=Fecha y hora Name[es_CL]=Fecha y hora Name[es_CO]=Fecha y hora @@ -41,18 +40,16 @@ Name[es_DO]=Fecha y hora Name[es_EC]=Fecha y hora Name[es_ES]=Fecha y hora -Name[es_GT]=Fecha y hora -Name[es_HN]=Fecha y hora Name[es_MX]=Fecha y hora Name[es_NI]=Fecha y hora Name[es_PA]=Fecha y hora Name[es_PE]=Fecha y hora Name[es_PR]=Fecha y hora Name[es_SV]=Fecha y hora -Name[es_US]=Fecha y hora Name[es_UY]=Fecha y hora Name[es_VE]=Fecha y hora Name[et]=Kuupäev & kellaaeg +Name[et_EE]=Kuupäev & kellaaeg Name[eu]=Data eta ordua Name[fi]=Päiväys ja aika Name[fi_FI]=Päiväys ja aika @@ -70,6 +67,7 @@ Name[id_ID]=Waktu & Tanggal Name[is]=Dagsetning og tími Name[it]=Data e ora +Name[it_CH]=Data e ora Name[it_IT]=Data e ora Name[ja]=日付・時間 Name[ja_JP]=日付・時間 @@ -105,10 +103,10 @@ Name[sr]=Датум и време Name[sr@Latn]=Датум и време Name[sr@ije]=Датум и време -Name[sr@ijekavian]=Датум и време Name[sr@ijekavianlatin]=Датум и време Name[sr@latin]=Датум и време Name[sr_RS]=Датум и време +Name[sr_RS@latin]=Датум и време Name[sv]=Datum & Tid Name[ta]=தேதி & நேரம் Name[ta_LK]=தேதி & நேரம் @@ -119,7 +117,6 @@ Name[uk]=Дата й час Name[uk_UA]=Дата й час Name[ur]=وقت اور تاريخ -Name[ur_PK]=وقت اور تاريخ Name[vi]=Ngày Giờ Name[vi_VN]=Ngày Giờ Name[zh_CN]=日期和时间 @@ -149,7 +146,6 @@ Comment[de_DE]=Datum- und Zeiteinstellungen Comment[el]=Προτιμήσεις Ημερομηνίας και Ώρας Comment[es]=Preferencias de fecha y hora -Comment[es_419]=Preferencias de fecha y hora Comment[es_AR]=Preferencias de fecha y hora Comment[es_CL]=Preferencias de fecha y hora Comment[es_CO]=Preferencias de fecha y hora @@ -157,18 +153,16 @@ Comment[es_DO]=Preferencias de fecha y hora Comment[es_EC]=Preferencias de fecha y hora Comment[es_ES]=Preferencias de fecha y hora -Comment[es_GT]=Preferencias de fecha y hora -Comment[es_HN]=Preferencias de fecha y hora Comment[es_MX]=Preferencias de fecha y hora Comment[es_NI]=Preferencias de fecha y hora Comment[es_PA]=Preferencias de fecha y hora Comment[es_PE]=Preferencias de fecha y hora Comment[es_PR]=Preferencias de fecha y hora Comment[es_SV]=Preferencias de fecha y hora -Comment[es_US]=Preferencias de fecha y hora Comment[es_UY]=Preferencias de fecha y hora Comment[es_VE]=Preferencias de fecha y hora Comment[et]=Kuupäeva ja kellaaja eelistused +Comment[et_EE]=Kuupäeva ja kellaaja eelistused Comment[eu]=Data eta orduaren hobespenak Comment[fi]=Päivämäärän ja kellonajan asetukset Comment[fi_FI]=Päivämäärän ja kellonajan asetukset @@ -186,6 +180,7 @@ Comment[id_ID]=Preferensi Waktu dan Tanggal Comment[is]=Valkostir fyrir dagsetningu og tíma Comment[it]=Preferenze Data e Ora +Comment[it_CH]=Preferenze Data e Ora Comment[it_IT]=Preferenze Data e Ora Comment[ja]=日付・設定の設定 Comment[ja_JP]=日付・設定の設定 @@ -221,10 +216,10 @@ Comment[sr]=Поставке датума и времена Comment[sr@Latn]=Поставке датума и времена Comment[sr@ije]=Поставке датума и времена -Comment[sr@ijekavian]=Поставке датума и времена Comment[sr@ijekavianlatin]=Поставке датума и времена Comment[sr@latin]=Поставке датума и времена Comment[sr_RS]=Поставке датума и времена +Comment[sr_RS@latin]=Поставке датума и времена Comment[sv]=Datum och Tidsinställningar Comment[ta]=தேதி மற்றும் நேர முன்னிருப்புகள் Comment[ta_LK]=தேதி மற்றும் நேர முன்னிருப்புகள் @@ -235,7 +230,6 @@ Comment[uk]=Налаштування дати та часу Comment[uk_UA]=Налаштування дати та часу Comment[ur]=تاریخ اور وقت کی ترجیحات -Comment[ur_PK]=تاریخ اور وقت کی ترجیحات Comment[vi]=Tuỳ thích Ngày giờ Comment[vi_VN]=Tuỳ thích Ngày giờ Comment[zh_CN]=时间和日期的偏好设置 diff -Nru cinnamon-control-center-3.2.1/panels/display/cc-display-panel.c cinnamon-control-center-3.4.0/panels/display/cc-display-panel.c --- cinnamon-control-center-3.2.1/panels/display/cc-display-panel.c 2016-12-12 14:31:49.000000000 +0000 +++ cinnamon-control-center-3.4.0/panels/display/cc-display-panel.c 2017-05-04 12:30:36.000000000 +0000 @@ -2183,7 +2183,7 @@ self->priv->proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, G_DBUS_PROXY_FLAGS_NONE, NULL, - "org.cinnamon.SettingsDaemon", + "org.cinnamon.SettingsDaemon.XRANDR_2", "/org/cinnamon/SettingsDaemon/XRANDR", "org.cinnamon.SettingsDaemon.XRANDR_2", NULL, diff -Nru cinnamon-control-center-3.2.1/panels/display/cinnamon-display-panel.desktop.in.in cinnamon-control-center-3.4.0/panels/display/cinnamon-display-panel.desktop.in.in --- cinnamon-control-center-3.2.1/panels/display/cinnamon-display-panel.desktop.in.in 2016-12-12 14:31:49.000000000 +0000 +++ cinnamon-control-center-3.4.0/panels/display/cinnamon-display-panel.desktop.in.in 2017-05-04 12:30:36.000000000 +0000 @@ -29,7 +29,6 @@ Name[de_DE]=Bildschirm Name[el]=Προβολή Name[es]=Visualización -Name[es_419]=Visualización Name[es_AR]=Visualización Name[es_CL]=Visualización Name[es_CO]=Visualización @@ -37,18 +36,16 @@ Name[es_DO]=Visualización Name[es_EC]=Visualización Name[es_ES]=Visualización -Name[es_GT]=Visualización -Name[es_HN]=Visualización Name[es_MX]=Visualización Name[es_NI]=Visualización Name[es_PA]=Visualización Name[es_PE]=Visualización Name[es_PR]=Visualización Name[es_SV]=Visualización -Name[es_US]=Visualización Name[es_UY]=Visualización Name[es_VE]=Visualización Name[et]=Kuva +Name[et_EE]=Kuva Name[eu]=Pantaila Name[fi]=Näyttö Name[fi_FI]=Näyttö @@ -66,6 +63,7 @@ Name[id_ID]=Tampilan Name[is]=Skjár Name[it]=Monitor +Name[it_CH]=Monitor Name[it_IT]=Monitor Name[kab]=Sken Name[kk]=Дисплей @@ -93,10 +91,10 @@ Name[sr]=Приказ Name[sr@Latn]=Приказ Name[sr@ije]=Приказ -Name[sr@ijekavian]=Приказ Name[sr@ijekavianlatin]=Приказ Name[sr@latin]=Приказ Name[sr_RS]=Приказ +Name[sr_RS@latin]=Приказ Name[sv]=Skärmar Name[ta]=காண்பி Name[ta_LK]=காண்பி @@ -107,7 +105,6 @@ Name[uk]=Дисплей Name[uk_UA]=Дисплей Name[ur]=ڈسپلے -Name[ur_PK]=ڈسپلے Name[vi]=Hiển thị Name[vi_VN]=Hiển thị Name[zh_CN]=显示 @@ -138,7 +135,6 @@ Comment[el]=Αλλαγή της αναλύσης και της θέσης των οθονών και του προτζέκτορα Comment[eo]=Ŝanĝi distingivon kaj posicion de ekranoj kaj projekciiloj Comment[es]=Cambiar la resolución y posición de los monitores y proyectores -Comment[es_419]=Cambiar la resolución y posición de los monitores y proyectores Comment[es_AR]=Cambiar la resolución y posición de los monitores y proyectores Comment[es_CL]=Cambiar la resolución y posición de los monitores y proyectores Comment[es_CO]=Cambiar la resolución y posición de los monitores y proyectores @@ -146,18 +142,16 @@ Comment[es_DO]=Cambiar la resolución y posición de los monitores y proyectores Comment[es_EC]=Cambiar la resolución y posición de los monitores y proyectores Comment[es_ES]=Cambiar la resolución y posición de los monitores y proyectores -Comment[es_GT]=Cambiar la resolución y posición de los monitores y proyectores -Comment[es_HN]=Cambiar la resolución y posición de los monitores y proyectores Comment[es_MX]=Cambiar la resolución y posición de los monitores y proyectores Comment[es_NI]=Cambiar la resolución y posición de los monitores y proyectores Comment[es_PA]=Cambiar la resolución y posición de los monitores y proyectores Comment[es_PE]=Cambiar la resolución y posición de los monitores y proyectores Comment[es_PR]=Cambiar la resolución y posición de los monitores y proyectores Comment[es_SV]=Cambiar la resolución y posición de los monitores y proyectores -Comment[es_US]=Cambiar la resolución y posición de los monitores y proyectores Comment[es_UY]=Cambiar la resolución y posición de los monitores y proyectores Comment[es_VE]=Cambiar la resolución y posición de los monitores y proyectores Comment[et]=Kuvarite ja projektorite eraldusvõime ja asukoha muutmine +Comment[et_EE]=Kuvarite ja projektorite eraldusvõime ja asukoha muutmine Comment[eu]=Aldatu pantaila eta proiektagailuen bereizmena eta posizioa Comment[fi]=Vaihda näyttöjen ja projektorien tarkkuutta ja sijaintia Comment[fi_FI]=Vaihda näyttöjen ja projektorien tarkkuutta ja sijaintia @@ -175,6 +169,7 @@ Comment[id_ID]=Ubah resolusi dan posisi monitor dan projektor Comment[is]=Breyttu upplausn og stöðu skjáa og myndvarpa Comment[it]=Cambia la risoluzione e la posizione dei monitor e dei proiettori +Comment[it_CH]=Cambia la risoluzione e la posizione dei monitor e dei proiettori Comment[it_IT]=Cambia la risoluzione e la posizione dei monitor e dei proiettori Comment[ja]=モニタやプロジェクタの解像度と位置を変更する Comment[ja_JP]=モニタやプロジェクタの解像度と位置を変更する @@ -208,10 +203,10 @@ Comment[sr]=Промените размеру и места екрана и пројектора Comment[sr@Latn]=Промените размеру и места екрана и пројектора Comment[sr@ije]=Промените размеру и места екрана и пројектора -Comment[sr@ijekavian]=Промените размеру и места екрана и пројектора Comment[sr@ijekavianlatin]=Промените размеру и места екрана и пројектора Comment[sr@latin]=Промените размеру и места екрана и пројектора Comment[sr_RS]=Промените размеру и места екрана и пројектора +Comment[sr_RS@latin]=Промените размеру и места екрана и пројектора Comment[sv]=Ändra upplösning och position för skärmar och projektorer Comment[tg]=Тағйир додани возеҳӣ ва мавқеияти мониторҳо ва проекторҳо Comment[th]=เปลี่ยนความละเอียดและตำแหน่งของจอภาพและเครื่องฉาย @@ -221,7 +216,6 @@ Comment[uk]=Змінити роздільність та розташування моніторів і проєкторів Comment[uk_UA]=Змінити роздільність та розташування моніторів і проєкторів Comment[ur]=مانیٹروں اور پراجیکٹروں کی ریزولوشن اور پوزیشن تبدیل کریں -Comment[ur_PK]=مانیٹروں اور پراجیکٹروں کی ریزولوشن اور پوزیشن تبدیل کریں Comment[vi]=Đổi độ phân giải và vị trí màn hình/máy chiếu Comment[vi_VN]=Đổi độ phân giải và vị trí màn hình/máy chiếu Comment[zh_CN]=更改显示器和投影仪的分辨率和位置 diff -Nru cinnamon-control-center-3.2.1/panels/Makefile.am cinnamon-control-center-3.4.0/panels/Makefile.am --- cinnamon-control-center-3.2.1/panels/Makefile.am 2016-12-12 14:31:49.000000000 +0000 +++ cinnamon-control-center-3.4.0/panels/Makefile.am 2017-05-04 12:30:36.000000000 +0000 @@ -2,7 +2,6 @@ enabled_panels = \ common \ - color \ display \ region \ datetime @@ -15,6 +14,12 @@ disabled_panels += network endif +if BUILD_COLOR +enabled_panels += color +else +disabled_panels += color +endif + if BUILD_WACOM enabled_panels += wacom else diff -Nru cinnamon-control-center-3.2.1/panels/network/cc-network-panel.c cinnamon-control-center-3.4.0/panels/network/cc-network-panel.c --- cinnamon-control-center-3.2.1/panels/network/cc-network-panel.c 2016-12-12 14:31:49.000000000 +0000 +++ cinnamon-control-center-3.4.0/panels/network/cc-network-panel.c 2017-05-04 12:30:36.000000000 +0000 @@ -48,7 +48,9 @@ #include "network-dialogs.h" #include "connection-editor/net-connection-editor.h" +#ifdef BUILD_MODEM #include +#endif CC_PANEL_REGISTER (CcNetworkPanel, cc_network_panel) @@ -70,7 +72,11 @@ GtkBuilder *builder; GtkWidget *treeview; NMClient *client; +#ifdef BUILD_MODEM MMManager *modem_manager; +#else + void *modem_manager; +#endif NMRemoteSettings *remote_settings; gboolean updating_device; guint nm_warning_idle; @@ -1435,7 +1441,7 @@ G_CALLBACK (device_added_cb), panel); g_signal_connect (panel->priv->client, "device-removed", G_CALLBACK (device_removed_cb), panel); - +#ifdef BUILD_MODEM /* Setup ModemManager client */ system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); if (system_bus == NULL) { @@ -1454,7 +1460,9 @@ } g_object_unref (system_bus); } - +#else + panel->priv->modem_manager = NULL; +#endif widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "add_toolbutton")); g_signal_connect (widget, "clicked", diff -Nru cinnamon-control-center-3.2.1/panels/network/cinnamon-network-panel.desktop.in.in cinnamon-control-center-3.4.0/panels/network/cinnamon-network-panel.desktop.in.in --- cinnamon-control-center-3.2.1/panels/network/cinnamon-network-panel.desktop.in.in 2016-12-12 14:31:49.000000000 +0000 +++ cinnamon-control-center-3.4.0/panels/network/cinnamon-network-panel.desktop.in.in 2017-05-04 12:30:36.000000000 +0000 @@ -34,7 +34,6 @@ Name[el]=Δίκτυο Name[eo]=Reto Name[es]=Red -Name[es_419]=Red Name[es_AR]=Red Name[es_CL]=Red Name[es_CO]=Red @@ -42,18 +41,16 @@ Name[es_DO]=Red Name[es_EC]=Red Name[es_ES]=Red -Name[es_GT]=Red -Name[es_HN]=Red Name[es_MX]=Red Name[es_NI]=Red Name[es_PA]=Red Name[es_PE]=Red Name[es_PR]=Red Name[es_SV]=Red -Name[es_US]=Red Name[es_UY]=Red Name[es_VE]=Red Name[et]=Võrk +Name[et_EE]=Võrk Name[eu]=Sarea Name[fi]=Verkko Name[fi_FI]=Verkko @@ -71,6 +68,7 @@ Name[id_ID]=Jaringan Name[is]=Netkerfi Name[it]=Rete +Name[it_CH]=Rete Name[it_IT]=Rete Name[ja]=ネットワーク Name[ja_JP]=ネットワーク @@ -108,10 +106,10 @@ Name[sr]=Мрежа Name[sr@Latn]=Мрежа Name[sr@ije]=Мрежа -Name[sr@ijekavian]=Мрежа Name[sr@ijekavianlatin]=Мрежа Name[sr@latin]=Мрежа Name[sr_RS]=Мрежа +Name[sr_RS@latin]=Мрежа Name[sv]=Nätverk Name[ta]=வலையமைப்பு Name[ta_LK]=வலையமைப்பு @@ -123,7 +121,6 @@ Name[uk]=Мережа Name[uk_UA]=Мережа Name[ur]=نیٹ ورک -Name[ur_PK]=نیٹ ورک Name[vi]=Mạng Name[vi_VN]=Mạng Name[zh_CN]=网络 @@ -154,7 +151,6 @@ Comment[el]=Ρυθμίσεις του δικτύου Comment[eo]=Retagordoj Comment[es]=Configuración de red -Comment[es_419]=Configuración de red Comment[es_AR]=Configuración de red Comment[es_CL]=Configuración de red Comment[es_CO]=Configuración de red @@ -162,18 +158,16 @@ Comment[es_DO]=Configuración de red Comment[es_EC]=Configuración de red Comment[es_ES]=Configuración de red -Comment[es_GT]=Configuración de red -Comment[es_HN]=Configuración de red Comment[es_MX]=Configuración de red Comment[es_NI]=Configuración de red Comment[es_PA]=Configuración de red Comment[es_PE]=Configuración de red Comment[es_PR]=Configuración de red Comment[es_SV]=Configuración de red -Comment[es_US]=Configuración de red Comment[es_UY]=Configuración de red Comment[es_VE]=Configuración de red Comment[et]=Võrguseaded +Comment[et_EE]=Võrguseaded Comment[eu]=Sareko ezarpenak Comment[fi]=Verkkoasetukset Comment[fi_FI]=Verkkoasetukset @@ -191,6 +185,7 @@ Comment[id_ID]=Pengaturan jaringan Comment[is]=Netstillingar Comment[it]=Impostazioni di rete +Comment[it_CH]=Impostazioni di rete Comment[it_IT]=Impostazioni di rete Comment[ja]=ネットワークの設定 Comment[ja_JP]=ネットワークの設定 @@ -226,10 +221,10 @@ Comment[sr]=Подешавања мреже Comment[sr@Latn]=Подешавања мреже Comment[sr@ije]=Подешавања мреже -Comment[sr@ijekavian]=Подешавања мреже Comment[sr@ijekavianlatin]=Подешавања мреже Comment[sr@latin]=Подешавања мреже Comment[sr_RS]=Подешавања мреже +Comment[sr_RS@latin]=Подешавања мреже Comment[sv]=Nätverksinställningar Comment[ta]=பிணைய அமைப்புகள் Comment[ta_LK]=பிணைய அமைப்புகள் @@ -241,7 +236,6 @@ Comment[uk]=Налаштування мережі Comment[uk_UA]=Налаштування мережі Comment[ur]=نیٹ ورک کی ترتیبات -Comment[ur_PK]=نیٹ ورک کی ترتیبات Comment[vi]=Thiết đặt mạng Comment[vi_VN]=Thiết đặt mạng Comment[zh_CN]=网络设置 diff -Nru cinnamon-control-center-3.2.1/panels/network/Makefile.am cinnamon-control-center-3.4.0/panels/network/Makefile.am --- cinnamon-control-center-3.2.1/panels/network/Makefile.am 2016-12-12 14:31:49.000000000 +0000 +++ cinnamon-control-center-3.4.0/panels/network/Makefile.am 2017-05-04 12:30:36.000000000 +0000 @@ -32,8 +32,6 @@ net-device-simple.h \ net-device-ethernet.c \ net-device-ethernet.h \ - net-device-mobile.c \ - net-device-mobile.h \ net-device-bond.c \ net-device-bond.h \ net-device-bridge.c \ @@ -51,13 +49,25 @@ cc-network-panel.c \ cc-network-panel.h +if BUILD_MODEM +libnetwork_la_SOURCES += \ + net-device-mobile.c \ + net-device-mobile.h +NETWORK_PANEL_CFLAGS += -DBUILD_MODEM +AM_CPPFLAGS += $(MODEM_MANAGER_CFLAGS) +endif + TEAM_FILES = net-device-team.c net-device-team.h EXTRA_DIST = $(TEAM_FILES) if HAVE_NM_UNSTABLE libnetwork_la_SOURCES += $(TEAM_FILES) endif +if BUILD_MODEM +libnetwork_la_LIBADD = $(PANEL_LIBS) $(NETWORK_PANEL_LIBS) $(NETWORK_MANAGER_LIBS) $(MODEM_MANAGER_LIBS) $(builddir)/connection-editor/libconnection-editor.la +else libnetwork_la_LIBADD = $(PANEL_LIBS) $(NETWORK_PANEL_LIBS) $(NETWORK_MANAGER_LIBS) $(builddir)/connection-editor/libconnection-editor.la +endif libnetwork_la_LDFLAGS = $(WARN_LDFLAGS) $(PANEL_LDFLAGS) diff -Nru cinnamon-control-center-3.2.1/panels/region/cinnamon-region-panel.desktop.in.in cinnamon-control-center-3.4.0/panels/region/cinnamon-region-panel.desktop.in.in --- cinnamon-control-center-3.2.1/panels/region/cinnamon-region-panel.desktop.in.in 2016-12-12 14:31:49.000000000 +0000 +++ cinnamon-control-center-3.4.0/panels/region/cinnamon-region-panel.desktop.in.in 2017-05-04 12:30:36.000000000 +0000 @@ -35,7 +35,6 @@ Name[el]=Περιοχή & γλώσσα Name[eo]=Regio & lingvo Name[es]=Región e idioma -Name[es_419]=Región e idioma Name[es_AR]=Región e idioma Name[es_CL]=Región e idioma Name[es_CO]=Región e idioma @@ -43,18 +42,16 @@ Name[es_DO]=Región e idioma Name[es_EC]=Región e idioma Name[es_ES]=Región e idioma -Name[es_GT]=Región e idioma -Name[es_HN]=Región e idioma Name[es_MX]=Región e idioma Name[es_NI]=Región e idioma Name[es_PA]=Región e idioma Name[es_PE]=Región e idioma Name[es_PR]=Región e idioma Name[es_SV]=Región e idioma -Name[es_US]=Región e idioma Name[es_UY]=Región e idioma Name[es_VE]=Región e idioma Name[et]=Piirkond ja keel +Name[et_EE]=Piirkond ja keel Name[eu]=Eskualdea eta hizkuntza Name[fi]=Alue ja kielet Name[fi_FI]=Alue ja kielet @@ -72,6 +69,7 @@ Name[id_ID]=Wilayah & Bahasa Name[is]=Land & tungumál Name[it]=Regione e lingua +Name[it_CH]=Regione e lingua Name[it_IT]=Regione e lingua Name[ja]=地域と言語 Name[ja_JP]=地域と言語 @@ -108,10 +106,10 @@ Name[sr]=Област и језик Name[sr@Latn]=Област и језик Name[sr@ije]=Област и језик -Name[sr@ijekavian]=Област и језик Name[sr@ijekavianlatin]=Област и језик Name[sr@latin]=Област и језик Name[sr_RS]=Област и језик +Name[sr_RS@latin]=Област и језик Name[sv]=Område och språk Name[ta]=வட்டாரம் & மொழி Name[ta_LK]=வட்டாரம் & மொழி @@ -123,7 +121,6 @@ Name[uk]=Регіон та мова Name[uk_UA]=Регіон та мова Name[ur]=علاقہ اور زبان -Name[ur_PK]=علاقہ اور زبان Name[vi]=Khu vực & Ngôn ngữ Name[vi_VN]=Khu vực & Ngôn ngữ Name[zh_CN]=区域和语言 @@ -154,7 +151,6 @@ Comment[el]=Αλλαγή ρυθμίσεων της περιοχής και γλώσσας Comment[eo]=Ŝanĝi vian regionon kaj lingvajn agordojn Comment[es]=Cambiar su configuración de región e idioma -Comment[es_419]=Cambiar su configuración de región e idioma Comment[es_AR]=Cambiar su configuración de región e idioma Comment[es_CL]=Cambiar su configuración de región e idioma Comment[es_CO]=Cambiar su configuración de región e idioma @@ -162,18 +158,16 @@ Comment[es_DO]=Cambiar su configuración de región e idioma Comment[es_EC]=Cambiar su configuración de región e idioma Comment[es_ES]=Cambiar su configuración de región e idioma -Comment[es_GT]=Cambiar su configuración de región e idioma -Comment[es_HN]=Cambiar su configuración de región e idioma Comment[es_MX]=Cambiar su configuración de región e idioma Comment[es_NI]=Cambiar su configuración de región e idioma Comment[es_PA]=Cambiar su configuración de región e idioma Comment[es_PE]=Cambiar su configuración de región e idioma Comment[es_PR]=Cambiar su configuración de región e idioma Comment[es_SV]=Cambiar su configuración de región e idioma -Comment[es_US]=Cambiar su configuración de región e idioma Comment[es_UY]=Cambiar su configuración de región e idioma Comment[es_VE]=Cambiar su configuración de región e idioma Comment[et]=Sinu asukoha- ja keelesätete muutmine +Comment[et_EE]=Sinu asukoha- ja keelesätete muutmine Comment[eu]=Aldatu zure eskualde eta hizkuntzaren ezarpenak Comment[fi]=Muuta alue- ja kieliasetuksia Comment[fi_FI]=Muuta alue- ja kieliasetuksia @@ -191,6 +185,7 @@ Comment[id_ID]=Ubah pengaturan wilayah dan bahasa Anda Comment[is]=Stilltu landsvæðið þitt og tungumálastillingar Comment[it]=Cambia le impostazioni della tua regione e della lingua +Comment[it_CH]=Cambia le impostazioni della tua regione e della lingua Comment[it_IT]=Cambia le impostazioni della tua regione e della lingua Comment[ja]=地域と言語に関する設定の変更 Comment[ja_JP]=地域と言語に関する設定の変更 @@ -226,10 +221,10 @@ Comment[sr]=Измените ваша подешавања региона и језика Comment[sr@Latn]=Измените ваша подешавања региона и језика Comment[sr@ije]=Измените ваша подешавања региона и језика -Comment[sr@ijekavian]=Измените ваша подешавања региона и језика Comment[sr@ijekavianlatin]=Измените ваша подешавања региона и језика Comment[sr@latin]=Измените ваша подешавања региона и језика Comment[sr_RS]=Измените ваша подешавања региона и језика +Comment[sr_RS@latin]=Измените ваша подешавања региона и језика Comment[sv]=Ändra inställningar för din region och ditt språk Comment[ta]=உங்கள் வட்டார மற்றும் மொழி அமைப்புகளை மாற்றி அமைக்கவும் Comment[ta_LK]=உங்கள் வட்டார மற்றும் மொழி அமைப்புகளை மாற்றி அமைக்கவும் @@ -241,7 +236,6 @@ Comment[uk]=Зміна налаштування Вашого регіону та мови Comment[uk_UA]=Зміна налаштування Вашого регіону та мови Comment[ur]=اپنا علاقہ اور زبان کی ترتیبات تبدیل کریں -Comment[ur_PK]=اپنا علاقہ اور زبان کی ترتیبات تبدیل کریں Comment[vi]=Thay đổi thiết đặt khu vực và ngôn ngữ Comment[vi_VN]=Thay đổi thiết đặt khu vực và ngôn ngữ Comment[zh_CN]=更改您的区域和语言设置 diff -Nru cinnamon-control-center-3.2.1/panels/wacom/cc-wacom-page.c cinnamon-control-center-3.4.0/panels/wacom/cc-wacom-page.c --- cinnamon-control-center-3.2.1/panels/wacom/cc-wacom-page.c 2016-12-12 14:31:49.000000000 +0000 +++ cinnamon-control-center-3.4.0/panels/wacom/cc-wacom-page.c 2017-05-04 12:30:36.000000000 +0000 @@ -67,7 +67,7 @@ struct _CcWacomPagePrivate { CcWacomPanel *panel; - CsdWacomDevice *stylus, *eraser, *pad; + CsdWacomDevice *stylus, *pad; GtkBuilder *builder; GtkWidget *nav; GtkWidget *notebook; @@ -1200,7 +1200,7 @@ styli = csd_wacom_device_list_styli (priv->stylus); for (l = styli; l; l = l->next) { - CsdWacomStylus *stylus, *eraser; + CsdWacomStylus *stylus; GtkWidget *page; stylus = l->data; @@ -1208,15 +1208,7 @@ if (csd_wacom_stylus_get_stylus_type (stylus) == WACOM_STYLUS_TYPE_PUCK) continue; - if (csd_wacom_stylus_get_has_eraser (stylus)) { - CsdWacomDeviceType type; - type = csd_wacom_stylus_get_stylus_type (stylus); - eraser = csd_wacom_device_get_stylus_for_type (priv->eraser, type); - } else { - eraser = NULL; - } - - page = cc_wacom_stylus_page_new (stylus, eraser); + page = cc_wacom_stylus_page_new (stylus); cc_wacom_stylus_page_set_navigation (CC_WACOM_STYLUS_PAGE (page), GTK_NOTEBOOK (priv->notebook)); gtk_widget_show (page); gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), page, NULL); @@ -1321,7 +1313,6 @@ gboolean cc_wacom_page_update_tools (CcWacomPage *page, CsdWacomDevice *stylus, - CsdWacomDevice *eraser, CsdWacomDevice *pad) { CcWacomPagePrivate *priv; @@ -1332,12 +1323,11 @@ layout = get_layout_type (stylus); priv = page->priv; - changed = (priv->stylus != stylus || priv->eraser != eraser || priv->pad != pad); + changed = (priv->stylus != stylus || priv->pad != pad); if (!changed) return FALSE; priv->stylus = stylus; - priv->eraser = eraser; priv->pad = pad; update_tablet_ui (CC_WACOM_PAGE (page), layout); @@ -1348,7 +1338,6 @@ GtkWidget * cc_wacom_page_new (CcWacomPanel *panel, CsdWacomDevice *stylus, - CsdWacomDevice *eraser, CsdWacomDevice *pad) { CcWacomPage *page; @@ -1357,9 +1346,6 @@ g_return_val_if_fail (CSD_IS_WACOM_DEVICE (stylus), NULL); g_return_val_if_fail (csd_wacom_device_get_device_type (stylus) == WACOM_TYPE_STYLUS, NULL); - g_return_val_if_fail (CSD_IS_WACOM_DEVICE (eraser), NULL); - g_return_val_if_fail (csd_wacom_device_get_device_type (eraser) == WACOM_TYPE_ERASER, NULL); - if (pad != NULL) g_return_val_if_fail (csd_wacom_device_get_device_type (pad) == WACOM_TYPE_PAD, NULL); @@ -1368,7 +1354,7 @@ priv = page->priv; priv->panel = panel; - cc_wacom_page_update_tools (page, stylus, eraser, pad); + cc_wacom_page_update_tools (page, stylus, pad); /* FIXME move this to construct */ priv->wacom_settings = csd_wacom_device_get_settings (stylus); @@ -1410,4 +1396,4 @@ "notebook", notebook, "ignore-first", ignore_first_page, NULL); -} +} \ No newline at end of file diff -Nru cinnamon-control-center-3.2.1/panels/wacom/cc-wacom-page.h cinnamon-control-center-3.4.0/panels/wacom/cc-wacom-page.h --- cinnamon-control-center-3.2.1/panels/wacom/cc-wacom-page.h 2016-12-12 14:31:49.000000000 +0000 +++ cinnamon-control-center-3.4.0/panels/wacom/cc-wacom-page.h 2017-05-04 12:30:36.000000000 +0000 @@ -71,12 +71,10 @@ GtkWidget * cc_wacom_page_new (CcWacomPanel *panel, CsdWacomDevice *stylus, - CsdWacomDevice *eraser, CsdWacomDevice *pad); gboolean cc_wacom_page_update_tools (CcWacomPage *page, CsdWacomDevice *stylus, - CsdWacomDevice *eraser, CsdWacomDevice *pad); void cc_wacom_page_set_navigation (CcWacomPage *page, diff -Nru cinnamon-control-center-3.2.1/panels/wacom/cc-wacom-panel.c cinnamon-control-center-3.4.0/panels/wacom/cc-wacom-panel.c --- cinnamon-control-center-3.2.1/panels/wacom/cc-wacom-panel.c 2016-12-12 14:31:49.000000000 +0000 +++ cinnamon-control-center-3.4.0/panels/wacom/cc-wacom-panel.c 2017-05-04 12:30:36.000000000 +0000 @@ -52,7 +52,6 @@ typedef struct { const char *name; CsdWacomDevice *stylus; - CsdWacomDevice *eraser; CsdWacomDevice *pad; } Tablet; @@ -188,12 +187,10 @@ case WACOM_TYPE_STYLUS: tablet->stylus = device; break; - case WACOM_TYPE_ERASER: - tablet->eraser = device; - break; case WACOM_TYPE_PAD: tablet->pad = device; break; + case WACOM_TYPE_ERASER: default: /* Nothing */ ; @@ -209,8 +206,7 @@ GtkWidget *page; tablet = l->data; - if (tablet->stylus == NULL || - tablet->eraser == NULL) { + if (tablet->stylus == NULL) { page = g_hash_table_lookup (priv->pages, tablet->name); if (page != NULL) { remove_page (GTK_NOTEBOOK (priv->notebook), page); @@ -220,10 +216,10 @@ } continue; } - /* this code is called once the stylus + eraser were set up, but the pad does not exist yet */ + /* this code is called once the stylus is set up, but the pad does not exist yet */ page = g_hash_table_lookup (priv->pages, tablet->name); if (page == NULL) { - page = cc_wacom_page_new (self, tablet->stylus, tablet->eraser, tablet->pad); + page = cc_wacom_page_new (self, tablet->stylus, tablet->pad); cc_wacom_page_set_navigation (CC_WACOM_PAGE (page), GTK_NOTEBOOK (priv->notebook), TRUE); gtk_widget_show (page); gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), page, NULL); @@ -231,7 +227,7 @@ changed = TRUE; } else { - cc_wacom_page_update_tools (CC_WACOM_PAGE (page), tablet->stylus, tablet->eraser, tablet->pad); + cc_wacom_page_update_tools (CC_WACOM_PAGE (page), tablet->stylus, tablet->pad); } } g_list_free (tablets); @@ -386,4 +382,3 @@ g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT, CC_TYPE_WACOM_PANEL, "wacom", 0); } - diff -Nru cinnamon-control-center-3.2.1/panels/wacom/cc-wacom-stylus-page.c cinnamon-control-center-3.4.0/panels/wacom/cc-wacom-stylus-page.c --- cinnamon-control-center-3.2.1/panels/wacom/cc-wacom-stylus-page.c 2016-12-12 14:31:49.000000000 +0000 +++ cinnamon-control-center-3.4.0/panels/wacom/cc-wacom-stylus-page.c 2017-05-04 12:30:36.000000000 +0000 @@ -39,7 +39,7 @@ struct _CcWacomStylusPagePrivate { - CsdWacomStylus *stylus, *eraser; + CsdWacomStylus *stylus; GtkBuilder *builder; GtkWidget *nav; GSettings *stylus_settings, *eraser_settings; @@ -203,12 +203,16 @@ BUTTONNUMBER_COLUMN, &mapping_b2, -1); - if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (WID ("combo-topbutton")), &iter)) - return; + if (csd_wacom_stylus_get_num_buttons (priv->stylus) > 1) { + if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (WID ("combo-topbutton")), &iter)) + return; - gtk_tree_model_get (GTK_TREE_MODEL (liststore), &iter, - BUTTONNUMBER_COLUMN, &mapping_b3, - -1); + gtk_tree_model_get (GTK_TREE_MODEL (liststore), &iter, + BUTTONNUMBER_COLUMN, &mapping_b3, + -1); + } else { + mapping_b3 = 0; + } map_button (priv->stylus_settings, mapping_b2, mapping_b3); } @@ -350,9 +354,10 @@ /* Different types of layout for the stylus config */ enum { - LAYOUT_NORMAL, /* eraser, 2 buttons, tip */ - LAYOUT_INKING, /* tip */ - LAYOUT_AIRBRUSH, /* eraser, 1 button, tip */ + LAYOUT_NORMAL, /* eraser, 2 buttons, tip */ + LAYOUT_INKING, /* tip */ + LAYOUT_AIRBRUSH, /* eraser, 1 button, tip */ + LAYOUT_GENERIC_2_BUTTONS_NO_ERASER, /* 2 buttons, tip, no eraser */ LAYOUT_OTHER }; @@ -414,6 +419,10 @@ gtk_container_child_set (CWID ("stylus-controls-grid"), WID ("box-tip-feel"), "top_attach", 2, NULL); + break; + case LAYOUT_GENERIC_2_BUTTONS_NO_ERASER: + remove_eraser (page->priv); + break; case LAYOUT_OTHER: /* We already warn about it in cc_wacom_stylus_page_new () */ break; @@ -421,13 +430,13 @@ } GtkWidget * -cc_wacom_stylus_page_new (CsdWacomStylus *stylus, - CsdWacomStylus *eraser) +cc_wacom_stylus_page_new (CsdWacomStylus *stylus) { CcWacomStylusPage *page; CcWacomStylusPagePrivate *priv; int num_buttons; int layout; + int has_eraser; g_return_val_if_fail (CSD_IS_WACOM_STYLUS (stylus), NULL); @@ -435,26 +444,28 @@ priv = page->priv; priv->stylus = stylus; - priv->eraser = eraser; /* Icon */ set_icon_name (page, "image-stylus", csd_wacom_stylus_get_icon_name (stylus)); /* Settings */ priv->stylus_settings = csd_wacom_stylus_get_settings (stylus); - if (eraser != NULL) - priv->eraser_settings = csd_wacom_stylus_get_settings (eraser); + has_eraser = csd_wacom_stylus_get_has_eraser (stylus); + if (has_eraser) + priv->eraser_settings = csd_wacom_stylus_get_settings (stylus); /* Stylus name */ gtk_label_set_text (GTK_LABEL (WID ("label-stylus")), csd_wacom_stylus_get_name (stylus)); num_buttons = csd_wacom_stylus_get_num_buttons (stylus); - if (num_buttons == 0 && eraser == NULL) + if (num_buttons == 0 && !has_eraser) layout = LAYOUT_INKING; - else if (num_buttons == 2 && eraser != NULL) + else if (num_buttons == 2 && has_eraser) layout = LAYOUT_NORMAL; - else if (num_buttons == 1 && eraser != NULL) + else if (num_buttons == 1 && has_eraser) layout = LAYOUT_AIRBRUSH; + else if (num_buttons == 2 && !has_eraser) + layout = LAYOUT_GENERIC_2_BUTTONS_NO_ERASER; else { layout = LAYOUT_OTHER; if (num_buttons == 0) @@ -462,11 +473,12 @@ else if (num_buttons == 1) remove_button (priv); - if (eraser == NULL) - remove_eraser (priv); + /* Gray out eraser if not available */ + gtk_widget_set_sensitive (WID ("eraser-box"), has_eraser); + gtk_widget_set_sensitive (WID ("label-eraser-feel"), has_eraser); g_warning ("The layout of this page is not known, %d buttons, %s eraser", - num_buttons, eraser ? "with" : "without"); + num_buttons, has_eraser ? "with" : "without"); } update_stylus_ui (page, layout); @@ -477,7 +489,7 @@ set_button_mapping_from_gsettings (GTK_COMBO_BOX (WID ("combo-bottombutton")), priv->stylus_settings, 2); set_feel_from_gsettings (GTK_ADJUSTMENT (WID ("adjustment-tip-feel")), priv->stylus_settings); - if (eraser != NULL) + if (has_eraser) set_feel_from_gsettings (GTK_ADJUSTMENT (WID ("adjustment-eraser-feel")), priv->eraser_settings); g_object_set (G_OBJECT (page), "margin-top", 16, NULL); diff -Nru cinnamon-control-center-3.2.1/panels/wacom/cc-wacom-stylus-page.h cinnamon-control-center-3.4.0/panels/wacom/cc-wacom-stylus-page.h --- cinnamon-control-center-3.2.1/panels/wacom/cc-wacom-stylus-page.h 2016-12-12 14:31:49.000000000 +0000 +++ cinnamon-control-center-3.4.0/panels/wacom/cc-wacom-stylus-page.h 2017-05-04 12:30:36.000000000 +0000 @@ -68,8 +68,7 @@ GType cc_wacom_stylus_page_get_type (void) G_GNUC_CONST; -GtkWidget * cc_wacom_stylus_page_new (CsdWacomStylus *stylus, - CsdWacomStylus *eraser); +GtkWidget * cc_wacom_stylus_page_new (CsdWacomStylus *stylus); CsdWacomStylus * cc_wacom_stylus_page_get_stylus (CcWacomStylusPage *page); diff -Nru cinnamon-control-center-3.2.1/panels/wacom/cinnamon-wacom-panel.desktop.in.in cinnamon-control-center-3.4.0/panels/wacom/cinnamon-wacom-panel.desktop.in.in --- cinnamon-control-center-3.2.1/panels/wacom/cinnamon-wacom-panel.desktop.in.in 2016-12-12 14:31:49.000000000 +0000 +++ cinnamon-control-center-3.4.0/panels/wacom/cinnamon-wacom-panel.desktop.in.in 2017-05-04 12:30:36.000000000 +0000 @@ -33,7 +33,6 @@ Name[de_DE]=Grafiktablett Name[el]=Επιφάνεια Αφής Name[es]=Tableta gràfica -Name[es_419]=Tableta gràfica Name[es_AR]=Tableta gràfica Name[es_CL]=Tableta gràfica Name[es_CO]=Tableta gràfica @@ -41,18 +40,16 @@ Name[es_DO]=Tableta gràfica Name[es_EC]=Tableta gràfica Name[es_ES]=Tableta gràfica -Name[es_GT]=Tableta gràfica -Name[es_HN]=Tableta gràfica Name[es_MX]=Tableta gràfica Name[es_NI]=Tableta gràfica Name[es_PA]=Tableta gràfica Name[es_PE]=Tableta gràfica Name[es_PR]=Tableta gràfica Name[es_SV]=Tableta gràfica -Name[es_US]=Tableta gràfica Name[es_UY]=Tableta gràfica Name[es_VE]=Tableta gràfica Name[et]=Tahvli graafika +Name[et_EE]=Tahvli graafika Name[eu]=Taula grafikoa Name[fi]=Piirtoalusta Name[fi_FI]=Piirtoalusta @@ -70,6 +67,7 @@ Name[id_ID]=Tablet Grafis Name[is]=Teiknitafla Name[it]=Tavoletta grafica +Name[it_CH]=Tavoletta grafica Name[it_IT]=Tavoletta grafica Name[ja]=グラフィックタブレット Name[ja_JP]=グラフィックタブレット @@ -103,10 +101,10 @@ Name[sr]=Таблица за цртање Name[sr@Latn]=Таблица за цртање Name[sr@ije]=Таблица за цртање -Name[sr@ijekavian]=Таблица за цртање Name[sr@ijekavianlatin]=Таблица за цртање Name[sr@latin]=Таблица за цртање Name[sr_RS]=Таблица за цртање +Name[sr_RS@latin]=Таблица за цртање Name[sv]=Ritplatta Name[ta]=வரைகலை தொடுதட்டு Name[ta_LK]=வரைகலை தொடுதட்டு @@ -118,7 +116,6 @@ Name[uk]=Графічний пляншет Name[uk_UA]=Графічний пляншет Name[ur]=گرافکس ٹیبلیٹ -Name[ur_PK]=گرافکس ٹیبلیٹ Name[vi]=Bàn vẽ Đồ hoạ Name[vi_VN]=Bàn vẽ Đồ hoạ Name[zh_CN]=绘图板 @@ -142,7 +139,6 @@ Comment[de_DE]=Knopfzuordnung einstellen und die Empfindlichkeit des Stiftes für Grafiktabletts einstellen Comment[el]=Ορισμός απεικονίσεων κουμπιών και ρύθμιση ευαισθησίας γραφίδας (stylus) για ταμπλέτες γραφικών Comment[es]=Asignar botones y ajustar la sensibilidad del lápiz en tabletas gráficas -Comment[es_419]=Asignar botones y ajustar la sensibilidad del lápiz en tabletas gráficas Comment[es_AR]=Asignar botones y ajustar la sensibilidad del lápiz en tabletas gráficas Comment[es_CL]=Asignar botones y ajustar la sensibilidad del lápiz en tabletas gráficas Comment[es_CO]=Asignar botones y ajustar la sensibilidad del lápiz en tabletas gráficas @@ -150,15 +146,12 @@ Comment[es_DO]=Asignar botones y ajustar la sensibilidad del lápiz en tabletas gráficas Comment[es_EC]=Asignar botones y ajustar la sensibilidad del lápiz en tabletas gráficas Comment[es_ES]=Asignar botones y ajustar la sensibilidad del lápiz en tabletas gráficas -Comment[es_GT]=Asignar botones y ajustar la sensibilidad del lápiz en tabletas gráficas -Comment[es_HN]=Asignar botones y ajustar la sensibilidad del lápiz en tabletas gráficas Comment[es_MX]=Asignar botones y ajustar la sensibilidad del lápiz en tabletas gráficas Comment[es_NI]=Asignar botones y ajustar la sensibilidad del lápiz en tabletas gráficas Comment[es_PA]=Asignar botones y ajustar la sensibilidad del lápiz en tabletas gráficas Comment[es_PE]=Asignar botones y ajustar la sensibilidad del lápiz en tabletas gráficas Comment[es_PR]=Asignar botones y ajustar la sensibilidad del lápiz en tabletas gráficas Comment[es_SV]=Asignar botones y ajustar la sensibilidad del lápiz en tabletas gráficas -Comment[es_US]=Asignar botones y ajustar la sensibilidad del lápiz en tabletas gráficas Comment[es_UY]=Asignar botones y ajustar la sensibilidad del lápiz en tabletas gráficas Comment[es_VE]=Asignar botones y ajustar la sensibilidad del lápiz en tabletas gráficas Comment[eu]=Ezarri botoi-mapatzea eta doitu arkatzaren sentikortasuna taula grafikoentzako @@ -178,6 +171,7 @@ Comment[id_ID]=Tata pemetaan tombol dan atur kepekaan stylus bagi tablet grafis Comment[is]=Stilltu hnappavörpun og aðlagaðu næmni snertipenna fyrir teikniborð Comment[it]=Imposta la mappatura dei pulsanti e regola la sensibilità del pennino per tavolette grafiche +Comment[it_CH]=Imposta la mappatura dei pulsanti e regola la sensibilità del pennino per tavolette grafiche Comment[it_IT]=Imposta la mappatura dei pulsanti e regola la sensibilità del pennino per tavolette grafiche Comment[kk]=Графикалық планшеттер үшін батырмалар сәйкестіктерін және стилус сезімталдылығын баптау Comment[ko]=그래픽 타블릿의 단추를 매핑 하고 스타일러스의 감도를 조절합니다. @@ -202,10 +196,10 @@ Comment[sr]=Подеси пречице дугмади и осетљивост писаљке графичким таблицама Comment[sr@Latn]=Подеси пречице дугмади и осетљивост писаљке графичким таблицама Comment[sr@ije]=Подеси пречице дугмади и осетљивост писаљке графичким таблицама -Comment[sr@ijekavian]=Подеси пречице дугмади и осетљивост писаљке графичким таблицама Comment[sr@ijekavianlatin]=Подеси пречице дугмади и осетљивост писаљке графичким таблицама Comment[sr@latin]=Подеси пречице дугмади и осетљивост писаљке графичким таблицама Comment[sr_RS]=Подеси пречице дугмади и осетљивост писаљке графичким таблицама +Comment[sr_RS@latin]=Подеси пречице дугмади и осетљивост писаљке графичким таблицама Comment[sv]=Ställ in knappmappningar och justera känslighet för styluspenna till ritplattor Comment[th]=กำหนดผังปุ่มและปรับความตอบสนองปากกาชี้สำหรับแท็บเล็ตกราฟิกส์ Comment[th_TH]=กำหนดผังปุ่มและปรับความตอบสนองปากกาชี้สำหรับแท็บเล็ตกราฟิกส์ diff -Nru cinnamon-control-center-3.2.1/panels/wacom/cinnamon-wacom-properties.ui cinnamon-control-center-3.4.0/panels/wacom/cinnamon-wacom-properties.ui --- cinnamon-control-center-3.2.1/panels/wacom/cinnamon-wacom-properties.ui 2016-12-12 14:31:49.000000000 +0000 +++ cinnamon-control-center-3.4.0/panels/wacom/cinnamon-wacom-properties.ui 2017-05-04 12:30:36.000000000 +0000 @@ -1,6 +1,7 @@ + - + @@ -22,7 +23,6 @@ False True - 5 Tablet Preferences False 675 @@ -41,11 +41,11 @@ gtk-help + False True True True False - False True @@ -57,11 +57,11 @@ gtk-close + False True True True False - False True @@ -84,6 +84,7 @@ True True False + False True @@ -98,10 +99,10 @@ True False True - 1 No tablet detected - center True + center + 1 False @@ -110,13 +111,16 @@ + + + True False True - 0 Please plug in or turn on your graphics tablet center + 0 False @@ -125,18 +129,14 @@ - - - Bluetooth Settings + False True True True - False end end - False none @@ -164,8 +164,9 @@ True False - 10 + 25 10 + 10 True @@ -181,21 +182,19 @@ 0 0 2 - 1 True False - wacom-tablet.svg - start center + start + wacom-tablet.svg 0 1 - 1 3 @@ -208,11 +207,11 @@ Map to Monitor… + False True True True center - False False @@ -224,11 +223,11 @@ Map Buttons… + False True True True center - False False @@ -240,10 +239,10 @@ Calibrate… + False True True center - False False @@ -256,35 +255,29 @@ 1 2 - 1 - 1 - - Adjust display resolution - False - True - True - False - False - none - end - center + + Adjust display resolution + False + True + True + end + center + none 1 3 - 1 - 1 True False - vertical 16 + vertical 10 10 @@ -301,8 +294,6 @@ 0 0 - 1 - 1 @@ -315,8 +306,6 @@ 1 0 - 1 - 1 @@ -333,31 +322,25 @@ 0 1 - 1 - 1 + False True True start center - False 1 1 - 1 - 1 1 1 - 1 - 1 @@ -366,12 +349,12 @@ True True False + False 0 4 2 - 1 diff -Nru cinnamon-control-center-3.2.1/panels/wacom/csd-wacom-device.c cinnamon-control-center-3.4.0/panels/wacom/csd-wacom-device.c --- cinnamon-control-center-3.2.1/panels/wacom/csd-wacom-device.c 2016-12-12 14:31:49.000000000 +0000 +++ cinnamon-control-center-3.4.0/panels/wacom/csd-wacom-device.c 2017-05-04 12:30:36.000000000 +0000 @@ -121,8 +121,10 @@ } static const char * -get_icon_name_from_type (WacomStylusType type) +get_icon_name_from_type (const WacomStylusType *wstylus) { + WacomStylusType type = libwacom_stylus_get_type (wstylus); + switch (type) { case WSTYLUS_INKING: case WSTYLUS_STROKE: @@ -136,6 +138,8 @@ case WSTYLUS_CLASSIC: return "wacom-stylus-classic"; default: + if (!libwacom_stylus_has_eraser (wstylus)) + return "wacom-stylus-no-eraser"; return "wacom-stylus"; } } @@ -157,7 +161,7 @@ stylus->priv->name = g_strdup (libwacom_stylus_get_name (wstylus)); stylus->priv->settings = settings; stylus->priv->type = libwacom_stylus_get_type (wstylus); - stylus->priv->icon_name = get_icon_name_from_type (stylus->priv->type); + stylus->priv->icon_name = get_icon_name_from_type (wstylus); stylus->priv->has_eraser = libwacom_stylus_has_eraser (wstylus); stylus->priv->num_buttons = libwacom_stylus_get_num_buttons (wstylus); diff -Nru cinnamon-control-center-3.2.1/panels/wacom/test-wacom.c cinnamon-control-center-3.4.0/panels/wacom/test-wacom.c --- cinnamon-control-center-3.2.1/panels/wacom/test-wacom.c 2016-12-12 14:31:49.000000000 +0000 +++ cinnamon-control-center-3.4.0/panels/wacom/test-wacom.c 2017-05-04 12:30:36.000000000 +0000 @@ -19,18 +19,15 @@ GtkWidget *notebook) { GtkWidget *widget; - CsdWacomDevice *stylus, *eraser, *pad; + CsdWacomDevice *stylus, *pad; GList *l; if (devices == NULL) return; - stylus = eraser = pad = NULL; + stylus = pad = NULL; for (l = devices; l ; l = l->next) { switch (csd_wacom_device_get_device_type (l->data)) { - case WACOM_TYPE_ERASER: - eraser = l->data; - break; case WACOM_TYPE_STYLUS: stylus = l->data; break; @@ -44,7 +41,7 @@ } g_list_free (devices); - widget = cc_wacom_page_new (NULL, stylus, eraser, pad); + widget = cc_wacom_page_new (NULL, stylus, pad); cc_wacom_page_set_navigation (CC_WACOM_PAGE (widget), GTK_NOTEBOOK (notebook), FALSE); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), widget, NULL); gtk_widget_show (widget); diff -Nru cinnamon-control-center-3.2.1/panels/wacom/wacom.gresource.xml cinnamon-control-center-3.4.0/panels/wacom/wacom.gresource.xml --- cinnamon-control-center-3.2.1/panels/wacom/wacom.gresource.xml 2016-12-12 14:31:49.000000000 +0000 +++ cinnamon-control-center-3.4.0/panels/wacom/wacom.gresource.xml 2017-05-04 12:30:36.000000000 +0000 @@ -6,6 +6,7 @@ button-mapping.ui wacom-tablet.svg wacom-stylus.svg + wacom-stylus-no-eraser.svg wacom-stylus-airbrush.svg wacom-stylus-inking.svg wacom-stylus-art-pen.svg diff -Nru cinnamon-control-center-3.2.1/panels/wacom/wacom-stylus-no-eraser.svg cinnamon-control-center-3.4.0/panels/wacom/wacom-stylus-no-eraser.svg --- cinnamon-control-center-3.2.1/panels/wacom/wacom-stylus-no-eraser.svg 1970-01-01 00:00:00.000000000 +0000 +++ cinnamon-control-center-3.4.0/panels/wacom/wacom-stylus-no-eraser.svg 2017-05-04 12:30:36.000000000 +0000 @@ -0,0 +1,118 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + +