Hello community, here is the log from the commit of package cinnamon-control-center for openSUSE:Factory checked in at 2018-09-14 00:03:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon-control-center (Old) and /work/SRC/openSUSE:Factory/.cinnamon-control-center.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cinnamon-control-center" Fri Sep 14 00:03:19 2018 rev:14 rq:635559 version:3.8.2 Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon-control-center/cinnamon-control-center.changes 2018-07-26 10:17:59.995893447 +0200 +++ /work/SRC/openSUSE:Factory/.cinnamon-control-center.new/cinnamon-control-center.changes 2018-09-14 00:03:32.573855119 +0200 @@ -1,0 +2,6 @@ +Wed Sep 12 11:35:50 UTC 2018 - sor.alexei@meowr.ru + +- Update to version 3.8.2: + * wacom: Update to support 3-button and 3D styli. + +------------------------------------------------------------------- Old: ---- cinnamon-control-center-3.8.1.tar.gz New: ---- cinnamon-control-center-3.8.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon-control-center.spec ++++++ --- /var/tmp/diff_new_pack.QuZAqA/_old 2018-09-14 00:03:34.841853387 +0200 +++ /var/tmp/diff_new_pack.QuZAqA/_new 2018-09-14 00:03:34.845853385 +0200 @@ -19,7 +19,7 @@ %define soname libcinnamon-control-center %define sover 1 Name: cinnamon-control-center -Version: 3.8.1 +Version: 3.8.2 Release: 0 Summary: Utilities to configure the Cinnamon desktop License: GPL-2.0-only AND GPL-3.0-or-later AND MIT ++++++ cinnamon-control-center-3.8.1.tar.gz -> cinnamon-control-center-3.8.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.8.1/configure.ac new/cinnamon-control-center-3.8.2/configure.ac --- old/cinnamon-control-center-3.8.1/configure.ac 2018-07-17 09:38:41.000000000 +0200 +++ new/cinnamon-control-center-3.8.2/configure.ac 2018-09-11 15:47:37.000000000 +0200 @@ -1,4 +1,4 @@ -m4_define([cinnamon_control_center_version], 3.8.1) +m4_define([cinnamon_control_center_version], 3.8.2) AC_INIT([cinnamon-control-center], [cinnamon_control_center_version], [https://github.com/linuxmint/cinnamon-control-center/issues]) @@ -274,6 +274,11 @@ gtk+-3.0 >= 3.8.0]) build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build]) + + PKG_CHECK_MODULES(NEWER_WACOM, libwacom >= 0.27, have_newer_wacom="yes", have_newer_wacom="no") + if test x$have_newer_wacom = xyes; then + AC_DEFINE(HAVE_WACOM_3D_STYLUS, 1, [Define if wacom supports 3d stylus]) + fi fi AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue") AC_SUBST(WACOM_PANEL_CFLAGS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.8.1/debian/changelog new/cinnamon-control-center-3.8.2/debian/changelog --- old/cinnamon-control-center-3.8.1/debian/changelog 2018-07-17 09:38:41.000000000 +0200 +++ new/cinnamon-control-center-3.8.2/debian/changelog 2018-09-11 15:47:37.000000000 +0200 @@ -1,3 +1,10 @@ +cinnamon-control-center (3.8.2) tara; urgency=medium + + [ Michael Webster ] + * wacom: Update to support 3-button and 3D styli. + + -- Clement Lefebvre <root@linuxmint.com> Tue, 11 Sep 2018 14:47:17 +0100 + cinnamon-control-center (3.8.1) tara; urgency=medium [ Michael Webster ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.8.1/panels/wacom/cc-wacom-stylus-page.c new/cinnamon-control-center-3.8.2/panels/wacom/cc-wacom-stylus-page.c --- old/cinnamon-control-center-3.8.1/panels/wacom/cc-wacom-stylus-page.c 2018-07-17 09:38:41.000000000 +0200 +++ new/cinnamon-control-center-3.8.2/panels/wacom/cc-wacom-stylus-page.c 2018-09-11 15:47:37.000000000 +0200 @@ -158,7 +158,7 @@ } static void -map_button (GSettings *settings, int button2, int button3) +map_button (GSettings *settings, int button2, int button3, int button4) { GVariant *current; /* current mapping */ GVariant *array; /* new mapping */ @@ -176,6 +176,8 @@ tmp[i] = g_variant_new_int32 (button2); else if (i == 2) tmp[i] = g_variant_new_int32 (button3); + else if (i == 3) + tmp[i] = g_variant_new_int32 (button4); else tmp[i] = g_variant_new_int32 (values[i]); } @@ -193,7 +195,8 @@ GtkTreeIter iter; GtkListStore *liststore; gint mapping_b2, - mapping_b3; + mapping_b3, + mapping_b4; if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (WID ("combo-bottombutton")), &iter)) return; @@ -214,7 +217,19 @@ mapping_b3 = 0; } - map_button (priv->stylus_settings, mapping_b2, mapping_b3); + if (csd_wacom_stylus_get_num_buttons (priv->stylus) > 2) { + if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (WID ("combo-thirdbutton")), &iter)) + return; + + gtk_tree_model_get (GTK_TREE_MODEL (liststore), &iter, + BUTTONNUMBER_COLUMN, &mapping_b4, + -1); + } else { + mapping_b4 = 0; + } + + + map_button (priv->stylus_settings, mapping_b2, mapping_b3, mapping_b4); } static void @@ -330,6 +345,11 @@ g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (button_changed_cb), self); + combo = GTK_COMBO_BOX (WID ("combo-thirdbutton")); + combobox_text_cellrenderer (combo, BUTTONNAME_COLUMN); + g_signal_connect (G_OBJECT (combo), "changed", + G_CALLBACK (button_changed_cb), self); + priv->nav = cc_wacom_nav_button_new (); gtk_widget_set_halign (priv->nav, GTK_ALIGN_END); gtk_widget_set_margin_left (priv->nav, 10); @@ -357,24 +377,26 @@ LAYOUT_INKING, /* tip */ LAYOUT_AIRBRUSH, /* eraser, 1 button, tip */ LAYOUT_GENERIC_2_BUTTONS_NO_ERASER, /* 2 buttons, tip, no eraser */ + LAYOUT_3DPEN, /* 3 buttons, tip, no eraser */ LAYOUT_OTHER }; static void -remove_buttons (CcWacomStylusPagePrivate *priv) -{ - gtk_widget_destroy (WID ("combo-topbutton")); - gtk_widget_destroy (WID ("combo-bottombutton")); - gtk_widget_destroy (WID ("label-top-button")); - gtk_widget_destroy (WID ("label-lower-button")); -} - -static void -remove_button (CcWacomStylusPagePrivate *priv) +remove_buttons (CcWacomStylusPagePrivate *priv, int n) { - gtk_widget_destroy (WID ("combo-topbutton")); - gtk_widget_destroy (WID ("label-top-button")); - gtk_label_set_text (GTK_LABEL (WID ("label-lower-button")), _("Button")); + if (n < 3) { + gtk_widget_destroy (WID ("combo-thirdbutton")); + gtk_widget_destroy (WID ("label-third-button")); + } + if (n < 2) { + gtk_widget_destroy (WID ("combo-topbutton")); + gtk_widget_destroy (WID ("label-top-button")); + gtk_label_set_text (GTK_LABEL (WID ("label-lower-button")), _("Button")); + } + if (n < 1) { + gtk_widget_destroy (WID ("combo-bottombutton")); + gtk_widget_destroy (WID ("label-lower-button")); + } } static void @@ -392,10 +414,11 @@ switch (layout) { case LAYOUT_NORMAL: + remove_buttons (page->priv, 2); /* easy! */ break; case LAYOUT_INKING: - remove_buttons (page->priv); + remove_buttons (page->priv, 0); remove_eraser (page->priv); gtk_container_child_set (CWID ("stylus-controls-grid"), WID ("label-tip-feel"), @@ -405,7 +428,7 @@ "top_attach", 0, NULL); break; case LAYOUT_AIRBRUSH: - remove_button (page->priv); + remove_buttons (page->priv, 1); gtk_container_child_set (CWID ("stylus-controls-grid"), WID ("label-lower-button"), "top_attach", 1, NULL); @@ -420,8 +443,12 @@ "top_attach", 2, NULL); break; case LAYOUT_GENERIC_2_BUTTONS_NO_ERASER: + remove_buttons (page->priv, 2); remove_eraser (page->priv); break; + case LAYOUT_3DPEN: + remove_buttons (page->priv, 3); + remove_eraser (page->priv); case LAYOUT_OTHER: /* We already warn about it in cc_wacom_stylus_page_new () */ break; @@ -465,24 +492,28 @@ layout = LAYOUT_AIRBRUSH; else if (num_buttons == 2 && !has_eraser) layout = LAYOUT_GENERIC_2_BUTTONS_NO_ERASER; + else if (num_buttons == 3 && !has_eraser) + layout = LAYOUT_3DPEN; else { layout = LAYOUT_OTHER; if (num_buttons == 0) - remove_buttons (priv); + remove_buttons (priv, 0); else if (num_buttons == 1) - remove_button (priv); + remove_buttons (priv, 1); /* 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, has_eraser ? "with" : "without"); + g_warning ("%s The layout of this page is not known, %d buttons, %s eraser", + csd_wacom_stylus_get_name (stylus),num_buttons, has_eraser ? "with" : "without"); } update_stylus_ui (page, layout); - if (num_buttons == 2) + if (num_buttons >= 3) + set_button_mapping_from_gsettings (GTK_COMBO_BOX (WID ("combo-thirdbutton")), priv->stylus_settings, 4); + if (num_buttons >= 2) set_button_mapping_from_gsettings (GTK_COMBO_BOX (WID ("combo-topbutton")), priv->stylus_settings, 3); if (num_buttons >= 1) set_button_mapping_from_gsettings (GTK_COMBO_BOX (WID ("combo-bottombutton")), priv->stylus_settings, 2); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.8.1/panels/wacom/csd-wacom-device.c new/cinnamon-control-center-3.8.2/panels/wacom/csd-wacom-device.c --- old/cinnamon-control-center-3.8.1/panels/wacom/csd-wacom-device.c 2018-07-17 09:38:41.000000000 +0200 +++ new/cinnamon-control-center-3.8.2/panels/wacom/csd-wacom-device.c 2018-09-11 15:47:37.000000000 +0200 @@ -137,11 +137,36 @@ return "wacom-stylus-art-pen"; case WSTYLUS_CLASSIC: return "wacom-stylus-classic"; - default: - if (!libwacom_stylus_has_eraser (wstylus)) - return "wacom-stylus-no-eraser"; - return "wacom-stylus"; - } +#ifdef HAVE_WACOM_3D_STYLUS + case WSTYLUS_3D: + return "wacom-stylus-3btn-no-eraser"; +#endif + default: + if (!libwacom_stylus_has_eraser (wstylus)) { + if (libwacom_stylus_get_num_buttons (wstylus) >= 3) + return "wacom-stylus-3btn-no-eraser"; + else + return "wacom-stylus-no-eraser"; + } + else { + if (libwacom_stylus_get_num_buttons (wstylus) >= 3) + return "wacom-stylus-3btn"; + else + return "wacom-stylus"; + } +} + + + + + + + + + + + + } static CsdWacomStylus * @@ -238,6 +263,10 @@ return WACOM_STYLUS_TYPE_STROKE; case WSTYLUS_PUCK: return WACOM_STYLUS_TYPE_PUCK; +#ifdef HAVE_WACOM_3D_STYLUS + case WSTYLUS_3D: + return WACOM_STYLUS_TYPE_3D; +#endif default: g_assert_not_reached (); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.8.1/panels/wacom/csd-wacom-device.h new/cinnamon-control-center-3.8.2/panels/wacom/csd-wacom-device.h --- old/cinnamon-control-center-3.8.1/panels/wacom/csd-wacom-device.h 2018-07-17 09:38:41.000000000 +0200 +++ new/cinnamon-control-center-3.8.2/panels/wacom/csd-wacom-device.h 2018-09-11 15:47:37.000000000 +0200 @@ -77,7 +77,8 @@ WACOM_STYLUS_TYPE_CLASSIC, WACOM_STYLUS_TYPE_MARKER, WACOM_STYLUS_TYPE_STROKE, - WACOM_STYLUS_TYPE_PUCK + WACOM_STYLUS_TYPE_PUCK, + WACOM_STYLUS_TYPE_3D } CsdWacomStylusType; GType csd_wacom_stylus_get_type (void); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.8.1/panels/wacom/wacom-stylus-3btn-no-eraser.svg new/cinnamon-control-center-3.8.2/panels/wacom/wacom-stylus-3btn-no-eraser.svg --- old/cinnamon-control-center-3.8.1/panels/wacom/wacom-stylus-3btn-no-eraser.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/cinnamon-control-center-3.8.2/panels/wacom/wacom-stylus-3btn-no-eraser.svg 2018-09-11 15:47:37.000000000 +0200 @@ -0,0 +1,132 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<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" + id="svg86343" + version="1.1" + inkscape:version="0.91 r13725" + width="148" + height="192" + sodipodi:docname="wacom-stylus-3btn-no-eraser.svg"> + <metadata + id="metadata86349"> + <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 /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs86347" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="960" + inkscape:window-height="1014" + id="namedview86345" + showgrid="false" + inkscape:snap-nodes="false" + inkscape:snap-bbox="true" + inkscape:zoom="2.4748737" + inkscape:cx="176.8759" + inkscape:cy="81.687362" + inkscape:window-x="1920" + inkscape:window-y="27" + inkscape:window-maximized="0" + inkscape:current-layer="g10631" + borderlayer="true" + inkscape:showpageshadow="false"> + <inkscape:grid + type="xygrid" + id="grid86802" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> + <g + style="display:inline" + transform="translate(592.43375,-287.62088)" + id="g10545"> + <path + sodipodi:nodetypes="cscscccccccccccccscscc" + inkscape:connector-curvature="0" + id="rect10526" + transform="translate(-928.4063,-95.84375)" + d="m 344.125,384.88832 c -1.9944,0 -3.59375,1.59935 -3.59375,3.59375 L 340.53125,516 338,545.125 c -0.1873,2.15512 1.62589,3.92035 3.75,4.125 l 4.625,10.90625 1.53125,0 0,2.15625 3.61536,8.57242 1.18546,0.0214 0.44918,3.78119 0.33938,-3.7414 1.14797,-0.0687 3.76265,-8.53366 0,-2.1875 1.53125,0 4.65625,-10.96875 c 1.96694,-0.35188 3.54637,-2.02216 3.40625,-4.0625 L 365.53125,516 l 0,-127.51793 c 0,-1.9944 -1.59935,-3.59375 -3.59375,-3.59375 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#d3d7cf;fill-opacity:1;fill-rule:nonzero;stroke:#babdb6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + <rect + style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#babdb6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect10541" + width="8.75" + height="22" + x="-579.65631" + y="385.90625" + rx="3.25" + ry="3.25" /> + <rect + style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#babdb6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect10543" + width="8.75" + height="12.25" + x="-579.65631" + y="410.90625" + rx="3.25" + ry="3.2500002" /> + <rect + style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#babdb6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect10544" + width="8.75" + height="8.75" + x="-579.65631" + y="429.15625" + rx="3.25" + ry="3.2500002" /> + </g> + <g + style="opacity:0.2;display:inline" + id="g10631" + transform="translate(592.43375,-302.48416)"> + <path + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m -571.1563,413.06786 35.28033,0 0,-89.17947 82.46967,0" + id="path3342" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccc" /> + <path + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m -571.1563,430.06786 48.28033,0 0,-64.17947 69.46967,0" + id="path3344" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccc" /> + <path + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m -571.1563,448.31786 61.28033,0 0,-40.43396 56.46967,0" + id="path3344" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccc" /> + <path + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m -575.4063,492.06786 78.53033,0 0,-43.17947 43.46967,0" + id="path10629" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccc" /> + </g> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.8.1/panels/wacom/wacom-stylus-3btn.svg new/cinnamon-control-center-3.8.2/panels/wacom/wacom-stylus-3btn.svg --- old/cinnamon-control-center-3.8.1/panels/wacom/wacom-stylus-3btn.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/cinnamon-control-center-3.8.2/panels/wacom/wacom-stylus-3btn.svg 2018-09-11 15:47:37.000000000 +0200 @@ -0,0 +1,138 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<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" + id="svg86343" + version="1.1" + inkscape:version="0.48.2 r9819" + width="148" + height="192" + sodipodi:docname="wacom-stylus-3btn.svg"> + <metadata + id="metadata86349"> + <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 /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs86347" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1280" + inkscape:window-height="742" + id="namedview86345" + showgrid="false" + inkscape:snap-nodes="false" + inkscape:snap-bbox="true" + inkscape:zoom="7" + inkscape:cx="93.888956" + inkscape:cy="186.10424" + inkscape:window-x="0" + inkscape:window-y="26" + inkscape:window-maximized="1" + inkscape:current-layer="svg86343" + borderlayer="true" + inkscape:showpageshadow="false"> + <inkscape:grid + type="xygrid" + id="grid86802" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> + <g + style="display:inline" + transform="translate(592.43375,-287.62088)" + id="g10545"> + <path + sodipodi:nodetypes="sscsscscccccccccccccscsscsss" + inkscape:connector-curvature="0" + id="rect10526" + transform="translate(-928.4063,-95.84375)" + d="m 349.69531,384.96463 c -2.3083,0 -3.2326,1.49535 -3.69531,4.51323 L 345.53125,396 344.125,396 c -1.9944,0 -3.59375,1.59935 -3.59375,3.59375 L 340.53125,516 338,545.125 c -0.1873,2.15512 1.62589,3.92035 3.75,4.125 l 4.625,10.90625 1.53125,0 0,2.15625 3.61536,8.57242 1.18546,0.0214 0.44918,3.78119 0.33938,-3.7414 1.14797,-0.0687 3.76265,-8.53366 0,-2.1875 1.53125,0 4.65625,-10.96875 c 1.96694,-0.35188 3.54637,-2.02216 3.40625,-4.0625 L 365.53125,516 l 0,-116.40625 c 0,-1.9944 -1.59935,-3.59375 -3.59375,-3.59375 l -1.40625,0 L 360,389.47786 c -0.23272,-2.85711 -1.26201,-4.51323 -3.69531,-4.51323 z" + style="color:#000000;fill:#d3d7cf;fill-opacity:1;fill-rule:nonzero;stroke:#babdb6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#babdb6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect10541" + width="8.75" + height="22" + x="-579.65631" + y="385.90625" + rx="3.25" + ry="3.25" /> + <rect + style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#babdb6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect10543" + width="8.75" + height="12.25" + x="-579.65631" + y="410.90625" + rx="3.25" + ry="3.2500002" /> + <rect + style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#babdb6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect10544" + width="8.75" + height="8.75" + x="-579.65631" + y="429.15625" + rx="3.25" + ry="3.2500002" /> + </g> + <g + style="opacity:0.2;display:inline" + id="g10631" + transform="translate(592.43375,-302.48416)"> + <path + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m -568.1563,309.03125 32.25,0 0,14.85714 82.5,0" + id="path10556" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccc" /> + <path + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m -571.1563,413.06786 35.28033,0 0,-52.14286 82.46967,0" + id="path10552" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccc" /> + <path + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m -571.1563,430.06786 48.28033,0 0,-27.14286 69.46967,0" + id="path86913" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccc" /> + <path + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m -571.1563,448.31786 61.28033,0 0,-3.39286 56.46967,0" + id="path3344" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccc" /> + <path + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m -575.4063,492.06786 78.53033,0 0,-5.14286 43.46967,0" + id="path10629" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccc" /> + </g> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.8.1/panels/wacom/wacom-stylus-page.ui new/cinnamon-control-center-3.8.2/panels/wacom/wacom-stylus-page.ui --- old/cinnamon-control-center-3.8.1/panels/wacom/wacom-stylus-page.ui 2018-07-17 09:38:41.000000000 +0200 +++ new/cinnamon-control-center-3.8.2/panels/wacom/wacom-stylus-page.ui 2018-09-11 15:47:37.000000000 +0200 @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.22.1 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkAdjustment" id="adjustment-eraser-feel"> <property name="upper">6</property> <property name="step_increment">1</property> @@ -64,8 +65,8 @@ <object class="GtkGrid" id="stylus-grid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">10</property> <property name="row_spacing">10</property> + <property name="column_spacing">10</property> <child> <object class="GtkLabel" id="label-stylus"> <property name="visible">True</property> @@ -81,7 +82,6 @@ <property name="left_attach">0</property> <property name="top_attach">0</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -95,17 +95,16 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkGrid" id="stylus-controls-grid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> <property name="margin_left">16</property> <property name="margin_top">6</property> + <property name="hexpand">True</property> + <property name="orientation">vertical</property> <property name="row_spacing">10</property> <property name="column_spacing">10</property> <child> @@ -123,8 +122,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -181,8 +178,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -200,8 +195,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -214,8 +207,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -233,8 +224,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -247,8 +236,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -265,9 +252,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> + <property name="top_attach">4</property> </packing> </child> <child> @@ -322,30 +307,43 @@ </object> <packing> <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label-third-button"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="label" translatable="yes">Lowest Button</property> + <property name="justify">right</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="combo-thirdbutton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="model">liststore-buttons</property> + </object> + <packing> + <property name="left_attach">1</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> </interface> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-3.8.1/panels/wacom/wacom.gresource.xml new/cinnamon-control-center-3.8.2/panels/wacom/wacom.gresource.xml --- old/cinnamon-control-center-3.8.1/panels/wacom/wacom.gresource.xml 2018-07-17 09:38:41.000000000 +0200 +++ new/cinnamon-control-center-3.8.2/panels/wacom/wacom.gresource.xml 2018-09-11 15:47:37.000000000 +0200 @@ -11,6 +11,8 @@ <file>wacom-stylus-inking.svg</file> <file>wacom-stylus-art-pen.svg</file> <file>wacom-stylus-classic.svg</file> + <file>wacom-stylus-3btn.svg</file> + <file>wacom-stylus-3btn-no-eraser.svg</file> <file>wacom-tablet-cintiq.svg</file> <file>wacom-tablet-pc.svg</file> </gresource>