From d0e477e42b8d9567d3e675a49e9eafccaa6cda79 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 6 Mar 2017 16:39:29 +0100 Subject: [PATCH 1/4] universal-access: Don't use C++ style comments --- panels/universal-access/cc-ua-panel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/panels/universal-access/cc-ua-panel.c b/panels/universal-access/cc-ua-panel.c index 477a6895a..88e55e66e 100644 --- a/panels/universal-access/cc-ua-panel.c +++ b/panels/universal-access/cc-ua-panel.c @@ -358,7 +358,7 @@ activate_row (CcUaPanel *self, GtkListBoxRow *row) const gchar *dialog_id; const gchar *widget_name; - // Check switches to toggle + /* Check switches to toggle */ widget_name = gtk_buildable_get_name (GTK_BUILDABLE (row)); if (widget_name) { @@ -384,7 +384,7 @@ activate_row (CcUaPanel *self, GtkListBoxRow *row) } } - // Check dialog to open + /* Check dialog to open */ dialog_id = (const gchar *)g_object_get_data (G_OBJECT (row), "dialog-id"); if (g_strcmp0 (dialog_id, "zoom") == 0) { -- 2.12.0 From 1d3aadcf331572b770b89d22101edc8fdfc1ca8d Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 6 Mar 2017 17:30:07 +0100 Subject: [PATCH 2/4] universal-access: Add bits for glade to shut up --- panels/universal-access/uap.ui | 2 ++ 1 file changed, 2 insertions(+) diff --git a/panels/universal-access/uap.ui b/panels/universal-access/uap.ui index e6c7955dc..636b7740d 100644 --- a/panels/universal-access/uap.ui +++ b/panels/universal-access/uap.ui @@ -1,5 +1,7 @@ + + 100 1000 -- 2.12.0 From d0c8026172f441d00519577064aad04d7cd68429 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 6 Mar 2017 17:28:33 +0100 Subject: [PATCH 3/4] universal-access: Add Cursor Size selection dialogue The dialogue offers the 5 separate cursor sizes that adwaita's cursor theme supports, aligned in a row. The cursor sizes are described in a way that doesn't judge their respective sizes, but simply describes them. https://bugzilla.gnome.org/show_bug.cgi?id=608231 --- panels/universal-access/cc-ua-panel.c | 118 +++++++++++++++++++++ panels/universal-access/left_ptr_24px.png | Bin 0 -> 762 bytes panels/universal-access/left_ptr_32px.png | Bin 0 -> 1081 bytes panels/universal-access/left_ptr_48px.png | Bin 0 -> 1766 bytes panels/universal-access/left_ptr_64px.png | Bin 0 -> 2447 bytes panels/universal-access/left_ptr_96px.png | Bin 0 -> 3995 bytes panels/universal-access/uap.ui | 111 +++++++++++++++++++ .../universal-access.gresource.xml | 5 + 8 files changed, 234 insertions(+) create mode 100644 panels/universal-access/left_ptr_24px.png create mode 100644 panels/universal-access/left_ptr_32px.png create mode 100644 panels/universal-access/left_ptr_48px.png create mode 100644 panels/universal-access/left_ptr_64px.png create mode 100644 panels/universal-access/left_ptr_96px.png diff --git a/panels/universal-access/cc-ua-panel.c b/panels/universal-access/cc-ua-panel.c index 88e55e66e..1985f7718 100644 --- a/panels/universal-access/cc-ua-panel.c +++ b/panels/universal-access/cc-ua-panel.c @@ -50,6 +50,7 @@ #define KEY_ICON_THEME "icon-theme" #define KEY_CURSOR_BLINKING "cursor-blink" #define KEY_CURSOR_BLINKING_TIME "cursor-blink-time" +#define KEY_MOUSE_CURSOR_SIZE "cursor-size" /* application settings */ #define APPLICATION_SETTINGS "org.gnome.desktop.a11y.applications" @@ -178,6 +179,67 @@ zoom_options_launch (CcUaPanel *self) GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (self)))); } +/* cursor size dialog */ +static void +cursor_size_toggled (GtkWidget *button, + CcUaPanel *self) +{ + CcUaPanelPrivate *priv = self->priv; + guint cursor_size; + + if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))) + return; + + cursor_size = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (button), "cursor-size")); + g_settings_set_int (priv->interface_settings, KEY_MOUSE_CURSOR_SIZE, cursor_size); + g_debug ("Setting cursor size to %d", cursor_size); +} + +static void +cursor_size_setup (CcUaPanel *self) +{ + guint cursor_sizes[] = { 24, 32, 48, 64, 96 }; + guint current_cursor_size, i; + CcUaPanelPrivate *priv = self->priv; + GtkWidget *grid; + GtkSizeGroup *size_group; + GtkWidget *last_radio_button = NULL; + + grid = WID ("cursor_size_grid"); + gtk_style_context_add_class (gtk_widget_get_style_context (grid), "linked"); + + current_cursor_size = g_settings_get_int (priv->interface_settings, + KEY_MOUSE_CURSOR_SIZE); + size_group = gtk_size_group_new (GTK_SIZE_GROUP_BOTH); + + for (i = 0; i < G_N_ELEMENTS(cursor_sizes); i++) + { + GtkWidget *image, *button; + char *cursor_image_name; + + cursor_image_name = g_strdup_printf ("/org/gnome/control-center/universal-access/left_ptr_%dpx.png", cursor_sizes[i]); + image = gtk_image_new_from_resource (cursor_image_name); + g_free (cursor_image_name); + + button = gtk_radio_button_new_from_widget (GTK_RADIO_BUTTON (last_radio_button)); + last_radio_button = button; + gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE); + g_object_set_data (G_OBJECT (button), "cursor-size", GUINT_TO_POINTER (cursor_sizes[i])); + + gtk_container_add (GTK_CONTAINER (button), image); + gtk_grid_attach (GTK_GRID (grid), button, i, 0, 1, 1); + gtk_size_group_add_widget (size_group, button); + + g_signal_connect (button, "toggled", + G_CALLBACK (cursor_size_toggled), self); + + if (current_cursor_size == cursor_sizes[i]) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); + } + + gtk_widget_show_all (grid); +} + /* seeing section */ static gboolean @@ -271,6 +333,45 @@ on_off_label_mapping_get (GValue *value, return TRUE; } +static gboolean +cursor_size_label_mapping_get (GValue *value, + GVariant *variant, + gpointer user_data) +{ + char *label; + int cursor_size; + + cursor_size = g_variant_get_int32 (variant); + + switch (cursor_size) + { + case 24: + /* translators: the labels will read: + * Cursor Size: Default */ + label = g_strdup (C_("cursor size", "Default")); + break; + case 32: + label = g_strdup (C_("cursor size", "Medium")); + break; + case 48: + label = g_strdup (C_("cursor size", "Large")); + break; + case 64: + label = g_strdup (C_("cursor size", "Larger")); + break; + case 96: + label = g_strdup (C_("cursor size", "Largest")); + break; + default: + label = g_strdup_printf (_("%d pixels"), g_variant_get_int32 (variant)); + break; + } + + g_value_take_string (value, label); + + return TRUE; +} + static void add_separators (GtkListBox *list) { @@ -434,6 +535,23 @@ cc_ua_panel_init_seeing (CcUaPanel *self) priv->interface_settings, NULL); + /* cursor size */ + + cursor_size_setup (self); + + g_settings_bind_with_mapping (priv->interface_settings, KEY_MOUSE_CURSOR_SIZE, + WID ("value_cursor_size"), + "label", G_SETTINGS_BIND_GET, + cursor_size_label_mapping_get, + NULL, NULL, NULL); + + dialog = WID ("cursor_size_dialog"); + priv->toplevels = g_slist_prepend (priv->toplevels, dialog); + + g_object_set_data (G_OBJECT (WID ("row_cursor_size")), "dialog", dialog); + g_signal_connect (dialog, "delete-event", + G_CALLBACK (gtk_widget_hide_on_delete), NULL); + /* zoom */ g_settings_bind_with_mapping (priv->application_settings, "screen-magnifier-enabled", diff --git a/panels/universal-access/left_ptr_24px.png b/panels/universal-access/left_ptr_24px.png new file mode 100644 index 0000000000000000000000000000000000000000..46f77601dea43e8a9a0739a145633b2218230f0e GIT binary patch literal 762 zcmVVa0*6UN zK~y-)m6I_@TTv8-KTT5`W71$_B`Q%w;-D_#P>~K!wNh{>3Y|(7B`BR*`#RbwL(EW@ z2En1yDIgTZfI~rW5W%IOQ>%g^LX>ABrs|9F?-C^{wR)C&hx>o$Kj+*7U^h)O3b=tn z?ifxUCq+}u~-@m&BeNos6t)YjIPH8V341-!QfxFpH#cB`eO zMcdok*6i%;XW-Fo04_;#I294zX{ zUe(mpsHv$*t*xyx3`40@>LeTvzsUz&YeXiK!LqDN=hD&=;c)o=z`($lP$<*|6rTew zWd`JMIOOyBw7$N6rYn(7rw<~LNC#lQCa$io*5KfvJRXk>!_e~b@)i&TUIJafbD#-$ za7kQSTdU2@&CLG({%K`prTl)s5{X2nudnYNP?hVrJ7>G_qUJy#z{0}9>GbsUkCl~` zpTS@-dw6)r#KeTHzrX)Aa1TfW2f!cT>>~5d&Q4}@bo4vWIXpc4!Zb~*qM}0e_4P_7 zlbP=B?pJ{G+MKi5Y&H^!d;^~4Hp;cSx;j5HGLrRry^6=<*4WtC1W}&bOhwdjU`cl;nVEz{-E~7sl3M3zH_@{r~^~07*qoM6N<$g72Pdm;e9( literal 0 HcmV?d00001 diff --git a/panels/universal-access/left_ptr_32px.png b/panels/universal-access/left_ptr_32px.png new file mode 100644 index 0000000000000000000000000000000000000000..5d9ba96be4a15321c24a371038e7bbc3b0002a1b GIT binary patch literal 1081 zcmV-91jhS`P)>|vIE)3aBCCE7t#9avL!gUkkF&v^B3q#m(LhCT!{oeQK=G~ZXo;;_1@Lav` z`+1(@9#@js4?>U{$y8tQy$etO~>-8!kqSMpUgQljYcm5MtU0tmv zA`(TB5{blt#bSB;nZZ0ZF)=}BXJZ!pz*4NiZHk*yk&(DS9H)z;SD z3x~rqDwV1h!0nrWB^YB2J3BjYxm+@n$@D=a68TP{P#6I`_itbUBccMv7{lh~CI$xw zxyHuEmPjP>4S<&bD4zsgTHIocF^2W^bqoy+ab~mmqphv2Q2;eh0xx03Q_aWP+8TU5 zA7`~%?Hd~#UH}FFigIAdwqL~`%&COwPaS`q9 z?GF|f7Cr}{%Y*WAm?(;ck2#J*TU#3x3I&u(B@_w;j*gCyNF=!K?(Q#VXJ@kxhvRzy zj|%N%x7!IoA>?v7RaRD#!C;_BBtqAXTrQUj1Oi_GsFGiI0G&=J=I7_Z7{m1RG^|!D zy1Kf4SYBTK4ZvRj1S#=j0Dk~bmaWX|^%4=$z`y{h)oQA#siFP-eIXi+J_OJXpaH-u z0A2=Qly>&{5^QvIlmtPb!^6WrPfkt*tyW7qosL{C7cs`fo}M13)LIn)Zb=~nz+J+o zrlyE7CXS7b1uYiKSJ`Zqx!rE6s;VNR(Ma)lT-e^;-U4v9Y~$y#-Q8Wv<#OW4$jDCs zJ^}FV-rnBN$z+mgG#b+D_2lt*=;GpnwYIi?EFB41S&Zj-VR(4>M*#N$ybhq+R2omjK||lr_+(y zY^GEyCHVdR6##FR+#q_rUbVWq`Wb-t0ho&JeGWi{*Xy-rGMUGzREp(tIWd_`KB}*; ze*oaMtG&rdrRFR78^DEhMDov7ZnyixmX?{BA0PiEolfrq_#HqRfLM%iQYFP5 zP&{r)$+XhHAS)pm0Ic|Z?uI`xSy6~mlqCKKwtYsZ`atu@00000NkvXXu0mjfq1E$r literal 0 HcmV?d00001 diff --git a/panels/universal-access/left_ptr_48px.png b/panels/universal-access/left_ptr_48px.png new file mode 100644 index 0000000000000000000000000000000000000000..51b1dc2f726b2adc3fff54246b5b799a91db35b9 GIT binary patch literal 1766 zcmV|1%~tnU`c<6t~+7CX>v}Gtd0@%Y7c6 zn90Po*}ZTXEG!)PUlDZ!XY9`6Yj~`zK@FM_)0E`-AR(x0~ z#=U#@x&XWb!2Nwf3#b{x!^3|TP}lbbwJESvDn*hU7#R4Y25MMos0!S_e?MheCdu@T z8#jIrpbCIfKy@n)bT}M5a^#4zOkcl#{dWTDSV^b~wApMdEG*=S6DLTLvMkG2u3Y&X zz&ZiVT?wcPv|6onI-T_Sd~9oLQ_eNj(a~{Sq>OzfpeoR0GSP0gbM@-g^!xp6Z*M0_ zN|Ka{L?TB4RIUV61saV;=I7_r<#Ms8sE8#cCG70%BuOTd$;7#H=UM?&0I>Z(P!*Vy zlS8xFOozikkH^D6Ai#=>3U+sQlO*Hu`25L}Cz}D311JEH^EOZwsMqV6mzT$af&#kT zZWb38v$V97RaI5&>+4gXbH|S#{|$h$w}q-e0L;zJrNv^Q)9Iww>t!$)WJN^`QH_~0I1jNX)>AA6!H80EGsMHx^?SVQ&Yo{kr9$)EEbz? zX=(WcK*@K7E&u|c!C;`(YNgBNqR;2!nl)=!Sy{>T>({fcu8yOlqa?{_H2QMSo;@D{ zSo5aPj2bD+GScZZWLZ|HvW~~&2#3RX@ZbTgR;#nEt?i43hK7wo7>oc`WrJn}YGLVg zdeJ%-i{aqGgP53@fX!xG-PzgMzH{f!YN5MXp&5ZBvwA7ZGG=CG(AwIHM~@!CZnt|c zUcC6_)~#FL(RixQ1YNT1Eazo9oyPR^G!7j)geOm)!0mPiu3fv5@s%+3@f!Vy2 zWf@abQwWE{c=qfW+-`SCcX#)f)z#G%LIM{-vliAj@luv$OioTB91df0auQyzx3aIV z?~AgsvQiCHr$Dm;m+~sp`uX$cIC}IbUcP(@zu&)pXlUpU!CJ@^);Jbr^gKaLC%P%BQE#Qk1UpsX=9gRk#s;}kc<(!(D;+u|%iHTve z*}PF{KbQ58Kg(xo>R>a}av{`~&^`=^XXqYZ#TCp`Qg0O)j?1!DK^-RSM@ zh0$n)!C-*LQ0OxN?~BS&DEe8am=1Ai%tG8V1J9m4tMoH+EEY?UWPN?T+Jg9eKKAtV zkR(S&Muq`w2H+PP=Zejhxk@Vl3xGPEPVLx|$)p?(hp%^ab$uXyWLKY$HUE= zH&d2nCK8EcU0q$H2wj0jytQ+2J=E!RJb(VY7WNf@PXmEK)7;!#lq5r;keVVzMMb=I z>lR6}zrVi^z|R19mTQ_-;DrkpNRo*}BGuB;as|L|0qg+q{^;oFC6XK*9Hhl!p~K;z z*Xw0NLxa+G#LCOdKNhW|HJggrw22yz$ED`x=F8&deIOn+foV{p8zxg_=PwVm$=TJ@$vDCBzg1Z%>`Zh zzJ2>hlH=p!;{dh+2m;7ksvZ&mlF8)!fddC39UUFF0sIrdzeS=(MMBS>K7G1flBD@i zD1@4t8dZTLNdf@m=H}*!Te@Tc27r7?l4gz_JJt%|*8sMNcZ5UpHq?m_6+V3Uu!|(e z#>Uv#*vKfj^M0C}!zaMns&z9}mw^vV3 zPd|QLq=$xv?(6mXW?^t(sgNp`TZBbv0CNE50i=|0Yrf3^P_S#)uIi?yroB$5bM1>4 zFXnrCdj1}XME)l9@?YXN3P65s57lx-4Jbg1KGYM8zP!pBK@I3s}Z|-sZWbKv!urlENEVOe|&ew@NkcY$HW^Hvj+t07*qo IM6N<$g64`j8 zK~z}7&6$62RMi#7KfBpLl4Y}OLVo`u8ces8Snv-NP^f5sSddc3U=1`Rng*;*15$s~ zI56O#)Qnq0bO0v;!%!yE5Sz>dC&G+tW+G^HqB6rMqs0zl8WJ~~ADe78yYKW5?`~g0 zvSj&X@64Iqef!>hpZ7iIo_p_k0EozH{*T&p5gGaX^UogwW&tySIKTuL0mF?3iW3nD z1Omg&&CTn8*+4R22BN(yu5rp@WUGo6#{B%YLbSAh7i=? z;Gk>$`t=V3b`|JxHv%dI)Y#Z4$;rvm+}s?38Wf?U9+%TZC+3d%VCfF4NGH2V7bShsE+XU?1fASERw zueG)H6}#P@eLd#AunGmu?RHaAQo@&CehENoYHI%5Z@=xx$;ru5P}eM*PYFoVG`hRH zDJd!8>#x5CATu*_URzt+%bA&(nL4Ge8tSqx(_3d}C&k6Zbar+Eke!|VW2e)(%Vx8s zDX7@1g^CDB(=;wzxIkH189hBc0Ni}@%?sPx+jqpo#H6Y~kG-07a0yU2w*~FoxpS14 zm*aN30kGTc%Rc<@!|f)MDH*Wp+!ryFaiW8l1JX2&vuDq;VZ#Rc`}+ZyJ9qB#_uqfN zN=+|To%x86>jI>pwlTk-q-0NiuWJ;lw<&5!EbHzg=zINC^|+S=OKzI{7^Kmfq7a^=bm zZ@&3vaU@EG1&RbFXile->gsAl1i*0r{r5k9`0(L1I;iQo$=DDP(3L{H_10TB91cVT zqtR$wvu4efef##U1`+{_Qffk|>jI={8Z9j??A^N;fT*absM6BXKkwPIXQfhVQYhn8 za>JEEH8wVK=+L1clRoI?6c3_2_%e%GEQ}lxf&pVy1F`A zT3WsUfcAfjC0Y=l+0>#J2^WuvyVl)~@%`98CEb=-~T-;2D!|}4;@87t8|Nf7G zfbmL!^!D0ouU+vP+H5w@s;Q}|DJ?C%35YXA+QE_~OE`J*z$l<8x1c^Xz^BgX1-=DL5h?WKlTUK|_;K>`@+MWuXfztOZQHg0 z7yx>J3&6jDf9dR;vhzR};0A^O|CE8YZr#eRUAu^iisGrKp1K66wY8NmzW4%w#ful) z@3`ZR7@$wx@VtULr-S-R9UBkzzpZqAeZ2&uU2i*g?i^Fl8XX-KyWK8kvsq@&oGD33 zNs^Y9CR?^_37vD|#0e+x0I(3aNiA&?)b2!YRyFCG)e18_&`U496uOC~X`%0Lyzz#_ z#>Pr~e7qzkCQ3?5isa_zN@r(hunIRaZ{ED$0gHef-I^$R0y8O#niR-jFo?t9(AOSE zAA9Vv#;&feZ-dpg{QP{GF=K|qUR9j1skzIjo4Y2m zOMwgqgY4eDTVHb=EiW%W0z6k!Q}g%W@x6QZN?cr=Sglq`OiYy2)KtmO&li`=6)X!5 zW@l#?0k;8ZYI}6q!o(OLgTWxLzWS;j##dHWb_n8GyKr%xYL6C@QC6_;f1;1(M&n9XLhE)RtrX$c}C!^6Yfg@uJr0L8$sfjd?HNE%nR zGpfauZQ;U&1zxYWS45=0zhAPlvczh&N^)|tR8>_;AP^7{k*=<;9^g?Ghru|Sv{*XR z=ks0IxN+lyz|Vo7DQV{@e~&N!8q^cU0qGxo^wBFpzg)a{QQmpy9qI1w4uyc<@7FeM z+O!||t$N5D<@!m1EVZ?@3)MS~1!^Sas-@**wP-_7CA-}|*X?$nl?j^H>-AMvSN{We z9Qc(Q`l;cDeiUFlcI;R`5CDc%tPH5{qv|-iwG8@>dU|@aQ>RX~<>uxZ&1Q3=&*$^I zTrT&!@4owSSy@?qU0q!Va8bo#kLuf}>vv2uCsbNb$~&qbkw*UBMKle!J2x)_Fu0HG1 literal 0 HcmV?d00001 diff --git a/panels/universal-access/left_ptr_96px.png b/panels/universal-access/left_ptr_96px.png new file mode 100644 index 0000000000000000000000000000000000000000..5897a7c3d03a87d018184fbcc2a23ade15ad6a02 GIT binary patch literal 3995 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 literal 0 HcmV?d00001 diff --git a/panels/universal-access/uap.ui b/panels/universal-access/uap.ui index 636b7740d..ab0c0c4a7 100644 --- a/panels/universal-access/uap.ui +++ b/panels/universal-access/uap.ui @@ -224,6 +224,53 @@ + + True + True + + + True + False + + + True + False + 20 + 20 + 6 + 6 + C_ursor Size + True + 0 + + + True + True + 0 + + + + + True + False + 20 + 20 + 6 + 6 + 24 pixels + 1 + + + False + True + 1 + + + + + + + True True @@ -952,6 +999,7 @@ + @@ -962,6 +1010,69 @@ + + False + 5 + Cursor Size + False + True + dialog + + + False + vertical + 2 + + + False + + + False + False + 0 + + + + + True + False + 12 + 6 + 6 + 6 + Cursor size can be combined with zoom to make it easier to see the cursor. + True + 45 + 0 + + + False + True + 0 + + + + + True + False + + + False + True + 2 + + + + + + + + + + False + + + False 5 diff --git a/panels/universal-access/universal-access.gresource.xml b/panels/universal-access/universal-access.gresource.xml index bc07b356f..d7f2e337a 100644 --- a/panels/universal-access/universal-access.gresource.xml +++ b/panels/universal-access/universal-access.gresource.xml @@ -3,5 +3,10 @@ uap.ui zoom-options.ui + left_ptr_24px.png + left_ptr_32px.png + left_ptr_48px.png + left_ptr_64px.png + left_ptr_96px.png -- 2.12.0 From 4196874fcd6ed1ceac1923065d9bda2dce67fbe2 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Thu, 9 Mar 2017 12:44:25 +0100 Subject: [PATCH 4/4] universal-access: Handle "pixels" plural correctly Using g_dngettext() as required. https://bugzilla.gnome.org/show_bug.cgi?id=779798 --- panels/universal-access/cc-ua-panel.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/panels/universal-access/cc-ua-panel.c b/panels/universal-access/cc-ua-panel.c index 1985f7718..f0928555e 100644 --- a/panels/universal-access/cc-ua-panel.c +++ b/panels/universal-access/cc-ua-panel.c @@ -363,7 +363,11 @@ cursor_size_label_mapping_get (GValue *value, label = g_strdup (C_("cursor size", "Largest")); break; default: - label = g_strdup_printf (_("%d pixels"), g_variant_get_int32 (variant)); + label = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE, + "%d pixel", + "%d pixels", + cursor_size), + cursor_size); break; } -- 2.12.0