diff --git a/demos/gtk-demo/application.ui b/demos/gtk-demo/application.ui index fa6798ddbe..c08388187f 100644 --- a/demos/gtk-demo/application.ui +++ b/demos/gtk-demo/application.ui @@ -7,35 +7,29 @@ document-open - 1 - 1 1 - 1 document-open - 1 application-exit app.quit - 1 - 1 applications-other win.logo @@ -54,7 +48,6 @@ - 1 1 @@ -64,10 +57,9 @@ - 1 center _OK - 1 + 1 @@ -81,11 +73,9 @@ - 1 in - 1 1 1 buffer @@ -100,7 +90,6 @@ 1 - 1 0 diff --git a/demos/gtk-demo/blendmodes.ui b/demos/gtk-demo/blendmodes.ui index fb5b5b7541..168b4b22b6 100644 --- a/demos/gtk-demo/blendmodes.ui +++ b/demos/gtk-demo/blendmodes.ui @@ -2,21 +2,16 @@ - False - False + 0 CSS Blend Modes - 400 - 300 + 400 + 300 - True - False - 12 - 12 + 12 + 12 - True - False Blend mode: 0 - 0 - 0 + 0 + 0 - True - True - True - in - 150 + 1 + 1 + in + 150 - 0 - 1 + 0 + 1 - True - False center - True + 1 stack - 1 - 0 + 1 + 0 - True - False - True - True - False - False - crossfade + 1 + 1 + 0 + 0 + crossfade - True - False center center - False - True - 12 - 12 + 1 + 12 + 12 - True - False Duck - 0 - 0 + 0 + 0 - True - False Background - 1 - 0 + 1 + 0 - True - False - 0 - 1 + 0 + 1 - True - False - 1 - 1 + 1 + 1 - True - False Blended picture - 0 - 2 + 0 + 2 2 - True - False center - 0 - 3 + 0 + 3 2 @@ -157,87 +132,72 @@ Blended picture - True - False center center - False - True - 12 - 12 + 1 + 12 + 12 - True - False Red - 0 - 0 + 0 + 0 - True - False Blue - 1 - 0 + 1 + 0 - True - False - 0 - 1 + 0 + 1 - True - False - 1 - 1 + 1 + 1 - True - False Blended picture - 0 - 2 + 0 + 2 2 - True - False center - 0 - 3 + 0 + 3 2 @@ -249,71 +209,59 @@ Blended picture - True - False center center - True - True - 6 - 12 + 1 + 1 + 6 + 12 - True - False - 0 - 1 + 0 + 1 - True - False - 1 - 1 + 1 + 1 - True - False - 0 - 3 + 0 + 3 - True - False center - 1 - 3 + 1 + 3 - True - False Cyan 0 - 0 - 0 + 0 + 0 - True - False Magenta 0 - 1 - 0 + 1 + 0 - True - False Yellow 0 - 0 - 2 + 0 + 2 - True - False Blended picture 0 @@ -366,8 +308,8 @@ Blended picture - 1 - 2 + 1 + 2 @@ -378,14 +320,13 @@ Blended picture - 1 - 1 + 1 + 1 - diff --git a/demos/gtk-demo/cursors.ui b/demos/gtk-demo/cursors.ui index df2a030790..9a78fa436f 100644 --- a/demos/gtk-demo/cursors.ui +++ b/demos/gtk-demo/cursors.ui @@ -24,8 +24,6 @@ resource:///cursors/none_cursor.png - 0 - 0 none @@ -33,8 +31,6 @@ resource:///cursors/none_cursor.png - 0 - 0 none_cursor @@ -650,15 +646,14 @@ zoom-out_cursor - 300 - 300 + 300 + 300 Cursors never - automatic - True - True + 1 + 1 vertical @@ -675,10 +670,9 @@ - False + 0 - horizontal 10 10 @@ -692,7 +686,7 @@ start baseline 0.0 - True + 1 @@ -700,7 +694,7 @@ 32 32 default_cursor - The "default" named cursor. + The "default" named cursor. @@ -716,7 +710,7 @@ 32 32 default_cursor_fallback - The "default" named cursor falling back to an image cursor. + The "default" named cursor falling back to an image cursor. @@ -724,7 +718,7 @@ 32 32 default_cursor_image_fallback - An image cursor falling back to the "default" cursor. + An image cursor falling back to the "default" cursor. @@ -733,10 +727,9 @@ - False + 0 - horizontal 10 10 @@ -750,7 +743,7 @@ start baseline 0.0 - True + 1 @@ -758,7 +751,7 @@ 32 32 none_cursor - The "none" named cursor. + The "none" named cursor. @@ -774,7 +767,7 @@ 32 32 none_cursor_fallback - The "none" named cursor falling back to an image cursor. + The "none" named cursor falling back to an image cursor. @@ -782,7 +775,7 @@ 32 32 none_cursor_image_fallback - An image cursor falling back to the "none" cursor. + An image cursor falling back to the "none" cursor. @@ -791,10 +784,9 @@ - False + 0 - horizontal 10 10 @@ -808,7 +800,7 @@ start baseline 0.0 - True + 1 @@ -816,7 +808,7 @@ 32 32 gtk-logo_cursor - The "gtk-logo" named cursor. + The "gtk-logo" named cursor. @@ -832,7 +824,7 @@ 32 32 gtk-logo_cursor_fallback - The "gtk-logo" named cursor falling back to an image cursor. + The "gtk-logo" named cursor falling back to an image cursor. @@ -840,7 +832,7 @@ 32 32 gtk-logo_cursor_image_fallback - An image cursor falling back to the "gtk-logo" cursor. + An image cursor falling back to the "gtk-logo" cursor. @@ -853,7 +845,7 @@ - True + 1 none @@ -862,10 +854,9 @@ - False + 0 - horizontal 10 10 @@ -879,7 +870,7 @@ start baseline 0.0 - True + 1 @@ -887,7 +878,7 @@ 32 32 context-menu_cursor - The "context-menu" named cursor. + The "context-menu" named cursor. @@ -903,7 +894,7 @@ 32 32 context-menu_cursor_fallback - The "context-menu" named cursor falling back to an image cursor. + The "context-menu" named cursor falling back to an image cursor. @@ -911,7 +902,7 @@ 32 32 context-menu_cursor_image_fallback - An image cursor falling back to the "context-menu" cursor. + An image cursor falling back to the "context-menu" cursor. @@ -920,10 +911,9 @@ - False + 0 - horizontal 10 10 @@ -937,7 +927,7 @@ start baseline 0.0 - True + 1 @@ -945,7 +935,7 @@ 32 32 help_cursor - The "help" named cursor. + The "help" named cursor. @@ -961,7 +951,7 @@ 32 32 help_cursor_fallback - The "help" named cursor falling back to an image cursor. + The "help" named cursor falling back to an image cursor. @@ -969,7 +959,7 @@ 32 32 help_cursor_image_fallback - An image cursor falling back to the "help" cursor. + An image cursor falling back to the "help" cursor. @@ -978,10 +968,9 @@ - False + 0 - horizontal 10 10 @@ -995,7 +984,7 @@ start baseline 0.0 - True + 1 @@ -1003,7 +992,7 @@ 32 32 pointer_cursor - The "pointer" named cursor. + The "pointer" named cursor. @@ -1019,7 +1008,7 @@ 32 32 pointer_cursor_fallback - The "pointer" named cursor falling back to an image cursor. + The "pointer" named cursor falling back to an image cursor. @@ -1027,7 +1016,7 @@ 32 32 pointer_cursor_image_fallback - An image cursor falling back to the "pointer" cursor. + An image cursor falling back to the "pointer" cursor. @@ -1036,10 +1025,9 @@ - False + 0 - horizontal 10 10 @@ -1053,7 +1041,7 @@ start baseline 0.0 - True + 1 @@ -1061,7 +1049,7 @@ 32 32 progress_cursor - The "progress" named cursor. + The "progress" named cursor. @@ -1077,7 +1065,7 @@ 32 32 progress_cursor_fallback - The "progress" named cursor falling back to an image cursor. + The "progress" named cursor falling back to an image cursor. @@ -1085,7 +1073,7 @@ 32 32 progress_cursor_image_fallback - An image cursor falling back to the "progress" cursor. + An image cursor falling back to the "progress" cursor. @@ -1094,10 +1082,9 @@ - False + 0 - horizontal 10 10 @@ -1111,7 +1098,7 @@ start baseline 0.0 - True + 1 @@ -1119,7 +1106,7 @@ 32 32 wait_cursor - The "wait" named cursor. + The "wait" named cursor. @@ -1135,7 +1122,7 @@ 32 32 wait_cursor_fallback - The "wait" named cursor falling back to an image cursor. + The "wait" named cursor falling back to an image cursor. @@ -1143,7 +1130,7 @@ 32 32 wait_cursor_image_fallback - An image cursor falling back to the "wait" cursor. + An image cursor falling back to the "wait" cursor. @@ -1156,7 +1143,7 @@ - True + 1 none @@ -1165,10 +1152,9 @@ - False + 0 - horizontal 10 10 @@ -1182,7 +1168,7 @@ start baseline 0.0 - True + 1 @@ -1190,7 +1176,7 @@ 32 32 cell_cursor - The "cell" named cursor. + The "cell" named cursor. @@ -1206,7 +1192,7 @@ 32 32 cell_cursor_fallback - The "cell" named cursor falling back to an image cursor. + The "cell" named cursor falling back to an image cursor. @@ -1214,7 +1200,7 @@ 32 32 cell_cursor_image_fallback - An image cursor falling back to the "cell" cursor. + An image cursor falling back to the "cell" cursor. @@ -1223,10 +1209,9 @@ - False + 0 - horizontal 10 10 @@ -1240,7 +1225,7 @@ start baseline 0.0 - True + 1 @@ -1248,7 +1233,7 @@ 32 32 crosshair_cursor - The "crosshair" named cursor. + The "crosshair" named cursor. @@ -1264,7 +1249,7 @@ 32 32 crosshair_cursor_fallback - The "crosshair" named cursor falling back to an image cursor. + The "crosshair" named cursor falling back to an image cursor. @@ -1272,7 +1257,7 @@ 32 32 crosshair_cursor_image_fallback - An image cursor falling back to the "crosshair" cursor. + An image cursor falling back to the "crosshair" cursor. @@ -1281,10 +1266,9 @@ - False + 0 - horizontal 10 10 @@ -1298,7 +1282,7 @@ start baseline 0.0 - True + 1 @@ -1306,7 +1290,7 @@ 32 32 text_cursor - The "text" named cursor. + The "text" named cursor. @@ -1322,7 +1306,7 @@ 32 32 text_cursor_fallback - The "text" named cursor falling back to an image cursor. + The "text" named cursor falling back to an image cursor. @@ -1330,7 +1314,7 @@ 32 32 text_cursor_image_fallback - An image cursor falling back to the "text" cursor. + An image cursor falling back to the "text" cursor. @@ -1339,10 +1323,9 @@ - False + 0 - horizontal 10 10 @@ -1356,7 +1339,7 @@ start baseline 0.0 - True + 1 @@ -1364,7 +1347,7 @@ 32 32 vertical-text_cursor - The "vertical-text" named cursor. + The "vertical-text" named cursor. @@ -1380,7 +1363,7 @@ 32 32 vertical-text_cursor_fallback - The "vertical-text" named cursor falling back to an image cursor. + The "vertical-text" named cursor falling back to an image cursor. @@ -1388,7 +1371,7 @@ 32 32 vertical-text_cursor_image_fallback - An image cursor falling back to the "vertical-text" cursor. + An image cursor falling back to the "vertical-text" cursor. @@ -1401,7 +1384,7 @@ - True + 1 none @@ -1410,10 +1393,9 @@ - False + 0 - horizontal 10 10 @@ -1427,7 +1409,7 @@ start baseline 0.0 - True + 1 @@ -1435,7 +1417,7 @@ 32 32 alias_cursor - The "alias" named cursor. + The "alias" named cursor. @@ -1451,7 +1433,7 @@ 32 32 alias_cursor_fallback - The "alias" named cursor falling back to an image cursor. + The "alias" named cursor falling back to an image cursor. @@ -1459,7 +1441,7 @@ 32 32 alias_cursor_image_fallback - An image cursor falling back to the "alias" cursor. + An image cursor falling back to the "alias" cursor. @@ -1468,10 +1450,9 @@ - False + 0 - horizontal 10 10 @@ -1485,7 +1466,7 @@ start baseline 0.0 - True + 1 @@ -1493,7 +1474,7 @@ 32 32 copy_cursor - The "copy" named cursor. + The "copy" named cursor. @@ -1509,7 +1490,7 @@ 32 32 copy_cursor_fallback - The "copy" named cursor falling back to an image cursor. + The "copy" named cursor falling back to an image cursor. @@ -1517,7 +1498,7 @@ 32 32 copy_cursor_image_fallback - An image cursor falling back to the "copy" cursor. + An image cursor falling back to the "copy" cursor. @@ -1526,10 +1507,9 @@ - False + 0 - horizontal 10 10 @@ -1543,7 +1523,7 @@ start baseline 0.0 - True + 1 @@ -1551,7 +1531,7 @@ 32 32 move_cursor - The "move" named cursor. + The "move" named cursor. @@ -1567,7 +1547,7 @@ 32 32 move_cursor_fallback - The "move" named cursor falling back to an image cursor. + The "move" named cursor falling back to an image cursor. @@ -1575,7 +1555,7 @@ 32 32 move_cursor_image_fallback - An image cursor falling back to the "move" cursor. + An image cursor falling back to the "move" cursor. @@ -1584,10 +1564,9 @@ - False + 0 - horizontal 10 10 @@ -1601,7 +1580,7 @@ start baseline 0.0 - True + 1 @@ -1609,7 +1588,7 @@ 32 32 no-drop_cursor - The "no-drop" named cursor. + The "no-drop" named cursor. @@ -1625,7 +1604,7 @@ 32 32 no-drop_cursor_fallback - The "no-drop" named cursor falling back to an image cursor. + The "no-drop" named cursor falling back to an image cursor. @@ -1633,7 +1612,7 @@ 32 32 no-drop_cursor_image_fallback - An image cursor falling back to the "no-drop" cursor. + An image cursor falling back to the "no-drop" cursor. @@ -1642,10 +1621,9 @@ - False + 0 - horizontal 10 10 @@ -1659,7 +1637,7 @@ start baseline 0.0 - True + 1 @@ -1667,7 +1645,7 @@ 32 32 not-allowed_cursor - The "not-allowed" named cursor. + The "not-allowed" named cursor. @@ -1683,7 +1661,7 @@ 32 32 not-allowed_cursor_fallback - The "not-allowed" named cursor falling back to an image cursor. + The "not-allowed" named cursor falling back to an image cursor. @@ -1691,7 +1669,7 @@ 32 32 not-allowed_cursor_image_fallback - An image cursor falling back to the "not-allowed" cursor. + An image cursor falling back to the "not-allowed" cursor. @@ -1700,10 +1678,9 @@ - False + 0 - horizontal 10 10 @@ -1717,7 +1694,7 @@ start baseline 0.0 - True + 1 @@ -1725,7 +1702,7 @@ 32 32 grab_cursor - The "grab" named cursor. + The "grab" named cursor. @@ -1741,7 +1718,7 @@ 32 32 grab_cursor_fallback - The "grab" named cursor falling back to an image cursor. + The "grab" named cursor falling back to an image cursor. @@ -1749,7 +1726,7 @@ 32 32 grab_cursor_image_fallback - An image cursor falling back to the "grab" cursor. + An image cursor falling back to the "grab" cursor. @@ -1758,10 +1735,9 @@ - False + 0 - horizontal 10 10 @@ -1775,7 +1751,7 @@ start baseline 0.0 - True + 1 @@ -1783,7 +1759,7 @@ 32 32 grabbing_cursor - The "grabbing" named cursor. + The "grabbing" named cursor. @@ -1799,7 +1775,7 @@ 32 32 grabbing_cursor_fallback - The "grabbing" named cursor falling back to an image cursor. + The "grabbing" named cursor falling back to an image cursor. @@ -1807,7 +1783,7 @@ 32 32 grabbing_cursor_image_fallback - An image cursor falling back to the "grabbing" cursor. + An image cursor falling back to the "grabbing" cursor. @@ -1820,7 +1796,7 @@ - True + 1 none @@ -1829,10 +1805,9 @@ - False + 0 - horizontal 10 10 @@ -1846,7 +1821,7 @@ start baseline 0.0 - True + 1 @@ -1854,7 +1829,7 @@ 32 32 all-scroll_cursor - The "all-scroll" named cursor. + The "all-scroll" named cursor. @@ -1870,7 +1845,7 @@ 32 32 all-scroll_cursor_fallback - The "all-scroll" named cursor falling back to an image cursor. + The "all-scroll" named cursor falling back to an image cursor. @@ -1878,7 +1853,7 @@ 32 32 all-scroll_cursor_image_fallback - An image cursor falling back to the "all-scroll" cursor. + An image cursor falling back to the "all-scroll" cursor. @@ -1887,10 +1862,9 @@ - False + 0 - horizontal 10 10 @@ -1904,7 +1878,7 @@ start baseline 0.0 - True + 1 @@ -1912,7 +1886,7 @@ 32 32 col-resize_cursor - The "col-resize" named cursor. + The "col-resize" named cursor. @@ -1928,7 +1902,7 @@ 32 32 col-resize_cursor_fallback - The "col-resize" named cursor falling back to an image cursor. + The "col-resize" named cursor falling back to an image cursor. @@ -1936,7 +1910,7 @@ 32 32 col-resize_cursor_image_fallback - An image cursor falling back to the "col-resize" cursor. + An image cursor falling back to the "col-resize" cursor. @@ -1945,10 +1919,9 @@ - False + 0 - horizontal 10 10 @@ -1962,7 +1935,7 @@ start baseline 0.0 - True + 1 @@ -1970,7 +1943,7 @@ 32 32 row-resize_cursor - The "row-resize" named cursor. + The "row-resize" named cursor. @@ -1986,7 +1959,7 @@ 32 32 row-resize_cursor_fallback - The "row-resize" named cursor falling back to an image cursor. + The "row-resize" named cursor falling back to an image cursor. @@ -1994,7 +1967,7 @@ 32 32 row-resize_cursor_image_fallback - An image cursor falling back to the "row-resize" cursor. + An image cursor falling back to the "row-resize" cursor. @@ -2003,10 +1976,9 @@ - False + 0 - horizontal 10 10 @@ -2020,7 +1992,7 @@ start baseline 0.0 - True + 1 @@ -2028,7 +2000,7 @@ 32 32 n-resize_cursor - The "n-resize" named cursor. + The "n-resize" named cursor. @@ -2044,7 +2016,7 @@ 32 32 n-resize_cursor_fallback - The "n-resize" named cursor falling back to an image cursor. + The "n-resize" named cursor falling back to an image cursor. @@ -2052,7 +2024,7 @@ 32 32 n-resize_cursor_image_fallback - An image cursor falling back to the "n-resize" cursor. + An image cursor falling back to the "n-resize" cursor. @@ -2061,10 +2033,9 @@ - False + 0 - horizontal 10 10 @@ -2078,7 +2049,7 @@ start baseline 0.0 - True + 1 @@ -2086,7 +2057,7 @@ 32 32 e-resize_cursor - The "e-resize" named cursor. + The "e-resize" named cursor. @@ -2102,7 +2073,7 @@ 32 32 e-resize_cursor_fallback - The "e-resize" named cursor falling back to an image cursor. + The "e-resize" named cursor falling back to an image cursor. @@ -2110,7 +2081,7 @@ 32 32 e-resize_cursor_image_fallback - An image cursor falling back to the "e-resize" cursor. + An image cursor falling back to the "e-resize" cursor. @@ -2119,10 +2090,9 @@ - False + 0 - horizontal 10 10 @@ -2136,7 +2106,7 @@ start baseline 0.0 - True + 1 @@ -2144,7 +2114,7 @@ 32 32 s-resize_cursor - The "s-resize" named cursor. + The "s-resize" named cursor. @@ -2160,7 +2130,7 @@ 32 32 s-resize_cursor_fallback - The "s-resize" named cursor falling back to an image cursor. + The "s-resize" named cursor falling back to an image cursor. @@ -2168,7 +2138,7 @@ 32 32 s-resize_cursor_image_fallback - An image cursor falling back to the "s-resize" cursor. + An image cursor falling back to the "s-resize" cursor. @@ -2177,10 +2147,9 @@ - False + 0 - horizontal 10 10 @@ -2194,7 +2163,7 @@ start baseline 0.0 - True + 1 @@ -2202,7 +2171,7 @@ 32 32 w-resize_cursor - The "w-resize" named cursor. + The "w-resize" named cursor. @@ -2218,7 +2187,7 @@ 32 32 w-resize_cursor_fallback - The "w-resize" named cursor falling back to an image cursor. + The "w-resize" named cursor falling back to an image cursor. @@ -2226,7 +2195,7 @@ 32 32 w-resize_cursor_image_fallback - An image cursor falling back to the "w-resize" cursor. + An image cursor falling back to the "w-resize" cursor. @@ -2235,10 +2204,9 @@ - False + 0 - horizontal 10 10 @@ -2252,7 +2220,7 @@ start baseline 0.0 - True + 1 @@ -2260,7 +2228,7 @@ 32 32 ne-resize_cursor - The "ne-resize" named cursor. + The "ne-resize" named cursor. @@ -2276,7 +2244,7 @@ 32 32 ne-resize_cursor_fallback - The "ne-resize" named cursor falling back to an image cursor. + The "ne-resize" named cursor falling back to an image cursor. @@ -2284,7 +2252,7 @@ 32 32 ne-resize_cursor_image_fallback - An image cursor falling back to the "ne-resize" cursor. + An image cursor falling back to the "ne-resize" cursor. @@ -2293,10 +2261,9 @@ - False + 0 - horizontal 10 10 @@ -2310,7 +2277,7 @@ start baseline 0.0 - True + 1 @@ -2318,7 +2285,7 @@ 32 32 nw-resize_cursor - The "nw-resize" named cursor. + The "nw-resize" named cursor. @@ -2334,7 +2301,7 @@ 32 32 nw-resize_cursor_fallback - The "nw-resize" named cursor falling back to an image cursor. + The "nw-resize" named cursor falling back to an image cursor. @@ -2342,7 +2309,7 @@ 32 32 nw-resize_cursor_image_fallback - An image cursor falling back to the "nw-resize" cursor. + An image cursor falling back to the "nw-resize" cursor. @@ -2351,10 +2318,9 @@ - False + 0 - horizontal 10 10 @@ -2368,7 +2334,7 @@ start baseline 0.0 - True + 1 @@ -2376,7 +2342,7 @@ 32 32 sw-resize_cursor - The "sw-resize" named cursor. + The "sw-resize" named cursor. @@ -2392,7 +2358,7 @@ 32 32 sw-resize_cursor_fallback - The "sw-resize" named cursor falling back to an image cursor. + The "sw-resize" named cursor falling back to an image cursor. @@ -2400,7 +2366,7 @@ 32 32 sw-resize_cursor_image_fallback - An image cursor falling back to the "sw-resize" cursor. + An image cursor falling back to the "sw-resize" cursor. @@ -2409,10 +2375,9 @@ - False + 0 - horizontal 10 10 @@ -2426,7 +2391,7 @@ start baseline 0.0 - True + 1 @@ -2434,7 +2399,7 @@ 32 32 se-resize_cursor - The "se-resize" named cursor. + The "se-resize" named cursor. @@ -2450,7 +2415,7 @@ 32 32 se-resize_cursor_fallback - The "se-resize" named cursor falling back to an image cursor. + The "se-resize" named cursor falling back to an image cursor. @@ -2458,7 +2423,7 @@ 32 32 se-resize_cursor_image_fallback - An image cursor falling back to the "se-resize" cursor. + An image cursor falling back to the "se-resize" cursor. @@ -2467,10 +2432,9 @@ - False + 0 - horizontal 10 10 @@ -2484,7 +2448,7 @@ start baseline 0.0 - True + 1 @@ -2492,7 +2456,7 @@ 32 32 ew-resize_cursor - The "ew-resize" named cursor. + The "ew-resize" named cursor. @@ -2508,7 +2472,7 @@ 32 32 ew-resize_cursor_fallback - The "ew-resize" named cursor falling back to an image cursor. + The "ew-resize" named cursor falling back to an image cursor. @@ -2516,7 +2480,7 @@ 32 32 ew-resize_cursor_image_fallback - An image cursor falling back to the "ew-resize" cursor. + An image cursor falling back to the "ew-resize" cursor. @@ -2525,10 +2489,9 @@ - False + 0 - horizontal 10 10 @@ -2542,7 +2505,7 @@ start baseline 0.0 - True + 1 @@ -2550,7 +2513,7 @@ 32 32 ns-resize_cursor - The "ns-resize" named cursor. + The "ns-resize" named cursor. @@ -2566,7 +2529,7 @@ 32 32 ns-resize_cursor_fallback - The "ns-resize" named cursor falling back to an image cursor. + The "ns-resize" named cursor falling back to an image cursor. @@ -2574,7 +2537,7 @@ 32 32 ns-resize_cursor_image_fallback - An image cursor falling back to the "ns-resize" cursor. + An image cursor falling back to the "ns-resize" cursor. @@ -2583,10 +2546,9 @@ - False + 0 - horizontal 10 10 @@ -2600,7 +2562,7 @@ start baseline 0.0 - True + 1 @@ -2608,7 +2570,7 @@ 32 32 nesw-resize_cursor - The "nesw-resize" named cursor. + The "nesw-resize" named cursor. @@ -2624,7 +2586,7 @@ 32 32 nesw-resize_cursor_fallback - The "nesw-resize" named cursor falling back to an image cursor. + The "nesw-resize" named cursor falling back to an image cursor. @@ -2632,7 +2594,7 @@ 32 32 nesw-resize_cursor_image_fallback - An image cursor falling back to the "nesw-resize" cursor. + An image cursor falling back to the "nesw-resize" cursor. @@ -2641,10 +2603,9 @@ - False + 0 - horizontal 10 10 @@ -2658,7 +2619,7 @@ start baseline 0.0 - True + 1 @@ -2666,7 +2627,7 @@ 32 32 nwse-resize_cursor - The "nwse-resize" named cursor. + The "nwse-resize" named cursor. @@ -2682,7 +2643,7 @@ 32 32 nwse-resize_cursor_fallback - The "nwse-resize" named cursor falling back to an image cursor. + The "nwse-resize" named cursor falling back to an image cursor. @@ -2690,7 +2651,7 @@ 32 32 nwse-resize_cursor_image_fallback - An image cursor falling back to the "nwse-resize" cursor. + An image cursor falling back to the "nwse-resize" cursor. @@ -2703,7 +2664,7 @@ - True + 1 none @@ -2712,10 +2673,9 @@ - False + 0 - horizontal 10 10 @@ -2729,7 +2689,7 @@ start baseline 0.0 - True + 1 @@ -2737,7 +2697,7 @@ 32 32 zoom-in_cursor - The "zoom-in" named cursor. + The "zoom-in" named cursor. @@ -2753,7 +2713,7 @@ 32 32 zoom-in_cursor_fallback - The "zoom-in" named cursor falling back to an image cursor. + The "zoom-in" named cursor falling back to an image cursor. @@ -2761,7 +2721,7 @@ 32 32 zoom-in_cursor_image_fallback - An image cursor falling back to the "zoom-in" cursor. + An image cursor falling back to the "zoom-in" cursor. @@ -2770,10 +2730,9 @@ - False + 0 - horizontal 10 10 @@ -2787,7 +2746,7 @@ start baseline 0.0 - True + 1 @@ -2795,7 +2754,7 @@ 32 32 zoom-out_cursor - The "zoom-out" named cursor. + The "zoom-out" named cursor. @@ -2811,7 +2770,7 @@ 32 32 zoom-out_cursor_fallback - The "zoom-out" named cursor falling back to an image cursor. + The "zoom-out" named cursor falling back to an image cursor. @@ -2819,7 +2778,7 @@ 32 32 zoom-out_cursor_image_fallback - An image cursor falling back to the "zoom-out" cursor. + An image cursor falling back to the "zoom-out" cursor. diff --git a/demos/gtk-demo/demo.ui b/demos/gtk-demo/demo.ui index fd08164af4..0413a5383e 100644 --- a/demos/gtk-demo/demo.ui +++ b/demos/gtk-demo/demo.ui @@ -31,16 +31,14 @@ - 250 - 440 + 250 + 440 Builder - 1 vertical - 1 The menubar @@ -48,35 +46,30 @@ - 1 _File 1 - 1 _New 1 - 1 _Open 1 - 1 _Save 1 - 1 Save _As 1 @@ -84,12 +77,10 @@ - 1 - 1 _Quit 1 win.quit @@ -101,28 +92,24 @@ - 1 _Edit 1 - 1 _Copy 1 - 1 _Cut 1 - 1 _Paste 1 @@ -133,14 +120,12 @@ - 1 _Help 1 - 1 _Help 1 win.help @@ -148,7 +133,6 @@ - 1 _About 1 win.about @@ -162,7 +146,6 @@ - 1 The toolbar @@ -170,7 +153,6 @@ - 1 New Create a new file document-new @@ -178,7 +160,6 @@ - 1 Open Open a file document-open @@ -186,7 +167,6 @@ - 1 Save Save a file document-save @@ -195,12 +175,10 @@ - 1 - 1 Copy Copy selected object into the clipboard edit-copy @@ -208,7 +186,6 @@ - 1 Cut Cut selected object into the clipboard edit-cut @@ -216,7 +193,6 @@ - 1 Paste Paste object from the clipboard edit-paste @@ -229,12 +205,10 @@ - in - 1 + in 1 - 1 liststore1 3 @@ -287,7 +261,6 @@ - 1 3 diff --git a/demos/gtk-demo/filtermodel.ui b/demos/gtk-demo/filtermodel.ui index 83db91e36a..8d7d3acf29 100644 --- a/demos/gtk-demo/filtermodel.ui +++ b/demos/gtk-demo/filtermodel.ui @@ -34,14 +34,12 @@ Filter Model - 1 10 - 10 - 10 - 1 + 10 + 10 + 1 - 1 Original 0 @@ -49,16 +47,15 @@ - 0 - 0 + 0 + 0 - 1 - 1 + 1 liststore1 - 0 + 0 @@ -86,16 +83,15 @@ - 0 - 1 + 0 + 1 - 1 - 1 - 0 - 0 + 1 + 0 + 0 @@ -135,13 +131,12 @@ - 1 - 1 + 1 + 1 - 1 Computed Columns 0 @@ -149,13 +144,12 @@ - 1 - 0 + 1 + 0 - 1 Filtered 0 @@ -163,16 +157,15 @@ - 0 - 2 + 0 + 2 - 1 - 1 - 0 - 0 + 1 + 0 + 0 @@ -194,8 +187,8 @@ - 0 - 3 + 0 + 3 diff --git a/demos/gtk-demo/fishbowl.ui b/demos/gtk-demo/fishbowl.ui index 2579fc7290..fca1d6f34b 100644 --- a/demos/gtk-demo/fishbowl.ui +++ b/demos/gtk-demo/fishbowl.ui @@ -5,45 +5,41 @@ Fishbowl - True - True + 1 - True - end + end - True - 0 + - end + end - False - True + changes-allow none - end + end - True - False + + changes-prevent none - end + end diff --git a/demos/gtk-demo/font-features.ui b/demos/gtk-demo/font-features.ui index 3a88e769f7..2cc89c92bc 100644 --- a/demos/gtk-demo/font-features.ui +++ b/demos/gtk-demo/font-features.ui @@ -7,19 +7,16 @@ 500 - 1 1 Font Explorer - 1 1 1 Reset - 1 view-refresh-symbolic @@ -29,24 +26,19 @@ - 1 - 1 1 never - 1 - 1 10 vertical 6 - 1 1 1 Sans 12 @@ -57,7 +49,6 @@ - 1 0 Font Features @@ -87,10 +78,8 @@ - 1 - 1 Font Variations 0 @@ -100,7 +89,6 @@ - 1 10 10 @@ -118,7 +106,6 @@ - 1 vertical 1 1 @@ -126,10 +113,8 @@ 20 - 1 - 1 1 0 0 @@ -142,7 +127,6 @@ - 1 Grumpy wizards make toxic brew for the evil Queen and Jack. A quick movement of the enemy will jeopardize six gunboats. The job of waxing linoleum frequently peeves chintzy kids. My girl wove six dozen plaid jackets before she quit. Twelve ziggurats quickly jumped a finch box. Разъяренный чтец эгоистично бьёт пятью жердями шустрого фехтовальщика. Наш банк вчера же выплатил Ф.Я. Эйхгольду комиссию за ценные вещи. Эх, чужак, общий съём цен шляп (юфть) – вдрызг! В чащах юга жил бы цитрус? Да, но фальшивый экземпляр! @@ -161,7 +145,6 @@ - 1 1 0 end @@ -176,22 +159,20 @@ - horizontal 10 - - - 1 - 1 - 0 - end - 50 - 50 - 1 - - - + + + 1 + 0 + end + 50 + 50 + 1 + + + document-edit-symbolic diff --git a/demos/gtk-demo/listbox.ui b/demos/gtk-demo/listbox.ui index d9b6677dbd..76b49b285d 100644 --- a/demos/gtk-demo/listbox.ui +++ b/demos/gtk-demo/listbox.ui @@ -3,61 +3,53 @@ - 1 - 1 Email message - 1 + 1 - 1 Embed message - 1 + 1 - horizontal @@ -703,7 +594,6 @@ - horizontal diff --git a/gtk/inspector/magnifier.ui b/gtk/inspector/magnifier.ui index 8bf7f62151..528f1069ed 100644 --- a/gtk/inspector/magnifier.ui +++ b/gtk/inspector/magnifier.ui @@ -4,11 +4,7 @@ vertical - True - automatic - automatic - True - none + 1 True diff --git a/gtk/inspector/menu.ui b/gtk/inspector/menu.ui index 51cbf99756..62e9e8fe00 100644 --- a/gtk/inspector/menu.ui +++ b/gtk/inspector/menu.ui @@ -2,24 +2,26 @@ - - - - - + + + + + + + + + + - horizontal @@ -785,4 +649,3 @@ - diff --git a/gtk/inspector/object-hierarchy.ui b/gtk/inspector/object-hierarchy.ui index 8afcb5cfdd..9b96c7780a 100644 --- a/gtk/inspector/object-hierarchy.ui +++ b/gtk/inspector/object-hierarchy.ui @@ -9,20 +9,17 @@ vertical - True never - automatic - True + 1 - True model - False - False + 0 + 0 1 0 18 - + none diff --git a/gtk/inspector/object-tree.ui b/gtk/inspector/object-tree.ui index e68b3d61b3..07d85d276d 100644 --- a/gtk/inspector/object-tree.ui +++ b/gtk/inspector/object-tree.ui @@ -16,18 +16,14 @@ - True - True + 1 - True - horizontal - True 40 @@ -37,14 +33,12 @@ - True go-down-symbolic - True go-up-symbolic @@ -55,27 +49,23 @@ - True never - automatic - True + 1 - True model - False + 0 vertical - single Object - True + 1 0.8 @@ -90,7 +80,7 @@ Name - True + 1 0.8 @@ -105,7 +95,7 @@ Label - True + 1 0.8 @@ -122,7 +112,7 @@ Style Classes - True + 1 0.8 diff --git a/gtk/inspector/prop-list.ui b/gtk/inspector/prop-list.ui index c1475a12a7..046f25d054 100644 --- a/gtk/inspector/prop-list.ui +++ b/gtk/inspector/prop-list.ui @@ -16,23 +16,19 @@ - True - True + 1 never - automatic - True model 4 0 - True vertical Property - True + 1 0 @@ -48,11 +44,10 @@ Value - True + 1 0.8 - False 20 end @@ -66,11 +61,10 @@ Type - True + 1 0.8 - False 20 end @@ -84,11 +78,10 @@ Attribute - True + 1 0.8 - False 6 diff --git a/gtk/inspector/recorder.ui b/gtk/inspector/recorder.ui index 75c591ae56..e506d937a4 100644 --- a/gtk/inspector/recorder.ui +++ b/gtk/inspector/recorder.ui @@ -4,16 +4,13 @@