1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
3190
3191
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
3208
3209
3210
3211
3212
3213
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
3226
3227
3228
3229
3230
3231
3232
3233
3234
3235
3236
3237
3238
3239
3240
3241
3242
3243
3244
3245
3246
3247
3248
3249
3250
3251
3252
3253
3254
3255
3256
3257
3258
3259
3260
3261
3262
3263
3264
3265
3266
3267
3268
3269
3270
3271
3272
3273
3274
3275
3276
3277
3278
3279
3280
3281
3282
3283
3284
3285
3286
3287
3288
3289
3290
3291
3292
3293
3294
3295
3296
3297
3298
3299
3300
3301
3302
3303
3304
3305
3306
3307
3308
3309
3310
3311
3312
3313
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323
3324
3325
3326
3327
3328
3329
3330
3331
3332
3333
3334
3335
3336
3337
3338
3339
3340
3341
3342
3343
3344
3345
3346
3347
3348
3349
3350
3351
3352
3353
3354
3355
3356
3357
3358
3359
3360
3361
3362
3363
3364
3365
3366
3367
3368
3369
3370
3371
3372
3373
3374
3375
3376
3377
3378
3379
3380
3381
3382
3383
3384
3385
3386
3387
3388
3389
3390
3391
3392
3393
3394
3395
3396
3397
3398
3399
3400
3401
3402
3403
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414
3415
3416
3417
3418
3419
3420
3421
3422
3423
3424
3425
3426
3427
3428
3429
3430
3431
3432
3433
3434
3435
3436
3437
3438
3439
3440
3441
3442
3443
3444
3445
3446
3447
3448
3449
3450
3451
3452
3453
3454
3455
3456
3457
3458
3459
3460
3461
3462
3463
3464
3465
3466
3467
3468
3469
3470
3471
3472
3473
3474
3475
3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497
3498
3499
3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
3522
3523
3524
3525
3526
3527
3528
3529
3530
3531
3532
3533
3534
3535
3536
3537
3538
3539
3540
3541
3542
3543
3544
3545
3546
3547
3548
3549
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
3565
3566
3567
3568
3569
3570
3571
3572
3573
3574
3575
3576
3577
3578
3579
3580
3581
3582
3583
3584
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
3597
3598
3599
3600
3601
3602
3603
3604
3605
3606
3607
3608
3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
3621
3622
3623
3624
3625
3626
3627
3628
3629
3630
3631
3632
3633
3634
3635
3636
3637
3638
3639
3640
3641
3642
3643
3644
3645
3646
3647
3648
3649
3650
3651
3652
3653
3654
3655
3656
3657
3658
3659
3660
3661
3662
3663
3664
3665
3666
3667
3668
3669
3670
3671
3672
3673
3674
3675
3676
3677
3678
3679
3680
3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
3691
3692
3693
3694
3695
3696
3697
3698
3699
3700
3701
3702
3703
3704
3705
3706
3707
3708
3709
3710
3711
3712
3713
3714
3715
3716
3717
3718
3719
3720
3721
3722
3723
3724
3725
3726
3727
3728
3729
3730
3731
3732
3733
3734
3735
3736
3737
3738
3739
3740
3741
3742
3743
3744
3745
3746
3747
3748
3749
3750
3751
3752
3753
3754
3755
3756
3757
3758
3759
3760
3761
3762
3763
3764
3765
3766
3767
3768
3769
3770
3771
3772
3773
3774
3775
3776
3777
3778
3779
3780
3781
3782
3783
3784
3785
3786
3787
3788
3789
3790
3791
3792
3793
3794
3795
3796
3797
3798
3799
3800
3801
3802
3803
3804
3805
3806
3807
3808
3809
3810
3811
3812
3813
3814
3815
3816
3817
3818
3819
3820
3821
3822
3823
3824
3825
3826
3827
3828
3829
3830
3831
3832
3833
3834
3835
3836
3837
3838
3839
3840
3841
3842
3843
3844
3845
3846
3847
3848
3849
3850
3851
3852
3853
3854
3855
3856
3857
3858
3859
3860
3861
3862
3863
3864
3865
3866
3867
3868
3869
3870
3871
3872
3873
3874
3875
3876
3877
3878
3879
3880
3881
3882
3883
3884
3885
3886
3887
3888
3889
3890
3891
3892
3893
3894
3895
3896
3897
3898
3899
3900
3901
3902
3903
3904
3905
3906
3907
3908
3909
3910
3911
3912
3913
3914
3915
3916
3917
3918
3919
3920
3921
3922
3923
3924
3925
3926
3927
3928
3929
3930
3931
3932
3933
3934
3935
3936
3937
3938
3939
3940
3941
3942
3943
3944
3945
3946
3947
3948
3949
3950
3951
3952
3953
3954
3955
3956
3957
3958
3959
3960
3961
3962
3963
3964
3965
3966
3967
3968
3969
3970
3971
3972
3973
3974
3975
3976
3977
3978
3979
3980
3981
3982
3983
3984
3985
3986
3987
3988
3989
3990
3991
3992
3993
3994
3995
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
4012
4013
4014
4015
4016
4017
4018
4019
4020
4021
4022
4023
4024
4025
4026
4027
4028
4029
4030
4031
4032
4033
4034
4035
4036
4037
4038
4039
4040
4041
4042
4043
4044
4045
4046
4047
4048
4049
4050
4051
4052
4053
4054
4055
4056
4057
4058
4059
4060
4061
4062
4063
4064
4065
4066
4067
4068
4069
4070
4071
4072
4073
4074
4075
4076
4077
4078
4079
4080
4081
4082
4083
4084
4085
4086
4087
4088
4089
4090
4091
4092
4093
4094
4095
4096
4097
4098
4099
4100
4101
4102
4103
4104
4105
4106
4107
4108
4109
4110
4111
4112
4113
4114
4115
4116
4117
4118
4119
4120
4121
4122
4123
4124
4125
4126
4127
4128
4129
4130
4131
4132
4133
4134
4135
4136
4137
4138
4139
4140
4141
4142
4143
4144
4145
4146
4147
4148
4149
4150
4151
4152
4153
4154
4155
4156
4157
4158
4159
4160
4161
4162
4163
4164
4165
4166
4167
4168
4169
4170
4171
4172
4173
4174
4175
4176
4177
4178
4179
4180
4181
4182
4183
4184
4185
4186
4187
4188
4189
4190
4191
4192
4193
4194
4195
4196
4197
4198
4199
4200
4201
4202
4203
4204
4205
4206
4207
4208
4209
4210
4211
4212
4213
4214
4215
4216
4217
4218
4219
4220
4221
4222
4223
4224
4225
4226
4227
4228
4229
4230
4231
4232
4233
4234
4235
4236
4237
4238
4239
4240
4241
4242
4243
4244
4245
4246
4247
4248
4249
4250
4251
4252
4253
4254
4255
4256
4257
4258
4259
4260
4261
4262
4263
4264
4265
4266
4267
4268
4269
4270
4271
4272
4273
4274
4275
4276
4277
4278
4279
4280
4281
4282
4283
4284
4285
4286
4287
4288
4289
4290
4291
4292
4293
4294
4295
4296
4297
4298
4299
4300
4301
4302
4303
4304
4305
4306
4307
4308
4309
4310
4311
4312
4313
4314
4315
4316
4317
4318
4319
4320
4321
4322
4323
4324
4325
4326
4327
4328
4329
4330
4331
4332
4333
4334
4335
4336
4337
4338
4339
4340
4341
4342
4343
4344
4345
4346
4347
4348
4349
4350
4351
4352
4353
4354
4355
4356
4357
4358
4359
4360
4361
4362
4363
4364
4365
4366
4367
4368
4369
4370
4371
4372
4373
4374
4375
4376
4377
4378
4379
4380
4381
4382
4383
4384
4385
4386
4387
4388
4389
4390
4391
4392
4393
4394
4395
4396
4397
4398
4399
4400
4401
4402
4403
4404
4405
4406
4407
4408
4409
4410
4411
4412
4413
4414
4415
4416
4417
4418
4419
4420
4421
4422
4423
4424
4425
4426
4427
4428
4429
4430
4431
4432
4433
4434
4435
4436
4437
4438
4439
4440
4441
4442
4443
4444
4445
4446
4447
4448
4449
4450
4451
4452
4453
4454
4455
4456
4457
4458
4459
4460
4461
4462
4463
4464
4465
4466
4467
4468
4469
4470
4471
4472
4473
4474
4475
4476
4477
4478
4479
4480
4481
4482
4483
4484
4485
4486
4487
4488
4489
4490
4491
4492
4493
4494
4495
4496
4497
4498
4499
4500
4501
4502
4503
4504
4505
4506
4507
4508
4509
4510
4511
4512
4513
4514
4515
4516
4517
4518
4519
4520
4521
4522
4523
4524
4525
4526
4527
4528
4529
4530
4531
4532
4533
4534
4535
4536
4537
4538
4539
4540
4541
4542
4543
4544
4545
4546
4547
4548
4549
4550
4551
4552
4553
4554
4555
4556
4557
4558
4559
4560
4561
4562
4563
4564
4565
4566
4567
4568
4569
4570
4571
4572
4573
4574
4575
4576
4577
4578
4579
4580
4581
4582
4583
4584
4585
4586
4587
4588
4589
4590
4591
4592
4593
4594
4595
4596
4597
4598
4599
4600
4601
4602
4603
4604
4605
4606
4607
4608
4609
4610
4611
4612
4613
4614
4615
4616
4617
4618
4619
4620
4621
4622
4623
4624
4625
4626
4627
4628
4629
4630
4631
4632
4633
4634
4635
4636
4637
4638
4639
4640
4641
4642
4643
4644
4645
4646
4647
4648
4649
4650
4651
4652
4653
4654
4655
4656
4657
4658
4659
4660
4661
4662
4663
4664
4665
4666
4667
4668
4669
4670
4671
4672
4673
4674
4675
4676
4677
4678
4679
4680
4681
4682
4683
4684
4685
4686
4687
4688
4689
4690
4691
4692
4693
4694
4695
4696
4697
4698
4699
4700
4701
4702
4703
4704
4705
4706
4707
4708
4709
4710
4711
4712
4713
4714
4715
4716
4717
4718
4719
4720
4721
4722
4723
4724
4725
4726
4727
4728
4729
4730
4731
4732
4733
4734
4735
4736
4737
4738
4739
4740
4741
4742
4743
4744
4745
4746
4747
4748
4749
4750
4751
4752
4753
4754
4755
4756
4757
4758
4759
4760
4761
4762
4763
4764
4765
4766
4767
4768
4769
4770
4771
4772
4773
4774
4775
4776
4777
4778
4779
4780
4781
4782
4783
4784
4785
4786
4787
4788
4789
4790
4791
4792
4793
4794
4795
4796
4797
4798
4799
4800
4801
4802
4803
4804
4805
4806
4807
4808
4809
4810
4811
4812
4813
4814
4815
4816
4817
4818
4819
4820
4821
4822
4823
4824
4825
4826
4827
4828
4829
4830
4831
4832
4833
4834
4835
4836
4837
4838
4839
4840
4841
4842
4843
4844
4845
4846
4847
4848
4849
4850
4851
4852
4853
4854
4855
4856
4857
4858
4859
4860
4861
4862
4863
4864
4865
4866
4867
4868
4869
4870
4871
4872
4873
4874
4875
4876
4877
4878
4879
4880
4881
4882
4883
4884
4885
4886
4887
4888
4889
4890
4891
4892
4893
4894
4895
4896
4897
4898
4899
4900
4901
4902
4903
4904
4905
4906
4907
4908
4909
4910
4911
4912
4913
4914
4915
4916
4917
4918
4919
4920
4921
4922
4923
4924
4925
4926
4927
4928
4929
4930
4931
4932
4933
4934
4935
4936
4937
4938
4939
4940
4941
4942
4943
4944
4945
4946
4947
4948
4949
4950
4951
4952
4953
4954
4955
4956
4957
4958
4959
4960
4961
4962
4963
4964
4965
4966
4967
4968
4969
4970
4971
4972
4973
4974
4975
4976
4977
4978
4979
4980
4981
4982
4983
4984
4985
4986
4987
4988
4989
4990
4991
4992
4993
4994
4995
4996
4997
4998
4999
5000
5001
5002
5003
5004
5005
5006
5007
5008
5009
5010
5011
5012
5013
5014
5015
5016
5017
5018
5019
5020
5021
5022
5023
5024
5025
5026
5027
5028
5029
5030
5031
5032
5033
5034
5035
5036
5037
5038
5039
5040
5041
5042
5043
5044
5045
5046
5047
5048
5049
5050
5051
5052
5053
5054
5055
5056
5057
5058
5059
5060
5061
5062
5063
5064
5065
5066
5067
5068
5069
5070
5071
5072
5073
5074
5075
5076
5077
5078
5079
5080
5081
5082
5083
5084
5085
5086
5087
5088
5089
5090
5091
5092
5093
5094
5095
5096
5097
5098
5099
5100
5101
5102
5103
5104
5105
5106
5107
5108
5109
5110
5111
5112
5113
5114
5115
5116
5117
5118
5119
5120
5121
5122
5123
5124
5125
5126
5127
5128
5129
5130
5131
5132
5133
5134
5135
5136
5137
5138
5139
5140
5141
5142
5143
5144
5145
5146
5147
5148
5149
5150
5151
5152
5153
5154
5155
5156
5157
5158
5159
5160
5161
5162
5163
5164
5165
5166
5167
5168
5169
5170
5171
5172
5173
5174
5175
5176
5177
5178
5179
5180
5181
5182
5183
5184
5185
5186
5187
5188
5189
5190
5191
5192
5193
5194
5195
5196
5197
5198
5199
5200
5201
5202
5203
5204
5205
5206
5207
5208
5209
5210
5211
5212
5213
5214
5215
5216
5217
5218
5219
5220
5221
5222
5223
5224
5225
5226
5227
5228
5229
5230
5231
5232
5233
5234
5235
5236
5237
5238
5239
5240
5241
5242
5243
5244
5245
5246
5247
5248
5249
5250
5251
5252
5253
5254
5255
5256
5257
5258
5259
5260
5261
5262
5263
5264
5265
5266
5267
5268
5269
5270
5271
5272
5273
5274
5275
5276
5277
5278
5279
5280
5281
5282
5283
5284
5285
5286
5287
5288
5289
5290
5291
5292
5293
5294
5295
5296
5297
5298
5299
5300
5301
5302
5303
5304
5305
5306
5307
5308
5309
5310
5311
5312
5313
5314
5315
5316
5317
5318
5319
5320
5321
5322
5323
5324
5325
5326
5327
5328
5329
5330
5331
5332
5333
5334
5335
5336
5337
5338
5339
5340
5341
5342
5343
5344
5345
5346
5347
5348
5349
5350
5351
5352
5353
5354
5355
5356
5357
5358
5359
5360
5361
5362
5363
5364
5365
5366
5367
5368
5369
5370
5371
5372
5373
5374
5375
5376
5377
5378
5379
5380
5381
5382
5383
5384
5385
5386
5387
5388
5389
5390
5391
5392
5393
5394
5395
5396
5397
5398
5399
5400
5401
5402
5403
5404
5405
5406
5407
5408
5409
5410
5411
5412
5413
5414
5415
5416
5417
5418
5419
5420
5421
5422
5423
5424
5425
5426
5427
5428
5429
5430
5431
5432
5433
5434
5435
5436
5437
5438
5439
5440
5441
5442
5443
5444
5445
5446
5447
5448
5449
5450
5451
5452
5453
5454
5455
5456
5457
5458
5459
5460
5461
5462
5463
5464
5465
5466
5467
5468
5469
5470
5471
5472
5473
5474
5475
5476
5477
5478
5479
5480
5481
5482
5483
5484
5485
5486
5487
5488
5489
5490
5491
5492
5493
5494
5495
5496
5497
5498
5499
5500
5501
5502
5503
5504
5505
5506
5507
5508
5509
5510
5511
5512
5513
5514
5515
5516
5517
5518
5519
5520
5521
5522
5523
5524
5525
5526
5527
5528
5529
5530
5531
5532
5533
5534
5535
5536
5537
5538
5539
5540
5541
5542
5543
5544
5545
5546
5547
5548
5549
5550
5551
5552
5553
5554
5555
5556
5557
5558
5559
5560
5561
5562
5563
5564
5565
5566
5567
5568
5569
5570
5571
5572
5573
5574
5575
5576
5577
5578
5579
5580
5581
5582
5583
5584
5585
5586
5587
5588
5589
5590
5591
5592
5593
5594
5595
5596
5597
5598
5599
5600
5601
5602
5603
5604
5605
5606
5607
5608
5609
5610
5611
5612
5613
5614
5615
5616
5617
5618
5619
5620
5621
5622
5623
5624
5625
5626
5627
5628
5629
5630
5631
5632
5633
5634
5635
5636
5637
5638
5639
5640
5641
5642
5643
5644
5645
5646
5647
5648
5649
5650
5651
5652
5653
5654
5655
5656
5657
5658
5659
5660
5661
5662
5663
5664
5665
5666
5667
5668
5669
5670
5671
5672
5673
5674
5675
5676
5677
5678
5679
5680
5681
5682
5683
5684
5685
5686
5687
5688
5689
5690
5691
5692
5693
5694
5695
5696
5697
5698
5699
5700
5701
5702
5703
5704
5705
5706
5707
5708
5709
5710
5711
5712
5713
5714
5715
5716
5717
5718
5719
5720
5721
5722
5723
5724
5725
5726
5727
5728
5729
5730
5731
5732
5733
5734
5735
5736
5737
5738
5739
5740
5741
5742
5743
5744
5745
5746
5747
5748
5749
5750
5751
5752
5753
5754
5755
5756
5757
5758
5759
5760
5761
5762
5763
5764
5765
5766
5767
5768
5769
5770
5771
5772
5773
5774
5775
5776
5777
5778
5779
5780
5781
5782
5783
5784
5785
5786
5787
5788
5789
5790
5791
5792
5793
5794
5795
5796
5797
5798
5799
5800
5801
5802
5803
5804
5805
5806
5807
5808
5809
5810
5811
5812
5813
5814
5815
5816
5817
5818
5819
5820
5821
5822
5823
5824
5825
5826
5827
5828
5829
5830
5831
5832
5833
5834
5835
5836
5837
5838
5839
5840
5841
5842
5843
5844
5845
5846
5847
5848
5849
5850
5851
5852
5853
5854
5855
5856
5857
5858
5859
5860
5861
5862
5863
5864
5865
5866
5867
5868
5869
5870
5871
5872
5873
5874
5875
5876
5877
5878
5879
5880
5881
5882
5883
5884
5885
5886
5887
5888
5889
5890
5891
5892
5893
5894
5895
5896
5897
5898
5899
5900
5901
5902
5903
5904
5905
5906
5907
5908
5909
5910
5911
5912
5913
5914
5915
5916
5917
5918
5919
5920
5921
5922
5923
5924
5925
5926
5927
5928
5929
5930
5931
5932
5933
5934
5935
5936
5937
5938
5939
5940
5941
5942
5943
5944
5945
5946
5947
5948
5949
5950
5951
5952
5953
5954
5955
5956
5957
5958
5959
5960
5961
5962
5963
5964
5965
5966
5967
5968
5969
5970
5971
5972
5973
5974
5975
5976
5977
5978
5979
5980
5981
5982
5983
5984
5985
5986
5987
5988
5989
5990
5991
5992
5993
5994
5995
5996
5997
5998
5999
6000
6001
6002
6003
6004
6005
6006
6007
6008
6009
6010
6011
6012
6013
6014
6015
6016
6017
6018
6019
6020
6021
6022
6023
6024
6025
6026
6027
6028
6029
6030
6031
6032
6033
6034
6035
6036
6037
6038
6039
6040
6041
6042
6043
6044
6045
6046
6047
6048
6049
6050
6051
6052
6053
6054
6055
6056
6057
6058
6059
6060
6061
6062
6063
6064
6065
6066
6067
6068
6069
6070
6071
6072
6073
6074
6075
6076
6077
6078
6079
6080
6081
6082
6083
6084
6085
6086
6087
6088
6089
6090
6091
6092
6093
6094
6095
6096
6097
6098
6099
6100
6101
6102
6103
6104
6105
6106
6107
6108
6109
6110
6111
6112
6113
6114
6115
6116
6117
6118
6119
6120
6121
6122
6123
6124
6125
6126
6127
6128
6129
6130
6131
6132
6133
6134
6135
6136
6137
6138
6139
6140
6141
6142
6143
6144
6145
6146
6147
6148
6149
6150
6151
6152
6153
6154
6155
6156
6157
6158
6159
6160
6161
6162
6163
6164
6165
6166
6167
6168
6169
6170
6171
6172
6173
6174
6175
6176
6177
6178
6179
6180
6181
6182
6183
6184
6185
6186
6187
6188
6189
6190
6191
6192
6193
6194
6195
6196
6197
6198
6199
6200
6201
6202
6203
6204
6205
6206
6207
6208
6209
6210
6211
6212
6213
6214
6215
6216
6217
6218
6219
6220
6221
6222
6223
6224
6225
6226
6227
6228
6229
6230
6231
6232
6233
6234
6235
6236
6237
6238
6239
6240
6241
6242
6243
6244
6245
6246
6247
6248
6249
6250
6251
6252
6253
6254
6255
6256
6257
6258
6259
6260
6261
6262
6263
6264
6265
6266
6267
6268
6269
6270
6271
6272
6273
6274
6275
6276
6277
6278
6279
6280
6281
6282
6283
6284
6285
6286
6287
6288
6289
6290
6291
6292
6293
6294
6295
6296
6297
6298
6299
6300
6301
6302
6303
6304
6305
6306
6307
6308
6309
6310
6311
6312
6313
6314
6315
6316
6317
6318
6319
6320
6321
6322
6323
6324
6325
6326
6327
6328
6329
6330
6331
6332
6333
6334
6335
6336
6337
6338
6339
6340
6341
6342
6343
6344
6345
6346
6347
6348
6349
6350
6351
6352
6353
6354
6355
6356
6357
6358
6359
6360
6361
6362
6363
6364
6365
6366
6367
6368
6369
6370
6371
6372
6373
6374
6375
6376
6377
6378
6379
6380
6381
6382
6383
6384
6385
6386
6387
6388
6389
6390
6391
6392
6393
6394
6395
6396
6397
6398
6399
6400
6401
6402
6403
6404
6405
6406
6407
6408
6409
6410
6411
6412
6413
6414
6415
6416
6417
6418
6419
6420
6421
6422
6423
6424
6425
6426
6427
6428
6429
6430
6431
6432
6433
6434
6435
6436
6437
6438
6439
6440
6441
6442
6443
6444
6445
6446
6447
6448
6449
6450
6451
6452
6453
6454
6455
6456
6457
6458
6459
6460
6461
6462
6463
6464
6465
6466
6467
6468
6469
6470
6471
6472
6473
6474
6475
6476
6477
6478
6479
6480
6481
6482
6483
6484
6485
6486
6487
6488
6489
6490
6491
6492
6493
6494
6495
6496
6497
6498
6499
6500
6501
6502
6503
6504
6505
6506
6507
6508
6509
6510
6511
6512
6513
6514
6515
6516
6517
6518
6519
6520
6521
6522
6523
6524
6525
6526
6527
6528
6529
6530
6531
6532
6533
6534
6535
6536
6537
6538
6539
6540
6541
6542
6543
6544
6545
6546
6547
6548
6549
6550
6551
6552
6553
6554
6555
6556
6557
6558
6559
6560
6561
6562
6563
6564
6565
6566
6567
6568
6569
6570
6571
6572
6573
6574
6575
6576
6577
6578
6579
6580
6581
6582
6583
6584
6585
6586
6587
6588
6589
6590
6591
6592
6593
6594
6595
6596
6597
6598
6599
6600
6601
6602
6603
6604
6605
6606
6607
6608
6609
6610
6611
6612
6613
6614
6615
6616
6617
6618
6619
6620
6621
6622
6623
6624
6625
6626
6627
6628
6629
6630
6631
6632
6633
6634
6635
6636
6637
6638
6639
6640
6641
6642
6643
6644
6645
6646
6647
6648
6649
6650
6651
6652
6653
6654
6655
6656
6657
6658
6659
6660
6661
6662
6663
6664
6665
6666
6667
6668
6669
6670
6671
6672
6673
6674
6675
6676
6677
6678
6679
6680
6681
6682
6683
6684
6685
6686
6687
6688
6689
6690
6691
6692
6693
6694
6695
6696
6697
6698
6699
6700
6701
6702
6703
6704
6705
6706
6707
6708
6709
6710
6711
6712
6713
6714
6715
6716
6717
6718
6719
6720
6721
6722
6723
6724
6725
6726
6727
6728
6729
6730
6731
6732
6733
6734
6735
6736
6737
6738
6739
6740
6741
6742
6743
6744
6745
6746
6747
6748
6749
6750
6751
6752
6753
6754
6755
6756
6757
6758
6759
6760
6761
6762
6763
6764
6765
6766
6767
6768
6769
6770
6771
6772
6773
6774
6775
6776
6777
6778
6779
6780
6781
6782
6783
6784
6785
6786
6787
6788
6789
6790
6791
6792
6793
6794
6795
6796
6797
6798
6799
6800
6801
6802
6803
6804
6805
6806
6807
6808
6809
6810
6811
6812
6813
6814
6815
6816
6817
6818
6819
6820
6821
6822
6823
6824
6825
6826
6827
6828
6829
6830
6831
6832
6833
6834
6835
6836
6837
6838
6839
6840
6841
6842
6843
6844
6845
6846
6847
6848
6849
6850
6851
6852
6853
6854
6855
6856
6857
6858
6859
6860
6861
6862
6863
6864
6865
6866
6867
6868
6869
6870
6871
6872
6873
6874
6875
6876
6877
6878
6879
6880
6881
6882
6883
6884
6885
6886
6887
6888
6889
6890
6891
6892
6893
6894
6895
6896
6897
6898
6899
6900
6901
6902
6903
6904
6905
6906
6907
6908
6909
6910
6911
6912
6913
6914
6915
6916
6917
6918
6919
6920
6921
6922
6923
6924
6925
6926
6927
6928
6929
6930
6931
6932
6933
6934
6935
6936
6937
6938
6939
6940
6941
6942
6943
6944
6945
6946
6947
6948
6949
6950
6951
6952
6953
6954
6955
6956
6957
6958
6959
6960
6961
6962
6963
6964
6965
6966
6967
6968
6969
6970
6971
6972
6973
6974
6975
6976
6977
6978
6979
6980
6981
6982
6983
6984
6985
6986
6987
6988
6989
6990
6991
6992
6993
6994
6995
6996
6997
6998
6999
7000
7001
7002
7003
7004
7005
7006
7007
7008
7009
7010
7011
7012
7013
7014
7015
7016
7017
7018
7019
7020
7021
7022
7023
7024
7025
7026
7027
7028
7029
7030
7031
7032
7033
7034
7035
7036
7037
7038
7039
7040
7041
7042
7043
7044
7045
7046
7047
7048
7049
7050
7051
7052
7053
7054
7055
7056
7057
7058
7059
7060
7061
7062
7063
7064
7065
7066
7067
7068
7069
7070
7071
7072
7073
7074
7075
7076
7077
7078
7079
7080
7081
7082
7083
7084
7085
7086
7087
7088
7089
7090
7091
7092
7093
7094
7095
7096
7097
7098
7099
7100
7101
7102
7103
7104
7105
7106
7107
7108
7109
7110
7111
7112
7113
7114
7115
7116
7117
7118
7119
7120
7121
7122
7123
7124
7125
7126
7127
7128
7129
7130
7131
7132
7133
7134
7135
7136
7137
7138
7139
7140
7141
7142
7143
7144
7145
7146
7147
7148
7149
7150
7151
7152
7153
7154
7155
7156
7157
7158
7159
7160
7161
7162
7163
7164
7165
7166
7167
7168
7169
7170
7171
7172
7173
7174
7175
7176
7177
7178
7179
7180
7181
7182
7183
7184
7185
7186
7187
7188
7189
7190
7191
7192
7193
7194
7195
7196
7197
7198
7199
7200
7201
7202
7203
7204
7205
7206
7207
7208
7209
7210
7211
7212
7213
7214
7215
7216
7217
7218
7219
7220
7221
7222
7223
7224
7225
7226
7227
7228
7229
7230
7231
7232
7233
7234
7235
7236
7237
7238
7239
7240
7241
7242
7243
7244
7245
7246
7247
7248
7249
7250
7251
7252
7253
7254
7255
7256
7257
7258
7259
7260
7261
7262
7263
7264
7265
7266
7267
7268
7269
7270
7271
7272
7273
7274
7275
7276
7277
7278
7279
7280
7281
7282
7283
7284
7285
7286
7287
7288
7289
7290
7291
7292
7293
7294
7295
7296
7297
7298
7299
7300
7301
7302
7303
7304
7305
7306
7307
7308
7309
7310
7311
7312
7313
7314
7315
7316
7317
7318
7319
7320
7321
7322
7323
7324
7325
7326
7327
7328
7329
7330
7331
7332
7333
7334
7335
7336
7337
7338
7339
7340
7341
7342
7343
7344
7345
7346
7347
7348
7349
7350
7351
7352
7353
7354
7355
7356
7357
7358
7359
7360
7361
7362
7363
7364
7365
7366
7367
7368
7369
7370
7371
7372
7373
7374
7375
7376
7377
7378
7379
7380
7381
7382
7383
7384
7385
7386
7387
7388
7389
7390
7391
7392
7393
7394
7395
7396
7397
7398
7399
7400
7401
7402
7403
7404
7405
7406
7407
7408
7409
7410
7411
7412
7413
7414
7415
7416
7417
7418
7419
7420
7421
7422
7423
7424
7425
7426
7427
7428
7429
7430
7431
7432
7433
7434
7435
7436
7437
7438
7439
7440
7441
7442
7443
7444
7445
7446
7447
7448
7449
7450
7451
7452
7453
7454
7455
7456
7457
7458
7459
7460
7461
7462
7463
7464
7465
7466
7467
7468
7469
7470
7471
7472
7473
7474
7475
7476
7477
7478
7479
7480
7481
7482
7483
7484
7485
7486
7487
7488
7489
7490
7491
7492
7493
7494
7495
7496
7497
7498
7499
7500
7501
7502
7503
7504
7505
7506
7507
7508
7509
7510
7511
7512
7513
7514
7515
7516
7517
7518
7519
7520
7521
7522
7523
7524
7525
7526
7527
7528
7529
7530
7531
7532
7533
7534
7535
7536
7537
7538
7539
7540
7541
7542
7543
7544
7545
7546
7547
7548
7549
7550
7551
7552
7553
7554
7555
7556
7557
7558
7559
7560
7561
7562
7563
7564
7565
7566
7567
7568
7569
7570
7571
7572
7573
7574
7575
7576
7577
7578
7579
7580
7581
7582
7583
7584
7585
7586
7587
7588
7589
7590
7591
7592
7593
7594
7595
7596
7597
7598
7599
7600
7601
7602
7603
7604
7605
7606
7607
7608
7609
7610
7611
7612
7613
7614
7615
7616
7617
7618
7619
7620
7621
7622
7623
7624
7625
7626
7627
7628
7629
7630
7631
7632
7633
7634
7635
7636
7637
7638
7639
7640
7641
7642
7643
7644
7645
7646
7647
7648
7649
7650
7651
7652
7653
7654
7655
7656
7657
7658
7659
7660
7661
7662
7663
7664
7665
7666
7667
7668
7669
7670
7671
7672
7673
7674
7675
7676
7677
7678
7679
7680
7681
7682
7683
7684
7685
7686
7687
7688
7689
7690
7691
7692
7693
7694
7695
7696
7697
7698
7699
7700
7701
7702
7703
7704
7705
7706
7707
7708
7709
7710
7711
7712
7713
7714
7715
7716
7717
7718
7719
7720
7721
7722
7723
7724
7725
7726
7727
7728
7729
7730
7731
7732
7733
7734
7735
7736
7737
7738
7739
7740
7741
7742
7743
7744
7745
7746
7747
7748
7749
7750
7751
7752
7753
7754
7755
7756
7757
7758
7759
7760
7761
7762
7763
7764
7765
7766
7767
7768
7769
7770
7771
7772
7773
7774
7775
7776
7777
7778
7779
7780
7781
7782
7783
7784
7785
7786
7787
7788
7789
7790
7791
7792
7793
7794
7795
7796
7797
7798
7799
7800
7801
7802
7803
7804
7805
7806
7807
7808
7809
7810
7811
7812
7813
7814
7815
7816
7817
7818
7819
7820
7821
7822
7823
7824
7825
7826
7827
7828
7829
7830
7831
7832
7833
7834
7835
7836
7837
7838
7839
7840
7841
7842
7843
7844
7845
7846
7847
7848
7849
7850
7851
7852
7853
7854
7855
7856
7857
7858
7859
7860
7861
7862
7863
7864
7865
7866
7867
7868
7869
7870
7871
7872
7873
7874
7875
7876
7877
7878
7879
7880
7881
7882
7883
7884
7885
7886
7887
7888
7889
7890
7891
7892
7893
7894
7895
7896
7897
7898
7899
7900
7901
7902
7903
7904
7905
7906
7907
7908
7909
7910
7911
7912
7913
7914
7915
7916
7917
7918
7919
7920
7921
7922
7923
7924
7925
7926
7927
7928
7929
7930
7931
7932
7933
7934
7935
7936
7937
7938
7939
7940
7941
7942
7943
7944
7945
7946
7947
7948
7949
7950
7951
7952
7953
7954
7955
7956
7957
7958
7959
7960
7961
7962
7963
7964
7965
7966
7967
7968
7969
7970
7971
7972
7973
7974
7975
7976
7977
7978
7979
7980
7981
7982
7983
7984
7985
7986
7987
7988
7989
7990
7991
7992
7993
7994
7995
7996
7997
7998
7999
8000
8001
8002
8003
8004
8005
8006
8007
8008
8009
8010
8011
8012
8013
8014
8015
8016
8017
8018
8019
8020
8021
8022
8023
8024
8025
8026
8027
8028
8029
8030
8031
8032
8033
8034
8035
8036
8037
8038
8039
8040
8041
8042
8043
8044
8045
8046
8047
8048
8049
8050
8051
8052
8053
8054
8055
8056
8057
8058
8059
8060
8061
8062
8063
8064
8065
8066
8067
8068
8069
8070
8071
8072
8073
8074
8075
8076
8077
8078
8079
8080
8081
8082
8083
8084
8085
8086
8087
8088
8089
8090
8091
8092
8093
8094
8095
8096
8097
8098
8099
8100
8101
8102
8103
8104
8105
8106
8107
8108
8109
8110
8111
8112
8113
8114
8115
8116
8117
8118
8119
8120
8121
8122
8123
8124
8125
8126
8127
8128
8129
8130
8131
8132
8133
8134
8135
8136
8137
8138
8139
8140
8141
8142
8143
8144
8145
8146
8147
8148
8149
8150
8151
8152
8153
8154
8155
8156
8157
8158
8159
8160
8161
8162
8163
8164
8165
8166
8167
8168
8169
8170
8171
8172
8173
8174
8175
8176
8177
8178
8179
8180
8181
8182
8183
8184
8185
8186
8187
8188
8189
8190
8191
8192
8193
8194
8195
8196
8197
8198
8199
8200
8201
8202
8203
8204
8205
8206
8207
8208
8209
8210
8211
8212
8213
8214
8215
8216
8217
8218
8219
8220
8221
8222
8223
8224
8225
8226
8227
8228
8229
8230
8231
8232
8233
8234
8235
8236
8237
8238
8239
8240
8241
8242
8243
8244
8245
8246
8247
8248
8249
8250
8251
8252
8253
8254
8255
8256
8257
8258
8259
8260
8261
8262
8263
8264
8265
8266
8267
8268
8269
8270
8271
8272
8273
8274
8275
8276
8277
8278
8279
8280
8281
8282
8283
8284
8285
8286
8287
8288
8289
8290
8291
8292
8293
8294
8295
8296
8297
8298
8299
8300
8301
8302
8303
8304
8305
8306
8307
8308
8309
8310
8311
8312
8313
8314
8315
8316
8317
8318
8319
8320
8321
8322
8323
8324
8325
8326
8327
8328
8329
8330
8331
8332
8333
8334
8335
8336
8337
8338
8339
8340
8341
8342
8343
8344
8345
8346
8347
8348
8349
8350
8351
8352
8353
8354
8355
8356
8357
8358
8359
8360
8361
8362
8363
8364
8365
8366
8367
8368
8369
8370
8371
8372
8373
8374
8375
8376
8377
8378
8379
8380
8381
8382
8383
8384
8385
8386
8387
8388
8389
8390
8391
8392
8393
8394
8395
8396
8397
8398
8399
8400
8401
8402
8403
8404
8405
8406
8407
8408
8409
8410
8411
8412
8413
8414
8415
8416
8417
8418
8419
8420
8421
8422
8423
8424
8425
8426
8427
8428
8429
8430
8431
8432
8433
8434
8435
8436
8437
8438
8439
8440
8441
8442
8443
8444
8445
8446
8447
8448
8449
8450
8451
8452
8453
8454
8455
8456
8457
8458
8459
8460
8461
8462
8463
8464
8465
8466
8467
8468
8469
8470
8471
8472
8473
8474
8475
8476
8477
8478
8479
8480
8481
8482
8483
8484
8485
8486
8487
8488
8489
8490
8491
8492
8493
8494
8495
8496
8497
8498
8499
8500
8501
8502
8503
8504
8505
8506
8507
8508
8509
8510
8511
8512
8513
8514
8515
8516
8517
8518
8519
8520
8521
8522
8523
8524
8525
8526
8527
8528
8529
8530
8531
8532
8533
8534
8535
8536
8537
8538
8539
8540
8541
8542
8543
8544
8545
8546
8547
8548
8549
8550
8551
8552
8553
8554
8555
8556
8557
8558
8559
8560
8561
8562
8563
8564
8565
8566
8567
8568
8569
8570
8571
8572
8573
8574
8575
8576
8577
8578
8579
8580
8581
8582
8583
8584
8585
8586
8587
8588
8589
8590
8591
8592
8593
8594
8595
8596
8597
8598
8599
8600
8601
8602
8603
8604
8605
8606
8607
8608
8609
8610
8611
8612
8613
8614
8615
8616
8617
8618
8619
8620
8621
8622
8623
8624
8625
8626
8627
8628
8629
8630
8631
8632
8633
8634
8635
8636
8637
8638
8639
8640
8641
8642
8643
8644
8645
8646
8647
8648
8649
8650
8651
8652
8653
8654
8655
8656
8657
8658
8659
8660
8661
8662
8663
8664
8665
8666
8667
8668
8669
8670
8671
8672
8673
8674
8675
8676
8677
8678
8679
8680
8681
8682
8683
8684
8685
8686
8687
8688
8689
8690
8691
8692
8693
8694
8695
8696
8697
8698
8699
8700
8701
8702
8703
8704
8705
8706
8707
8708
8709
8710
8711
8712
8713
8714
8715
8716
8717
8718
8719
8720
8721
8722
8723
8724
8725
8726
8727
8728
8729
8730
8731
8732
8733
8734
8735
8736
8737
8738
8739
8740
8741
8742
8743
8744
8745
8746
8747
8748
8749
8750
8751
8752
8753
8754
8755
8756
8757
8758
8759
8760
8761
8762
8763
8764
8765
8766
8767
8768
8769
8770
8771
8772
8773
8774
8775
8776
8777
8778
8779
8780
8781
8782
8783
8784
8785
8786
8787
8788
8789
8790
8791
8792
8793
8794
8795
8796
8797
8798
8799
8800
8801
8802
8803
8804
8805
8806
8807
8808
8809
8810
8811
8812
8813
8814
8815
8816
8817
8818
8819
8820
8821
8822
8823
8824
8825
8826
8827
8828
8829
8830
8831
8832
8833
8834
8835
8836
8837
8838
8839
8840
8841
8842
8843
8844
8845
8846
8847
8848
8849
8850
8851
8852
8853
8854
8855
8856
8857
8858
8859
8860
8861
8862
8863
8864
8865
8866
8867
8868
8869
8870
8871
8872
8873
8874
8875
8876
8877
8878
8879
8880
8881
8882
8883
8884
8885
8886
8887
8888
8889
8890
8891
8892
8893
8894
8895
8896
8897
8898
8899
8900
8901
8902
8903
8904
8905
8906
8907
8908
8909
8910
8911
8912
8913
8914
8915
8916
8917
8918
8919
8920
8921
8922
8923
8924
8925
8926
8927
8928
8929
8930
8931
8932
8933
8934
8935
8936
8937
8938
8939
8940
8941
8942
8943
8944
8945
8946
8947
8948
8949
8950
8951
8952
8953
8954
8955
8956
8957
8958
8959
8960
8961
8962
8963
8964
8965
8966
8967
8968
8969
8970
8971
8972
8973
8974
8975
8976
8977
8978
8979
8980
8981
8982
8983
8984
8985
8986
8987
8988
8989
8990
8991
8992
8993
8994
8995
8996
8997
8998
8999
9000
9001
9002
9003
9004
9005
9006
9007
9008
9009
9010
9011
9012
9013
9014
9015
9016
9017
9018
9019
9020
9021
9022
9023
9024
9025
9026
9027
9028
9029
9030
9031
9032
9033
9034
9035
9036
9037
9038
9039
9040
9041
9042
9043
9044
9045
9046
9047
9048
9049
9050
9051
9052
9053
9054
9055
9056
9057
9058
9059
9060
9061
9062
9063
9064
9065
9066
9067
9068
9069
9070
9071
9072
9073
9074
9075
9076
9077
9078
9079
9080
9081
9082
9083
9084
9085
9086
9087
9088
9089
9090
9091
9092
9093
9094
9095
9096
9097
9098
9099
9100
9101
9102
9103
9104
9105
9106
9107
9108
9109
9110
9111
9112
9113
9114
9115
9116
9117
9118
9119
9120
9121
9122
9123
9124
9125
9126
9127
9128
9129
9130
9131
9132
9133
9134
9135
9136
9137
9138
9139
9140
9141
9142
9143
9144
9145
9146
9147
9148
9149
9150
9151
9152
9153
9154
9155
9156
9157
9158
9159
9160
9161
9162
9163
9164
9165
9166
9167
9168
9169
9170
9171
9172
9173
9174
9175
9176
9177
9178
9179
9180
9181
9182
9183
9184
9185
9186
9187
9188
9189
9190
9191
9192
9193
9194
9195
9196
9197
9198
9199
9200
9201
9202
9203
9204
9205
9206
9207
9208
9209
9210
9211
9212
9213
9214
9215
9216
9217
9218
9219
9220
9221
9222
9223
9224
9225
9226
9227
9228
9229
9230
9231
9232
9233
9234
9235
9236
9237
9238
9239
9240
9241
9242
9243
9244
9245
9246
9247
9248
9249
9250
9251
9252
9253
9254
9255
9256
9257
9258
9259
9260
9261
9262
9263
9264
9265
9266
9267
9268
9269
9270
9271
9272
9273
9274
9275
9276
9277
9278
9279
9280
9281
9282
9283
9284
9285
9286
9287
9288
9289
9290
9291
9292
9293
9294
9295
9296
9297
9298
9299
9300
9301
9302
9303
9304
9305
9306
9307
9308
9309
9310
9311
9312
9313
9314
9315
9316
9317
9318
9319
9320
9321
9322
9323
9324
9325
9326
9327
9328
9329
9330
9331
9332
9333
9334
9335
9336
9337
9338
9339
9340
9341
9342
9343
9344
9345
9346
9347
9348
9349
9350
9351
9352
9353
9354
9355
9356
9357
9358
9359
9360
9361
9362
9363
9364
9365
9366
9367
9368
9369
9370
9371
9372
9373
9374
9375
9376
9377
9378
9379
9380
9381
9382
9383
9384
9385
9386
9387
9388
9389
9390
9391
9392
9393
9394
9395
9396
9397
9398
9399
9400
9401
9402
9403
9404
9405
9406
9407
9408
9409
9410
9411
9412
9413
9414
9415
9416
9417
9418
9419
9420
9421
9422
9423
9424
9425
9426
9427
9428
9429
9430
9431
9432
9433
9434
9435
9436
9437
9438
9439
9440
9441
9442
9443
9444
9445
9446
9447
9448
9449
9450
9451
9452
9453
9454
9455
9456
9457
9458
9459
9460
9461
9462
9463
9464
9465
9466
9467
9468
9469
9470
9471
9472
9473
9474
9475
9476
9477
9478
9479
9480
9481
9482
9483
9484
9485
9486
9487
9488
9489
9490
9491
9492
9493
9494
9495
9496
9497
9498
9499
9500
9501
9502
9503
9504
9505
9506
9507
9508
9509
9510
9511
9512
9513
9514
9515
9516
9517
9518
9519
9520
9521
9522
9523
9524
9525
9526
9527
9528
9529
9530
9531
9532
9533
9534
9535
9536
9537
9538
9539
9540
9541
9542
|
2000-04-05 John Sullivan <sullivan@eazel.com>
Some cleanups from the file-renaming checkin I did
yesterday. The largest change was making NautilusDirectory
send "files-changed" signal instead of "files-removed"
signal when a file is removed. That way interested callers
need register only for one signal. The callers can use
nautilus_file_is_gone () to test whether the file was removed.
* libnautilus/nautilus-directory-private.h:
(nautilus_directory_files_removed): Removed function.
* libnautilus/nautilus-directory.h:
(files_removed): Removed signal definition, updated comments.
* libnautilus/nautilus-directory.c:
Removed FILES_REMOVED signal enum entry;
(nautilus_directory_initialize_class): Removed FILES_REMOVED
signal creation.
(nautilus_directory_files_removed): Removed function.
* libnautilus/nautilus-file.c:
(get_file_for_parent_directory): New private function.
(nautilus_file_can_rename): This function was quite broken in
its initial check-in. It worked only on a random basis. Now it
works quite a bit better. It should only return FALSE if it's
darn well sure that the user can't rename the file; it returns
TRUE even if it isn't sure, so clients must handle failed
renames (which they would have to anyway).
(nautilus_file_delete): Call nautilus_file_changed instead of
nautilus_directory_files_removed when file is deleted.
* src/file-manager/fm-directory-view.h:
(remove_file): Remove signal definition, update comments.
* src/file-manager/fm-directory-view.c:
remove REMOVE_FILE signal enum entry;
remove files_removed_handler_id and pending_files_removed from
Details struct;
(fm_directory_view_initialize_class): remove REMOVE_FILE signal
initialization
(display_pending_files): remove "removed" case; made "changed"
case handle updating uri table; made "changed" case send signal
even if file is gone.
(files_removed_cb): Removed function.
(fm_directory_view_load_uri): removed connection to "files_removed"
signal
(disconnect_model_handlers): removed disconnect of files_removed_handler.
* src/file-manager/fm-icon-view.c:
(fm_icon_view_remove_file): Removed function.
(fm_icon_view_initialize_class): Remove remove_file signal handler override.
(fm_icon_view_file_changed): check if file is gone and do what
fm_icon_view_remove_file used to do if so.
* src/file-manager/fm-list-view.c:
(fm_list_view_remove_file): Removed function.
(fm_list_view_initialize_class): Remove remove_file signal handler override.
(fm_list_view_file_changed): check if file is gone and do what
fm_list_view_remove_file used to do if so.
* src/file-manager/fm-properties-window.c:
(properties_window_file_changed_callback): Don't update the window title
if you just nuked the window -- Doh! Now the Properties window will
vanish silently if the file is deleted.
2000-04-05 Darin Adler <darin@eazel.com>
Improved the background handling code so more is shared.
There's even more we could do in this direction.
* components/music/nautilus-music-view.c:
(nautilus_music_view_initialize): Got rid of redundant background
color initialization.
(nautilus_music_view_realize): Got rid of background color
initialization.
(nautilus_music_view_update_from_uri): Changed background color
handling to use new nautilus_directory_background calls.
(nautilus_music_view_background_changed): Not needed any more.
* components/notes/ntl-notes.c:
Did some cleanup and reformatting.
* libnautilus/Makefile.am:
* libnautilus/nautilus-directory-background.c:
* libnautilus/nautilus-directory-background.h:
Created a new file with functions that manage the background for
a window connected with a particular directory. Later we might
generalize it further to work for windows that are connected to
any URI, not just a directory.
* libnautilus/nautilus-directory.c:
* libnautilus/nautilus-directory.h:
Added a new "metdata_changed" signal so that the background can
be updated if the underlying data changes.
(nautilus_directory_initialize_class): Create the new signal.
(nautilus_directory_ref), (nautilus_directory_unref): Made these
functions quietly do nothing for NULL. This simplifies life for
callers.
(nautilus_directory_set_metadata): Emit the "metadata_changed"
signal.
* libnautilus/nautilus-file.c:
(nautilus_file_ref), (nautilus_file_unref): Made these
functions quietly do nothing for NULL. This simplifies life for
callers.
* libnautilus/nautilus-metadata.h:
Renamed all the constants to be consistent. Got rid of separate
constants for the icon view and list view backgrounds. Changed
some of the underlying XML tags as well.
* libnautilus/nautilus-icon-factory.c:
(nautilus_icon_factory_get_icon_for_file):
* src/nautilus-index-title.c: (nautilus_index_title_update_info):
* src/ntl-index-panel: (nautilus_index_panel_update_info),
(receive_dropped_uri_list),
(nautilus_index_panel_background_changed):
* src/ntl-uri-map.c: (set_initial_content_iid),
(add_components_from_metadata):
* src/ntl-window-msgs.c: (view_menu_switch_views_cb):
* src/file-manager/fm-icon-view.c: (add_icon_if_already_positioned),
(fm_icon_view_begin_loading), (fm_icon_view_set_zoom_level),
(fm_icon_view_icon_changed_callback):
* src/file-manager/fm-list-view.c: (fm_list_view_begin_loading),
(fm_list_view_set_zoom_level), (fm_list_view_sort_items):
Updated uses of metadata constants to use the new names.
* src/ntl-index-panel: (nautilus_index_panel_destroy),
(nautilus_index_panel_update_info):
* src/ntl-uri-map.c: (add_components_from_metadata):
* src/file-manager/fm-directory-view.c:
(fm_directory_view_destroy), (fm_directory_view_load_uri):
Used new nautilus_directory_unref to simplify code.
* src/ntl-uri-map.c: (set_initial_content_iid):
* src/ntl-window-msgs.c: (view_menu_switch_views_cb):
Added missing nautilus_directory_unref (storage leak).
* src/file-manager/fm-icon-view.c: (create_icon_container),
(fm_icon_view_background_changed_callback): Removed "changed"
signal handler on NautilusBackground since that's now handled
by the new nautilus_directory_background calls instead.
(fm_icon_view_begin_loading): Used nautilus_directory_background
to replace background customization code.
* src/file-manager/fm-icon-view.c: (fm_icon_view_get_zoom_level):
Fixed a bug where it would try to use view as an FMIconView after
the FM_IS_ICON_VIEW check failed.
* src/file-manager/fm-list-view.c: (create_list),
(fm_list_view_background_changed_callback): Removed "changed"
signal handler on NautilusBackground since that's now handled
by the new nautilus_directory_background calls instead.
(fm_list_view_begin_loading): Used nautilus_directory_background
to replace background customization code.
2000-04-05 John Sullivan <sullivan@eazel.com>
Fixed bug in Ramiro's recent checkin that broke booting
if the icon theme had never been set.
* libnautilus/nautilus-icon-factory.c:
(nautilus_icon_factory_initialize_class),
(nautilus_get_current_icon_factory): Moved theme initialization
from the former to the latter, because theme needs to be non-NULL
before initialize_class is called.
2000-04-05 Darin Adler <darin@eazel.com>
* components/services/startup/eazel-register.c:
(add_package_info):
* libnautilus/nautilus-file-utilities.c:
(nautilus_user_top_directory):
* libnautilus/nautilus-global_preferences.c:
(global_preferences_get_dialog):
* libnautilus/nautilus-icon-factory.c:
(nautilus_icon_factory_get_thumbnail_uri):
Removed unnecessary \n characters from g_warning, g_error, and
g_message calls.
* components/html/ntl-web-browser.c (browser_url_load_done):
Ettore says we should stop calling gtk_html_private_calc_scrollbars
and if it causes any problems then it's just a bug in GtkHTML
that should be fixed,.
* src/ntl-window-msgs.c:
Reformatted the code as a first step for some changes
that will make the state machine easier to understand.
2000-04-05 Ramiro Estrugo <ramiro@eazel.com>
Preferences work. Make preference registration implicit.
* nautilus-widgets/nautilus-preferences.c,
nautilus-widgets/nautilus-preferences.h:
(prefs_hash_lookup_with_implicit_registration): New function to do
preference lookup with implicit registration. If the pref is not
found at first, it will be automatically added.
(preference_get): Replace the old badly named prefs_get_pref with
something simpler.
(preference_set): Same here.
(nautilus_preferences_set_info): Add a function that allows
tweaking the default values and other info for a pref.
(nautilus_preferences_add_enum_callback):
(nautilus_preferences_add_boolean_callback):
(nautilus_preferences_add_string_callback): New callback adding
functions that work with implicit registration. The caller needs
to know the type of preference they want to munge beforehand for
the implicit registration to work.
Also cleanup a bunch bucnhsome of style issues.
* nautilus-widgets/test-nautilus-widgets.c:
Update for all the pref changes.
* libnautilus/nautilus-global-preferences.c,
libnautilus/nautilus-global-preferences.h:
(global_preferences_register_for_ui): Add a new private function
to register only preferences used in the pref dialog ui.
(global_preferences_static_info): Remove
NAUTILUS_PREFERENCES_ICON_VIEW_TEXT_ATTRIBUTE_NAMES and
NAUTILUS_PREFERENCES_ICON_THEME since they dont have a ui and can
be used implicitly.
(nautilus_global_preferences_initialize): Removed.
* libnautilus/nautilus-icon-factory.c:
(icon_theme_changed_callback): Doesnt take a type paramater no
more.
(nautilus_get_current_icon_factory): Remove the global preferences
initialization code and blurb. Not needed since prefs are
registered implicitly as needed. Use
nautilus_preferences_add_string_callback instead of obsolete
nautilus_preferences_add_callback.
(nautilus_icon_factory_initialize_class): Add a preferences call
to set the default value for the ICON_THEME string.
We might want to change things such that no default has to be installed
for this preference. If so, then the code that fetches the preference
would have to deal with either a NULL return value (or "").
* src/ntl-app.c:
(nautilus_app_startup): Remove global preferences initialization
call.
* src/file-manager/fm-directory-view.c:
(user_level_changed_callback):
(use_new_window_changed_callback): Callbacks dont take a
preference type argument no more.
(fm_directory_view_initialize): Use
nautilus_preferences_add_{enum,boolean}_callback instead of obsolete
nautilus_preferences_add_callback.
* src/file-manager/fm-icon-text-window.c:
(preference_changed_callback): Doesnt take a type paramater no
more.
(create_icon_text_window): Use
nautilus_preferences_add_string_callback instead of obsolete
nautilus_preferences_add_callback.
* src/file-manager/fm-icon-view.c:
(text_attribute_names_changed_callback): Doesnt take a type paramater no
more.
(fm_icon_view_initialize_class): Add a preferences call
to set the default value for the ICON_VIEW_TEXT_ATTRIBUTE_NAMES string.
We might want to change things such that no default has to be installed
for this preference. If so, then the code that fetches the preference
would have to deal with either a NULL return value (or "").
2000-04-05 Andy Hertzfeld <andy@eazel.com>
* components/services/startup/nautilus-service-startup-view.c:
made the register button make an HTTP request to the service using ghttp.
* components/services/startup/Makefile.am:
made the component link with lghttp
2000-04-04 Maciej Stachowiak <mjs@eazel.com>
Make selection persistent across content view changes (task 105).
* src/file-manager/fm-directory-view.c,
src/file-manager/fm-directory-view.h
(fm_directory_view_set_selection): New function.
(set_selection): New virtual method that must by implemented by
subclasses.
(add_nautilus_file_to_uri_map, remove_nautilus_file_from_uri_map,
free_file_by_uri_map_entry, free_file_by_uri_map): New functions
to manage a hash table mapping from uri strings to NautilusFile
objects.
(notify_selection_change_cb): New function; on a selection change
notification, either set the selection immediately if the view has
completed loading, or establish it as pending.
(display_pending_files): Maintain the uri -> file hash table on
notifications from the model; do any pending selections required
when loading completes.
* src/file-manager/fm-list-view.c (fm_list_view_set_selection):
New function to implement `set_selection' virtual method.
* src/file-manager/fm-icon-view.c (fm_icon_view_set_selection):
New function to implement `set_selection' virtual method.
* libnautilus/nautilus-list.c (nautilus_list_set_selection): New
function: set the selection to a specified set of rows.
* libnautilus/nautilus-icon-container.c,
libnautilus/nautilus-icon-container.h
(nautilus_icon_container_set_selection): New function: set the
selection to a specified set of icons.
2000-04-04 Andy Hertzfeld <andy@eazel.com>
* components.services/startup/nautilus-service-startup-view.c:
changed the account name field to e-mail address; make the submit
button initially insensitive; turned off the visibility property of
the gtk_entry objects used for passwords
2000-04-04 Ramiro Estrugo <ramiro@eazel.com>
* components/services/startup/nautilus-service-startup-view.c:
(register_later_cb): Fix cast for stricter -Werror compliance.
2000-04-04 Darin Adler <darin@eazel.com>
Finished task 54 (Set background image by drag/drop).
Fixed bug 346 (Bad icon positions when you change user level).
Fixed bug 372 (Better icons for common file types).
* libnautilus/nautilus-background-canvas-group.c:
(nautilus_background_canvas_group_draw): Got rid of the colormap
which is not needed now that we use gtk_rgb instead of gtk_color
calls. Passed in the corner of the canvas as a parameter to
nautilus_background_draw so it knows where the origin of any
repeating pattern should be.
* libnautilus/nautilus-background.h:
* libnautilus/nautilus-background.c: (nautilus_background_draw):
Added parameters to determine where the origin of any repeating
pattern should be. Removed colormap parameter (see above).
(nautilus_background_draw_flat_box): Passed in origin parameters
in call to nautilus_background_draw.
* libnautilus/nautilus-gdk-extensions.h:
* libnautilus/nautilus-gdk-extensions.c:
(nautilus_fill_rectangle_with_gradient): Removed colormap
parameter (see above).
* libnautilus/nautilus-gdk-pixbuf-extensions.c:
(nautilus_gdk_pixbuf_render_to_drawable_tiled): Fixed the tiling
so it will use the dither parameters to set the origin of the
tiles as well.
* libnautilus/nautilus-icon-dnd.c: (receive_dropped_tile_image),
(nautilus_icon_container_receive_dropped_icons): Added code so that
dropping an image file on the window with the shift key held down
will customize the background tile image.
* libnautilus/nautilus-icon-factory.c: (make_full_icon_path),
(get_themed_icon_file_path): Fixed two bugs that prevented
MIME-type-based icons from working correctly. First, got rid of
code that tried to prepend the theme name and "nautilus/" to the
beginning of a full path. Then made sure that it tries the file
name without adding a suffix before it starts trying out suffixes.
* libnautilus/nautilus-icon-grid.c: (nautilus_icon_grid_clear):
Fixed bug where clearing the grid was resetting the visible width.
* components/sample/Makefile.am:
* components/services/startup/Makefile.am:
Turned on -Werror for these two directories.
* components/sample/nautilus-sample-content-view.h:
* components/sample/nautilus-sample-content-view.c:
(nautilus_sample_content_view_destroy), (bonobo_sample_callback):
Fixed warnings and did some small cleanup.
2000-04-04 John Sullivan <sullivan@eazel.com>
Renaming a file from its Set Properties dialog now works, though
there are various odds and ends I still need to clean up.
It turned out (surprise!) that there was a lot of
underpinnings work involved in implementing this feature.
Fortunately most of it will be shared by rename-in-place.
* libnautilus/nautilus-directory-private.h:
add #define for METADATA_NODE_NAME_FOR_FILE_NAME
* libnautilus/nautilus-directory.c:
(nautilus_directory_get_file_metadata_node): Use
METADATA_NODE_NAME_FOR_FILE_NAME #define
(nautilus_directory_set_file_metadata): Use g_return_val_if_fail
to prevent callers from changing the file name this way, since
that wouldn't work right.
* libnautilus/nautilus-file.h:
* libnautilus/nautilus-file.c:
(nautilus_file_can_rename): New function, returns TRUE if the
user has write permission for this file.
(nautilus_file_rename): New function, uses gnome_vfs_move to
try to rename the file, updating metadata as appropriate.
Returns the GnomeVFSResult from gnome_vfs_move.
* libnautilus/nautilus-list.c
(row_selected): Renamed this formerly private function to
nautilus_list_is_row_selected and made it check its parameters
more carefully.
* libnautilus/nautilus-list.h:
(nautilus_list_is_row_selected): Made this public.
* src/file-manager/fm-error-reporting.c,
* src/file-manager/fm-error-reporting.h: New files, home for
UI code to display user error messages and such. It's initial
occupant is:
(fm_report_error_renaming_file): New function, puts up a non-modal
alert reporting the renaming failure.
* src/file-manager/Makefile.am: Add these two new files to the build.
* src/file-manager/fm-directory-view.c:
(bonobo_menu_open_properties_window_cb): New function, opens a
Properties window for each selected item using the Bonobo callback API.
(fm_directory_view_real_merge_menus): Include Set Properties item in
File menu, and rearrange other items a little.
(fm_directory_view_real_update_menus): Update sensitivity of Set
Properties menu item.
* src/file-manager/fm-list-view.c:
(add_to_list): Return the new row index.
(fm_list_view_file_changed): Remove and reinsert the changed file; this
not only does less sorting but also recomputes all the text so name
changes will be displayed.
* src/file-manager/fm-properties-window.c:
(get_pixmap_and_mask_for_properties_window),
(update_properties_window_icon),
(create_pixmap_widget_for_file),
(name_field_done_editing),
(name_field_update),
(update_properties_window_title),
(properties_window_file_changed_callback):
New functions used to wire up the new editable name field
and new icon pixmap widget in the properties window.
(create_properties_window): Added notebook tabs, first
one is Basic and currently contains icon & name; second
is Emblems and has all those checkboxes. Use all the
new functions to create and wire up things so that name
changes & icon changes are propagated and reflected correctly.
* src/nautilus-bookmarks-window.c:
(create_bookmarks_window): Removed a bunch of unnecessary
and leak-causing gtk_widget_refs that I happened to notice
in here. I left these behind when modifying code originally
created by glade, where the refs are necessary.
2000-04-04 Andy Hertzfeld <andy@eazel.com>
* components.services/startup/nautilus-service-startup-view.c:
more work on the registration and configuration form
2000-04-04 Andy Hertzfeld <andy@eazel.com>
* src/ntl=window-msgs.c:
fixed bug where it was allocating a uri for a null string by only
trying the actual_uri if it's non-null
* components.services/startup/nautilus-service-startup-view.c:
more work on the registration form
2000-04-03 Andy Hertzfeld <andy@eazel.com>
more work on the service component
* components.services/startup/nautilus-service-startup-view.h:
changed it to inherit from eventbox so it can have a background
* components.services/startup/nautilus-service-startup-view.c:
restructured code for displaying multiple forms
made it use a Nautilus background
added test form, registration form and configuration form placeholders
added most of configuration form
* icons/eazel-logo.gif: added Eazel logo image
* icons/Makefile.am: added Eazel logo to Makefile
2000-04-03 Andy Hertzfeld <andy@eazel.com>
added configuration inventory to nascent service component. This only
builds if --enable-eazel-services is set
* components/services/startup/Makefile.am:
added eazel-register.c,h to the build
* components/services/startup/eazel-register.c,h:
contains to build an xml file that expresses the hardware and software
configuration, using the package database and the proc filesystem.
* components/services/startup/nautilus-service-startup-view.c:
added a button to generate the configuration inventory file in the
user's home directory. This is temporary scaffolding and will be
replaced soon.
* src/ntl-uri-map.c:
made it invoke the service component for uri's starting with "eazel:";
also, fixed a bug where an uninitialized variable was being freed.
* nautilus-clean.sh:
added the rpm view to the list of cleaned components.
2000-04-03 Darin Adler <darin@eazel.com>
First cut at tiled background images.
There's no UI for setting them yet, they are only in
the icon view, and they don't work properly with scrolling yet.
* libnautilus/Makefile.am:
* libnautilus/nautilus-gdk-extensions.c:
* libnautilus/nautilus-gdk-extensions.h:
* libnautilus/nautilus-gdk-pixbuf-extensions.c:
* libnautilus/nautilus-gdk-pixbuf-extensions.h:
Split the GdkPixbuf stuff into its own file.
* libnautilus/nautilus-background.c:
(nautilus_background_destroy): Fixed a bunch of leaks
and added new code to stop pixbuf loading.
(nautilus_background_draw): Added call to draw tiled
background image. Converted gradients to use gdk_rgb
instead of gdk_color.
(nautilus_background_get_tile_image_uri): Implemented.
(nautilus_background_set_color): Added short-circuit
for background image case.
(load_image_callback),
(nautilus_background_set_tile_image_uri): Implemented.
Include code to load in the tiled image when its URI is set.
(nautilus_background_receive_dropped_color): Set the
tile image to NULL when a color is dropped.
* libnautilus/nautilus-gdk-extensions.c:
* libnautilus/nautilus-gdk-extensions.h:
(nautilus_fill_rectangle_with_color),
(nautilus_fill_rectangle_with_color),
(nautilus_interpolate_color): Changed from gdk_color
to gdk_rgb.
(nautilus_parse_rgb_with_white_default): Added function
for gdk_rgb similar to what we already have for gdk_color.
* libnautilus/nautilus-icon-canvas-item.c:
* libnautilus/nautilus-icon-container.c:
* libnautilus/nautilus-list.c:
Use gdk-pixbuf extensions in new location.
* libnautilus/nautilus-metadata.h:
Added metadata keys for background images.
* src/ntl-view.c:
Added lots of stronger checks for NAUTILUS_IS_VIEW since
this is where we run into trouble with a bug I ran into.
* src/file-manager/icon-view.c: Added code to handle
the new background images.
(create_icon_container): Keep around the handler ID when
connecting to the "changed" message of the background so
we can block the handler as needed.
(fm_icon_view_begin_loading): Load the background image
as well as the background color. We need to block the
background changed signal handler so we don't get
confused while the color but not the image is set up.
(fm_icon_view_background_changed_callback): Save the
background image URI as well as the background color in
the metadata.
2000-04-03 Darin Adler <darin@eazel.com>
Fix the build. Changes in GtkHtml and Bonobo required us
to catch up.
* libnautilus/ntl-meta-view-frame.h:
* libnautilus/ntl-meta-view-frame.c:
Rewrote to use the new property bag. This requires us to
store our own properties, since the bag no longer provides
any storage.
(nautilus_meta_view_frame_initialize): Set up the label.
(nautilus_meta_view_frame_new_from_bonobo_control): Make it
actually take a BonoboControl instead of a BonoboObject and
make it set up the property bag.
(nautilus_meta_view_destroy): Free the label.
(autilus_meta_view_frame_set_label): Just set the label.
The property bag simply uses our stored label.
* components/html/ntl-web-browser.c (browser_url_load_gone):
Changed call to match name in new version of GtkHtml.
Unfortunately, the new name makes it clear the call is
intended to be private.
* components/rpmview/.cvsignore: Ignore the actual binary,
not nautilus-music-view.
* components/rpmview/Makefile.am: Turned on -Werror.
* components/music/Makefile.am: Turned on -Werror.
* components/rpmview/nautilus-rpm-view.c: Fixed warnings.
2000-04-02 Andy Hertzfeld <andy@eazel.com>
Added a first cut at a component for viewing rpm packages.
* configure.in: added components/rpmview
* components/Makefile.am: added rpmview
* components/rpmview/.cvsignore: new file
* components/rpmview/Makefile.am: make file for rpm view
* components/rpmview/main.c: boilerplate factory, main loop for component
* components/rpmview/nautilus-rpm-view.h: defines for rpm view component
* components/rpmview/nautilus-rpm-view.goad: goad record for activating rpmview component
* components/rpmview/nautilus-rpm-view.c: here's the actual code for the component,
which reads a package with rpm and sets up the fields in the view from the data
* src/ntl-uri-map.c: modified mapping so rpms get this component added
2000-04-01 Ramiro Estrugo <ramiro@eazel.com>
Add a conditionally built skeleton for a startup service.
* configure.in: Properly define EAZEL_SERVICES with an
AM_CONDITIONAL. Add new directories components/services
components/srevices/startup.
* components/Makefile.am: Recurse into services dir if needed.
* components/services, components/services/startup: new dirs.
* components/services/nautilus-service-startup-view.c,
components/services/nautilus-service-startup-view.h,
components/services/nautilus-service-startup-view.goad,
components/services/Makefile.am,
components/services/.cvsignore:
Skeleton code for startup service.
2000-03-31 Pavel Cisler <pavel@eazel.com>
* libnautilus/nautilus-icon-container.c:
(motion_nofity_event):
Disable copy as a drag&drop operation for now. The current
copy engine doesn't handle conflicts properly yet and can
erase your files.
2000-03-31 Darin Adler <darin@eazel.com>
Fixed a bug that Pavel reported where he got a crash in
nautilus_directory_monitor_files_unref when he pushed the
"Up" button.
* libnautilus/nautilus-glib-extensions.c:
* libnautilus/nautilus-glib-extensions.h:
(nautilus_g_strv_find): Renamed the existing function
nautilus_g_strfindv to be more consistent with the rest
of glib, even though it's less consistent with the other
strv functions.
(nautilus_g_list_safe_for_each): Added an alternate
version of g_list_foreach that works even when the current
item is removed from the list inside the function.
* libnautilus/nautilus-gtk-extensions.c:
(nautilus_gtk_object_list_unref): Use the new safe version
of g_list_foreach so this works even on lists where the
objects remove themselves in their destroy/finalize methods.
This is the change that fixes the bug.
* src/nautilus-bookmark-list.c:
(nautilus_bookmark_list_load_file): Replaced some explicit
code with a call to nautilus_gtk_object_list_free.
* src/nautilus-index-title.c:
(nautilus_index_title_update_icon): Fixed a bug that would
prevent you from viewing the root level. The current version
of nautilus_file_get returns NULL for the root.
* src/nautilus-window-menus.c:
(clear_appended_bookmark_items): Replaced some explicit
code with a call to nautilus_g_list_free_deep.
* src/file-manager/fm-icon-text-window.c:
(synch_menus_with_preference): Updated to use the
nautilus_g_strv_find call by its new name.
* libnautilus/nautilus-file.c:
(nautilus_file_set_keywords): Did some minor tweaks to
simplify the no-keywords case.
2000-03-30 John Sullivan <sullivan@eazel.com>
Finished task 172 (show icon emblems in list view)
* libnautilus/nautilus-file.h:
added NAUTILUS_FILE_SORT_BY_EMBLEMS to enum
(nautilus_file_get_emblem_names): New function.
* libnautilus/nautilus-file.c:
(nautilus_file_get_emblem_names): New function.
(nautilus_file_compare_by_emblems): New function,
compares the emblems of two files for sorting.
(compare_emblem_names): New function, compares two
emblem names for sorting.
(nautilus_file_compare_for_sort_internal): handle
NAUTILUS_FILE_SORT_BY_EMBLEMS case
(sort_keyword_list_and_remove_duplicates): New function,
canonicalizes (canonifies? canonizes?) a list of keywords.
(nautilus_file_get_keywords): canonicalize list after
reading from file.
(nautilus_file_set_keywords): canonicalize copy of list
before storing.
* libnautilus/nautilus-icon-factory.c:
(nautilus_icon_factory_get_emblem_icons_for_file): Use
nautilus_file_get_emblem_names instead of having emblem
name knowledge here.
* libnautilus/nautilus-list.h:
NautilusCellType: new enum, a superset of GtkCellType that
we use to sneak in new values.
NautilusCellPixbufList: new struct, our new type of content
for a list cell.
(nautilus_list_set_pixbuf_list): New function.
* libnautilus/nautilus-list.c:
(nautilus_list_set_cell_contents): New function, handles the
NAUTILUS_CELL_PIXBUF_LIST case and lets GtkCList continue
handling the others.
(nautilus_list_initialize_class): Fill in set_cell_contents
function pointer with nautilus_list_set_cell_contents.
(gdk_window_size_as_rectangle): New helper function.
(draw_cell_pixmap): Removed width & height parameters (now
calculated internally) and reworked to use GdkRectangle math.
(draw_cell_pixbuf): New function, modelled after (new & improved)
draw_cell_pixmap but draws a gdk_pixbuf directly.
(draw_row): handle the NAUTILUS_CELL_PIXBUF_LIST case; fix up
callers to draw_cell_pixmap; use NautilusCellType instead of
GtkCellType.
(nautilus_list_set_pixbuf_list): New function, sneaks a list
of pixbufs into the ugly GtkCell data structure.
* src/file-manager/fm-list-view.c:
(fm_list_view_reset_row_height): New function, sets the row height
based on zoom level but with a minimum to avoid clipping emblems.
(fm_list_view_get_emblem_pixbufs_for_file): create list of
appropriately-sized emblem images. Size is based on zoom level
but has a minimum so the emblems don't get illegibly small.
(install_icons): Rename to install_row_images; handle setting
the list of emblems into the list widget.
(create_list): include column for emblems between icon & name;
set row height only after other widget manipulations.
(add_to_list), (update_icons): reflect install_icons name change.
(fm_list_view_file_changed): reflect install_icons name change;
sort list since changed file might change sort order. (No API
to resort just one row; I added a comment about that in case
we want to revisit it someday.)
(fm_list_view_set_zoom_level): call fm_list_view_reset_row_height.
(get_attribute_from_column), (get_column_from_attribute),
(sort_criterion_from_column): handle LIST_VIEW_COLUMN_EMBLEMS
2000-03-30 Darin Adler <darin@eazel.com>
Finished task 62 (Set custom icon by drag/drop on index panel)
and fixed some problems from my earlier check-ins today.
* libnautilus/nautilus-directory.c:
(nautilus_directory_monitor_files_ref):
Fixed a bad assert from my last check-in.
* src/file-manager/fm-list-view.c: (add_to_list):
The list view had the same missing ref that I fixed for icon
view in my last check-in.
* src/nautilus-index-title.c: (release_file),
(nautilus_index_title_destroy),
(nautilus_index_title_update_icon),
(nautilus_index_title_update_label),
(nautilus_index_title_update_info),
(nautilus_index_title_set_uri): Changed to hold around the
NautilusFile object and connect to its "changed" message to update
the file information. This causes the icon to get updated right
away when the custom icon is changed.
* libnautilus/nautilus-directory-private.h:
* libnautilus/nautilus-directory.c:
* libnautilus/nautilus-file-private.h:
* libnautilus/nautilus-file.c:
* libnautilus/nautilus-file.h:
Converted NautilusFile to be a GtkObject instead of a plain struct,
so it can have a "changed" signal. We still recommend using the
"files_changed" signal on the directory to avoid the overhead
of a signal connection for each file.
* libnautilus/nautilus-gtk-extensions.c:
* libnautilus/nautilus-gtk-extensions.h:
(nautilus_gtk_object_list_ref), (nautilus_gtk_object_list_unref),
(nautilus_gtk_object_list_free): Added some functions to be used
with a list of GtkObjects.
* libnautilus/nautilus-icon-factory.c:
(nautilus_icon_factory_get_icon_name_for_file):
Had to change the name of nautilus_file_get_type to avoid conflict
with the GtkObject standard get_type routine.
2000-03-30 Darin Adler <darin@eazel.com>
* src/file-manager/fm-icon-view.c: (add_icon_if_already_positioned),
(add_icon_at_free_position): Added missing ref that caused very bad
things to happen now that the file ref. counts are working.
* components/music/nautilus-music-view.c:
Did a bunch of cleanup and fixed some memory trashing bugs where
the result of g_basename was passed to g_free.
2000-03-30 Darin Adler <darin@eazel.com>
* libnautilus/nautilus-directory.c:
* libnautilus/nautilus-directory.h:
(nautilus_directory_ref), (nautilus_directory_unref):
Added convenience functions so people don't have to be constantly
reminded that a NautilusDirectory is a a GtkObject.
* libnautilus/nautilus-directory.c: (nautilus_directory_destroy):
Fixed a problem where the pending files callback might fire after
the NautilusDirectory is gone.
* libnautilus/nautilus-directory.c:
(nautilus_directory_destroy),
(nautilus_directory_monitor_files_ref),
(nautilus_directory_monitor_files_unref),
(dequeue_pending_idle_callback), (nautilus_directory_new_file):
* libnautilus/nautilus-file-private.h:
* libnautilus/nautilus-file.c:
(nautilus_file_get), (nautilus_file_ref), (nautilus_file_unref),
(nautilus_file_free), (nautilus_file_delete):
To prepare for changing NautilusFile to a GtkObject, made it use
ref counts in a way that is standard. Now the directory keeps a
list of the files, but only keeps a ref to the files if it is
monitoring them.
* src/file-manager/fm-directory-view.c: Tiny formatting tweak.
2000-03-30 Andy Hertzfeld <andy@eazel.com>
* libnautilus/nautilus-icon-container.c:
make the icon selection rectangle have a semi-transparent light blue
fill color.
* libnautilus/nautilus-icon-canvas-item.c:
tweaked the selection darkening to be a little bit lighter.
2000-03-30 Pavel Cisler <pavel@eazel.com>
More copy/move operations. Fixes a problem I introduced earlier where
drop onto a file would lock up Nautilus.
* libnautilus/nautilus-gtk-extensions.c:
* libnautilus/nautilus-gtk-extensions.h:
(nautilus_gtk_marshal_NONE__POINTER_POINTER_POINTER_INT_INT_INT):
Add more binder glue that I needed.
* libnautilus/nautilus-icon-container.c:
(motion_notify_event):
Enable move/copy modes during drag/drop.
* libnautilus/nautilus-icon-container.c:
* libnautilus/nautilus-icon-container.h:
* libnautilus/nautilus-icon-dnd.c:
* src/file-manager/fm-directory-view.c:
* src/file-manager/fm-directory-view.h:
(move_copy_items):
Pass in a list of point offsets to allow placing new item in
the right relative position.
* src/file-manager/fm-directory-view.c:
(xfer_callback):
Don't loop forever during a conflict.
2000-03-30 Maciej Stachowiak <mjs@eazel.com>
* components/sample/main.c (sample_make_object): Connect to the
"destroy" signal of the view_frame rather than the sample content
view object, to avoid a race condition where we might exit before
the view_frame is fully unreffed and has a chance to clean up.
components/sample/nautilus-sample-content-view.c
(nautilus_sample_content_view_destroy): Unref the
NautilusViewFrame when we are destroyed.
* libnautilus/nautilus-zoomable.c, libnautilus/ntl-view-frame.c,
libnautilus/ntl-content-view-frame.c,
libnautilus/ntl-meta-view-frame.c: Use boilerplate macros for
get_type method and to invoke parent destroy method.
* libnautilus/nautilus-zoomable.c, libnautilus/ntl-view-frame.c:
Unref the interface we query_local_interface for, to avoid holding
a superfluous ref to ourselves, since we eventually add_interface
that interface.
* src/ntl-view.c (nautilus_view_destroy_client): Use
bonobo_object_unref instead of bonobo_object_destroy.
2000-03-29 Andy Hertzfeld <andy@eazel.com>
* src/nautilus-index-tabs.c:
fixed bug #312, index tabs don't resize properly,
by overriding size_allocate, to fix up the
height appropriately when the size changes
2000-03-28 Pavel Cisler <pavel@eazel.com>
Started on copy/move operations
* libnautilus/nautilus-icon-dnd.c:
(nautilus_icon_container_item_at), (get_container_uri),
(nautilus_icon_container_selection_items_local),
(nautilus_icon_canvas_item_can_accept_item),
(nautilus_icon_canvas_item_can_accept_items),
(nautilus_icon_container_receive_dropped_icons):
Handle drops by starting a move operation. Add new calls that
help determine the drop target.
* src/file-manager/fm-directory-view.c:
* src/file-manager/fm-directory-view.h:
(xfer_callback), (fm_directory_view_move_copy_items):
Initial version of calls that start the gnome-vfs-xfer job.
* src/file-manager/fm-directory-view.c:
* src/file-manager/fm-directory-view.h:
(fm_directory_view_get_container_uri):
Added new call needed to determine type of move operation.
* src/file-manager/fm-icon-view.c:
* src/file-manager/fm-icon-view.h:
Connect "move_copy_items" and "get_container_uri" signals
with new calls in FMDirectoryView.
* nautilus-gtk-extensions.c
* nautilus-gtk-extensions.h
(nautilus_gtk_marshal_NONE__POINTER_POINTER_INT_INT_INT),
(nautilus_gtk_marshal_NONE__POINTER_INT_INT_DOUBLE_DOUBLE):
Add new binder glue that I needed for new signal calls.
* libnautilus/nautilus-icon-container.c:
* libnautilus/nautilus-icon-container.h:
Add new signals "move_copy_items" and "get_container_uri".
2000-03-28 Darin Adler <darin@eazel.com>
* libnautilus/nautilus-background.h:
* libnautilus/nautilus-background.c:
Preparing for support for background images.
* libnautilus/nautilus-background.c:
* libnautilus/nautilus-debug.c:
* libnautilus/nautilus-icon-canvas-item.c:
* libnautilus/nautilus-icon-dnd.c:
Add those braces that Maciej, John, and the style guide all prefer.
* libnautilus/nautilus-file.c: (nautilus_file_set_metadata):
A change to metadata is considered a change to the file.
* libnautilus/nautilus-graphic-effects.c:
* libnautilus/nautilus-graphic-effects.h:
Added nautilus_ prefix to all the functions in here.
* libnautilus/nautilus-gtk-extensions.c:
* libnautilus/nautilus-gtk-extensions.h:
(nautilus_point_in_allocation), (nautilus_point_in_widget):
Added hit testing help functions that check if a point is
in a particular allocation/widget.
* libnautilus/nautilus-icon-dnd.c: (get_gnome_icon_list_selection):
Fixed a bug that happens when you get a 0-length piece of
selection data.
* libnautilus/nautilus-icon-dnd.h:
Changed the icon list back to "x-gnome-icon-list".
That's how the other GNOME folks want it, not "x-nautilus-icon-list".
* src/nautilus-index-tabs.c:
* src/nautilus-index-tabs.h:
* src/nautilus-index-title.c:
* src/nautilus-index-title.h:
* src/ntl-index-panel.c:
* src/ntl-index-panel.h:
lite -> light, Other cleanup.
* src/nautilus-index-title.c:
* src/nautilus-index-title.h:
(nautilus_index_title_hit_test_icon):
* src/ntl-index-panel.c:
(hit_test), (uri_is_local_image), (receive_dropped_uri_list),
(receive_dropped_color):
Added code needed to support dropping an image on the icon to set
a custom icon. This doesn't yet update the icon in the panel itself,
but I'll do that soon.
2000-03-28 John Sullivan <sullivan@eazel.com>
Maciej, Darin and I discussed the notify_title_change
design and decided that we didn't need it now and that
we should keep the API simpler by removing it, along
with the initial_title parameter I added to
notify_location_change. So out they come.
* components/help/hyperbola-nav-tree.c,
* components/history/ntl-history-view.c,
* components/html/ntl-web-browser.c,
* components/music/nautilus-music-view.c,
* components/notes/ntl-notes.c,
* components/sample/nautilus-sample-content-view.c,
* components/websearch/ntl-web-search.c,
* idl/nautilus.idl,
* libnautilus/ntl-view-frame.c,
* libnautilus/ntl-view-frame.h,
* src/ntl-view-bonobo-control.c,
* src/ntl-view-bonobo-subdoc.c,
* src/ntl-view-nautilus.c,
* src/ntl-view-private.h,
* src/ntl-view.c,
* src/ntl-view.h,
* src/ntl-window-msgs.c,
* src/file-manager/fm-directory-view.c: Removed notify_title_change
and the initial_title parameter to notify_location_change wherever
they reared their ugly heads.
2000-03-28 John Sullivan <sullivan@eazel.com>
* libnautilus/nautilus-icon-container.c:
(keyboard_move_to): The behavior of the Control key got
accidentally reversed in a recent cleanup.
2000-03-28 Ramiro Estrugo <ramiro@eazel.com>
Cleanup NautilusPreferences a bit in preparation for api revamp
to support implicitly registered preferences.
* nautilus-widgets/nautilus-preferences.c,
nautilus-widgets/nautilus-preferences.h: Rename hash table node
structures from "PrefHashInfo" to "PrefHashNode". Remove some
unused and crufty code. Add a bunch of comments describing
structures and functions. Remove prefs_check_supported_type()
which was leftover from when I tried to use GtkType instead of
defining an enum of supported types. Also, rename
nautilus_preferences_get_pref_info to nautilus_preferences_get_info.
* nautilus-widgets/nautilus-preferences-item.c,
nautilus-widgets/nautilus-preferences-item.h: Add enum
NautilusPreferencesItemType to enumerate the types of pereferences
that have a corresponding UI. Since there can be preferences that
are not exposed in the UI, this is different than NautilusPreferencesType.
(preferences_item_construct): Use newly renamed function
nautilus_preferences_get_info. Also remove the dummy
NAUTILUS_PREFENCES_STRING case statement, since
NautilusPrefernecesItem now has its own type enumeration
independant of NautilusPreferences.
2000-03-28 John Sullivan <sullivan@eazel.com>
Followup to last night's checkin; I forgot to add the
initial_title parameter to a notify_location_change
signal and all its signal handlers.
* libnautilus/ntl-view-frame.c:
(impl_Nautilus_View_notify_location_change): Add
initial_title parameter, pass it along when emitting
signal.
* components/help/hyperbola-nav-tree.c,
* components/history/ntl-history-view.c,
* components/html/ntl-web-browser.c,
* components/music/nautilus-music-view.c,
* components/notes/ntl-notes.c,
* components/sample/nautilus-sample-content-view.c,
* components/websearch/ntl-web-search.c,
* src/file-manager/fm-directory-view.c:
Added initial_title parameter to notify_location_change
signal handlers.
* src/ntl-view-nautilus.c: Removed a stray g_message.
2000-03-27 Andy Hertzfeld <andy@eazel.com>
* icons/eazel/i-directory-24.png:
fixed bug #9, folder too small, by replacing the icon with one that's the proper size
2000-03-27 John Sullivan <sullivan@eazel.com>
Made web page titles be used for the window title,
the index panel location name, and the menu item in
the Go menu (which is then used for the Bookmarks menu
too). This required lots of underpinnings work. Now any
content view (not just the web browser) can express its
opinion on what title for the current location should be
displayed to the user.
* idl/nautilus.idl: added View:notify_title_change; added
initial_title parameter to View:notify_location_change;
reordered functions in View to better group related items;
added ContentViewFrame:request_title_change.
* libnautilus/nautilus-view-frame-private.h: New file,
holds a struct and a function shared by NautilusViewFrame
and (now) NautilusContentViewFrame.
* libnautilus/ntl-view-frame.h: Reordered functions to
match idl (just for clarity); also added (notify_title_change).
* libnautilus/ntl-view-frame.c: Moved _NautilusViewFramePrivate
struct to new private .h file, added (notify_title_change);
reordered function pointers in epv to match idl.
(nautilus_view_frame_class_init): Set up signal for
notify_title_change.
(nautilus_view_frame_ensure_view_frame): No longer static since
it's in new private .h file.
* libnautilus/ntl-content-view-frame.h,
* libnautilus/ntl-content-view-frame.c:
(nautilus_content_view_frame_request_title_change):
New function that a content view calls on its frame
when it has an opinion about what the user-displayable
title for the current location should be.
* libnautilus/nautilus-bookmark.c,
* libnautilus/nautilus-bookmark.h:
(nautilus_bookmark_set_name): New function to change the name of
an existing bookmark.
* src/ntl-view-private.h: Moved definition of impl_POA_Nautilus_ViewFrame
here so it can be shared by NautilusContentView; reordered functions in
_NautilusViewComponentType to match idl and included notify_title_change.
* src/ntl-view-frame-svr.c: Moved definition of impl_POA_Nautilus_ViewFrame
out of here.
* src/ntl-view.h,
* src/ntl-view.c:
(nautilus_view_notify_location_change): Added initial_title parameter.
(nautilus_view_notify_title_change): New function.
* src/ntl-view-nautilus.c:
(nv_notify_location_change): Added initial_title parameter.
(nv_notify_title_change): New function.
nautilus_view_component_type: reordered function pointers to
match idl, and added new one for notify_title_change.
* src/ntl-view-bonobo-control.c:
(bonobo_control_notify_location_change): Added initial_title parameter.
bonobo_control_component_type: reordered function pointers to match idl
and added notify_title_change.
* src/ntl-view-bonobo-subdoc.c
(bonobo_subdoc_notify_location_change): Added initial_title parameter.
bonobo_subdoc_component_type: reordered function pointers to match idl
and added notify_title_change.
* src/nautilus-bookmark-list.c:
(destroy_bookmark): Removed this function.
(nautilus_bookmark_list_delete_item_at): unref where it was destroying.
(nautilus_list_load_file): use gtk_object_unref as foreach function
instead of destroy_bookmark.
* src/nautilus-index-title.h,
* src/nautilus-index-title.c:
new field _NautilusIndexTitleDetails->requested_text.
(nautilus_index_title_set_uri): Added initial_text parameter;
store initial_text in requested_text field after freeing old value.
(nautilus_index_panel_set_text): New function, passes new text to
nautilus_index_title_set_up_label.
(nautilus_index_title_finalize): free requested_text.
(nautilus_index_title_set_up_label):
Use requested_text instead of extracting short name of URI here.
* src/ntl-index-panel.h,
* src/ntl-index-panel.c:
(nautilus_index_panel_set_uri): Added initial_title parameter.
(nautilus_index_panel_set_title): New function, called if the title
changes later on; pass new_title on to nautilus_index_title_set_text.
(nautilus_index_panel_set_up_info): Added initial_title parameter;
pass initial_title on to nautilus_index_title_set_uri.
* src/ntl-content-view.h: Redid object & class struct definitions
to match others; added request_title_change signal definition.
* src/ntl-content-view.c:
added function pointer for request_title_change to epv;
added signal-definining enum & array;
(impl_Nautilus_ContentViewFrame_request_title_change): New function.
(nautilus_content_view_class_init): Define "request_title_change" signal.
(nautilus_content_view_request_title_change): New function, emits signal.
* src/ntl-window.h: New fields for requested_title, default_title,
current_location_bookmark, last_location_bookmark.
* src/ntl-window.c:
(nautilus_send_history_list_changed): New convenience routine to
emit "history_list_changed" signal since it's emitted in more than
one place now.
(nautilus_add_to_history_list): Change parameter from a const char *
to a NautilusBookmark; call nautilus_send_history_list_changed.
(nautilus_window_request_title_change_callback): New function, calls
nautilus_window_request_title_change.
(nautilus_window_connect_view): Just variable renaming & reformatting.
(nautilus_window_connect_content_view): New function, calls
nautilus_window_connect_view then connects to "request_title_change: signal
also.
* src/ntl-window-private.h:
(nautilus_window_connect_content_view): New prototype.
(nautilus_send_history_list): New prototype.
(nautilus_add_to_history_list): Change parameter from const char *
to NautilusBookmark *
* src/ntl-window-msgs.h:
(nautilus_window_request_title_change): prototype for new function.
* src/ntl-window-msgs.c:
(nautilus_window_refresh_title): Removed.
(compute_default_title), (nautilus_window_get_current_location_title),
(nautilus_window_update_title_internal),
(nautilus_window_reset_title_internal),
(nautilus_window_request_title_change): New functions having to do with
passing around the title-change request. Note that there's an unresolved
problem where calling nautilus_view_notify_title_change here doesn't work
properly for metaviews. There's a comment in the code and I'll write up
a bug report also. There are currently no metaviews that care.
(nautilus_window_update_internals): Use window->last_location_bookmark
instead of creating a new bookmark for back/forward lists (this means the
back/forward menus will respect any title change requests); remove one
of the two identical calls to nautilus_index_panel_set_uri; modify the
other one to pass current location title.
(nautilus_window_update_view): Pass current title to
nautilus_view_notify_location_change.
(nautilus_window_load_content_view):
Call nautilus_window_connect_content_view instead of
nautilus_window_connect_view.
(nautilus_window_update_state): Call nautilus_window_reset_title_internal
at two spots where the location is changing.
* src/nautilus-window-menus.c:
(nautilus_window_add_bookmark_for_current_location): Use
window->current_location_bookmark instead of creating a new one
to take advantage of any requested title changes.
* components/html/ntl-web-browser.c:
(browser_title_changed): New function, calls
nautilus_content_view_frame_request_title_change.
(make_obj): Connect browser_title_changed to "title_changed" signal
of gtkhtml widget.
Fixed bug 353 (Removing all bookmark items from window can lead to crash)
* src/nautilus-bookmarks-window.c: (on_remove_button_clicked):
If we removed the last item, explicitly call repopulate since
no callback handles that case.
2000-03-27 Andy Hertzfeld <andy@eazel.com>
* libnautilus/nautilus-icon-canvas-item.c:
changed the logic in nautilus_icon_canvas_item_draw to treat
pre-lighting and selection darkening independently, so both properties
will be visually reflected.
2000-03-27 Andy Hertzfeld <andy@eazel.com>
Changed how selection emboldening works. The problem was that using
a bold font changed the text layout, making words jump from line to
line when an icon was selected. The new approach doesn't use a bold
font; instead it just draws it an extra time, offset by a pixel
* libnautilus/nautilus-icon-canvas-item.c:
embolden by drawing twice instead of using a bold font; also, removed
the "hilight_font" stuff
* libnautilus/nautilus-icon-private.h:
removed the hilite_font field
* libnautilus/nautilus-icon-container.h:
removed the highlight font stuff
* libnautilus/nautilus-graphic-effects.c,h:
cleaned up by using a common routine to make the destination pixbuf;
fixed bug in create_darkened_pixbuf by using separate counts for source
and destination rowstride;
added a "create_colorized_pixbuf" routine
2000-03-26 Ramiro Estrugo <ramiro@eazel.com>
Removed the ETTORE user level easter egg and bullet proofed the
stuff that uses user levels a bit.
* libnautilus/nautilus-global-preferences.c,
libnautilus/nautilus-global-preferences.h: Remove references to
NAUTILUS_USER_LEVEL_ETTORE.
* src/ntl-window-state.c: Removed switch handling of ETTORE user
level and added a default case for the unlikely (but poissible)
event when the ~/.gnome/nautilus preferences file contains bogus
values for the user_level enumeration.
* src/file-manager/fm-directory-view.c: Same as above.
2000-03-25 Andy Hertzfeld <andy@eazel.com>
Improved selection highlighting.
* libnautilus/nautilus-graphic-effects.c,h:
added create_darkened_pixbuf routine based on one in panel
* libnautilus/icon-private.h:
added field for highlight_font
* libnautilus/icon-container.c:
loads and maintain highlight font
* libnautilus/icon-canvas-item:
if item is selected, darken the icon and use the highlight font
2000-03-24 Darin Adler <darin@eazel.com>
Fixed bug 337 (Crash on userlevel change).
* src/file-manager/fm-directory-view.c (user_level_changed_callback):
Fixed incorrect assert.
2000-03-24 Andy Hertzfeld <andy@eazel.com>
moved pixbuf special effect routines into libnautilus, to prepare for
adding selection hilighting and others
* libnautilus/nautilus-graphic-effects.h:
header file for pixbuf graphic effects routines
* libnautilus/nautilus-graphic-effects.c:
moved create_spotlight_pixbuf and make_semi_transparent here,
fixed bug in create_spotlight_pixbuf by using separate rowstride for
the src and dst like Darin did for make_semi_transparent
* libnautilus/Makefile.am:
added nautilus-graphic-effects.c & .h
* libnautilus/nautilus-icon-canvas-item.c:
removed create_spotlight_pixbuf routine
* libnautilus/nautilus-icon-dnd.c:
removed make_semi_transparent routine
2000-03-23 John Sullivan <sullivan@eazel.com>
Put sample merged menu item and merged toolbar item
into sample component.
* components/sample/nautilus_sample_content_view.c:
(sample_notify_location_change_cb): Changed name to
sample_notify_location_change_callback and changed
parameter name "view" to "view_frame" and "sample"
to "view" to match other uses; added assert that
view's view_frame is the same as parameter view_frame.
(nautilus_sample_content_view_initialize): Added signal
connection for bonobo control activation.
(nautilus_sample_content_view_load_uri): Made the displayed
text include an explanatory sentence in addition to the uri,
so Nautilus users will be more likely to understand what this
thing is.
(bonobo_sample_callback): New function, changes the sentence
displayed with the uri based on callback caller (menu item or
toolbar button).
(sample_merge_bonobo_items_callback): New function, creates one
sample merged menu item and one sample merged toolbar button,
whose callback functions are both bonobo_sample_callback.
* src/file-manager/fm-directory-view.c:
(bonobo_control_activate_cb): Removed never-called "state == FALSE"
case, added comment.
(fm_directory_view_real_merge_menus): Removed #if 0'ed sample
toolbar button, now that there's one in the sample component.
2000-03-23 John Sullivan <sullivan@eazel.com>
* src/file-manager/fm-directory-view.c:
(fm_directory_view_real_merge_menus): Put in a commented-out
sample merged toolbar button, as a starting point for the
ones we plan to implement later.
* src/ntl-window-msgs.c: (nautilus_window_set_state_info):
Put an #ifdef EXTREME_DEBUGGING around "Doing sync - action tag"
2000-03-23 Darin Adler <darin@eazel.com>
Fixed bug 336 (merged menu items don't go away when component
is swapped out).
* src/file-manager/fm-directory-view.c: (fm_directory_view_destroy):
While debugging, I noticed that the view_frame was allocated by the
FMDirectoryView and never unref'd. The exact connection of this to
why the widgets don't go away is now lost in time. We added a call
to bonobo_object_unref to get rid of the view frame.
* src/ntl-window.h, src/ntl-window.c, src/ntl-window-msgs.c:
(Nautilus_NavigationInfo_free): Got rid of this routine. It turns
out that this was an incorrect hack to work around the error in
the surrounding code that was copying CORBA object references
without calling CORBA_Object_duplicate.
(nautilus_window_destroy), (nautilus_window_request_selection_change):
Changed code that was calling Nautilus_NavigationInfo_free to just
call CORBA_free now that the incorrect hack is not needed.
(nautilus_window_request_selection_change),
(nautilus_window_update_view),
(nautilus_window_update_internals),
(nautilus_window_load_content_view): Changed all code that was
manipulating content_view to use CORBA_Object_duplicate when
storing a reference and CORBA_Object_release when overwriting
a reference.
2000-03-22 Darin Adler <darin@eazel.com>
Fixed bug 334 (Need proper hit detection when hit-testing icons)
* libnautilus/nautilus-icon-canvas-item.c: (hit_test_pixbuf):
Fixed a typo-type error where we were checking every pixel of the
pixbuf instead of only the pixels that we were hit testing against.
* libnautilus/nautilus-icon-container.c: Tweaks.
2000-03-22 John Sullivan <sullivan@eazel.com>
Fixed bug 308 (Straighten out the new_window situation
in Nautilus_NavigationRequestInfo)
Nautilus_NavigationRequestInfo was passing around a trio
of tri-state values where one boolean would do. Now it
passes around one boolean.
* idl/nautilus.idl: Eliminated enum TruthValue,
replaced NavigationRequestInfo's new_window_default,
new_window_suggested, and new_window_enforced with boolean
new_window_requested.
* components/help/hyperbola-nav-index.c: (hyperbola_navigation_index_select_row),
* components/help/hyperbola-nav-search.c: (hyperbola_navigation_search_select_row),
* components/help/hyperbola-nav-tree.c: (hyperbola_navigation_tree_select_row),
* components/history/ntl-history-view.c:
* components/websearch/ntl-web-search.c:
* src/nautilus-window-toolbars.c:
* src/ntl-window-msgs.c:
* src/ntl-window.c:
* src/file-manager/fm-directory-view.c:
Simplified all users of Nautilus_NavigationRequestInfo to match.
* components/music/main.c: Added a #include to kill
warning about gnome_vfs_init being undefined.
2000-03-21 John Sullivan <sullivan@eazel.com>
Fixed bug 335 (Menus incorrect after keyboard navigation)
* libnautilus/nautilus-icon-container.c: (keyboard_move_to):
Emit SELECTION_CHANGED signal after changing selection.
2000-03-21 John Sullivan <sullivan@eazel.com>
Fixed bug 203 (preserve back/forward chain when using
back/forward menus).
* src/ntl-window.h: added enum NautilusLocationChangeType.
Removed window fields is_back and is_reload. Added window
fields location_change_type and location_change_distance.
* src/ntl-window-private.h:
(nautilus_window_back_or_forward): Exposed this function.
(nautilus_window_change_location): Changed name to
nautilus_window_begin_location_change and replaced is_back
and is_forward parameters with type & distance.
(nautilus_window_end_location_change): Removed this prototype
that had no implementation.
* src/ntl-window-msgs.c:
(nautilus_window_update_internals): Rewrote to use
location_change_type and location_change_index.
(nautilus_window_change_location): Changed name to
nautilus_window_begin_location_change and replaced is_back
and is_forward parameters with type & distance.
(nautilus_window_request_location_change): Updated caller of
nautilus_window-change_location.
(nautilus_window_change_location_2): Renamed to
nautilus_window_end_location_change_callback for clarity; removed
useless assignment to window->is_back.
(view_menu_switch_views_cb): Removed useless assignments of
window->is_back and window->is_reload.
(nautilus_window_update_state): Removed is_back from a debug message.
* src/ntl-window.c:
(nautilus_window_back_or_forward): Added distance parameter;
call nautilus_window_begin_location_change properly.
(nautilus_window_back_cb), (nautilus_window_forward_cb):
Pass distance of 0 to nautilus_window_back_or_forward.
* src/nautilus-window-toolbars.c: (activate_back_or_forward_menu_item):
call newly-exposed nautilus_window_back_or_forward.
2000-03-21 Pavel Cisler <pavel@eazel.com>
* libnautilus/nautilus-icon-container.c
(motion_notify_event):
Fixed an annoying bug that would sometimes cause the drag&drop feedback
to come up delayed. Turned out to be a silly mistake in the drag
snap resistance test that caused the snap resistance to be infinite when
you dragged near-horizontaly or near-vertically.
2000-03-21 Darin Adler <darin@eazel.com>
Did some of the items from RENAMING.
* libnautilus/Makefile.am:
* libnautilus/gnome-icon-container-dnd.c:
* libnautilus/gnome-icon-container-dnd.h:
* libnautilus/gnome-icon-container-grid.c:
* libnautilus/gnome-icon-container-grid.h:
* libnautilus/gnome-icon-container-private.h:
* libnautilus/gnome-icon-container.c:
* libnautilus/gnome-icon-container.h:
* libnautilus/gtkflist.c:
* libnautilus/gtkflist.h:
* libnautilus/nautilus-icon-canvas-item.c:
* libnautilus/nautilus-icon-canvas-item.h:
* libnautilus/nautilus-icon-container.c:
* libnautilus/nautilus-icon-container.h:
* libnautilus/nautilus-icon-dnd.c:
* libnautilus/nautilus-icon-dnd.h:
* libnautilus/nautilus-icon-grid.c:
* libnautilus/nautilus-icon-grid.h:
* libnautilus/nautilus-icon-private.h:
* libnautilus/nautilus-icons-view-icon-item.c:
* libnautilus/nautilus-icons-view-icon-item.h:
* libnautilus/nautilus-lib-self-check-functions.h:
* libnautilus/nautilus-list-column-title.c:
* libnautilus/nautilus-list.c:
* libnautilus/nautilus-list.h:
* src/file-manager/Makefile.am:
* src/file-manager/fm-directory-view-icons.c:
* src/file-manager/fm-directory-view-icons.h:
* src/file-manager/fm-directory-view-list.c:
* src/file-manager/fm-directory-view-list.h:
* src/file-manager/fm-icon-view.c:
* src/file-manager/fm-icon-view.h:
* src/file-manager/fm-list-view.c:
* src/file-manager/fm-list-view.h:
* src/ntl-app.c:
Did these RENAMING entries:
FMDirectoryViewIcons -> FMIconView
FMDirectoryViewList -> FMListView
GnomeIconContainer -> NautilusIconContainer
GnomeIconContainerIcon -> NautilusIcon
NautilusIconsViewIconItem -> NautilusIconCanvasItem
* RENAMING: Marked the renaming done.
2000-03-21 Darin Adler <darin@eazel.com>
Fixed arrow keys and worked on the icon grid.
Fixes bugs #314, #324, and #325.
* components/help/hyperbola.goad:
Corrected repo_ids -> repo_id, reported by Richard Hult.
* src/nautilus.goad:
Added missing = character, reported by Richard Hult.
* libnautilus/gnome-icon-container-grid.c:
* libnautilus/gnome-icon-container-grid.h:
* libnautilus/gnome-icon-container.c:
* libnautilus/gnome-icon-container-private.h:
Made the icon grid handle negative coordinates.
Removed most of the icon grid code.
Reimplemented the arrow keys. They should work again.
* libnautilus/nautilus-gnome-extensions.c:
* libnautilus/nautilus-gnome-extensions.h:
(nautilus_art_irect_contains_irect):
Added another helper function.
* libnautilus/nautilus-icons-view-icon-item.c:
* libnautilus/nautilus-icons-view-icon-item.h:
* libnautilus/gnome-icon-container.c:
* libnautilus/gnome-icon-container-private.h:
Added user data to each canvas item and got rid of the hash table
that maps canvas items to icons.
* RENAMING: Tweaks.
2000-03-20 Pavel Cisler <pavel@eazel.com>
* libnautilus/nautilus-list-column-title.c
(nautilus_list_column_title_paint):
Center the sort order indicators inside a title better. Make the column
title label spacing more like the old CtkCList.
2000-03-20 Pavel Cisler <pavel@eazel.com>
* libnautilus/nautilus-list-column-title.c
(nautilus_list_column_title_paint), (nautilus_list_column_title_draw),
(nautilus_list_column_title_buffered_draw),
(nautilus_list_column_title_expose):
Use an offscreen bitmap to draw the column title during column resizing
and column prelighting.
* libnautilus/nautilus-list-column-title.c
(nautilus_list_column_title_finalize):
Clean up properly - destroy a gc used to blit the sort order indicators
* libnautilus/gtkflist.c
* libnautilus/nautilus-list-column-title.c
(gtk_flist_track_new_column_width),
(nautilus_list_column_title_motion):
Remove the column title update from the flist, have the mouse tracking
routine in the list column title take care of it.
2000-03-17 Darin Adler <darin@eazel.com>
Fixed the "tall line of icons" bug.
* libnautilus/gnome-icon-container-grid.h:
* libnautilus/gnome-icon-container-grid.c:
* libnautilus/gnome-icon-container.c:
Rewrote the routines to not have a separate concept of the
actual grid height and the allocated grid height. Most important
change was to update the first_free variables when resizing.
* src/file-manager/fm-directory-view-icons.h:
* src/file-manager/fm-directory-view-icons.c:
(fm_directory_view_icons_line_up_icons):
Removed the unused line_up_icons call. This feature will return,
but for now it's just a waste of space.
2000-03-17 Darin Adler <darin@eazel.com>
Fixed the "rubberband does not work" bug.
* libnautilus/gnome-icon-container-grid.h:
* libnautilus/gnome-icon-container-grid.c:
* libnautilus/gnome-icon-container-private.h:
* libnautilus/gnome-icon-container.c:
* libnautilus/nautilus-icons-view-icon-item.c:
* libnautilus/nautilus-icons-view-icon-item.h:
Simplified the grid a bit and did some redesign. The grid now
takes into account the height and width of the icons. More work
to come.
* libnautilus/nautilus-global-preferences.c:
* nautilus-widgets/nautilus-preferences.h:
Some cleanup, including types for constants.
* libnautilus/nautilus-gnome-extensions.h:
* libnautilus/nautilus-gnome-extensions.c:
(nautilus_art_irect_equal), (nautilus_art_drect_equal),
(nautilus_gnome_canvas_item_get_current_canvas_bounds),
(nautilus_gnome_canvas_item_request_redraw),
(nautilus_gnome_canvas_request_redraw_rectangle),
(nautilus_gnome_canvas_item_get_world_bounds):
More useful canvas and libart routines.
* RENAMING: More renaming ideas.
2000-03-17 Elliot Lee <sopwith@eazel.com>
* libnautilus/gnome-icon-container-grid.c:
Added #include <string.h>. For some reason Elliot needs this on
his configuration even though I (Darin) don't need it on mine.
Some day we have to track this down.
Elliot checked in the above change without a ChangeLog entry,
so I decided to make one for him.
2000-03-17 Darin Adler <darin@eazel.com>
* HACKING: Fixed to match what we actually have on Eazel machines.
2000-03-17 John Sullivan <sullivan@eazel.com>
Fixed bug 322 (going Back goes wacko).
* src/nautilus-location-bar.c:
(nautilus_location_bar_set_location): This function should
not emit the location_changed signal; it's intended only to
update the displayed text. This was causing a location-changing
loop, which for reasons I did not investigate was not infinite.
Added comments to clarify this function's purpose.
Moved some more toolbar-related code into
nautilus_window_toolbars.c.
* src/nautilus-window-toolbars.c,
* src/ntl-window.c: (activate_back_or_forward_menu_item),
(activate_back_menu_item_cb), (activate_forward_menu_item_cb),
(create_back_or_forward_menu), (back_or_forward_button_clicked_cb):
Moved these functions from ntl-window.c to nautilus-window-toolbars.c.
2000-03-17 John Sullivan <sullivan@eazel.com>
Separate out toolbar code as first step towards
bonobo-izing it.
* src/nautilus-window-toolbars.c: New file
* src/Makefile.am: put new file in build.
* src/ntl-window-private.h: prototype for
nautilus_window_initialize_toolbars
* src/ntl-window.c: Moved toolbar stuff out of here
and into new file.
2000-03-17 Pavel Cisler <pavel@eazel.com>
Fix some bugs that John kindly uncovered.
* libnautilus/gtkflist.c
(gtk_flist_resize_column):
Make it so that the column title updates when column width changes
by zooming in and out.
* libnautilus/gtkflist.c
(gtk_flist_column_resize_track_start), (gtk_flist_column_resize_track_end):
Fix a dumb segfault - clist was not being initialized properly.
* libnautilus/nautilus-list-column-title.c
(nautilus_list_column_title_paint):
Make the sort indicator draw on the other side of the column title
as it should.
Tweak an assert.
* libnautilus/nautilus-list-column-title.c
(nautilus_list_column_title_leave):
Fix a problem where the column title would sometimes get stuck in a
prelight state after the mouse has exited.
2000-03-16 Pavel Cisler <pavel@eazel.com>
* scr/file-manager/fm-directory-view-list.c
(create_flist):
The icon column was set to the width of an icon at 100% zoom level.
This doesn't work at higher zoom levels and when using Eazel
theme icons. For now just make the column resizable again.
2000-03-16 Pavel Cisler <pavel@eazel.com>
First pass on making list column resizing live.
* libnautilus/Makefile.am
* libnautilus/nautilus-list-column-title.c
* libnautilus/nautilus-list-column-title.h
New list column title widget that makes it easier to hook into
the mouse tracking and allows using flicker free redraw. Currently
it doesn't use an offscreen buffer yet, comming soon.
* libnautilus/gtkflist.c
(gtk_flist_initialize_class), (gtk_flist_initialize),
(gtk_flist_realize), (list_requisition_width),
(gtk_flist_size_request), (new_column_width), (size_allocate_columns),
(size_allocate_title_buttons), (get_cell_style), (draw_cell_pixmap),
(draw_row), (draw_rows),
Made it possible to replace the existing column list view titles
from GtkCList view to be replaced with the new widget. In order
to do that I had to pull in a number of calls form GtkCList and
work around dependencies on column titles being buttons.
Prepared code some for smart column truncation.
* libnautilus/gtkflist.h
* libnautilus/gtkflist.c
(gtk_flist_track_new_column_width), (gtk_flist_column_resize_track_start),
(gtk_flist_column_resize_track), (gtk_flist_column_resize_track_end):
Added new calls that hook up with the mouse tracking code that
resize the tracker column.
* scr/file-manager/fm-directory-view-list.c
(get_sort_indicator), (hide_sort_indicator), (show_sort_indicator),
(create_flist):
Removed code that insert the sort order indicator into the list
column - this is now done in the new column title widget.
* scr/file-manager/fm-directory-view-list.c
(create_flist):
Added min and max column width values.
* libnautilus/gtkflist.c
(gtk_flist_initialize_class)
Fixe a bug where the "selection_changed" was mistakenly connected
to the start_drag callback.
* libnautilus/nautilus-gdk-extensions.c
* libnautilus/nautilus-gdk-extensions.h
(nautilus_rectangle_contains), (nautilus_rectangle_inset):
Added GdkRectangle utility calls.
2000-03-16 John Sullivan <sullivan@eazel.com>
* src/nautilus-index-title.c:
store uri in details struct.
(nautilus_index_title_set_uri), (nautilus_index_title_set_up_icon),
(nautilus_index_title_set_up_label), (nautilus_index_title_set_up_info):
Read uri from details struct instead of passing in parameter.
(nautilus_index_title_initialize): Connect with "icons_changed"
signal so nautilus_index_title_set_up_icon gets called again,
refreshing the icon appearance when the theme changes.
(nautilus_index_title_finalize): free details->uri.
* src/ntl-uri-map.c:
(get_nautilus-navigation_result_from_gnome_vfs_result):
Handle GNOME_VFS_ERROR_GENERIC case, since diskzero ran
into it. Unfortunately we can't put up a very specific error
message for that case!
2000-03-16 Darin Adler <darin@eazel.com>
Did some of the renamings that were queued in RENAMING.
* libnautilus/Makefile.am:
* libnautilus/gdk-extensions.c:
* libnautilus/gdk-extensions.h:
* libnautilus/nautilus-gdk-extensions.c:
* libnautilus/nautilus-gdk-extensions.h:
* libnautilus/gnome-icon-container.c:
* libnautilus/nautilus-background.c:
* libnautilus/nautilus-icons-view-icon-item.c:
Renamed gdk-extensions to add the nautilus- prefix and changed
all includers.
* src/Makefile.am:
* src/explorer-location-bar.c:
* src/explorer-location-bar.h:
* src/nautilus-location-bar.c:
* src/nautilus-location-bar.h:
* src/ntl-window-msgs.c:
* src/ntl-window.c:
Renamed ExplorerLocationBar to NautilusLocationBar.
* src/Makefile.am:
* src/nautilus-bookmarklist.c:
* src/nautilus-bookmarklist.h:
* src/nautilus-bookmark-list.c:
* src/nautilus-bookmark-list.h:
* src/nautilus-bookmarks-window.c:
* src/nautilus-bookmarks-window.h:
* src/nautilus-window-menus.c:
Renamed NautilusBookmarklist to NautilusBookmarkList.
* RENAMING: Marked items done and added some new ones.
* nautilus-widgets/nautilus-preferences-item.c:
* nautilus-widgets/nautilus-preferences.c:
* nautilus-widgets/test-nautilus-widgets.c:
* libnautilus/nautilus-icon-factory.c:
* src/file-manager/fm-directory-view-icons.c:
* src/file-manager/fm-directory-view.c:
* src/file-manager/fm-icon-text-window.c:
Cleaned up the interface to NautilusPreferences a bit.
2000-03-16 John Sullivan <sullivan@eazel.com>
Fixes for a couple of preferences bugs Darin and I ran into
while trying to debug a preferences-related problem. We
can't reproduce the original problem so we don't know if
these fix it.
* libnautilus/nautilus-icon-factory.c:
(nautilus_get_current_icon_factory): Call
nautilus_global_preferences_initialize before accessing preferences,
since this code is called by processes other than the main
nautilus one.
* nautilus-widgets/nautilus-preferences.c: (prefs_get_pref):
Remove redundant NULL check for prefs; add NULL check for pref_name;
remove test of uninitialized variable; change assert to
return FALSE since callers already handle the FALSE case.
(nautilus_preferences_get_enum): Changed return FALSE to return 0
to match return value type.
(nautilus_preferences_get_string): Changed return FALSE to return NULL
to match return value type.
2000-03-16 John Sullivan <sullivan@eazel.com>
Moved a couple of utility functions I wrote recently
into the right places in libnautilus.
* libnautilus/nautilus-bonobo-extensions.h,
* libnautilus/nautilus-bonobo-extensions.c: New files,
initially containing only the euphoniously-named
(nautilus_bonobo_ui_handler_menu_set_toggle_appearance),
which toggles a bonobo menu item's checkbox state without
invoking its callback.
* libnautilus/Makefile.am: Put these two new files into build.
* libnautilus/nautilus-glib-extensions.h,
* libnautilus/nautilus-glib-extensions.c:
(nautilus_g_strfindv): New function, finds a string in a
NULL-terminated string array. Hideous name to match glib conventions.
(nautilus_self_check_glib_extensions): Added tests for
nautilus_g_strfindv.
* src/nautilus-window-menus.c:
(nautilus_bonobo_ui_handler_menu_toggle_appearance): Moved out
of here, now called in its new home in libnautilus.
* src/file-manager/fm-icon-text-window.c:
(find_string_in_array): Moved out of here and renamed on its
way into libnautilus.
(synch_menus_with_preference): Updated for function name change.
2000-03-16 Darin Adler <darin@eazel.com>
* src/file-manager/fm-directory-view.c:
(disconnect_model_handlers), (stop_load): Fixed the CRITICALs that
I recently introduced. Made sure our unrefs match our refs for
monitor_files.
2000-03-16 John Sullivan <sullivan@eazel.com>
Made icon theme changes persist across sessions by
using preferences mechanism. When preferences mechanism
switches to using GConf this should (theoretically) make
icon theme changes work across multiple processes too.
* libnautilus/nautilus-global-preferences.h:
added #define for NAUTILUS_PREFERENCES_ICON_THEME
* libnautilus/nautilus-global-preferences.c:
(global_preferences_static_info[]): new entry for
NAUTILUS_PREFERENCES_ICON_THEME with initial value.
* libnautilus/nautilus-icon-factory.c:
(nautilus_get_current_icon_factory): get theme from preferences
and register callback to be notified of changes in preference.
(nautilus_icon_factory_destroy): unregister preferences callback.
(nautilus_icon_factory_get_theme): Removed this function.
(icon_theme_changed_callback): call set_theme when preference changes.
* libnautilus/nautilus-icon-factory.h:
(nautilus_icon_factory_get_theme),
(nautilus_icon_factory_set_theme): Removed public API. The
rare client that cares about the name of the theme should
get/set it from preferences.
* src/nautilus-window-menus.c:
(use_eazel_theme_icons_cb): get and set theme from
preferences rather than with icon factory calls.
(nautilus_bonobo_ui_handler_menu_set_toggle_appearance):
New function, sets the state of the checkbox in a bonobo
menu item without invoking the callback. Perhaps this belongs
in bonobo or in libnautilus, but I'm waiting to hear what the
bonobo folks have to say about the current behavior, which
seems broken to me.
(update_eazel_theme_menu_item): Rewritten to change the
state of the menu item without invoking the callback. This
was broken in the case where the initial state of the menu
item was backwards, which was never the case before since
it always started with Eazel theme icons off.
* libnautilus/nautilus-icon-factory.c:
(nautilus_icon_factory_initialize_class),
(nautilus_icon_factory_set_theme),
* components/history/ntl-history-view.c: (make_obj),
* src/nautilus-bookmarks-window.c:
(create_bookmarks_window),
* src/nautilus-window-menus.c:
(nautilus_window_initialize_menus),
(nautilus_window_initialize_bookmarks_menu),
(nautilus_window_initialize_go_menu),
* libnautilus/gnome-icon-container.c:
(gnome_icon_container_initialize),
* src/file-manager/fm-directory-view-list.c:
(fm_directory_view_list_initialize): Changed name of signal
emitted by icon factory from "theme_changed" to "icons_changed"
since it may be used in the future for other kinds of changes
in the available set of icons.
2000-03-15 Darin Adler <darin@eazel.com>
* HACKING: Tell people about the gnome-xml branch.
* libnautilus/Makefile.am:
* libnautilus/gnome-icon-container-grid.c:
* libnautilus/gnome-icon-container-grid.h:
* libnautilus/gnome-icon-container-private.h:
* libnautilus/gnome-icon-container.c:
Broke out the grid code from the main container code.
This is a first step toward improving the layout code.
* libnautilus/nautilus-directory-private.h:
* libnautilus/nautilus-directory.c:
* libnautilus/nautilus-directory.h:
* src/fm-directory-view.c:
Got started on making the directory I/O async.
There's still a long way to go, this was a baby step.
* libnautilus/nautilus-bookmark.c:
* libnautilus/nautilus-bookmark.h:
* libnautilus/nautilus-self-checks.c:
General cleanup.
* libnautilus/nautilus-file.h:
Rearranged a little bit.
* libnautilus/nautilus-file-utilities.c:
Put FIXME in where there's code that needs to be changed.
2000-03-15 John Sullivan <sullivan@eazel.com>
Used preferences mechanism for icon views' text-under-icons
and directory views' open-in-new-window preference. The former
was not persistent previously and the latter wasn't
implemented.
* nautilus-widgets/nautilus-preferences.h,
* nautilus-widgets/nautilus-preferences.c:
added NAUTILUS_PREFERENCE_STRING to NautilusPreferencesType enum.
(nautilus_preferences_get_string), (nautilus_preferences_set_string):
New functions for string preferences.
(prefs_check_supported_type), (prefs_set_pref),
(nautilus_preferences_register_from_info), (make_gnome_config_string):
Support for string preferences.
* nautilus-widgets/nautilus-preferences-item.c:
(preferences_item_construct): added a g_assert_not_reached as the
NAUTILUS_PREFERENCE_STRING case in a switch statement to make the
compiler happy. I didn't implement a UI for string items in the
preferences dialog because the string items we're using now have
their own specialized UI.
* libnautilus/nautilus-global-preferences.h:
added #define for NAUTILUS_PREFERENCES_ICON_VIEW_TEXT_ATTRIBUTE_NAMES
* libnautilus/nautilus-global-preferences.c:
(global_preferences_static_info[]): filled in initial value for
NAUTILUS_PREFERENCES_ICON_VIEW_TEXT_ATTRIBUTE_NAMES
* src/file-manager/fm-icon-text-window.c:
(changed_attributes_option_menu_cb): Set new value using
preferences mechanism instead of calling fm_directory_view_icons.
(find_string_in_array), (set_preference_string),
(synch_menus_with_preference), (preference_changed_cb),
(fm_icon_text_window_destroy_cb):
New functions used to keep UI in synch with text-attribute
preference.
(create_icon_text_window): wire up notifications about
text-attribute preferences and get initial value.
* src/file-manager/fm-directory-view-icons.h,
* src/file-manager/fm-directory-view-icons.c:
Added text_attribute_names field to details struct.
(icon_text_changed_cb), (fm_directory_view_icons_initialize_class),
(fm_directory_view_icons_initialize), (fm_directory_view_icons_destroy),
(text_attribute_names_changed_callback),
(fm_directory_view_icons_get_full_icon_text_attribute_names),
(fm_directory_view_icons_set_full_icon_text_attribute_names),
(fm_directory_view_icons_get_icon_text_attribute_names):
Replaced old mechanism that used FMSignaller to send notifications
about the text attribute names with new preferences mechanism.
* src/file-manager/fm-directory-view.c:
Added user_new_window field to details structure.
(fm_directory_view_activate_file_internal): New function, does
what fm_directory_view_activate_file did before.
(fm_directory_view_activate_file): Now respects the use_new_window
preference.
(bonobo_menu_open_cb), (open_cb), (open_one_in_new_window):
Changed callers to use fm_directory_view_activate_file_internal
for those cases where the use_new_window preference should be
ignored (e.g. "Open" and "Open in New Window" menu items).
(fm_directory_view_initialize): Get initial value of new-window
preference and set up notification for when value changes.
(use_new_window_changed_callback): Refresh local copy of preference.
(fm_directory_view_destroy): Remove preferences callback.
* src/file-manager/fm-signaller.c,
* src/file-manager/fm-signaller.h: Removed these two files
that were handling the text-under-icons mechanism previously.
* src/file-manager/Makefile.am: Took removed files out of build.
* libnautilus/nautilus-file.c: (nautilus_file_get_owner_as_string):
Removed an old debugging g_print.
2000-03-15 Darin Adler <darin@eazel.com>
A quick cleanup of how we use gnome-xml.
* libnautilus/Makefile.am:
* libnautilus/nautilus-xml-extensions.c:
* libnautilus/nautilus-xml-extensions.h:
Added some new gnome-xml helper functions.
* libnautilus/nautilus-directory.c:
(nautilus_directory_get_file_metadata_node):
* libnautilus/nautilus-file.c:
(nautilus_file_get_keywords):
(nautilus_file_set_keywords):
* libnautilus/nautilus-icon-factory.c:
(get_child_node_by_property):
(get_themed_icon_file_path):
* src/nautilus-bookmarklist.c:
(nautilus_bookmarklist_load_file):
Changed to use the new helper functions.
* src/nautilus-bookmarklist.c:
(nautilus_bookmarklist_save_file): Changed direct uses of root to
use xmlDocGet/SetRootElement while I was editing the file. I
think this is the same change Pavel made but wasn't able to check
in.
* src/nautilus-bookmarklist.c:
General cleanup.
2000-03-14 Darin Adler <darin@eazel.com>
Added additional data to icons so they can specify where the
embedded text fits in each icon.
* icons/eazel/Makefile.am, icons/eazel/i-regular.xml: Added the
file to specify attributes of icons. Specifically added the
attribute that says there is space for embedded text in the
Eazel-theme regular icon.
* libnautilus/nautilus-icon-factory.h:
* libnautilus/nautilus-icon-factory.c:
(get_child_node_by_property), (get_themed_icon_file_path),
(get_icon_file_path), (nautilus_icon_factory_get_thumbnail_uri),
(load_specific_image), (load_image_for_scaling),
(get_image_from_cache), (load_image_scale_if_necessary),
(nautilus_icon_factory_get_pixbuf_for_icon),
(nautilus_icon_factory_get_pixbuf_for_file):
Added code to read a rectangle for the embedded text along with
the icon, cache it with the icon, scale it with the icon, and
return it to the caller along with the icon.
* libnautilus/nautilus-icons-view-icon-item.c:
(nautilus_icons_view_icon_item_initialize_class),
(nautilus_icons_view_icon_item_set_arg),
(nautilus_icons_view_icon_item_get_arg),
(nautilus_icons_view_icon_item_get_image),
(nautilus_icons_view_icon_item_set_image),
(nautilus_art_irect_to_gdk_rectangle),
(draw_mini_text), (draw_embedded_text),
(nautilus_icons_view_icon_item_draw):
Changed the code that draws the embedded text to respect the
text rectangle passed in. Changed the pixbuf setting to use a
function instead of the arg interface and take a text rectangle
along with the pixbuf.
* libnautilus/gnome-icon-container-dnd.c
(gnome_icon_container_dnd_begin_drag):
* libnautilus/gnome-icon-container.c:
(icon_get_actual_size): Got rid of callers who were using the arg
interface to get at the image of an icon
("NautilusIconsViewIconItem::pixbuf").
* src/file-manager/fm-directory-view-icons.c:
(get_icon_property_cb): Get rid of hard-coded rule that only
themes with eazel at the front of their names can display text
inside the icons.
* libnautilus/gnome-icon-container.c:
(icon_new): Fixed a bug where icons would be super-tiny if they
got too big, like if you entered a directory that was zoomed all
the way in.
(start_stretching), (ungrab_stretch_icon), (end_stretching),
(gnome_icon_container_show_stretch_handles): Added code to grab
the pointer while stretching an icon.
(item_event_cb): Added a return statement that John forgot when
he was editing. Without that, it was falling through to the next
case, which had the same effect anyway.
(update_icon): Pass the text rectangle through from the icon
factory to the icon canvas item, using the new call instead of the
old arg interface approach.
* components/help/.cvsignore: Added entries for
.la and .lo files.
* components/help/Makefile.am:
* components/help/hyperbola-nav-index.c:
* components/help/hyperbola-nav-search.c:
* libnautilus/nautilus-directory-private.h:
* libnautilus/nautilus-directory.c:
* src/nautilus-bookmarklist.c:
Fixed flags for gnome-xml
includes. Someone pointed out that you are supposed to include
these as "#include <tree.h>", not "#include <gnome-xml/tree.h>" so
I fixed our uses to work that way.
* libnautilus/nautilus-directory.c:
(nautilus_directory_get_file_metadata_node): Fixed code that was
destroying something allocated by gnome-xml with g_free instead
of xmlFree.
* libnautilus/nautilus-file.c:
(nautilus_file_get_keywords), (nautilus_file_set_keywords):
Fixed storage leak where we were getting a property and not freeing it.
* libnautilus/nautilus-default-file-icon.h:
* libnautilus/nautilus-default-file-icon.c:
* libnautilus/nautilus-icon-factory.c:
(load_image_for_scaling): Got rid of the global that tells whether
the default icon has an alpha channel -- it's not hardwired TRUE.
2000-03-14 John Sullivan <sullivan@eazel.com>
When a directory with no explicitly-chosen viewer is
visited, the currently-displayed viewer is used if
possible. This matches the behavior of zooming. Darin
doesn't like this and would prefer a single global
setting with some possibly obscure way to set up values
for specific locations, which wouldn't affect subsequent
navigation. Let's try it for awhile and see if we can
agree on a better solution.
* src/ntl-types.h: added referring_iid field to
NautilusNavigationInfo
* src/ntl-uri-map.h,
* src/ntl-uri-map.c:
(nautilus_navinfo_new): Added a referring_iid parameter,
a copy of which is stored in the new struct.
(nautilus_navinfo_free): free the referring_iid string.
(set_initial_content_iid): Use the referring_iid if there's
no valid remembered iid.
* src/ntl-window-msgs.c:
(nautilus_window_change_location): Get the iid from the current
content view and pass it to nautilus_navinfo_new.
2000-03-14 John Sullivan <sullivan@eazel.com>
Directories now start out using the same view they were
last displayed with.
* libnautilus/nautilus-metadata.h: added #define for
NAUTILUS_INITIAL_VIEW_METADATA_KEY
* src/ntl-types.h: renamed field default_content_iid to
initial_content_iid, to avoid ambiguity with other uses
of default (e.g. default metadata value). Also made this
a char * instead of a const char *.
* src/ntl-uri-map.c:
(nautilus_window_load_content_view_menu),
(nautilus_window_update_state): Updated for name change.
(view_menu_switch_views_cb): Save iid of new view in metadata.
* src/ntl-window-msgs.c:
(check_iid): New GCompareFunc-type function, used by to
check whether a string matches the iid of any
NautilusViewIdentifier in a list.
(set_initial_content_iid): New function, gets stored iid
from metadata and uses it if it's non-NULL and matches one
of the available viewers (otherwise uses a fallback iid).
(my_notify_when_ready): Call set_initial_content_iid after
constructing the list of available viewers.
(nautilus_navinfo_free): free initial_content_iid, which was
created in set_initial_content_iid.
2000-03-14 John Sullivan <sullivan@eazel.com>
* libnautilus/gnome-icon-container.c: (icon_destroy):
Send SELECTION_CHANGED signal when destroying an icon
that had been selected. This fixes bug Elliot reported
where "Open in New Window" item in File menu was sensitive
after the selected items had been deleted.
2000-03-14 Jonathan Blandford <jrb@redhat.com>
* libnautilus/gnome-icon-container-dnd.c (drag_drop_cb): Add a
gtk_drag_finish to hopefully solve half the flying windows
problem. Needs more thought then this, though.
2000-03-14 John Sullivan <sullivan@eazel.com>
Fixed bug introduced in last checkin where two popup
menus appear if you right-click on an icon.
* libnautilus/gnome-icon-container.c: (item_event_cb):
Explicitly stop signal emission when button press is handled.
2000-03-13 John Sullivan <sullivan@eazel.com>
Cleanup of "icon selected for keyboard input" code and
behavior. Now it always draws the stippled border around
the keyboard input icon if non-NULL, but it's only non-NULL
after the user has started type-selecting. It chooses a
sensible place to start when a key is pressed, depending
on the key.
* libnautilus/gnome-icon-container.c:
(find_first), (find_last): Now take boolean for whether to
consider only selected items.
(kbd_home), (kbd_end): Updated to match API changes.
(set_kbd_current): Remove condition guarding highlight change.
(icon_toggle_selected): Removed code to reset the
current keyboard icon; no longer needed with previous change.
(idle_handler): Remove code setting the keyboard-select icon
at idle time.
(get_nth_selected_icon): New helper function to help avoid
walking through all items just to find a certain selected one.
(get_first_selected_icon): Rewritten to call get_nth_selected_icon.
(has_multiple_selection): New helper function that calls
get_nth_selected_icon (2) to determine whether there's at least
two items selected.
(set_kbd_current_to_single_selected_icon): New helper function
to set the keyboard navigation icon to the selected icon, if
the former is non-NULL and the latter is unique.
(kbd_left), (kbd_up), (kbd_right), (kbd_down): Set keyboard
navigation icon if necessary: If a single item is selected, use
that as starting point for keyboard navigation. If no items are
selected, use find_first/last. If multiple items are selected,
use find_first/last but only consider selected items.
(kbd_space): Select a keyboard navigation item if necessary
using find_first.
(button_press_event): Nullify keyboard navigation item since
we're now mouse-navigating.
(gnome_icon_container_almost_drag): Don't set keyboard navigation
item here.
(destroy), (gnome_icon_container_icon_initialize),
(linger_select_timeout_cb), (handle_icon_enter_notify),
(handle_icon_leave_notify), (item_event_cb): Removed code for
obsolete experimental "linger" feature.
* libnautilus/nautilus-icons-view-icon-item.c:
(nautilus_icons_view_icon_item_event): return TRUE only if the
event was actually used; this fixes bug where keyboard navigation
wouldn't work if mouse cursor happened to be over an item.
2000-03-13 Darin Adler <darin@eazel.com>
* libnautilus/nautilus-directory.c (nautilus_directory_get):
Fixed bug that caused a core dump when getting at the root
directory because all the '/' characters were stripped off
the URI.
* src/file-manager/fm-directory-view.c:
* nautilus-widgets/nautilus-preferences.c:
Tiny formatting fixes.
2000-03-13 Maciej Stachowiak <mjs@eazel.com>
* src/ntl-window.c (nautilus_window_constructed): Connect to
zoom_in and zoom_out singals of zoom control and view the zoom in
such cases, when applicable.
* src/nautilus-zoom-control.c
(nautilus_zoom_control_class_initialize): Add zoom_in and zoom_out
signals.
(nautilus_zoom_control_reset_zoom_level): Quick hack to get some
semblance of sanity in view switching.
* file-manager/fm-directory-view.c: Add Zoomable interface; for
now only implement zoom_in and zoom_out methods.
* components/sample/nautilus-sample-content-view.c: Added some
comments.
2000-03-13 Elliot Lee <sopwith@redhat.com>
* nautilus-widgets/nautilus-preferences.c, src/file-manager/fm-directory-view.c:
Fix pointer <-> int conversion warnings.
2000-03-13 Darin Adler <darin@eazel.com>
* libnautilus/nautilus-string-list.h:
* libnautilus/nautilus-string-list.c:
A quick cleanup pass on the NautilusStringList class:
Changed uses of gchar to char, changed g_assert to g_return_if_fail
as appropriate. Fixed brace style to be emacs-friendly (open brace
on same line as if statement). Fixed spelling of delimiter.
Got rid of some unnecessary special cases for NULL and sped up
the _equal function be eliminating the redundant length check.
Changed the self-check so that it doesn't write a warning to the
log when it runs.
2000-03-13 Darin Adler <darin@eazel.com>
* src/file-manager/fm-properties-window.c (create_properties_window):
Andy fixed a double-unref bug by removing an unref. The correct
fix was to add a ref. I rolled out his change and re-fixed the bug.
2000-03-12 Ramiro Estrugo <ramiro@eazel.com>
* libnautilus/nautilus-global-preferences.c,
* libnautilus/nautilus-global-preferences.h:
(nautilus_global_preferences_get_meta_view_iids) Add a table of
meta view iids and a function to retrieve them. This is a hack
until we have better runtime detection of components.
Add some better defaults for which meta views are shown. By
default none were shown. Undo a previous gnome_config default
hack. There is now a better fix in place in the prefs code.
* nautilus-widgets/nautilus-preferences.c:
(nautilus_preferences_make_gnome_config_string) A new function to
make a string as expected by gnome_config with a trailing default
value. Use this string to fetch the value of the preferences.
* src/Makefile.am,
src/ntl-prefs.c,
src/ntl-prefs.h,
src/nautilus-window-menus.c,
src/nautilus.h:
Retire ntl-prefs.c and ntl-prefs.h. Remove these 2 from build and
all references to them.
* src/ntl-app.c:
(nautilus_app_startup, nautilus_app_destroy) No need to call
retired ntl-prefs functions.
* src/ntl-uri-map.c:
(add_meta_view_iids_from_preferences): New function. Factor out
meta iid setup code into one place. Replace the static meta iid
setup code with something that looks in preferences to see which
meta views are enabled. Next step is to make the meta view
respond to pref changes.
2000-03-12 Ramiro Estrugo <ramiro@eazel.com>
* src/ntl-window-state.c:
(nautilus_window_set_initial_state) Make Intermediate user level
work like hacker, but without showing dot files.
2000-03-12 Andy Hertzfeld <andy@eazel.com>
* src/file-manager/fm-properties-window.c:
fixed bug where closing the properties window would cause a crash.
It was caused by double deleting nautilus_file objects and fixed by
removing the callback to delete the nautilus file in
create_properties_window. Darin better check this to make sure
we're not leaking here.
2000-03-12 Ramiro Estrugo <ramiro@eazel.com>
* nautilus-widgets/nautilus-preferences.c:
(pref_hash_info_remove_callback) Properly remove the item from
the list so that we dont crash later trying to munge a NULL node.
* libnautilus/nautilus-global-preferences.h:
(NAUTILUS_PREFERENCES_USER_LEVEL) Make sure the user level
defaults to hacker.
2000-03-12 Ramiro Estrugo <ramiro@eazel.com>
* libnautilus/Makefile.am: Added nautilus_string_table
* libnautilus/nautilus-lib-self-check-functions.h: Added string
table tests hooks.
* libnautilus/nautilus-string-list.c,
libnautilus/nautilus-string-list.h: New class to deal with lists
of strings in a type safe manner. Also added self tests for this
class.
2000-03-12 Ramiro Estrugo <ramiro@eazel.com>
* nautilus-widgets/nautilus-preferences.c:
(prefs_set_pref, nautilus_preferences_register_from_info,
nautilus_preferences_register_from_values): Make the preference
changes persistent.
* nautilus-widgets/nautilus-preferences-item.c,
nautilus-widgets/nautilus-preferences-item.h,
nautilus-widgets/nautilus-preferences.c,
nautilus-widgets/nautilus-preferences.h,
nautilus-widgets/test-nautilus-widgets.c:
Dont use GtkFunadamentalType, since we obviously wont support
all fundamental gtk types as preferences. Use an enum instead.
Makes the preferences type whacking code exactly 14.85% more type
safe.
2000-03-12 Ramiro Estrugo <ramiro@eazel.com>
* src/ntl-window-state.c:
(nautilus_window_set_initial_state): Use the alternative home
place if needed for the user level.
2000-03-12 Ramiro Estrugo <ramiro@eazel.com>
* nautilus-file-utilities.h,
nautilus-file-utilities.c:
(nautilus_user_top_directory): New function. Used to obtain
the user's "top" directory. The top directory is an alternative
home place for naive users.
2000-03-12 Ramiro Estrugo <ramiro@eazel.com>
* data/.cvsignore,
data/Makefile.am:
Add a data directory to the tree. This is the default per-user
data that nautilus installs the first time it runs.
*data/top/.cvsignore,
data/top/Makefile.am,
data/top/Welcome:
Add a top directory to the tree. The top directory is an
alternative home place for novice users.
*configure.in,
Makefile.am:
Grok the above.
2000-03-12 Ramiro Estrugo <ramiro@eazel.com>
* libnautilus/nautilus-global-preferences.c,
libnautilus/nautilus-global-preferences.h,
src/ntl-window-state.c:
Use better names for the global preferences macros.
Cleanup some #include cruft.
* nautilus-widgets/nautilus-preferences.c,
nautilus-widgets/nautilus-preferences.h:
(nautilus_prefecences_remove_callback):
New method for removing callbacks.
* src/file-manager/fm-directory-view.c:
(queue_pending_files, fm_directory_view_initialize ,
fm_directory_view_destroy): Filter files according to the user level.
Add/Remove a preferences callback to keep track of user level changes.
2000-03-12 Ramiro Estrugo <ramiro@eazel.com>
* AUTHORS,
src/nautilus-window-menus.c: Added myself.
2000-03-12 Ramiro Estrugo <ramiro@eazel.com>
* src/nautilus-window-menus.c:
* src/ntl-window-state.c:
* src/ntl-app.c:
Update for naming changes in the preferences api.
2000-03-12 Ramiro Estrugo <ramiro@eazel.com>
* nautilus-widgets/nautilus-preferences-box.c,
nautilus-widgets/nautilus-preferences-box.h,
nautilus-widgets/nautilus-preferences-dialog.c,
nautilus-widgets/nautilus-preferences-dialog.h,
nautilus-widgets/nautilus-preferences-group.c,
nautilus-widgets/nautilus-preferences-group.h,
nautilus-widgets/nautilus-preferences-item.c,
nautilus-widgets/nautilus-preferences-item.h,
nautilus-widgets/nautilus-preferences-pane.c,
nautilus-widgets/nautilus-preferences-pane.h,
nautilus-widgets/nautilus-preferences.c,
nautilus-widgets/nautilus-preferences.h,
nautilus-widgets/nautilus-radio-button-group.h,
nautilus-widgets/test-nautilus-widgets.c,
nautilus-widgets/test-preferences.c:
Cleanup naming of everything to use "preferences" instead of
"prefs". Remove a bunch of unused includes. Use "Details"
instead of "Private" for private structures. Fix pref item
support of boolean values.
2000-03-12 Ramiro Estrugo <ramiro@eazel.com>
* components/help/Makefile.am:
* components/history/Makefile.am:
* components/html/Makefile.am:
* components/music/Makefile.am:
* components/notes/Makefile.am:
* components/sample/Makefile.am:
* components/websearch/Makefile.am:
Link all components with nautilus-widgets.
2000-03-12 Ramiro Estrugo <ramiro@eazel.com>
* libnautilus/Makefile.am,
libnautilus/nautilus-global-preferences.c: New file
libnautilus/nautilus-global-preferences.h: New file
* src/Makefile.am,
src/nautilus-global-preferences.c: Removed
src/nautilus-global-preferences.h: Removed
Moved global preferences to libnautilus.
2000-03-10 Darin Adler <darin@eazel.com>
* libnautilus/nautilus-icons-view-icon-item.c
(nautilus_icons_view_icon_item_point):
Fixed typo that broke all hit testing except for rubber band
selection! (Sorry.)
* libnautilus/gnome-icon-container-dnd.c
(set_gnome_icon_list_selection, set_uri_list_selection),
libnautilus/gnome-icon-container-private.h,
libnautilus/gnome-icon-container.h,
libnautilus/gnome-icon-container.c
(gnome_icon_container_get_icon_uri,
gnome_icon_container_initialize_class, gnome_icon_container_new,
update_icon, gnome_icon_container_update,
gnome_icon_container_request_update),
src/file-manager/fm-directory-view-icons.c (create_icon_container,
get_icon_images_cb, get_icon_uri_cb, get_icon_text_cb,
get_icon_property_cb): Change code that used to use a separate
controller object to just use signals on the icon container
instead.
* libnautilus/nautilus-gtk-extensions.h,
libnautilus/nautilus-gtk-extensions.c,
src/file-manager/fm-directory-view.c: Add new signal marshal
functions as needed and changed the name of one of the old
functions.
* libnautilus/Makefile.am,
libnautilus/nautilus-icons-controller.h,
libnautilus/nautilus-icons-controller.c,
src/file-manager/Makefile.am,
src/file-manager/fm-icons-controller.h,
src/file-manager/fm-icons-controller.c: Removed the old controller
object, it was a bad idea.
2000-03-10 Ramiro Estrugo <ramiro@eazel.com>
* src/Makefile.am
Moved prefs things to nautilus-widgets.
Use alphabetization technology on the source list.
* src/nautilus-global-preferences.c,
src/nautilus-global-preferences.h:
New files that to deal with preferences that are
global to nautilus.
* src/nautilus-window-menus.c:
Use the new preferences dialog.
* src/ntl-window-state.c:
Go to a different home directory based on the user level.
Commented off until andy makes a nice default home directory
for novice users.
* src/ntl-prefs.c,
src/ntl-prefs.h:
Renamed a typedef to avoid conflict. This is a temporary hack.
* src/nautilus-prefs-box.c
src/nautilus-prefs-box.h,
src/nautilus-prefs-dialog.c,
src/nautilus-prefs-dialog.h,
src/nautilus-prefs-group-check.c,
src/nautilus-prefs-group-check.h,
src/nautilus-prefs-group-radio.c,
src/nautilus-prefs-group-radio.h,
src/nautilus-prefs-group.c,
src/nautilus-prefs-group.h,
src/nautilus-prefs-pane.c,
src/nautilus-prefs-pane.h,
src/ntl-prefs.c,
src/ntl-prefs.h:
Moved prefs widegtry things to nautilus-widgets.
2000-03-10 Ramiro Estrugo <ramiro@eazel.com>
* nautilus-widgets/Makefile.am,
nautilus-widgets/nautilus-preferences-box.c
nautilus-widgets/nautilus-preferences-box.h,
nautilus-widgets/nautilus-preferences-dialog.c,
nautilus-widgets/nautilus-preferences-dialog.h,
nautilus-widgets/nautilus-preferences-group.c,
nautilus-widgets/nautilus-preferences-group.h,
nautilus-widgets/nautilus-preferences-item.c,
nautilus-widgets/nautilus-preferences-item.h,
nautilus-widgets/nautilus-preferences-pane.c,
nautilus-widgets/nautilus-preferences-pane.h,
nautilus-widgets/nautilus-preferences.c,
nautilus-widgets/nautilus-preferences.h,
nautilus-widgets/nautilus-radio-button-group.c,
nautilus-widgets/nautilus-radio-button-group.h,
nautilus-widgets/test-nautilus-widgets.c,
nautilus-widgets/test-preferences.c:
Moved all the preference widetry to nautilus-widgets.
Added a test program for preferences (not built).
Renamed files to user "preference" instead of "prefs".
2000-03-10 Darin Adler <darin@eazel.com>
* libnautilus/Makefile.am, libnautilus/gnome-icon-container-dnd.c
(set_gnome_icon_list_selection,
gnome_icon_container_dnd_begin_drag),
libnautilus/gnome-icon-container.c (icon_is_in_region,
start_stretching), libnautilus/nautilus-icons-view-icon-item.h,
libnautilus/nautilus-icons-view-icon-item.c (hit_stretch_handle,
hit_test_pixbuf, hit_test, nautilus_icons_view_icon_item_point,
nautilus_icons_view_icon_item_get_icon_world_rectangle,
nautilus_icons_view_icon_item_get_icon_rectangle,
nautilus_icons_view_icon_item_get_icon_window_rectangle,
nautilus_icons_view_icon_item_get_hit_stretch_handle,
hit_stretch_handle,
nautilus_icons_view_icon_item_hit_test_stretch_handles,
nautilus_icons_view_icon_item_hit_test_rectangle):
Fixed rubber banding to hit test with all the parts of the icon,
not just the icon pixbuf itself. Did this by changing all the
internal hit testing to use rects instead of points. At the same
time changed the external interface to always use world
coordinates for clarity.
* libnautilus/nautilus-directory.c (compare_file_with_name),
libnautilus/nautilus-file.c (nautilus_file_set_keywords): Fixed
some void * problems that upset newer versions of GCC but not the
older one that I'm using.
* libnautilus/nautilus-gtk-extensions.h,
libnautilus/nautilus-gtk-extensions.c: Formatting and include
statements fix up.
2000-03-10 Jonathan Blandford <jrb@redhat.com>
* libnautilus/gnome-icon-container.c (button_press_event): Avoid a
bug where we get stuck grabs when you double click.
2000-03-10 Ramiro Estrugo <ramiro@eazel.com>
* nautilus-widgets:
New directory. A place to put generic widgets that are not
necessarily coupled to nautilus.
* configure.in: Added nautilus-widgets
* Makefile.am: Added nautilus-widgets
* nautilus-widgets/nautilus-radio-button-group.h,
* nautilus-widgets/nautilus-radio-button-group.c: Added a radio
group widget.
* nautilus-widgets/test-nautilus-widgets.c: Test program for
nautilus-widgets.
2000-03-10 Maciej Stachowiak <mjs@eazel.com>
* src/ntl-window.c, src/ntl-window.h: store zoom_control object in
the window.
* src/nautilus-zoomable-frame-svr.c: New file; implement CORBA
server for Nautilus::ZommableFrame interface.
* src/ntl-view-private.h: prototypes for shared stuff needed to make
this work.
* src/ntl-view.c, src/ntl-view.h: Attach a Nautilus::ZoomableFrame
interface to the Nautilus::ViewFrame.
* libnautilus/nautilus-gtk-extensions.h,
libnautilus/nautilus-gtk-extensions.c
(nautilus_gtk_marshal_NONE__DOUBLE): New function.
* src/ntl-uri-map.c (my_notify_when_ready): Enable both
html-appropriate and directory-appropriate views for
special/webdav-directory mime type (temporary hack).
2000-03-09 Darin Adler <darin@eazel.com>
* libnautilus/gnome-icon-container.c (set_scroll_region):
It turns out that you aren't intended to reset the scroll region
once you have items in the canvas. We need to do that, so I had
to write some code that would update all the items when that happens.
* libnautilus/nautilus-icons-view-icon-item.c:
(recompute_bounding_box): Rewrote this to not assume that the
icon items are all top-level items.
(compute_text_rectangle, hit_test,
nautilus_icons_view_icon_item_bounds): Change hit testing so
it includes hits on the text. The rubberband still has to be
fixed so it doesn't have the same problem.
* libnautilus/nautilus-file.c: Improved a comment.
* RENAMING: Some more name changes.
2000-03-09 John Sullivan <sullivan@eazel.com>
* libnautilus/nautilus-file.c:
(nautilus_file_unref): Got this fix wrong last time, causing
GTK-CRITICALs when deleting files. Remember file->is_gone
before unreffing directory since you can't test possibly-destroyed
file afterward.
2000-03-09 John Sullivan <sullivan@eazel.com>
* libnautilus/nautilus-directory-private.h:
(nautilus_directory_number_outstanding): Added prototype for this
debugging function.
* libnautilus/nautilus-directory.c:
(nautilus_directory_number_outstanding): New debugging function,
used in NautilusFile self-checks.
(nautilus_self_check_directory): Pulled out the NautilusFile tests
to move them to nautilus-file.c.
* libnautilus/nautilus-file.c:
(nautilus_file_unref): Move gtk_object_unref after
nautilus_file_free call. Darin noticed this bug while reading
the code with me.
(nautilus_file_list_unref): Made this unref instead of ref. Oops!
This was causing NautilusDirectory objects never to go away after
visiting a directory; now they're destroyed when you leave.
(nautilus_self_check_file): New function, some of this was moved
over from nautilus-directory.c, and I added some ref-count checks.
* libnautilus/nautilus-lib-self-check-functions.h:
Included nautilus_self_check_file in list of self-check functions.
2000-03-09 Andy Hertzfeld <andy@eazel.com>
* libnautilus/nautilus-icons-view-icon-item.c:
tweaked constants used to control amount of pre-lighting in "lighten"
routine
* components/music/nautilus-music-view.c:
fixed bug that Maciej found where the track number would show up as -1
if there was no encoded track number; now they show up as blank.
2000-03-09 Maciej Stachowiak <mjs@eazel.com>
* libnautilus/nautilus-zoomable.c
(impl_Nautilus_Zoomable__create): Pass the correct thing as the
servant to avoid crashing on instantiation.
(nautilus_zoomable_real_set_bonobo_control): ref and sink the
BonoboControl Gtk object.
(nautilus_zoomable_destroy): unref the control instead of
destroying.
* idl/nautilus.idl: Reformat, add emacs magic to maintain indent
style.
2000-03-09 Darin Adler <darin@eazel.com>
* src/file-manager/fm-directory-view-icons.c
(fm_directory_view_icons_clear,
fm_directory_view_icons_begin_loading),
src/file-manager/fm-directory-view-list.c
(fm_directory_view_list_clear,
fm_directory_view_list_begin_loading): Moved the code that loads
the background color from clear to begin_loading. Otherwise the
background color from one directory affects another.
2000-03-09 Darin Adler <darin@eazel.com>
* nautilus-icons-view-icon-item.c (emblem_layout_next,
nautilus_icons_view_icon_item_bounds):
Andy's check-in yesterday accidentally rolled out some changes
to this file. The changes include the typos that John and I had
fixed in emblem_layout_next and nautilus_icons_view_icon_item_bounds.
* nautilus-icons-view-icon-item.c:
As Andy was about to do anyway, I tightened up the emblem
positioning so they are closer to each other by changing the
hard-coded constant EMBLEM_SPACING.
2000-03-09 Darin Adler <darin@eazel.com>
* libnautilus/nautilus-directory-private.h,
libnautilus/nautilus-directory.c, libnautilus/nautilus-file.c
(nautilus_directory_find_file, compare_file_with_name,
nautilus_directory_get, nautilus_file_get): Fixed bugs relating to
multiple directory and file objects for the same entity. Stripped
trailing '/' characters in nautilus_directory_get and changed
nautilus_file_get to return already-existing files instead of
always creating new ones. Added self-checks to make sure this
works.
* libnautilus/nautilus-directory.c
(nautilus_directory_try_to_read_metafile): Fixed bug where
metafile reading would fail. The gnome-xml parser requires a null
character at the end of the file, even though the size is passed
in!
* libnautilus/nautilus-directory.c
(nautilus_directory_remove_write_metafile_idle,
nautilus_directory_finalize,
nautilus_directory_try_to_write_metafile,
nautilus_directory_request_write_metafile): Changed metafile
writing so it always happens at idle time.
* libnautilus/nautilus-lib-self-check-functions.h: Changed order
so lower-level tests come before higher-level ones.
* libnautilus/nautilus-string.h, libnautilus/nautilus-string.c:
Renamed functions:
nautilus_has_prefix -> nautilus_str_has_prefix
nautilus_strdup_prefix -> nautilus_str_get_prefix
nautilus_has_suffix -> nautilus_str_has_suffix
nautilus_strstrip -> nautilus_str_strip_chr
nautilus_string_to_int -> nautilus_str_to_int
nautilus_eat_string_to_int -> nautilus_eat_str_to_int
Changed nautilus_str_strip_chr not to modify in place.
Added nautilus_str_strip_trailing_chr.
* components/music/nautilus-music-view.c (is_mp3_file,
nautilus_music_view_update_from_uri),
libnautilus/nautilus-icon-factory.c
(nautilus_icon_factory_get_icon_for_file, make_thumbnail_path,
load_specific_image), libnautilus/nautilus-icons-view-icon-item.c
(draw_mini_text), src/ntl-index-panel.c (command_button_cb,
add_command_buttons), src/ntl-window-msgs.c
(nautilus_window_change_location_2),
src/file-manager-fm-directory-view-icons.c
(fm_directory_view_icons_compute_menu_item_info),
src/file-manager/fm-directory-view.c (compute_menu_item_info),
src/file-manager/fm-icons-controller.c
(fm_icons_controller_get_icon_property): Switched callers to use
new names for string calls.
* libnautilus/gnome-icon-container.c (destroy): Reformatting.
2000-03-09 John Sullivan <sullivan@eazel.com>
* libnautilus/gnome-icon-container.c: (update_icon):
Changed decision of when to draw mini-text on an icon to
be based on icon size rather than zoom level, so it works
more sensibly with stretched icons.
2000-03-09 John Sullivan <sullivan@eazel.com>
Bug fixes and memory leak fixes.
* libnautilus/gnome-icon-container.c:
(icon_destroy): Renamed to icon_free and fixed storage leak by
freeing icon struct.
(remove_icon_from_container): Renamed to icon_destroy and fixed
bug by setting details->kbd_current to NULL if it had been the
icon being destroyed.
(destroy): Fixed storage leak by calling gnome_icon_container_clear.
* libnautilus/nautilus-directory.c: (dequeue_pending_idle_cb):
Added file != NULL assert.
* libnautilus/nautilus-file.c: (nautilus_file_delete):
Fix bug where NULLs were sneaking into file list, and
causing havoc later, by setting list to result of g_list_remove.
2000-03-09 Elliot Lee <sopwith@redhat.com>
* libnautilus/Makefile.am: Install libnautilus.h
* src/ntl-uri-map.c: Handle mapping of special schemes
(i.e. unknown to gnome-vfs). Currently just 'irc'.
2000-03-08 John Sullivan <sullivan@eazel.com>
* libnautilus/nautilus-icon-factory.c:
(compare_thumbnail_info): New function, compares uris of two
NautilusThumbnailInfos.
(nautilus_icon_factory_get_thumbnail_uri): Use compare_thumbnail_info
to avoid putting the same uri in the thumbnail-making queue multiple
times. This may or may not have been the cause of an intermittent
thumbnail-creating problem I was seeing.
2000-03-08 Andy Hertzfeld <andy@eazel.com>
* libnautilus/nautilus-icons-view-icon-item.c:
implemented pre-lighting for icons by overriding the event method
to maintain the pre-lit boolean, and then using the boolean to
decide when to lighten the icon by using a new "lighten" routine
that manipulates the pixbuf.
* libnautilus/gnome-icon-container-dnd.c:
only use semi-transparent dragging for relatively small icons, due
to X performance limitations.
* libnautilus/gnome-icon-container.c:
change the ICON_MAXIMUM_SIZE used as a threshold for scaling from
80 to 96, to step around bug of scaling too much for thumbnails.
2000-03-08 Darin Adler <darin@eazel.com>
You can now use Set Properties to attach keywords to a file,
which will cause it to have emblems attached to its icon.
* libnautilus/gnome-icon-container.h,
libnautilus/gnome-icon-container.c (gnome_icon_container_update,
gnome_icon_container_update_icon),
libnautilus/nautilus-directory-private.h,
libnautilus/nautilus-directory.c
(nautilus_directory_files_changed), libnautilus/nautilus-file.h,
libnautilus/nautilus-file.c (nautilus_file_changed),
src/file-manager/fm-directory-view.h,
src/file-manager/fm-directory-view.c,
src/file-manager/fm-directory-view-icons.c,
src/file-manager/fm-directory-view-list.c,: Add files_changed
machinery in so views will notice changes to a NautilusFile.
* libnautilus/nautilus-icon-factory.h,
libnautilus/nautilus-icon-factory.c
(nautilus_icon_factory_get_thumbnail_uri,
nautilus_icon_factor_get_icon_for_file, check_for_thumbnails),
libnautilus/nautilus-icons-controller.h,
libnautilus/nautilus-icons-controller.c,
(nautilus_icons_controller_update_icon),
src/file-manager/fm-icons-controller.c
(fm_icons_controller_update_icon): Use the files_changed machinery
instead of a special case in the icon controller to tell the view
about a new thumbnail.
* libnautilus/nautilus-icons-view-icon-item.c
(emblem_layout_next): Fixed typo that caused emblems to go down
one side of the icon instead of going around.
* libnautilus/nautilus-directory-private.h,
libnautilus/nautilus-directory.c
(nautilus_directory_get_file_metadata_node,
nautilus_directory_request_write_metafile),
libnautilus/nautilus-file.c (nautilus_file_set_keywords):
Implemented the set_keywords operation so we can change the
keywords for a file.
* src/file-manager/fm-icon-text-window.c
(create_icon_text_window): Fixed a prototype.
* src/file-manager/fm-properties-window.c (property_button_update,
property_button_toggled, create_properties_window,
fm_properties_window_get_or_create): Implement a first cut at a
properties window.
2000-03-07 John Sullivan <sullivan@eazel.com>
* libnautilus/nautilus-icons-view-icon-item.c:
(nautilus_icons_view_icon_item_bounds): Fixed typo that was
causing bottom coordinate of icon bounds to be uninitialized.
This caused wacky results when keyboard navigating and probably
elsewhere.
* libnautilus/gnome-icon-container.c:
(icon_toggle_selected): Reset keyboard-selected icon if it's
this one so it updates whether or not to draw stippled outline.
(set_kbd_current): Only tell the icon to draw stippled outline
if it isn't selected the "normal" way and some other icon is.
(In other words, only display the keyboard-selected icon when
it diverges from the regular selection, and don't display it
when there is no regular selection.)
(kbd_space): Toggle the "normal" selection state of the
keyboard-selected icon. It had been forcing it to true, making
it impossible to keyboard-unselect a single item while leaving
the rest of the selection unchanged.
2000-03-07 Darin Adler <darin@eazel.com>
* components/music/nautilus-music-view.c,
components/notes/ntl-notes.c, libnautilus/Makefile.am,
libnautilus/nautilus-directory-private.h,
libnautilus/nautilus-directory.h,
libnautilus/nautilus-directory.c,
libnautilus/nautilus-file-private.h, libnautilus/nautilus-file.h,
libnautilus/nautilus-file.c, libnautilus/nautilus-icon-factory.h,
src/ntl-index-panel.c, src/file-manager/fm-directory-view.h:
Broke the file part of nautilus-directory.[ch] into
nautilus-file.[ch].
* libnautilus/nautilus-string.c (nautilus_strstrip): Added more
tests. Changed algorithm on strstrip so it's linear instead of
n^2.
* libnautilus/gnome-icon-container.c
(gnome_icon_container_initialize): Fixed font for "larger" zoom
level. Also made it assert if the font can't be loaded.
* components/help/hyperbola-nav-index.c (despace):
Fixed warning.
* libnautilus/gnome-icon-container-dnd.c,
libnautilus/nautilus-string.h: Whitespace.
* src/file-manager/Makefile.am,
src/file-manager/fm-directory-view.c,
src/file-manager/fm-properties-window.h,
src/file-manager/fm-properties-window.c: Added properties window
hook, but no window yet. The menu item still needs to be added to
the main menus as well as the context menus.
* src/file-manager/fm-directory-view.c,
src/file-manager/fm-directory-view-icons.c,
src/file-manager/fm-icon-text-window.h,
src/file-manager/fm-icon-text-window.c: A little cleanup. Shorter
names.
2000-03-08 Ramiro Estrugo <ramiro@eazel.com>
* src/nautilus-prefs-group-radio.h,
src/nautilus-prefs-group-radio.h: Make the radio group emit proper
signals on changes.
* src/nautilus-prefs-pane.c, src/nautilus-prefs-group.c
src/nautilus-prefs-box.c: Make everything prettier by using nice
offsets.
2000-03-08 Ramiro Estrugo <ramiro@eazel.com>
Added macros to check, assert and invoke class methods
for a given GtkOject.
* libnautilus/nautilus-gtk-macros.h:
(NAUTILUS_KLASS) Access the class for a given object
(NAUTILUS_INVOKE_METHOD) Invoke a method for a given object
(NAUTILUS_ACCESS_METHOD) Access a method.
(NAUTILUS_ASSERT_METHOD) Assert the non-nullness of a method
for a given object
(NAUTILUS_INVOKE_METHOD_IF) Invoke a method if it aint null.
2000-03-08 Ramiro Estrugo <ramiro@eazel.com>
First whack at having a better preferences ui.
* src/nautilus-prefs-box.h,
src/nautilus-prefs-box.c: The main prefefernce widgetry widget.
It manages the preferene category list and the creation and
management of right hand side panes.
* src/nautilus-prefs-dialog.h,
src/nautilus-prefs-dialog.c: A GnomeDialog sublass to make
it easier for the app to deal with prefs.
* src/nautilus-prefs-group.h,
src/nautilus-prefs-group.c: An abstract widget to manage a
group of related preferences.
* src/nautilus-prefs-group-check.h,
src/nautilus-prefs-group-check.c: A widget to manage a group
of boolean preferences.
* src/nautilus-prefs-group-radio.h,
src/nautilus-prefs-group-radio.c: A widget to manage a
"one of many" preference.
* src/nautilus-prefs-pane.h,
src/nautilus-prefs-pane.c: A widget to manage the right hand
side of the prefs box.
2000-03-07 Darin Adler <darin@eazel.com>
Reimplemented the delete command to use NautilusFile instead of
going directly to the file system.
* libnautilus/gnome-icon-container.h,
libnautilus/gnome-icon-container.c
(gnome_icon_container_clear_selected_items),
(gnome_icon_container_remove): Got rid of the call that removes
all the icons in the selection and replaced it with a call that
removes a specific icon.
* libnautilus/nautilus-directory.h,
libnautilus/nautilus-directory.c
(nautilus_directory_initialize_class), (nautilus_file_unref),
(nautilus_file_detach), (nautilus_file_free),
(nautilus_file_delete), (nautilus_file_is_gone): Implemented a
call to delete a file and emit the files_removed signal as needed.
* src/file-manager/fm-directory-view.h,
src/file-manager/fm-directory-view.c
(fm_directory_view_delete_selection),
(fm_directory_view_begin_adding_entries),
(fm_directory_view_add_entry),
(fm_directory_view_done_adding_entries), (display_pending_files),
(add_or_remove_files), (add_files_cb), (remove_files_cb),
(delete_one): Changed the delete implementation to call
nautilus_file_delete and got rid of the explicit call to
delete_selection. The views now will remove their entries in
response to the change in the model.
* src/file-manager/fm-directory-view-icons.c
(fm_directory_view_icons_remove_entry),
(fm_directory_view_icons_delete_selection),
src/file-manager/fm-directory-view-list.c
(fm_directory_view_list_remove_entry),
(fm_directory_view_list_delete_selection): Eliminated the
delete_selection function in favor of the remove_entry function.
2000-03-07 Andy Hertzfeld <andy@eazel.com>
* libnautilus/gnome-icon-container-dnd.c:
implemented semi-transparent dragging by writing a make-semi-transparent
routine that generates a gdk-pixbuf with a checkerboarded alpha channel.
The dragging is a bit too slow, so we might have to limit this to
small images, but for now it's there for all of them.
* libnautilus/gnome-icon-container.c:
make the text beneath icons use a sans-serif font (helvetica) at Susan's
request.
2000-03-07 Maciej Stachowiak <mjs@eazel.com>
* src/ntl-uri-map.c (my_notify_when_ready): Use eog-image-viewer,
not embeddable:image-generic for viewing images.
2000-03-07 John Sullivan <sullivan@eazel.com>
* src/ntl-view-nautilus.c:
(nautilus_view_try_load_client): Removed recently-added
activate call since Maciej implemented a more general solution.
(destroy_nautilus_view): Removed recently-added
deactivate call since Maciej implemented a more general solution.
2000-03-07 John Sullivan <sullivan@eazel.com>
Added Stretch/Restore menu items to Settings menu, and made some
other menu mechanism tweaks.
* src/nautilus-window-menus.c: Gave General Settings an underline
accelerator character.
* src/file-manager/fm-directory-view.h,
* src/file-manager/fm-directory-view.c:
(fm_directory_view_get_bonobo_ui_handler): New function, exposed
so subclasses can call.
(fm_directory_view_merge_menus), (fm_directory_view_real_merge_menus):
Removed BonoboUIHandler parameter. Updated callers.
* src/file-manager/fm-directory-view-icons.c:
Store react_to_icon_change_idle_id in details.
(fm_directory_view_icons_initialize_class): fill in update_menus
function pointer.
(fm_directory_view_icons_merge_menus): Removed BonoboUIHandler
parameter.
(fm_directory_view-icons_destroy): remove react_to_icon_change_idle_id
if non-zero.
(show_stretch_handles_cb): update menus since stretch item might
have changed state.
(unstretch_icons_cb): update menus since restore item might have
changed state.
(fm_directory_view_icons_compute_menu_item_info): New helper
function used for both context and bonobo menus.
(append_one_context_menu_item): New helper function used for
context menus.
(fm_directory_view_icons_append_selection_context_menu_items),
(fm_directory_view_icons_append_background_context_menu_items):
Use the new helper functions.
(append_bonobo_menu_item), (update_bonobo_menu_item): New helper
functions used for bonobo menus.
(fm_directory_view_icons_merge_menus): include stretch and restore
menu items in Settings menu.
(fm_directory_view_icons_update_menus): update wording and sensitivity
of stretch and restore menu items.
(fm_directory_view_icons_react_to_icon_change_idle_cb): update menus,
since at least Restore item may have changed.
(fm_directory_view_icons_icon_changed_cb): Schedule idle callback
to update menus, since doing it here affects stretching too much.
2000-03-07 Maciej Stachowiak <mjs@eazel.com>
* src/ntl-view-bonobo-subdoc.c (bonobo_subdoc_try_load_client):
Change a few things in the code so that embeddables get activated
properly; this makes scrolling and editing work in
bonobo-text-plain for instance.
* src/ntl-content-view.c, src/ntl-content-view.h
(nautilus_content_view_set_active): New function; intended to be
called when a content view becomes active, which should activate
the controls and merge its menu and toolbar items.
* ntl-window.c (nautilus_window_real_set_content_view): Call
`nautilus_content_view_set_active' on the new content view.
2000-03-07 Darin Adler <darin@eazel.com>
* nautilus-icons-view-icon-item.c (nautilus_icons_view_icon_item_bounds):
Fixed a typo that was causing the text area to not be included in the
bounds of an icon item.
2000-03-07 Darin Adler <darin@eazel.com>
* libnautilus/nautilus-directory.h,
libnautilus/nautilus-directory.c (get_file_metadata_node),
(nautilus_directory_get_file_metadata),
(nautilus_file_get_keywords): Added nautilus_file_get_keywords,
which returns a GList of keywords.
* libnautilus/nautilus-icon-factory.c (add_size_to_image_name),
(get_themed_icon_file_path), (get_icon_file_path), (add_emblem),
(nautilus_icon_factory_get_emblem_icons_for_file): Changed icon
names to not include the extension and wired some extensions into
the icon-reading code. The old code wired the entire file name, so
this is a bit more flexible. Added code to return an emblem for
each keyword attached to a file as well as the symbolic link emblem.
* libnautilus/gnome-icon-container.c (update_icon): Handle NULL
pixbufs for emblems. This happens when a keyword is specified that
doesn't have a corresponding emblem icon. Add g_list_reverse call
to keep emblems in the correct order.
* src/file-manager/fm-directory-view-icons.c
(fm_directory_view_icons_merge_menus): Took out g_message left
over from Bonobo menu merge work.
* libnautilus/nautilus-glib-extensions.h,
libnautilus/nautilus-glib-extensions.c
(nautilus_g_list_free_deep): Added convenience function for
getting rid of a GList of things that can be freed with g_free.
* icons/Makefile.am, icons/certified.gif, icons/changed.gif,
icons/confidential.gif, icons/emblem-certified.gif,
icons/emblem-changed.gif, icons/emblem-confidential.gif,
icons/emblem-encrypted.gif, icons/emblem-important.gif,
icons/emblem-new.gif, icons/emblem-personal.gif,
icons/emblem-remote.gif, icons/emblem-symbolic-link.png,
icons/encrypted.gif, icons/i-symlink.png, icons/important.gif,
icons/new.gif, icons/personal.gif, icons/remote.gif:
Changed all emblem icons to have names that start with "emblem-".
2000-03-06 Andy Hertzfeld <andy@eazel.com>
* icons/Makefile.am: added 8 new images for emblems in icons directory;
certified, changed, confidential, encrypted, important, new, personal, remote
2000-03-06 Maciej Stachowiak <mjs@eazel.com>
* src/ntl-window-msgs.c (nautilus_window_load_content_view):
Explicitly change `window->cv_progress_done' and
`window->cv_progress_error' to FALSE when loading a new content
view, to avoid being screwed up by extra done or error
notifications from the last content view. This is really just
putting more spit and bubble gum on the pile though.
2000-03-06 Andy Hertzfeld <andy@eazel.com>
* src/nautilus-index-title.c:
made the icon displayed in the index panel be constrained to fit by scaling it down
proportionally if it exceeds predetermined limits.
2000-03-06 John Sullivan <sullivan@eazel.com>
The file manager now uses Bonobo menu-merging to install
and remove its menu items from the window's menu bar.
I didn't put Zoom In/Zoom Out in the menu bar because
that seems unnecessary once the control works (they're
still in the right-click menu). I haven't yet put
Stretch/Restore in the menu bar, will do so soon. And
now you get a whole bunch of Gtk-CRITICALs when closing
a window because of all the double-destroyed bonobo menu
items (just like the two you used to get). Hope to fix
this soon. Added new "Settings" menu, which needs to be
organized better someday, and will be.
* components/history/ntl-history-view.c:
(menu_setup): Removed function.
(make_obj): Removed code to set up merged menu. This was
sample code for menu merging; now that we have real menu
merging working elsewhere we don't need this sample.
* libnautilus/nautilus-string.h,
* libnautilus/nautilus-string.c:
(nautilus_strstrip): New function, strips all occurrences
of a given char from a char *.
(nautilus_self_check_string): Added tests for nautilus_strstrip.
* src/ntl-view-nautilus.c:
(nautilus_view_try_load_client): Activate the new bonobo control
when it's installed.
(destroy_nautilus_view): Deactivate the bonobo control.
* src/nautilus-window-menus.c:
edit_menu_info[]: Removed "Preferences..." and preceding separator.
settings_menu_info[]: New menu, added "General Settings..."
(formerly "Preferences...") and "Use Eazel Theme Icons".
main_menu[]: Include settings_menu_info.
(edit_menu_prefs_cb): Renamed to general_settings_cb
(use_eazel_theme_icons_cb): New function, swaps themes.
(update_eazel_theme_menu_item): New function, sets the toggle state
of this menu item based on current theme.
(nautilus_window_initialize_menus): Call update_eazel_theme_menu_item
explicitly, also wire it up to theme change signal.
* src/ntl-prefs.c: (nautilus_prefs_ui_show): Renamed dialog
from "Preferences" to "General Settings" to match menu item. This
name will probably go away entirely eventually, but may as well
keep it consistent for now.
* src/file-manager/fm-directory-view.h: (merge_menus): New function
pointer. (update_menus): New function pointer.
(fm_directory_view_update_menus): Prototype for new function. *
src/file-manager/fm-directory-view.c:
(fm_directory_view_initialize_class): Set up merge_menus and
update_menus function pointers. (bonobo_menu_open_cb),
(bonobo_menu_open_in_new_window_cb), (bonobo_menu_delete_cb): New
callback functions with parameters the way Bonobo likes 'em.
(get_bonobo_control): New utility function for getting the
BonoboControl out of an FMDirectoryView.
(bonobo_control_activate_cb): New function, called when the view's
BonoboControl is activated or deactivated. Merges menus on
activate, unsets bonobo container on deactivate.
(fm_directory_view_initialize): Wire up bonobo_control_activate_cb
to "activate" signal of view's bonobo control.
(use_eazel_theme_icons_cb): Removed this function (it's in the
standard Nautilus menus now, not component-dependent).
(delete_one): Added a FIXME comment noting that the view is being
told to delete the entire selection for every selected item.
(fm_directory_view_delete_with_confirm): Moved the guts of
delete_cb into here so it can be conveniently called from both
bonobo menu and right-click menu. (delete_cb): Now just calls
fm_directory_view_delete_with_confirm.
(add_check_menu_item): Removed function, had only been used by
eazel theme icons menu item.
(fm_directory_view_real_append_background_context_menu_items):
Removed eazel theme icons menu item from right-click menu (now
accessible always in the Settings menu).
(compute_menu_item_info): New function, determines current label
and sensitivity for dynamic menu items, common to both bonobo menus
and context menus. Uses nautilus_strstrip to remove underlines used
for accelerators when item is used for context menu.
(append_one_selection_context_menu_item): New helper function,
wraps up common code for constructing a menu item for the
selection-dependent part of the context menu.
(fm_directory_view_real_append_selection_context_menu_items):
Replaced a lot of duplicated code with calls to
append_one_selection_context_menu_item.
(fm_directory_view_real_merge_menus): New funciton. Here lieth the
code to put directory view menu items into the window's menu bar.
(update_one_menu_item): New function, uses compute_menu_item_info
to update the label & sensitivity of one bonobo-style menu item.
(fm_directory_view_real_update_menus): New function, calls
update_one_menu_item on each menu item whose label or sensitivity
is dynamic.
(fm_directory_view_notify_selection_changed):
Call fm_directory_view_update_menus to update menu labels &
sensitivity that depend on the selection.
(fm_directory_view_merge_menus): New function, calls the function pointer.
(fm_directory_view_update_menus): New function, calls the function pointer.
* src/file-manager/fm-directory-view-icons.c:
(fm_directory_view_icons_initialize_class): Supply function pointer
for merge_menus.
(customize_icon_text_cb): Just added comments about its dual use.
(fm_directory_view_icons_merge_menus): Merge a "Customize Icon Text"
item into the Settings menu. Still need to do the Stretch/Restore items
here.
2000-03-06 Darin Adler <darin@eazel.com>
Fixed bug in Unstretch I just introduced.
Got emblems drawing.
* gnome-icon-container.c (gnome_icon_container_is_stretched),
(gnome_icon_container_unstretch): Fixed bug where Unstretch would do
all the icons, not just the selected ones.
* nautilus-icons-view-icon-item.c (draw_stretch_handles),
(emblem_layout_reset), (emblem_layout_next), (draw_pixbuf),
(nautilus_icons_view_icon_item_draw), (hit_test_pixbuf),
(hit_test), (nautilus_icons_view_icon_item_bounds): Added code to
draw emblems and take them into account for hit testing and bounds
calculation.
* gnome-icon-container.c (update_icon):
* nautilus-icons-view-icon-item.c (nautilus_icons_view_icon_item_draw):
Moved rule about which zoom levels can have text displayed out of the
canvas item class into the container. This is only one of many needed
cleanups to how the "text in an icon" is handled.
2000-03-06 Elliot Lee <sopwith@redhat.com>
* src/ntl-prefs.c: Use help search instead of help index.
* components/help/hyperbola-nav-search.c: Initial implementation completed.
2000-03-06 Darin Adler <darin@eazel.com>
* libnautilus/gnome-icon-container.c
(gnome_icon_container_move_icon): Added missing code to get
stretching to work again. (Oops.)
(gnome_icon_container_is_stretched), (gnome_icon_container_unstretch):
Fixed the unstretch code so it will work on multiple icons.
* src/file-manager/fm-directory-view-icons.c
(fm_directory_view_icons_append_selection_context_menu_items):
Make menu item name plural when there are multiple icons to
unstretch.
* libnautilus/nautilus-icons-view-icon-item.c
(nautilus_icons_view_icon_item_draw): Draw a box around the item
when the stretch handles are visible. This looks better.
* libnautilus/nautilus-icons-view-icon-item.h: White space.
2000-03-06 Darin Adler <darin@eazel.com>
Added the concept of separate X and Y scale factors to more
of the code. Even though we don't want to scale the two
dimensions separately at the moment, I figured it was better
to go in this direction than to remove all the separate X
and Y stuff that Seth Nickell added.
* libnautilus/gnome-icon-container-dnd.c
(gnome_icon_container_receive_dropped_icons):
* libnautilus/gnome-icon-container-private.h:
* libnautilus/gnome-icon-container.c (icon_get_actual_size),
(icon_new), (icon_get_size), (start_stretching), (update_icon),
(gnome_icon_container_add), (gnome_icon_container_is_stretched),
(gnome_icon_container_unstretch),
(gnome_icon_container_move_icon):
* libnautilus/gnome-icon-container.h:
Got rid of the old "scale", "xscale", and "yscale" and replaced
them with "scale_x" and "scale_y". Made the code always set the
scale factor through the gnome_icon_container_move_icon bottleneck
so the changes are all reported throught the icon_moved signal.
* src/file-manager/fm-directory-view-icons.c:
(add_icon_if_already_positioned),
(fm_directory_view_icons_icon_moved_cb):
Store only a single scale factor if the X and Y are both scaled
exactly the same (the normal case). Also, use a default for
the scale factor so we don't save 1.0 for every file.
* libnautilus/nautilus-gtk-extensions.h:
* libnautilus/nautilus-gtk-extensions.c:
My original change required an additional marshal function. I
decided to add it anyway even though I don't need it right now.
* libnautilus/nautilus/nautilus-bookmark.c
(nautilus_bookmark_get_pixmap_and_mask):
Changed to use the nautilus_icon_factory_get_pixbuf_for_file
convenience function which has a simpler interface.
* libnautilus/nautilus-icon-factory.h:
* libnautilus/nautilus-icon-factory.c:
Added separate X and Y scaling of icons for possible future
use; the convenience functions still use the same size in
both dimentions.
* components/music/.cvsignore:
New directory, new .cvsignore needed.
* RENAMING: Some more name change ideas.
2000-03-06 Elliot Lee <sopwith@redhat.com>
* components/help/hyperbola-nav-index.c: Initial implementation completed.
2000-03-05 Andy Hertzfeld <andy@eazel.com>
* components/music/nautilus-music-view.c: derive name and
track position when there's no id3 tag present, and format
the title better from the id3-derived information
2000-03-05 Andy Hertzfeld <andy@eazel.com>
* libnautilus/nautilus-string.c,.h: added a nautilus_has_suffix
routine in the style of nautilus_has_prefix.
* components/music/nautilus-music-view: use nautilus_has_suffix
in mp3 determination
* libnautilus/nautilus-icon-factory.c: make sure all thumbnails
have a png suffix, since they're always pngs now. Also, made
thumbnailing machinery call ImageMagick to handle the conversion
if gdk-pixbuf comes up empty, so we can handle many more formats
2000-03-05 Andy Hertzfeld <andy@eazel.com>
added a music view component for viewing directories of mp3 files.
This first cut only handles only the case when the mp3 files have
id3 tags present (most do these days)
* components/music/nautilus-music-view.c,.h: a new music view
component gathers information from the id3 tags of mp3 files in
the target directory and displays them in a list, sorted by track
number. It also displays the album cover if it can find one. For
now, it launches xmms to do the playing, but it will eventually
have an integrated player and support other file types.
* components/music/nautilus-music-view.goad: component activation file
* main.c: boiler-plate component stuff
* components/music/Makefile.am: makefile for music component
* configure.in: added music component
* components/Makefile.am: added music component
* src/ntl-uri-map: added a new way to install content view components,
by having the components explicitly listed in the metadata for the
object being displayed. Used this to test the music view, but there's
no way to manipulate it through the UI yet
* libnautilus/nautilus-metadata.h: added a "CONTENT_VIEWS" tag for
specifying content views in the metadata
2000-03-05 Maciej Stachowiak <mjs@eazel.com>
* src/ntl-window-msgs.c (nautilus_window_update_internals): Handle
freeing of window->ni in a fancier way to avoid double-free
problems which were causing crashes after some amount of view
switching and navigation. It might leak memory but it's the only
obvious way to avoid crashing.
* src/ntl-window.c (nautilus_window_destroy): Likewise to avoid
crashing on exit.
* src/ntl-window.h (Nautilus_NavigationInfo_free): Prototype this
function.
2000-03-04 Maciej Stachowiak <mjs@eazel.com>
* nautilus-clean.sh: Simple shell script to check if any of the
auxiliary processes nautilus might launch are still running, and
if so, report which ones and kill them. Total hack for dev/testing
use only; should not be distributed.
2000-03-03 Maciej Stachowiak <mjs@eazel.com>
* components/sample/nautilus-sample-content-view.c: Fix
indentation on some of the lines.
(nautilus_sample_content_view_load_uri): g_free() the old uri before
g_strdup()ing a new one to avoid leaking memory.
2000-03-03 Ramiro Estrugo <ramiro@eazel.com>
* configure.in: added eazel services define
* acconfig.h: new file to make autoheader happy
2000-03-03 Jonathan Blandford <jrb@redhat.com>
* libnautilus/Makefile.am (libnautilus_la_LDFLAGS): added libpng
to Makefile.am
* configure.in: added autoconf check for png.
2000-03-03 John Sullivan <sullivan@eazel.com>
* configure.in: Turned -Werror back on. It had been turned
off accidentally as part of the patch Maciej applied earlier today.
* src/file-manager/fm-directory-view-icons.c:
(fm_directory_view_icons_icon_moved_cb): Changed two %lf's to %f's
in g_strdup_printf to make compiler happy.
2000-03-03 Elliot Lee <sopwith@redhat.com>
* src/ntl-prefs.c: Default to showing help index (it's the parade of the meta views! :).
* components/help/hyperbola-nav-index.c: Compiles and
runs. Hardcoded to /gnome prefix for now.
2000-03-03 Maciej Stachowiak <mjs@eazel.com>
* components/html/ntl-web-browser.c (make_obj): Reorder to code to
avoid crashing.
(main): Drop to the debugger on warnings and criticals.
(browser_vfs_read_callback): Add some casts to avoid a warning.
2016-03-03 Elliot Lee <sopwith@redhat.com>
* src/ntl-app.c, src/nautilus.goad: Make NautilusApp a factory for
ViewWindows.
2000-03-03 Maciej Stachowiak <mjs@eazel.com>
* components/sample/nautilus-sample-content-view.c,
components/sample/nautilus-sample-content-view.h,
components/sample/nautilus-sample-content-view.goad,
components/sample/main.c, components/sample/Makefile.am: Sample
content view component. All it does is display the current URI in
a label.
* componets/Makefile.am, configure.in: Build it.
* src/ntl-uri-map.c: Activate the sample component whenever there
is at least one other applicable view. What it should really do is
have a special mode based on a command-line option of some sort
which will cause it to be always activated, and otherwise not at
all, but that looked more complicated to do.
* libnautilus/nautilus-directory.c
(nautilus_directory_try_to_read_metafile): Don't bomb on a
zero-length metafile.
Icon stretching is now persistent in the metafile, patch from Seth
Nickell <snickell@stanford.edu>:
* libnautilus/gnome-icon-container.c, gnome-icon-container.h,
gnome-icon-container-dnd.c: Add xscale and yscale arguments to
"icon_moved" signal to allow more unified handling of geometry
changes.
* libnautilus/nautilus-metadata.h: Add definition of
ICON_VIEW_SCALE_METADATA_KEY.
* src/file-manager/fm-directory-view-icons.c: Save the stretch
factor to the metafile when stretching and restore it when loading
the directory.
2000-03-02 Maciej Stachowiak <mjs@eazel.com>
* HACKING: Updated build instructions and list to send patches to.
2000-03-02 Pavel Cisler <pavel@eazel.com> (checking in as ramiro)
* src/ntl-window.c:
(nautilus_window_new): I meant to removed the call but messed it
up.
2000-03-02 Pavel Cisler <pavel@eazel.com> (checking in as ramiro)
Fixed a crash in "Open in New Window".
* src/ntl-window.c,h:
(nautilus_window_new): Removed the call. Creating new
windows should only be done through nautilus_app_create_window.
(nautilus_window_class_init): Added a call to add "NautilusWindow::app"
as an argument to make the app field get initialized properly.
* src/ntl-app.c:
(nautilus_app_create_window): Made it call gtk_object_new with the
right arguments to create a new window.
2000-03-02 Andy Hertzfeld <andy@eazel.com>
* libnautilus/nautilus-icon-factory.c:
changed thumbnailing to use gdk-pixbuf to make the thumbnails instead
of ImageMagick. Added code to save a gdk-pixbuf as a png that
was written by Iain Holmes for gnome-iconedit, but had to fix it
to work in the case where there's no alpha channel.
2000-03-02 Elliot Lee <sopwith@redhat.com>
* components/help/hyperbola-filefmt.c: Use 'help' URI scheme instead of 'ghelp'.
* components/help/hyperbola-nav-index.c: Just checking in an
uncompilable work-in-progress. Remove ifdefs at own risk. :)
2000-03-02 John Sullivan <sullivan@eazel.com>
* src/ntl-main.c: Change gtk_object_unref (app) to
bonobo_object_unref (app) to avoid bonobo complaints
when quitting.
2000-03-02 Elliot Lee <sopwith@redhat.com>
* src/nautilus.goad, src/ntl-app.[ch], src/ntl-main.c: Implement
IDL:Nautilus/Application:1.0 interface and NautilusApp GtkObject.
* src/nautilus-window-menus.c, src/ntl-window.[ch], src/ntl-window:
Change to match above.
* src/ntl-view-frame-svr.c: Implement _get_application()
operation.
2000-03-01 Andy Hertzfeld <andy@eazel.com>
* libnautilus/nautilus_icon_factory.c:
some bug fixes. Quoted filenames when invoking convert. Checked for a null
icon controller in some places and handled accordingly
2000-03-01 Andy Hertzfeld <andy@eazel.com>
implemented automatic thumbnail creation for large images.
* libnautilus/nautilus_icon_factory.c,h:
the bulk of the work is in here. If the relevant file is a large image,
look for a corresponding thumbnail in the .thumbnails directory; if
found, use it, otherwise put it on a queue for later thumbnail creation.
A timeout task is called periodically to fork a task to use ImageMagick
to actually create the thumbnail, and then call the icon controller to
actually update the icon. Eventually, we'll replace ImageMagick
with our own inline code for better performance.
*libnautilus/gnome-icon-container.c,h:
added a gnome_icon_container_update_icon method to update the icon
corresponding with the passed in uri. This is used by the icon
controller to update the icons with the newly created thumbnails.
*libnautilus/nautilus-icons-controller.c,h:
added a nautilus_icons_controller_update_icon method to the abstract
class to update the icon associated with the passed-in uri.
*src/file-manager/fm-icons-controller.c:
concrete implementation that calls the icon canvas to update the icon.
*libnautilus/nautilus_bookmark.c:
since I added a controller parameter to get_icon_for_file, I had to add
the parameter here, since nautilus_bookmark was using get_icon_for_file
*icons/loading.png:
added a placeholder icon to express that a thumbnail is loading; Susan
will replace this soon. Also, it's not being used properly yet.
* icons/Makefile.am
added the loading icon.
2000-02-29 John Sullivan <sullivan@eazel.com>
* src/ntl-window-msgs.c: (nautilus_window_set_state_info):
Replaced gtk_object_ref with comment explaining not to
ref in the cases NEW_CONTENT_VIEW_ACTIVATED and
NEW_META_VIEW_ACTIVATED. The former is called only when
switching views via the View As menu, and was leaving
an extra ref on the content_view, which was preventing
it from getting destroyed when switching views, which
was preventing me from using the destroy signal for
menu unmerging. The latter is never called, but presumably
would have the same issue if anyone ever called it.
2000-02-28 Maciej Stachowiak <mjs@eazel.com>
* src/nautilus-window-menus.c (clear_appended_bookmark_items):
Added an explicit cast to (const char *) to avoid gcc 2.95.2
complaining.
2000-02-28 John Sullivan <sullivan@eazel.com>
Separated out more menu-handling code into new file.
* src/ntl-app.h: Added #include ntl-window.h.
* src/nautilus-window-menus.c:
* src/ntl-window-private.h:
(nautilus_window_initialize_bookmarks_menu),
(nautilus_window_initialize_go_menu): Removed prototypes.
(nautilus_window_initialize_menus), (nautilus_window_back_cb),
(nautilus_window_forward_cb), (nautilus_window_up_cb),
(nautilus_window_home_cb): Added prototypes.
* src/ntl-window.c: Moved all the static menu definitions and
most of the callback functions out of here.
* src/nautilus-window-menus.c: Moved all of the static menu
definitions and most of the callback functions into here.
2000-02-28 John Sullivan <sullivan@eazel.com>
Switched NautilusWindow over to using BonoboUIHandler-style
menus. Everything works except that the Go and Bookmarks
menu items don't show icons for now. Apparently the part of
Bonobo that would support using arbitrary GdkPixbufs as
menu item icons is not yet implemented. Other than the
missing icons problem, this change has no visible effect,
but is required to support merging items into the standard
menus.
* src/nautilus-bookmarks-menu.h: Deleted this file.
* src/nautilus-bookmarks-menu.c: Deleted this file, moved/morphed its
code into ntl-window.c and nautilus-window-menus.c as appropriate.
* src/nautilus-window-menus.c: New file, avoids making ntl-window.c
any huger by keeping some of the menu-specific stuff in here. Right
now this file includes only stuff I had to change or create for this
checkin. I will soon make another pass at moving a bunch of old menu
code into here.
* src/Makefile.am: Removed deleted files, added new file.
* src/nautilus.h: Removed #include nautilus-bookmarks-menu.h.
* src/ntl-window-msgs.c: Added #include <libnautilus/nautilus-bookmark.h>
that became necessary when nautilus.h changed.
* src/ntl-app.c: (nautilus_app_exiting):
Changed nautilus_bookmarks_menu_exiting to nautilus_bookmarks_exiting,
since there's no menu involved in this code now.
* src/ntl-window-private.h: Added prototypes for functions called
between ntl-window.c and nautilus-window-menus.c.
* src/ntl-window.h: Added prototype for nautilus_bookmarks_exiting;
removed fields for various stored menu items.
* src/ntl-window.c:
Removed #defines for GO_MENU_<foo>_ITEM_INDEX, since menu-item
accessing is now done with paths the Bonobo way.
Removed separator from static part of Go menu; the separator is
now added when the dynamic items are added.
Added static items in Bookmarks menu to GnomeUIInfo array.
(add_bookmark_cb), (edit_bookmarks_cb): New callback functions used
by the static part of the Bookmarks menu.
(clear_go_menu_history), (activate_bookmark_in_menu_item),
(refresh_history_list_in_go_menu): Removed functions; new versions
are in nautilus-window-menus.c.
(nautilus_window_init): Removed go-menu signal connections; new
versions are in nautilus-window-menus.c.
(nautilus_window_constructed): Create and access menus the Bonobo way;
also call functions to initialize the two dynamic menus.
(nautilus_window_allow_back), (nautilus_window_allow_forward),
(nautilus_window_allow_up): Access menu items with paths, the Bonobo way.
(nautilus_get_history_list): New function, wrapper around static
variable so it can be accessed from nautilus-window-menus.c.
2000-02-26 Andy Hertzfeld <andy@eazel.com>
fixed bug where title tab was initially pre-lit
* src/ntl-index-panel.c:
turns pre-lite off when activating
* src/nautilus-index-tabs.c:
initialize prelit flag
2000-02-26 Andy Hertzfeld <andy@eazel.com>
made index tabs receive dropped colors and display them; it doesn't store it persistently yet
* src/ntl-index-panel.c:
made it call call index_tabs_receive_dropped_color when dropped over the tabs
* src/nautilus-index-tabs.c,h:
added index_tabs_receive_dropped_color to set the tab_color and redraw
2000-02-26 Andy Hertzfeld <andy@eazel.com>
* src/ntl-index-panel.c:
made it call index_tabs_prelite for the title tabs at the appropriate times
* src/nautilus-index-tabs.c:
made preliting work for the title tab
2000-02-26 Maciej Stachowiak <mjs@eazel.com>
* components/notes/ntl-notes.c: Make the text area take more of
the space of the component. Make the text box light yellow, the
official international color of annotation.
2000-02-25 Andy Hertzfeld <andy@eazel.com>
implemented mouse-over hiliting for the index tabs
* src/ntl-index-panel.c:
receive motion notify events to hit test the tabs
* src/nautilus-index-tabs.c,h:
add pre-lite boolean to tab, pre-lite color
draw with pre-lite color when boolean is set
implemented nautilus_index_tabs_prelite_tab to set booleans
* src/ntl-window.c:
turn on mouse motion events for the index panel
2000-02-25 Andy Hertzfeld <andy@eazel.com>
* libnautilus/gnome-icon-container.c:
made the return key activate all selected icons, to make keyboard navigation actually
do something useful besides selecting
2000-02-25 Andy Hertzfeld <andy@eazel.com>
* src/nautilus-index-tabs.c:
Susan's new look for the index-tabs, as well as some misc clean-ups
2000-02-25 John Sullivan <sullivan@eazel.com>
* src/file-manager/fm-directory-view-c:
(confirm-delete): New function, puts up a dialog confirming
whether to delete the selected items.
(delete_cb): Checks with confirm_delete before deleting.
It's too easy to accidentally delete files without this, as
I discovered yesterday in my foolish experimentations.
(fm_directory_view_real_append_selection_context_menu_items):
Renamed "Delete" menu item to "Delete..." to make it clear that
no deleting will occur without confirmation.
2000-02-25 Andy Hertzfeld <andy@eazel.com>
* libnautilus/gnome-icon-container.c:
set the scale factor so no icons are bigger than a specified size,
at least initially. Currently the size is set to 80 pixels.
2000-02-24 Maciej Stachowiak <mjs@eazel.com>
* src/ntl-uri-map.c (my_notify_when_ready): Make sure to
gnome_vfs_async_cancel our GnomeVFSAsyncHandle before setting it
to NULL, to avoid leaking gnome-vfs-slave processes.
* libnautilus/nautilus-directory.c (nautilus_directory_load_done):
When loading is complete, make sure to gnome_vfs_async_cancel the
handle before setting it NULL, to avoid leaking gnome-vfs-slave
processes.
* src/file-manager/fm-directory-view.c
(disconnect_model_handlers): if we have a NautilusDirectory in
use, make sure to call nautilus_directory_stop_monitoring on it to
avoid leaking gnome-vfs-slave processes.
2000-02-24 John Sullivan <sullivan@eazel.com>
Some work on improving the error messages when files
can't be displayed. There's still plenty of room for
improvement, but at least the most common cases are
halfway decent now.
* libnautilus/nautilus-string.h,
* libnautilus/nautilus-string.c:
(nautilus_strdup_prefix): New function, returns a new
string matching the beginning of another string, up to
but not including the first occurrence of a given substring.
(nautilus_self_check_string): Added test cases for new function.
* src/ntl-types.h:
Added enum NautilusNavigationResult, which is a cousin of
GnomeVFSResult that lumps many error types together and also
has special Nautilus-specific types. Added a field of this type
to NautilusNavigationInfo to keep track of various failure
scenarios. Also reformatted this file.
* src/ntl-uri-map.c:
(get_nautilus_navigation_result_from_gnome_vfs_result):
Long-windedly named helper function to translate between
GnomeVFSResult and NautilusNavigationResult.
(my_notify_when_ready): Determine and store NautilusNavigationResult
for error cases. Don't free navinfo here, because it's needed to
determine the uri-that-didn't-work later.
* src/ntl-window-msgs.c:
(nautilus_window_change_location_2): Compose reasonable error messages,
which include the uri that couldn't be shown, from various failure cases.
2000-02-24 Andy Hertzfeld <andy@eazel.com>
implemented the delete command in the context menu. It's not
completed yet,it still needs to remove entries from the model,
as well as giving better feedback.
* libnautilus/gnome-icon-container.c,.h:
added gnome_icon_container_clear_selected_items to remove
selected items from the view
* src/file-manager/fm-directory-view.c,h:
enabled the delete menu item, added a callback for it which
actually does the deletion
added a delete_selection method, implemented by the subclasses
to remove items from the view
* src/file-manager/fm-directory-view-icons.c:
implemented delete_selection by calling the icon container
* src/file-manager/fm-directory-view-list.c:
implemented delete_selection to remove selected items from the clist
2000-02-24 John Sullivan <sullivan@eazel.com>
* components/history/ntl-history-view.c:
(history_view_update_icons), (make_obj): Correction to previous
checkin: connect signal to CList instead of HistoryView because
HistoryView isn't a GtkObject.
2000-02-24 John Sullivan <sullivan@eazel.com>
* src/ntl-uri-map.c: (my_notify_when_ready):
Added "View as Text" as an option for html pages. Untestable
right now because attempting to load html pages fails.
* components/history/ntl-history-view.c:
(install_icon): Removed bookmark parameter; now it determines that
from the other parameters.
(history_view_update_icons): New function, walks through list updating
the icon for each row.
(hyperbola_navigation_history_notify_location_change): Removed bookmark
parameter from install_icon call.
(make_obj): register to call history_view_update_icons
when nautilus_icon_factory emits "theme_changed" signal. This has
no current visible effect, because changing the theme in Nautilus
does not change the theme in the separate icon factory used in this
metaview. This is bugzilla bug #5.
2000-02-24 John Sullivan <sullivan@eazel.com>
Cleaned up after fix to bug 14 from yesterday.
* src/ntl-types.h: Removed use_new_window field from
NautilusNavigationInfo struct; the new-window spawning
now happens early enough that this struct is not involved.
* src/ntl-uri-map.c: (nautilus_navinfo_new): Don't set the
now non-existent use_new_window field.
* src/ntl-window-msgs.c: (nautilus_window_change_location_2):
Don't make any decisions based on the now non-existent
use_new_window field.
2000-02-24 John Sullivan <sullivan@eazel.com>
* src/file-manager/fm-directory-view.c:
(fm_directory_view_real_append_selection_context_menu_items):
Made "Open in New Window" menu item label be "Open in n New Windows"
if more than one is selected; added some _()s to user-visible text.
2000-02-23 Maciej Stachowiak <mjs@eazel.com>
* src/ntl-uri-map.c (my_notify_when_ready): Use EOG as the in-line
image viewer. You need to have EOG from CVS installed for this to
work. It still has issues - the control zooms the image to fill
available space by default, and there is no zooming support. But
it's amazing that one line was enough to do this, and it worked on
the first try! Bonobo rules.
* libnautilus/nautilus-icons-view-icon-item.c
(nautilus_icons_view_icon_item_set_emblems): Nautilus was getting
an assertion failure on startup, so I weakened the
assertion. Darin should look at my fix.
* idl/nautilus.idl (ViewWindow): Added `application' readonly
attribute.
(Application): Renamed attribute from `windows' to `view_windows'
and made it a sequence<ViewWindow> rather than
sequence<Object>. Renamed `new_window' method to
`new_view_window'.
* src/ntl-window.h: Miscellaneous reformatting.
(nautilus_window_close): Added prototype
* src/ntl-window.c: Added implementations of
Nautilus::ViewWindow's methods. For now, _get_application just
returns CORBA_OBJECT_NIL because the Application object has not
yet been implemented.
(nautilus_window_close): New function used by `file_menu_close_cb'
and `impl_POA_Nautilus_ViewWindow_close'.
(would_be_in_gdk_pixbuf_if_federico_wasnt_stubborn_pixbuf_render):
Added an explanatory comment.
* idl/nautilus.idl: Added Nautilus::Zoomable and
Nautilus::ZoomableFrame interfaces.
* nautilus-zoomable.c, nautilus-zoomable.h: New files for the
NautilusZoomable class. This class is used to implement the
Nautilus::Zoomable interface on a nautilus view or other control.
* Makefile.am: Added nautilus.c and nautilus.h to the build.
2000-02-23 John Sullivan <sullivan@eazel.com>
Visible part of the fix to bug 14 (Open in New Window only
opens one window when multiple items selected). Still need
to clean up old, unnecessary code. Checking this in now for
convenience; will clean up other code tomorrow.
* src/ntl-app.c: (nautilus_app_create_window): Replaced the
gtk_widget_show of new window with comment explaining why not
to show it yet.
* src/ntl-window-msgs.c:
(nautilus_window_request_location_change): Spawn new window here
if the NavigationRequestInfo says so (formerly didn't spawn new
window until after we knew it was a displayable uri; that code
is still present but now never invoked; I will kill it tomorrow).
(nautilus_window_change_location_2): Call gtk_widget_show on
window when we know that location change will succeed; if the
location change failed, destroy the nascent window and put the
error message in an unparented dialog.
2000-02-23 Darin Adler <darin@eazel.com>
Some of the underlying work to prepare for emblems on the icons.
* style-guide.html: Some minor updates to the style guide,
including rules about headers.
* libnautilus/nautilus-icon-factory.h,
libnautilus/nautilus-icon-factory.c:
(nautilus_icon_factory_get_emblem_icons_for_file),
(nautilus_scalable_icon_get), (nautilus_icon_factor_clear),
(nautilus_icon_factory_load_file),
(nautilus_gdk_pixbuf_composite_corner),
(nautilus_icon_factor_load_icon), (nautilus_scalable_icon_hash),
(nautilus_scalable_icon_equal),
(nautilus_icon_factory_get_icon_for_file), (load_specific_image):
Added interface for getting emblem icons for a file, and got rid
of the symbolic-link overlay that was previously built into the
icon.
* libnautilus/gnome-icon-container.c (update_icon):
Get pixbufs for all emblems and pass into the icon object.
* libnautilus/nautilus-icons-controller.c
(nautius_icons_controller_get_icon_image):
src/file-manager/fm-icons-controller.h,
src/file-manager/fm-icons-controller.c
(fm_icons_controller_get_icon_image): Return a list of emblem
images along with the main image.
* libnautilus/nautilus-icons-view-icon-item.h,
libnautilus/nautilus-icons-view-icon-item.c
(nautilus_icons_view_icon_item_set_emblems),
(nautilus_icons_view_icon_item_destroy): Keep a list of emblem
pixbufs in each icon. We don't draw them quite yet.
* libnautilus/gdk-extensions.h, libnautilus/gdk-extensions.c:
(nautilus_gdk_pixbuf_list_ref), (nautilus_gdk_pixbuf_list_unref),
(nautilus_gdk_pixbuf_list_free): Convenience functions for
manipulating lists of GdkPixbuf objects.
* libnautilus/nautilus-directory.h,
libnautilus/nautilus-directory.c: (nautilus_file_list_ref),
(nautilus_file_list_unref), (nautilus_file_list_free): Convenience
functions for manipulating lists of NautilusFile objects. Also got
rid of NautilusFileList typedef.
* libnautilus/nautilus-icon-factory.h,
libnautilus/nautilus-icon-factory.h:
(nautilus_scalable_icon_list_free): Convenience function for
manipulating lists of NautilusScalableIcon objects.
* libnautilus/nautilus-glib-extensions.h,
libnautilus/nautilus-glib-extensions.c: (nautilus_g_list_equal):
Function to compare two GLists to see if they are
identical. Particularly useful with lists of reference-counted
objects.
* src/file-manager/fm-directory-view-icons.c
(fm_directory_view_icons_destroy),
(add_icon_if_already_positioned),
(fm_directory_view_icons_append_selection_context_menu_items),
(display_icons_not_already_positioned),
(fm_direectory_view_icons_get_selection):
src/file-manager/fm-directory-view-list.c
(fm_directory_view_list_get_selection):
src/file-manager/fm-directory-view.c (display_selection_info),
(display_pending_files), (add_files_cb), (open_in_new_window_cb),
(fm_directory_view_real_append_selection_context_menu_items): Got
rid of use of NautilusFileList typedef, corrected ref. counting of
files in the lists by using new calls.
* src/nautilus-bookmarklist.c, src/nautilus-bookmarks-menu.c,
src/nautilus-index-tabs.c,
src/file-manager/fm-directory-view-icons.c,
src/file-manager/fm-directory-view.c,
src/file-manager/fm-icons-controller.c: A bit of reformatting.
2000-02-23 Andy Hertzfeld <andy@eazel.com>
* icons/i-directory.png, icons/i-directory-36.png,
* icons/i-regular.png, icons/i-regular-36.png:
This completes Kenneth's set of icons for the generic document and folder
* icons/Makefile.am:
Added the 36 pixel versions.
2000-02-23 Elliot Lee <sopwith@redhat.com>
* autogen.sh: Finish the hack to not make people get gnome.m4 from
gnome-libs any more.
2000-02-22 Andy Hertzfeld <andy@eazel.com>
* icons/i-directory-12.png, icons/i-directory-24.png,
* icons/i-regular-12.png, icons/i-regular-24.png
Small versions of the standard gnome folder and document icons,
contributed by Kenneth Christiansen.
* icons/Makefile.am
Include Kenneth's icons.
2000-02-22 John Sullivan <sullivan@eazel.com>
Made list view respond to icon theme changes too. Forgot
about it last time!
* src/file-manager/fm-directory-view-list.c:
(update_icons): New function, walks through list installing
the icon for each row.
(fm_directory_view_list_initialize): register to call update_icons
when nautilus_icon_factory emits "theme_changed" signal.
2000-02-22 John Sullivan <sullivan@eazel.com>
Made bookmarks menu, go menu, and bookmarks window respond
to icon theme changes. The history metaview is still an
outstanding issue, waiting on technical solution to
icon-factories-in-different-executables problem.
* src/nautilus-bookmarks-menu.c:
(nautilus_bookmarks_menu_new): register to call
nautilus_bookmarks_menu_repopulate when nautilus_icon_factory
emits "theme_changed" signal.
* src/nautilus-bookmarks-window.c:
(create_bookmarks_window): register to call repopulate
when nautilus_icon_factory emits "theme_changed" signal.
* src/ntl-window.c:
(refresh_history_list_in_go_menu): Renamed from history_list_changed_cb,
removed unused NautilusSignaller parameter.
(nautilus_window_init): Changed a gtk_signal_connect_while_alive to
gtk_signal_connect_object_while_alive to avoid that unused
NautilusSignaller parameter; register to call
refresh_history_list_in_go_menu when nautilus_icon_factory emits
"theme_changed" signal.
2000-02-22 John Sullivan <sullivan@eazel.com>
Improved the status text that appears after changing the
selection in the file manager.
* libnautilus/nautilus-directory.h,
* libnautilus/nautilus-directory.c:
(nautilus_file_is_directory): New convenience function.
I updated everywhere in this file that was checking for
directories to use this.
(nautilus_file_get_directory_item_count): New function
to get the item count of a directory. This is implemented
with the evil get_directory_item_count_hack, but we'll want
this API later even when the evil hack is gone.
* src/file-manager/fm-directory-view.c:
(display_selection_info): The selection count/size string is
now broken into a directory part and an everything else part.
No more counting directories as 4.1K.
2000-02-22 Elliot Lee <sopwith@redhat.com>
* libnautilus/nautilus-file-utilities.c: include string.h to avoid warnings
* src/nautilus-index-title.c: Set order of items packed into box.
* src/file-manager/fm-directory-view-icons.c: include stdio.h to avoid warnings.
2000-02-22 Darin Adler <darin@eazel.com>
Fixed bug where the Eazel-theme icon for the document reverts to
the non-theme icon when you are zoomed in all the way.
* nautilus-icon-factory.c: (nautilus_icon_factory_load_file),
(add_size_to_image_name), (get_icon_file_path),
(nautilus_icon_factory_load_file),
(nautilus_icon_factory_load_icon), (load_specific_image): Changed
logic so the decision about whether to use a theme icon or the
default icon for each icon is decided based on the presence of the
non-sized version of the icon rather than the presence of the icon
for a particular size.
* nautilus-file-utilities.h, nautilus-file-utilities.c:
Cleaned up header and includes and changed ".gnomad" to
".nautilus". (At first I had added a nautilus_file_exists
function, but then I remembered the g_file_exists function in
gnome-utils.h.)
2000-02-22 Andy Hertzfeld <andy@eazel.com>
* icons/i-directory-192.png
* icons/i-directory-96.png
* icons/i-directory-72.png
Hi-res versions of the standard gnome folder icon,
contributed by Kenneth Christiansen.
* icons/Makefile.am
Include Kenneth's icons.
2000-02-21 Andy Hertzfeld <andy@eazel.com>
* icons/i-regular-192.png
* icons/i-regular-96.png
* icons/i-regular-72.png
Hi-res versions of the standard gnome generic document icon,
contributed by Kenneth Christiansen
* icons/Makefile.am
include Kenneth's icons
* libnautilus/nautilus-icons-controller.c,
* libnautilus/nautilus-icons-controller.h:
added a new method to get string properties
* libnautilus/nautilus-icons-view-icon-item.c:
Draw the contents of a text file into the icon itself in a small
font, if the text_source property is set.
* src/file-manager/fm-icons-controller.c:
Routine to determine whether to draw into icons. Since our
mime-type detection is inadequate now, we throw caution to the
winds and assume an unknown type is a text file it only enables
this for eazel themes now, we have to figure out a better way to
tell if the icon can contain it.
2000-02-21 Maciej Stachowiak <mjs@eazel.com>
* libnautilus/ntl-view-frame.c: Fixed crashes introduced in the
course of my reorganization - in one case I g_new()'d something
that should have been g_new0()'d, in another I forgot to
CORBA_exception_init().
2000-02-21 Andy Hertzfeld <andy@eazel.com>
added document icons to eazel icons theme in 4 sizes
* icons/eazel/i-regular.png, i-regular-36.png, i-regular-72.png,
i-regular-96.png:
Added Susan's document icons at 4 zoom levels.
* icons/eazel/Makefile.am:
Added to Makefile so they get installed.
2000-02-21 John Sullivan <sullivan@eazel.com>
Refined right-click context-menu behavior in file manager.
Now right-click affects the selection exactly as a left-click
would, including modifying the selection with modifier keys.
The first section of the context menu applies to all the
selected items. Menu items that can only apply to a single
item are insensitive if there's more than one item selected.
* libnautilus/gnome-icon-container.h:
(context_click_selection): Renamed this signal from context_click_icon
and removed the file parameter.
* libnautilus/gnome-icon-container.c:
(gnome_icon_container_initialize_class), (handle_icon_button_press):
Renamed signal context_click_icon to context_click_selection and
removed the file parameter.
(handle_icon_button_press): Reorder so that all selection changes
happen before the drag/activate/context-menu decision-making.
* libnautilus/gtkflist.h:
(context_click_selection): Renamed this signal from context_click_row
and removed the row parameter.
* libnautilus/gtkflist.c:
(gtk_flist_initialize_class), (gtk_flist_button_press):
Renamed signal context_click_row to context_click_selection and
removed the row parameter.
(gtk_flist_button_press):
For context clicks, call select_row the normal way to get the
normal selection modification behavior, instead of forcing only
the clicked row to be selected.
* src/file-manager/fm-directory-view.h:
(append_selection_context_menu_items): Renamed from
append_item_context_menu_items and changed NautilusFile parameter
to a NautilusFileList.
(fm_directory_view_pop_up_selection_context_menu): Renamed from
fm_directory_view_popup_item_context_menu.
(fm_directory_view_pop_up_background_context_menu): Renamed from
fm_directory_view_popup_background_context_menu
* src/file-manager/fm-directory-view.c:
Renamed all functions with "item_context_menu" in their names
to include "selection_context_menu" instead; Changed verb "popup"
to "pop up" in function names.
(open_one_in_new_window): New GFunc-type function, calls
fm_directory_view_activate_entry on a single NautilusFile.
(open_in_new_window_cb): Now takes a NautilusFileList* instead of
a NautilusFile* and iterates with open_one_in_new_window.
(fm_directory_view_real_append_selection_context_menu_items):
Desensitize "Open" if more than one selected item, since more than
one can't open into the same window; pass selected file list to
open_in_new_window_cb
(create_selection_context_menu): Skip the selection-specific part
of the menu if there are no selected items (but still put up the
menu with the background items);
* src/file-manager/fm-directory-view-icons.c:
Various changes to match renamings and parameter changes listed
above. Also,
(fm_directory_view_icons_append_selection_context_menu_items):
Only enable "Stretch Icon" if exactly one item is selected, since
the UI is only designed to work with a single icon.
* src/file-manager/fm-directory-view-list.c:
Various changes to match renamings and parameter changes listed
above.
2000-02-21 Maciej Stachowiak <mjs@eazel.com>
* libnautilus/ntl-view-frame.h: Don't include <gtk/gtkbin.h>; do
include <gtk/gtkwidget.h>.
2000-02-19 Maciej Stachowiak <mjs@eazel.com>
* libnautilus/ntl-view-frame.c, libnautilus/ntl-view-frame.h:
Changed NautilusViewFrame to allow creation of `Nautilus::View'
objects that have additional interfaces while sharing the actual
control. This will allow, for instance, the creation of components
that are both a `Nautilus::View' and a `Bonobo::Embeddable'. The
basic changes are to require a `BonoboObject' with a
`Bonobo::Control' interface at construction time.
- Two creation functions are provided: `nautilus_view_frame_new',
which takes a GtkWidget, creates a new control that contains that
widget, and the constructs a NautilusViewFrame with that control,
and `nautilus_view_frame_new_from_control', which creates a
NautilusViewFrame that gets added as an additional interface to an
existing control.
- In the course of doing this it became clear that it would be
easier if NautilusViewFrame were changed to inherit from
BonoboObject rather than GtkBin, so this was done; as a result,
the nautilus_view_frame_get_bonobo_object call was removed, since
the view_frame _is_ a bonobo object. However, a
nautilus_view_frame_get_bonobo_control call was added as a
convenience, to allow other code to avoid having to
query_local_interface for the control object manually.
* libnautilus/ntl-meta-view-frame.c,
libnautilus/ntl-meta-view-frame.h,
libnautilus/ntl-content-view-frame.c,
libnautilus/ntl-content-view-frame.h: Analogous changes; mainly,
added `nautilus_meta_view_frame_new',
`nautilus_meta_view_frame_new_from_control',
`nautilus_content_view_frame_new' and
`nautilus_content_view_frame_new_from_control'.
* components/help/hyperbola-nav-index.c,
components/help/hyperbola-nav-tree.c,
components/history/ntl-history-view.c,
components/html/ntl-web-browser.c, components/notes/ntl-notes.c,
components/websearch/ntl-web-search.c, src/ntl-app.c,
src/file-manager/fm-directory-view.c: Fixed initialization and
object creation functions to deal with the above API change.
* libnautilus/ntl-view-frame.c, libnautilus/ntl-view-frame.h:
Moved fields from object struct to separate private struct.
2000-02-18 Maciej Stachowiak <mjs@eazel.com>
* RENAMING: Suggest swapping the names NautilusView and
NautilusViewFrame to better match the way Bonobo handles naming of
mutual client-server pairs of this type. I'm not sure I agree, but
better to be consistent than right.
2000-02-18 Darin Adler <darin@eazel.com>
* gnome-icon-container.c: (set_scroll_region):
Set up the step_increment so the vertical and horizontal scroll
bars will scroll when you click on the arrows.
2000-02-18 Darin Adler <darin@eazel.com>
* src/file-manager/fm-directory-view.c:
(use_eazel_theme_icons_cb), (finish_adding_menu_item),
(add_menu_item), (add_check_menu_item),
(fm_directory_view_real_append_background_context_menu_items):
Hooked up the menu item for using the Eazel Theme Icons so people
can try out the icons that are tuned at different sizes.
* libnautilus/nautilus-icon-factory.h:
* libnautilus/nautilus-icon-factory.c,
(nautilus_icon_factory_get), (nautilus_icon_factory_new),
(nautilus_icon_factory_initialize),
(nautilus_icon_factory_initialize_class),
(nautilus_icon_factory_get_theme),
(nautilus_icon_factory_set_theme): Added a signal "theme_changed"
to the icon factory, and had to add a visible icon factory object
so clients can connect to the signal.
* libnautilus/gnome-icon-container.c,
(gnome_icon_container_initialize),
(gnome_icon_container_request_update_all): Update all icons when
the theme changes.
* docs/recommended-books.html: Added this since
style-guide.html refers to it.
2000-02-18 John Sullivan <sullivan@eazel.com>
Made bookmarks (including in history list) for file system
items display just the name of the file or directory instead
of the entire path. Made history list appear in Go menu.
Still need to muck with CORBA so that history metaview is
getting the history list from Nautilus rather than
maintaining its own parallel copy.
* libnautilus/nautilus-bookmark.h:
(nautilus_bookmark_new_with_name): Renamed this function, which
takes both a uri and a display name, from nautilus_bookmark_new.
(nautilus_bookmark_new): New function, takes just a uri.
* libnautilus/nautilus-bookmark.c:
(nautilus_boookmark_new_with_name): Renamed.
(nautilus_bookmark_new): New function, determines what initial
name to use for a bookmark given its uri. Right now the only rule
it knows is to use just the leaf file/directory name for file
system uris. (Someday it should also know to get the page title
for web uris.)
* libnautilus/nautilus-bookmark.c,
* components/history/ntl-history-view.c,
* src/nautilus-bookmarklist.c,
* src/nautilus-bookmarks-menu.c,
* src/nautilus-bookmarks-window.c,
* src/ntl-window-msgs.c:
Updated callers of old nautilus_bookmark_new to either use new
one-parameter version or to use nautilus_bookmark_new_with_name.
* libnautilus/nautilus-directory.c: (nautilus_self_check_directory):
Added new test that catches gnome-vfs bug I ran into where the name
computed for uris with a trailing slash is "". Maciej plans to fix
this in gnome-vfs; for now, make check catches it.
* src/nautilus-signaller.c,
* src/nautilus-signaller.h: New files for an object that manages
nautilus-wide signals (not associated with a particular window, e.g.).
The initial nautilus-wide signal is "history_list_changed".
* src/Makefile.am: Build these two new files.
* src/ntl-window.h:
Removed window_signals from NautilusWindowClass struct, made it a static
variable in the file to better hide it and match existing practice;
Added go_menu and go_menu_separator_item widgets to the set maintained
for each window. (This will have to change when I convert the menus
to using BonoboUIHandler, but that's for another day.)
* src/ntl-window.c:
I added then later removed a signal to this class. In the process, I
cleaned up some of the signal-handling details: Added an enum for
signal names (currently only LAST_SIGNAL); moved array of signals to
a static variable instead of field in Class struct; used LAST_SIGNAL
instead of 0 in (nautilus_window_class_init).
Added static history_list variable. Perhaps this and related functions
belong in their own file.
(nautilus_add_to_history_list): New function, updates global history
list and emits "history_list_changed" signal.
(clear_go_menu_history): New function, erase all the bookmark menu
items from the Go menu.
(activate_bookmark_in_menu_item): New function, go to the uri in the
bookmark stored as user data in the given menu item.
(history_list_changed_cb): New function, updates history section of
Go menu.
(nautilus_window_init): Connect history_list_changed_cb to
"history_list_changed" signal of nautilus_signaller object.
(nautilus_window_constructed): Stores away pointers to Go menu and
separator between static & dynamic parts of this menu.
* src/ntl-window-private.h: (nautilus_add_to_history_list): Prototype
for new function.
* src/ntl-window-msgs.c: (nautilus_window_update_internals): Call
nautilus_add_to_history_list with the new uri.
2000-02-17 Andy Hertzfeld <andy@eazel.com>
Improved index panel command buttons. There's still a problem
with the button box removal, though.
* libnautilus/nautilus-mime-type.c:
Changed how command strings are structured to a simpler scheme
with no substitution.
* src/ntl-index-panel.c:
Improved the way commands are launched and fixed a bug in the
button removal code, but there's still some problems.
2000-02-17 Andy Hertzfeld <andy@eazel.com>
implemented command buttons for the index panel.
* libnautilus/nautilus-mime-type.c, libnautilus/nautilus-mime-type.h:
This is interim code for associating applications with mime-types; we
will eventually keep this in OAF or GConf or at least in a file
somewhere, but for now it's just scaffolding so we can work on the UI.
* libnautilus/Makefile.am:
Make nautilus-mime-type.c,h build.
* stc/ntl-index-panel.c:
Added code to call nautilus-mime-types to get relevant commands based
on the mime-type, and then generate corresponding buttons in the index
panel.
2000-02-17 Darin Adler <darin@eazel.com>
Hand tuned icons for multiple resolutions.
So for example you can have an icon designed for the 96x96
size, which is called i-directory-96.png, and it will be
loaded instead of loading i-directory.png and scaling it.
* libnautilus/nautilus-icon-factory.c:
(nautilus_icon_factory_get_icon_name_for_regular_file),
(add_size_to_icon_name), (nautilus_icon_factory_load_icon),
(nautilus_icon_factory_create_image_for_item),
(get_larger_icon_size), (get_smaller_icon_size),
(get_next_icon_size_to_try), (load_specific_image),
(load_image_for_scaling), (load_image_scale_if_necessary),
(nautilus_icon_factory_mark_recently_used), (mark_recently_used),
(nautilus_icon_factory_get_pixbuf_for_icon),
(get_image_from_cache), (nautilus_icon_factory_scale): Changed the
icon factory so it will look for icons of multiple resolutions and
scale the nearest. Also made other improvements including sharing
a single fallback icon instead of making multiple ones, using the
"core-dump" icon for files named "core", adding some additional
g_return_if_fail.
* libnautilus/nautilus-icon-factory.c:
(self_test_next_icon_size_to_try),
(nautilus_self_check_icon_factory):
* libnautilus/nautilus-lib-self-check-functions.h:
The new code needed a bit of self-check code, so I added it.
* libnautilus/nautilus-directory.c:
(nautilus_directory_try_to_read_metafile),
(nautilus_directory_construct_alternate_metafile_uri):
Since "make check" was failing, I checked to see what was wrong.
The code that was respecting the new "valid_fields" part of
GnomeVFSFileInfo was looking at the wrong field (flags instead
of valid_fields), which caused all metafile reading to fail.
While debugging this, I noticed that the alternate metafiles
had particularly bad long names, so I fixed that too.
* libnautilus/nautilus-directory.c: (nautilus_file_ref):
* libnautilus/nautilus-glib-extensions.c:
(nautilus_strdup_strftime):
* libnautilus/nautilus-string.c: (nautilus_string_to_int):
Switched from using <limits.h> constants to the ones from
<glib.h>. I have no idea why I made this change. All hail
glib! C Standard be damned!
* fm-directory-view.c:
(use_eazel_theme_icons_cb), (add_menu_item),
(fm_directory_view_real_append_background_context_menu_items):
Started on a user interface to switch to the Eazel theme
icons so you can see the multiple-resolution icons, but
I wanted to check in, so I stopped before it was done.
* src/nautilus-index-title.c:
Reindented Andy's new code to match the emacs mode header.
* configure.in:
* icons/Makefile.am:
* icons/eazel/.cvsignore:
* icons/eazel/Makefile.am:
* icons/eazel/i-directory-24.png:
* icons/eazel/i-directory-36.png:
* icons/eazel/i-directory-72.png:
* icons/eazel/i-directory-96.png:
* icons/eazel/i-directory.png:
I needed some variable-size icons to demonstrate the multiple
resolution support in the icon factory, so I added a few
directory icons from gnomad. Since these don't match the other
icons, I made them part of an "eazel" icons theme.
* RENAMING: Some new name ideas.
2000-02-17 Jonathan Blandford <jrb@redhat.com>
* src/nautilus-index-title.c (nautilus_index_title_set_up_label):
remember strlen (string) + 1 gives you the length necessary to
copy a string, not strlen.
2000-02-16 Andy Hertzfeld <andy@eazel.com>
* src/nautilus-index-title.c:
made the title be above the additional info again; Elliot broke this
when he added the checks for null file objects. Fixed by putting
the checks in the subroutines that do that real work. Also, made
the label center justified.
2000-02-16 Elliot Lee <sopwith@redhat.com>
* components/help/hyperbola-nav-tree.c: Show the stinking view. :)
2000-02-16 John Sullivan <sullivan@eazel.com>
* libnautilus/nautilus-directory.c:
Change empty folder string from "empty" to "0 items" at
Andy's suggestion. It looked too much like part of the
folder's name.
2000-02-16 Elliot Lee <sopwith@redhat.com>
* components/help/hyperbola-main.c: Fix the GOAD ID for help index.
* components/help/hyperbola.goad: Add help index.
* libnautilus/nautilus-directory.c: To avoid a warning in case
nautilus_directory_new fails, and speed things up, remove
unnecessary cast.
* libnautilus/nautilus-icon-factory.c: Add sanity checks to avoid segfaults.
* src/nautilus-index-title.c: Add sanity check, plus try to handle
case where nautilus_file_get() returns NULL.
* src/ntl-window.c, src/ntl-window-msgs.c: Notify the index panel
of a URI change when we notify everyone else, instead of doing it when
the user requests a change.
* components/html/ntl-web-browser.c: Fixups for VFS usage.
* components/help/converters/gnome-info2html2/main.c: Search info path for files.
* components/help/hyperbola-nav-index.c: Fix warning.
* components/history/ntl-history-view.c: Update for Bonobo UIH changes.
* components/html/main.c: Update repo ID for Bonobo changes.
* src/ntl-view-bonobo-control.c: Likewise
* src/ntl-view-bonobo-subdoc.c: Likewise
* src/ntl-view-nautilus.c: Likewise
* src/ntl-view.c: Only check for death every other second.
* components/html/ntl-web-browser: Debugging printfs for now
2000-02-16 Darin Adler <darin@eazel.com>
Added icon stretching and did some cleanups.
Stretched icons aren't yet persistent (the scale factor is not
saved in metadata), but that's not much more work.
* libnautilus/gnome-icon-container-private.h:
* libnautilus/gnome-icon-container.h:
* libnautilus/gnome-icon-container.c: (icon_new), (icon_position),
(icon_set_position), (icon_get_size), (icon_set_size),
(icon_toggle_selected), (icon_select), (icon_set_selected),
(button_press_event), (gnome_icon_container_begin_stretch),
(start_stretching), (gnome_icon_container_stretch),
(continue_stretching), (gnome_icon_container_end_stretch),
(end_stretching), (button_release_event), (motion_notify_event),
(handle_icon_button_press), (gnome_icon_container_clear),
(request_update_one), (update_icon), (get_first_selected_icon),
(gnome_icon_container_show_stretch_handles),
(gnome_icon_container_has_stretch_handles),
(gnome_icon_container_is_stretched),
(gnome_icon_container_unstretch), (compute_stretch),
(nautilus_self_check_compute_stretch),
(nautilus_self_check_gnome_icon_container):
* libnautilus/nautilus-icons-view-icon-item.h:
* libnautilus/nautilus-icons-view-icon-item.c:
(nautilus_icons_view_icon_item_draw),
(nautilus_icons_view_icon_item_point),
(nautilus_icons_view_icon_item_set_show_stretch_handles),
(nautilus_icons_view_icon_item_get_hit_stretch_handle):
* libnautilus/nautilus-lib-self-check-functions.h:
Added machinery for stretching icons.
* src/file-manager/fm-directory-view.h:
* src/file-manager/fm-directory-view.c:
(append_item_context_menu_items),
(fm_directory_view_real_append_item_context_menu_items),
(fm_directory_view_initialize_class), (create_item_context_menu):
Added machinery for views to have view-specific menu items for
icons as well as for the window as a whole.
* src/file-manager/fm-directory-view-icons.c:
(fm_directory_view_icons_initialize_class),
(fm_directory_view_icons_append_item_context_menu_items),
(show_stretch_handles_cb), (unstretch_item_cb):
Added menu items for stretching icons.
* libnautilus/gnome-icon-container.c: (start_rubberbanding):
Fixed bug that would result in two rubberband timeouts at
once if you did rubberbanding quickly.
* components/notes/.cvsignore: Andy's new component needs a
.cvsignore file for its generated pieces.
* libnautilus/nautilus-directory.c:
(nautilus_directory_try_to_read_metafile),
(nautilus_directory_read_metafile):
Simplified logic in metafile-reading functions and fixed a bug
where the vfs handle would be left open if certain categories
of errors occurred.
* libnautilus/nautilus-gtk-extensions.h:
Added a missing gtk_marshal function.
* libnautilus/nautilus-icon-factory.h:
* libnautilus/nautilus-icon-factory.c:
(nautilus_icon_size_for_zoom_level),
(nautilus_get_icon_size_for_zoom_level),
(nautilus_icon_factory_get_pixbuf_for_file),
(nautilus_icon_factory_get_pixmap_and_mask_for_file):
* src/nautilus-index-title.c: (nautilus_index_title_set_up_icon):
* src/nautilus-zoom-control.c: (set_zoom_level):
* src/file-manager/fm-directory-view-list.c:
(fm_directory_view_list_bump_zoom_level), (install_icon):
Made some API improvements for the icon factory. Added a missing
get_ to the name nautilus_get_icon_size_for_zoom_level and added
convenience functions for the most common uses of the factory.
* libnautilus/ntl-content-view-frame.c:
* libnautilus/ntl-meta-view-frame.c:
* libnautilus/ntl-view-frame.c:
Weaned all the files in libnautilus itself from using the
libnautilus.h include file. They instead include the parts that
they need. Also added some missing <config.h> includes.
2000-02-15 Andy Hertzfeld <andy@eazel.com>
* src/ntl-index-panel.c:
Removed test code that created extra tabs on right-click.
* src/ntl-index-title.c:
Added logic to break the title into two lines so it can use a larger font,
if it can find an appropriate breaking point.
2000-02-15 Maciej Stachowiak <mjs@eazel.com>
* src/ntl-window.c (nautilus_window_init): gtk_quit_add_destroy
the NautilusWindow at level 1, so that we can clean up CORBA
objects and such when we Exit rather than Closing the last window.
* src/ntl-index-panel.c: sink and ref the notebook and unref in
the destructor, so it gets destroyed even if it never ends up
getting added to the index panel.
* src/ntl-view-nautilus.c: Don't ref the Control interface we just
QI'd; query_interface implicitly refs.
2000-02-15 Elliot Lee <sopwith@redhat.com>
* libnautilus/nautilus-directory.c: Pay attention to the
GnomeVFSFileInfo flags to determine whether to read the metafile.
* components/html/ntl-web-browser.c: Try to fall back to using
gnome-vfs if we can't load it via libwww. Sort of bad hack, but it
just might work.
2000-02-15 John Sullivan <sullivan@eazel.com>
History metaview now lists all locations visited in this
session, from most recent (top) to longest ago, with no
duplicates.
* components/history/ntl-history-view.c:
Removed last_row field from HistoryView struct. This was used
to keep track of previously-visited location, but since the most
recently-visited location is always first now, this is always 0.
(get_bookmark_from_row): New helper function to extract the bookmark
stored in the row data.
(get_uri_from_row): Use get_bookmark_from_row.
(hyperbola_navigation_history_notify_location_change):
Remove existing row for this location, if any, and then prepend
new row. Replaces back/forward/reload logic that wasn't quite right
anyway.
(hyperbola_navigation_history_select_row): Move gtk_clist_freeze
after early bail-out; change bail-out to just check for row 0;
remove setting of last_row; add comment about dragging bug.
(menu_setup): Change menu item from "Do nothing" to
"Do nothing (menu merge test)" for clarity.
(make_obj) Remove initialization for last_row.
2000-02-15 John Sullivan <sullivan@eazel.com>
Added small icons to history metaview.
* components/history/ntl-history-view.c:
Added #defines for columns and column count.
(get_uri_from_row): New function, abstracts getting the URI from
a row in the history list.
(install_icon): New function, handles getting the right icon and
putting it into the right cell.
(hyperbola_navigation_history_notify_location_change):
Deployed column #defines; fixed check-off-end-of-list bug;
use get_uri_from_row; store NautilusBookmark as row data;
use install_icon.
(hyperbola_navigation_history_select_row): use get_uri_from_row.
(make_obj): Turn off titles for clist, include icon column;
set row height to account for icons
(main): add gnome_vfs_init (needed by nautilus_icon_factory).
2000-02-15 Ramiro Estrugo <ramiro@eazel.com>
Added styleguide.
* docs/style-guide.html: New file
2000-02-15 Ramiro Estrugo <ramiro@eazel.com>
Added displacement offset for popup menus, so that the first
item doesn't get triggered right away.
* libnautilus/nautilus-gtk-extensions.c:
* libnautilus/nautilus-gtk-extensions.h: Added x,y displacement
args to nautilus_pop_up_context_menu.
* src/ntl-window.c: Updated for new api
* src/file-manager/fm-directory-view.c: Updated for new api
2000-02-15 Ramiro Estrugo <ramiro@eazel.com>
Added modules blurb to HACKING file.
* HACKING: Added modules blurb.
2000-02-15 John Sullivan <sullivan@eazel.com>
Moved NautilusBookmark to libnautilus, in preparation for
using it in the History metaview.
* src/nautilus-bookmark.c: Removed file.
* src/nautilus-bookmark.h: Removed file.
* src/Makefile.am: Took out these two files.
* libnautilus/nautilus-bookmark.c: Added file.
* libnautilus/nautilus-bookmark.h: Added file.
* libnautilus/Makefile.am: Build the two new files.
* src/nautilus-bookmarklist.h: Updated #include
2000-02-15 John Sullivan <sullivan@eazel.com>
Right-click menus from Back and Forward buttons now include
small icons. To support this, window back/forward lists now
store NautilusBookmarks.
* src/nautilus-bookmarks-menu.c:
(bookmark_menu_item_new): Removed (moved to nautilus-bookmark.c/h,
and renamed nautilus_bookmark_menu_item_new).
(create_pixmap_widget_for_bookmark): Removed (moved to nautilus-bookmark.c/h)
(nautilus_bookmarks_menu_repopulate): updated caller to match name change.
* src/nautilus-bookmark.h:
(nautilus_bookmark_menu_item_new): New function.
* src/nautilus-bookmark.c:
(nautilus_bookmark_menu_item_new): New function, moved over from
nautilus-bookmarks-menu.c
(create_pixmap_widget_for_bookmark): New function, moved over from
nautilus-bookmarks-menu.c
* src/ntl-window.h:
Replaced uris_prev and uris_next with back_list and forward_list.
Added comment explaining that the data is now NautilusBookmark * and
not just char *.
* src/ntl-window-msgs.c:
(nautilus_window_update_internals): updated to use back_list and
forward_list.
* src/ntl-window.c:
(activate_back_or_forward_menu_item), (nautilus_window_destroy):
updated to use back_list and forward_list
(create_back_or_forward_menu): updated to use back_list and
forward_list; use nautilus_bookmark_menu_item_new to get icons.
(nautilus_window_back_or_forward): New function, consolidates
repeated code from nautilus_window_back and nautilus_window_forward.
(nautilus_window_back), (nautilus_window_fwd): Now call
nautilus_window_back_or_forward.
2000-02-15 Andy Hertzfeld <andy@eazel.com>
* src/nautilus-index-tabs/c:
improved tab-resizing code by not the last one if it's invisible,
also, invoked resize code after a tab is selected
2000-02-14 Andy Hertzfeld <andy@eazel.com>
* components/notes/ntl-notes.c:
fixed problems with notes component by initializing gnome-vfs, etc.
changed metadata key to "ANNOTATION" to keep them separate from panel notes
* libnautilus/nautilus-metadata.h:
defined "ANNOTATION" metadata type
2000-02-14 Andy Hertzfeld <andy@eazel.com>
first cut at annotation metaview
* components/notes/Makefile.am:
automake file for notes component
* components/notes/ntl-notes.c:
implementation of annotation metaview
* components/notes/ntl-notes.goad:
activation file for notes component
* components/Makefile.am:
added notes folder
* configure.in:
added component/notes/Makefile
* src/ntl-prefs.c:
added annotation metaview to prefs
2000-02-14 John Sullivan <sullivan@eazel.com>
Back and Forward buttons now sprout right-click menus.
Still work to do to put small icons in them, and to
make them keep the back/forward chain intact.
* libnautilus/nautilus-gtk-extensions.h:
* libnautilus/nautilus-gtk-extensions.c:
(nautilus_pop_up_context_menu): New helper function used
when displaying right-click context menus.
* src/file-manager/fm-directory-view.c:
(popup_context_menu): Removed (moved & renamed to
nautilus_pop_up_context_menu).
(fm_directory_view_popup_item_context_menu),
(fm_directory_view_popup_background_context_menu):
Now use nautilus_pop_up_context_menu.
* src/ntl-window.c:
(activate_back_or_forward_menu_item): New function, go to the
appropriate location.
(activate_back_menu_item_cb): New function, call
activate_back_or_forward_menu_item.
(activate_forward_menu_item_cb): New function, call
activate_back_or_forward_menu_item.
(create_back_or_forward_menu): New function, create and populate a
menu from the back list or the forward list.
(back_or_forward_button_clicked_cb): New function, pop up the result
of create_back_or_forward_menu.
(nautilus_window_constructed): Wire up context menu code to
back and forward buttons.
2000-02-14 Darin Adler <darin@eazel.com>
* libnautilus/nautilus-icon-factory.c:
(nautilus_icon_factory_load_icon):
Just noticed that Elliot checked in a gdk-pixbuf fix, so I can
roll the cast back out.
2000-02-14 Darin Adler <darin@eazel.com>
* libnautilus/nautilus-icon-factory.c:
(nautilus_icon_factory_load_icon):
Need a cast in here so people can build while I wait for the OK
from Federico to check in my const change to gdk-pixbuf.
2000-02-14 Elliot Lee <sopwith@redhat.com>
* libnautilus/nautilus-icon-factory.c: Use GPOINTER_TO_UINT()
instead of a manual cast.
2000-02-14 Darin Adler <darin@eazel.com>
* libnautilus/nautilus-directory.c: (nautilus_directory_read_metafile):
Handle the case where you try to make a NautilusDirectory object for
something that's a file.
* libnautilus/nautilus-directory.c: (nautilus_directory_get_metadata):
Handle NULL directory objects better.
* src/ntl-index-panel.c:
Changed handling of NULL directory case so it will display something
instead of doing early exits that leave the display as-is.
* src/nautilus-index-title.h:
* src/nautilus-index-title.c:
Reformatted, some minor cleanups.
2000-02-14 Darin Adler <darin@eazel.com>
* libnautilus/nautilus-icon-factory.c:
Redid the icon factory to fix a few things:
- Replaced the existing non-working count-based LRU algorithm with
one that works (uses a linked list).
- Keep resized icons in the cache.
- Hand out a single NautilusScalableIcon when multiple callers ask
for the same icon instead of a new one each time.
- Fixed one bug where pixbuf's would get an extra ref and never get
freed once they are no longer used.
* libnautilus/nautilus-metadata.h:
* src/nautilus-index-title.c (nautilus_index_title_set_up_info):
* libnautilus/nautilus-icon-factory.c
(nautilus_icon_factory_get_icon_for_file):
Added keys for the two pieces of metadata Andy just added.
* libnautilus/gnome-icon-container-private.h:
* libnautilus/gnome-icon-container.c: (scroll),
(make_icon_visible), (set_scroll_region): Fixed the code that
resizes the canvas as items are added and removed to properly
handle the case where the canvas extends into negative-coordinate
territory. This included removing the width and height that were
stored in the private structure.
* libnautilus/nautilus-directory.c: (nautilus_directory_get): Tiny
formatting tweak.
2000-02-14 John Sullivan <sullivan@eazel.com>
Fixed index title bugs that showed up when visiting http:// url.
It's still the case that the wrong text appears; I just made it
not drop into the debugger.
* libnautilus/nautilus-icon-factory.c:
(nautilus_icon_factory_get_icon_for_file): Made it return NULL
for a NULL file. Could have made this a return_val_if_fail
instead, wasn't sure which was better in this case.
* src/nautilus-index-title.c:
(nautilus_index_title_set_up_icon): Made it bail out early if
NautilusFile parameter is NULL.
(nautilus_index_title_set_up_info): Made it bail out early if
NautilusFile parameter is NULL.
(nautilus_index_title_set_uri): Made it unref file_object only
if non-NULL.
Experimental zoom behavior change: Now it resets the default
zoom level every time the zoom level is set. This means that
zoom level changes stick across locations, until you revisit
a location that had its zoom level set explicitly earlier.
* src/file-manager/fm-directory-view-icons.c:
Added default_zoom_level to Details struct.
(fm_directory_view_icons_initialize): Initialize default_zoom_level
to NAUTILUS_ZOOM_LEVEL_STANDARD.
(fm_directory_view_icons_begin_loading),
(fm_directory_view_icons_get_zoom_level): Pass default_zoom_level
to metadata calls.
(fm_directory_view_icons_set_zoom_level): Pass default_zoom_level
to metadata call, also reset default_zoom_level to new level.
* src/file-manager/fm-directory-view-list.c:
Added default_zoom_level to Details struct.
(fm_directory_view_icons_initialize): Initialize default_zoom_level
to NAUTILUS_ZOOM_LEVEL_SMALLER.
(fm_directory_view_list_begin_loading): Pass default_zoom_level
to metadata call.
(fm_directory_view_list_set_zoom_level): Pass default_zoom_level
to metadata call, also reset default_zoom_level to new level.
2000-02-14 Elliot Lee <sopwith@redhat.com>
* components/html/ntl-web-browser.c: Send status strings for now,
until nautilus knows how to generate them from selection info.
2000-02-14 Andy Hertzfeld <andy@eazel.com>
* src/nautilus-index-tabs.c:
Fixed warning about measuring NULL string that Elliot pointed out
2000-02-14 Elliot Lee <sopwith@redhat.com>
* src/ntl-window-msgs.c: Revert.
* components/help/hyperbola-nav-index.c: More work.
2000-02-13 Andy Hertzfeld <andy@eazel.com>
* libnautilus/nautilus-icon-factory.c:
Made it use custom image specified in meta-data, if present.
also, upped the size used for displaying images as themselves
without thumbnails, from 10K to 16K.
* src/nautilus-index-title.c:
Display "notes" from metadata in index panel if present.
* src/ntl-index-panel.c:
Fiddled with drag and drop code trying to get it to accept
image files, not yet working
2000-02-13 Andy Hertzfeld <andy@eazel.com>
Made nautilus-index-title widget to hold the title information
for the index panel.
* src/ntl-index-panel.c:
allocated index-title to display info, removed old code that did it
* src/Makefile.am:
added nautilus-index-title.c and nautilus-index-title.h
* src/nautilus-index-title.c,h:
moved code from index-panel here to show icon and title
used nautilus_file and icon_factory to get the icon the real way
added more info besides the name (size, type and date)
2000-02-12 Andy Hertzfeld <andy@eazel.com>
* src/nautilus-index-tabs.c:
made the tabs layout be more dynamic, laying out as many
tabs as fit in a row instead of a maximum of two. Tightened
up the layout and improved the drawing, too.
* src/ntl-index-panel.c:
Right clicking on the tabs adds extra ones for testing purposes.
2000-02-11 Andy Hertzfeld <andy@eazel.com>
* libnautilus/gnome-icon-container-dnd.c:
made it no longer use a drag shadow rectangle when dragging a single item
2000-02-11 Andy Hertzfeld <andy@eazel.com>
* src/ntl-window.c:
removed Elliot's weird hack where the index panel size would vary
according to the first letter of the username; replaced it with code
that special-cases the size for "sopwith".
2000-02-11 Andy Hertzfeld <andy@eazel.com>
Finally enabled the new metaview UI
* src/nautilus-index-tabs.c,h:
made clicking on the title tab deactivate the current metaview
removed the panel_width field since it didn't work for the
resizable panel, instead, look at the parents width on the fly
added code to test lots of tabs and improved the drawing in that case
before removing the test code.
* src/ntl-index-panel.c:
removed the USE_NEW_TABS boolean; we always use them now
2000-02-11 John Sullivan <sullivan@eazel.com>
Made right-clicking on an item select just that one item
before popping up context menu. This makes it clear what
the context menu is operating on.
* libnautilus/gnome-icon-container.c:
(handle_icon_button_press): Select just the clicked icon
before sending CONTEXT_CLICK_ICON signal.
* libnautilus/gtkflist.c:
(gtk_flist_button_press): Select just the clicked row
before sending CONTEXT_CLICK_ROW signal.
Fixed bug where "Open" and "Open in New Window" had
unexpected results in list view.
* src/file-manager/fm-directory-view-list.c:
(context_click_row_cb): Fixed bug where this routine was passing
the wrong item to the context menu.
2000-02-11 Elliot Lee <sopwith@redhat.com>
* src/ntl-window.c: If an empty string is passed for a status string, just unset it all.
* src/ntl-window-msgs.c: If we get a selection of size 1, indicate it on the status bar.
(Triggers a nautilus_window_set_status bug, will fix later.)
2000-02-11 John Sullivan <sullivan@eazel.com>
* src/ntl-window.h:
Return of the stored widgets for toolbar buttons that need
sensitivity changes, only this time do them all and add
the new menu items too.
* src/ntl-window.c:
(nautilus_window_constructed): Save away pointers to all the
widgets that need accessing later.
(nautilus_window_allow_back), (nautilus_window_allow_forward),
(nautilus_window_allow_up), (nautilus_window_allow_reload),
(nautilus_window_allow_stop): Use stored widget pointers rather
than GnomeUIInfo arrays to access the buttons and menu items.
Getting the widget from the array only worked until another
window was created.
* libnautilus/nautilus-directory.c: (get_directory_item_count_hack):
Subtract 2 from item count before returning, to account for . and ..
2000-02-11 John Sullivan <sullivan@eazel.com>
Sensitized "Open" context menu item, and added
"Open in New Window". Extended the framework as
required to support opening into a new window.
* src/ntl-types.h: Added use_new_window gboolean
to NautilusNavigationInfo struct. (Nautilus_
NavigationRequestInfo already had a concept of using
a new window, but it was never passed on to the
window-managing code).
* src/ntl-uri-map.c: (nautilus_navinfo_new): Set the
use_new_window field of the new object based on the
new_window_default/suggested/enforced settings from
the NavigationRequestInfo.
* src/ntl-window-msgs.c: (nautilus_window_change_location_2):
Create a new window if passed-in NautilusNavigationInfo says so.
* src/file-manager/fm-directory-view.h:
(fm_directory_view_activate_entry): Added gboolean
request_new_window parameter.
* src/file-manager/fm-directory-view.c:
(fm_directory_view_activate_entry): Set new_window_suggested
of NavigationRequestInfo based on value of new
request_new_window parameter.
(open_cb): New function, calls fm_directory_view_activate_entry
with request_new_window FALSE.
(open_in_new_window_cb): New function, calls
fm_directory_view_activate_entry with request_new_window TRUE.
(append_item_context_menu_items): Sensitize "Open" item, add
"Open in New Window" item, wire 'em up.
* src/file-manager/fm-directory-view-icons.c:
(icon_container_activate_cb): pass FALSE for request_new_window.
* src/file-manager/fm-directory-view-list.c:
(flist_activate_cb): pass FALSE for request_new_window.
Added beginnings of Go menu, and cleaned up some
cruft found in the process. Holler now if you think
the Go menu is a bad idea.
* src/ntl-window.h:
Removed btn_back and btn_fwd fields, as they were being
initialized and then ignored.
* src/ntl-window.c:
Added go_menu_info array and filled it with Back, Forward,
Up, and Home, all with keyboard equivalents. (Later this menu
will also contain dynamic history list.)
Added #defines for toolbar button indices.
(nautilus_window_constructed): Removed mentions of btn_back
and btn_fwd; moved nautilus_window_allow_stop to after the
menus are set up; added nautilus_window_allow_back and
nautilus_window_allow_forward calls.
(nautilus_window_allow_back): Use #define for Back button index
instead of hardcoded magic number; set Back menu item sensitivity.
(nautilus_window_allow_forward): Use #define for Forward button index
instead of hardcoded magic number; set Forward menu item sensitivity.
(nautilus_window_allow_up): Use #define for Up button index
instead of hardcoded magic number; set Up menu item sensitivity.
(nautilus_window_allow_reload): Use #define for Reload button index
instead of hardcoded magic number (which was incorrect).
(nautilus_window_allow_stop): Use #define for Stop button index
instead of hardcoded magic number.
2000-02-10 Andy Hertzfeld <andy@eazel.com>
* src/ntl-index-panel.c:
added code to hide metaview when the title tab is clicked upon
* src/nautilus-index-tabs.c:
made hit-testing work for the title tab
* src/ntl-window.c:
defaulted hpaned position to proper size
2000-02-10 Andy Hertzfeld <andy@eazel.com>
* src/nautilus-index-tabs.c,h:
added visibility property to tabs, improved drawing and layout,
added title mode for title tab on top
* src/ntl-index-panel.c
made it allocate title tab and use it
made clicking on tabs activate the proper view
2000-02-10 John Sullivan <sullivan@eazel.com>
* libnautilus/nautilus-icons-view-icon-item.c:
(draw_or_measure_text): Removed : from the set of breakable
characters, so times won't get broken in two.
2000-02-10 Elliot Lee <sopwith@redhat.com>
* src/ntl-window.c: Set hpaned position for Darin's sanity.
* src/ntl-window-state.c: Handle view loading failure properly.
2000-02-10 Darin Adler <darin@eazel.com>
* ntl-window-msgs.c: (nautilus_window_has_really_changed):
Check GTK_OBJECT_DESTROYED to handle the case of a view
that self-destructs.
2000-02-10 Darin Adler <darin@eazel.com>
* nautilus-index-tabs.c: (draw_or_hit_test_all_tabs):
Fix so it doesn't try to create a GC when hit testing
a tab. This gets rid of critical errors people were
running into.
2000-02-10 John Sullivan <sullivan@eazel.com>
* libnautilus/nautilus-directory.c:
(nautilus_file_get_owner_as_string): New function
(nautilus_file_get_group_as_string): New function
(nautilus_file_get_permissions_as_string): New function
(nautilus_file_get_string_attribute): Now supports
"owner", "group", and "permissions" string attributes.
* src/file-manager/fm-icon-text-window.c:
Now includes "owner", "group", and "permissions" among the
choices to display under an icon.
2000-02-10 Elliot Lee <sopwith@redhat.com>
* src/ntl-main.c: Add "Bonobo" to list of log domains to catch.
* src/ntl-window.c: Do proper UIH setup for the menubar and
toolbar. Also switch to using the hpaned temporarily, to be able
to see/manipulate all the meta views.
* components/history/ntl-history-view.c: Implement client side of
menu merging properly.
2000-02-10 John Sullivan <sullivan@eazel.com>
Used directory item count hack when comparing by size, so
the item counts are sorted correctly. This is horribly
inefficient, but isn't actually horribly slow in most cases.
This will be fixed when we switch the item count calculation
to use the deferred-result architecture.
* libnautilus/nautilus-directory.c:
(nautilus_file_compare_by_size_with_directories): New function,
uses item count hack, as well as putting directories before
non-directories.
(nautilus_file_compare_for_sort_internal): Uses
nautilus_file_compare_by_size_with_directories to handle
directories, falls through to GnomeVFS rules for other cases.
2000-02-10 John Sullivan <sullivan@eazel.com>
Put in quick hack for showing directory item counts under icons
since "--" looks so awful. It's a hack because it blocks the
display until all directories inside this one have been
iterated. We'll change that after we've got a deferred-result
architecture in NautilusDirectory.
* libnautilus/nautilus-directory.c:
(get_directory_item_count_hack): New function to count items
in a directory. Will go away with time.
(nautilus_file_get_size_as_string): uses new hack instead of
returning "--" for directory sizes.
2000-02-09 Andy Hertzfeld <andy@eazel.com>
Completed hit-testing and activation for the index tabs. They're
usable now, but I'm leaving them off until they're more refined.
* src/nautilus-index-tabs.c:
completed hit-testing
* src/ntl-index-panel.c:
activate the appropriate metaview when the corresponding tab is clicked
2000-02-09 Andy Hertzfeld <andy@eazel.com>
More work on the index panel, still conditionally disabled;
change USE_NEW_TABS to a non-zero value if you want to check it out.
* src/nautilus-index-tabs.c,h:
improved positioning and started on hit-testing
* src/ntl-index-panel.c:
made the notebook hidden by default and added hit-testing infrastructure
* src/nautilus-zoom-control.c:
fixed incorrect comment
2000-02-09 Darin Adler <darin@eazel.com>
* fm-directory-view-icons.c:
(fm_directory_view_icons_get_full_icon_text_attribute_names):
(fm_directory_view_icons_set_full_icon_text_attribute_names):
After talking to John, removed the asserts from both of these
routines. Later, he'll figure out whether this needs refinement,
but for now we just want to avoid the abort on startup!
2000-02-09 Darin Adler <darin@eazel.com>
Reworked the canvas item class used by the icon
container. Straightened out the use of various coordinate systems
and bounds calculations and removed much unused code inherited
from the GdkPixbuf canvas item class that Andy cloned our code
from. Changed the class so it doesn't scale icons any more -- we
leave that to the icon factory so the scaled icons can be cached.
* libnautilus/gnome-icon-container-dnd.c:
* libnautilus/gnome-icon-container-private.h:
* libnautilus/gnome-icon-container.c:
* libnautilus/nautilus-icons-view-icon-item.c:
* libnautilus/nautilus-icons-view-icon-item.h:
Made extensive changes to the icon item class, including getting
rid of the "x", "y", "width", and "height" attributes, adding a
new "font" attribute, changing the "label" attribute name to "text"
to be more consistent with other canvas items, simplifying the
update logic for now (we can recomplicate it later if need be),
changing the pixbuf to have a fixed size in pixels instead of being
scaled with the pixels_per_unit and changing the pixbuf when we change
zoom levels, and other misc. cleanup.
(nautilus_icons_view_icon_item_get_arg):
Fixed bug for "label" which would return a non-strdup'd piece of text.
(draw_or_measure_text_box):
Fixed bug where width of the selection box would be based on the
length of the last line of text, not the widest, and extra GCs would
be created for each line of text.
* libnautilus/nautilus-icons-controller.h:
* libnautilus/nautilus-icons-controller.c:
(nautilus_icons_controller_get_icon_image):
* src/file-manager/fm-icons-controller.c:
(fm_icons_controller_get_icon_image):
Changed the interface so that the icons controller specifies the icon
as a NautilusScalableIcon instead of a GdkPixbuf. This lets the icon
container get the appropriate icon for size as it zooms.
* libnautilus/gdk-extensions.h:
* libnautilus/gdk-extensions.c:
(nautilus_gdk_font_equal):
Added a version of gdk_font_equal that works with NULL for the font.
Maybe we need a naming scheme for these NULL-tolerant variations on
basic calls.
* src/ntl-uri-map.c: (nautilus_navinfo_free):
* src/ntl-window-msgs.c: (nautilus_window_change_location_2):
Fixed a NULL dereference that would happen when @navi was NULL.
* libnautilus/nautilus-directory.c:
(nautilus_directory_try_to_read_metafile):
Fixed error handling for case when gnome_vfs_read fails. Fixed
error handling for case where metafile_info.size won't fit into a
size_t. Switched back to g_malloc instead of g_alloca, since the
size of a file might be too big for the stack. In the long run, we
will feed the file data directly to the XML code, so this is a bit
temporary. Removed the assert that Elliot added to help track
down the giant files sizes coming from gnome-vfs; the failure in
g_malloc will be easy to debug, unlike the failure in
g_alloca. (The assert was added without a ChangeLog entry.)
2000-02-09 John Sullivan <sullivan@eazel.com>
Fixed bug Andy found with icon-text window.
* src/file-manager/fm-icon-text-window.c:
* src/file-manager/fm-icon-text-window.h:
Removed icon_view static variable.
(changed_attributes_option_menu_cb): Removed assert that icon_view
is valid, since there's only a global setting; pass NULL as parameter
to fm_directory_view_icons_set_full_icon_text_attribute_names.
(fm_icon_text_window_set_view): Eliminated, since there's only a
global setting.
* src/file-manager/fm-directory-view-icons.c:
(customize_icon_text_cb): Removed call to fm_icon_text_window_set_view.
(fm_directory_view_icons_get_full_icon_text_attribute_names),
(fm_directory_view_icons_set_full_icon_text_attribute_names):
Clarified comments, and added assertion that no particular
viewer was specified.
2000-02-09 Elliot Lee <sopwith@redhat.com>
* libnautilus/bonobo-stream-vfs.[ch]: Implement truncate.
* src/nautilus-zoom-control.c: Use GINT_TO_POINTER and GPOINTER_TO_INT macros
for "proper" int <-> pointer conversion.
2000-02-09 John Sullivan <sullivan@eazel.com>
* src/file-manager/fm-icon-text-window.c:
(get_attribute_index_from_option_menu): New helper function.
(ensure_unique_attributes): New function, makes sure that no
two option menus in this window have same value.
(is_in_chosen_values): New function, used by ensure_unique_attributes.
(get_chosen_attribute_name): Use get_attribute_index_from_option_menu.
(changed_attributes_option_menu_cb): Reworked to use array of
option menus; also calls ensure_unique_attributes so the user can't
set more than one of the menus to the same value (new one wins, old
one gets set to first unused value).
(create_attributes_option_menu): Now takes menu_number parameter,
which is passed to item-activation callback.
(create_icon_text_window): Reworked to use array of option menus;
renamed all glade-invented variable names to sensible ones.
* src/file-manager/fm-directory-view-icons.c:
(fm_directory_view_icons_append_background_context_menu_items):
Added a separator before "Customize Icon Text...", since by acting
globally rather than on the viewed directory it's conceptually in a
different class than the other menu items. It may move out of this
menu entirely someday.
* libnautilus/nautilus-directory.c:
(nautilus_file_get_size_as_string): Back to using "--" for directories,
so there's no blank line. We want to use item counts here, but I've
postponed implementing that feature.
(nautilus_file_get_type_as_string): Made files with no mime type
return "unknown type" at Andy's suggestion.
(nautilus_file_compare_by_type): New function, needed to compare
nautilus-generated type strings (can't use GnomeVFS comparison function).
2000-02-09 Elliot Lee <sopwith@redhat.com>
* src/ntl-view-bonobo-control.c: In notify_location_change, send
progress back (because the Bonobo control, which might be the
content view, can't do it).
* src/ntl-view-bonobo-subdoc.c: As above, plus don't use
PersistFile interface, plus use bonobo-stream-vfs instead of
bonobo-stream-fs.
* src/ntl-uri-map.c: If no content type is found, default to text/plain.
* libnautilus/bonobo-stream-vfs.[ch], libnautilus/Makefile.am:
Initial implementation of bonobo streams in terms of Gnome VFS.
2000-02-09 Maciej Stachowiak <mjs@eazel.com>
* src/ntl-meta-view.c: To avoid a bug which caused parts of the
destroy function calling chain to be skipped, remove the destroy
function. In the process, switch over to using the boilerplate
generation macros from nautilus-gtk-macros.h
2000-02-08 Andy Hertzfeld <andy@eazel.com>
More work on the index tabs; they're drawing properly now but they're
still not ready to be left hooked up.
* src/nautilus-index-tabs.c:
made the index tabs draw properly
* src/nautilus-index-panel.c:
install the new index tabs if the USE_NEW_TABS define is set; it's
not by default
* icons/tableft.png, icons/tabright.png:
added alpha channel to edge pixmaps so they can draw non-rectangular
2000-02-08 John Sullivan <sullivan@eazel.com>
Tweaked the appearance of the icon-text choosing window.
Still not quite laid out right, but it's closer.
* src/file-manager/fm-icon-text-window.c:
(create_attributes_option_menu): Center the text in the menu items.
(create_icon_text_window): Change expand parameter for vertical
box so option menus are only as wide as they need to be.
2000-02-08 John Sullivan <sullivan@eazel.com>
Completed first cut at icon-text-choosing UI.
Choose "Customize Icon Text..." from context menu in icon view to try.
Still doesn't save global setting across sessions; awaiting
more of a Preferences framework for that.
* src/file-manager/fm-signaller.h: New file.
* src/file-manager/fm-signaller.c: New file, manages object that acts
as a central place for file manager objects to register with and
broadcast signals, without having to wire specific objects together.
* src/file-manager/Makefile.am: Added these two new files to the build.
* src/file-manager/fm-directory-view-icons.h:
(fm_directory_view_icons_set_full_icon_text_attribute_names): Removed the
set_default parameter; for now at least, the text beneath icons is only
changeable on a global basis.
* src/file-manager/fm-directory-view-icons.c:
(icon_text_changed_cb): New function, tells GnomeIconContainer to
update all its icons.
(fm_directory_view_icons_initialize): Connect with FMSignaller's
"icon_text_changed" signal, so all windows will be updated.
(fm_directory_view_icons_set_full_icon_text_attribute_names):
Removed the set_default parameter; also tell FMSignaller to emit
"icon_text_changed".
* src/file-manager/fm-icon-text-window.c:
Completely reworked. Window used to contain three radio buttons for
pre-defined orderings of size/type/date_modified. Now window contains
three option menus, each with all available text attributes (except
name, which is hardwired to always go first). Selecting from any of
the option menus instantly updates all directory views.
* libnautilus/nautilus-directory.c:
defined private typedef enum NautilusDateType.
(nautilus_file_get_date_as_string): Added NautilusDateType parameter,
which chooses between the three available file dates (modified, changed,
accessed).
(nautilus_file_get_string_attribute): Now handles all three date types.
2000-02-08 John Sullivan <sullivan@eazel.com>
* configure.in: turned -Werror back on. It had been turned off a
few days ago, presumably accidentally.
* src/nautilus-index-tabs.c: (draw_one_tab): #if-0'ed this
currently unused function out since -Werror doesn't like unused functions.
2000-02-08 Elliot Lee <sopwith@redhat.com>
* src/ntl-window-msgs.c: Don't segfault if an error occurs while loading the start page.
2000-02-07 John Sullivan <sullivan@eazel.com>
Switching which info appears in icon labels is now demoable.
Choose "Customize Icon Text..." from context menu in icon view to try.
Next I'll make a decent UI for it.
* libnautilus/gnome-icon-container.h:
(gnome_icon_container_request_update_all): New function.
* libnautilus/gnome-icon-container.c:
(gnome_icon_container_request_update_all): New function, tells
the container to get fresh text & image for each icon.
(request_update_one): Renamed, was synch_icon_with_controller
(gnome_icon_container_set_zoom_level): Extracted code from which
to form request_update_all, which this now calls.
* src/file-manager/fm-directory-view.h:
(append_background_context_menu_items): New signal, lets subclasses
append (or otherwise modify) items to background context menu.
* src/file-manager/fm-directory-view.c:
Add enum entry for APPEND_BACKGROUND_CONTEXT_MENU_ITEMS
(fm_directory_view_initialize_class): Create new signal, and assign
function pointer.
(fm_directory_view_real_append_background_context_menu_items): Renamed
from append_background_items, now that it's a default signal handler.
(append_item_context_menu_items): New function, broke code out from
create_item_context_menu. This may have an associated signal also someday,
but not yet.
(fm_directory_view_append_background_context_menu_items): New function,
emits "append_background_context_menu_items" signal.
(create_item_context_menu): Broke out append_item_context_menu_items, and
now calls fm_directory_view_append_background_context_menu_items.
(create_background_context_menu): Now calls
fm_directory_view_append_background_context_menu_items.
* src/file-manager/fm-directory-view-icons.h:
(fm_directory_view_icons_set_full_icon_text_attribute_names),
(fm_directory_view_icons_get_full_icon_text_attrubute_names): New functions.
* src/file-manager/fm-directory-view-icons.c:
(fm_directory_view_icons_initialize_class): Replaces function
pointer for append_background_context_menu_items.
(customize_icon_text_cb): New function, shows icon-text-customizing window.
(fm_directory_view_icons_append_background_context_menu_items): New
function, appends a "Customize Icon Text..." item to context menu, which
when selected calls customize_icon_text_cb.
(fm_directory_view_icons_set_full_icon_text_attribute_names): New function,
sets a new order in which to display icon text, and forces an update.
(fm_directory_view_icons_get_full_icon_text_attrubute_names): New function,
returns the order in which to display icon text.
(fm_directory_view_icons_get_icon_text_attribute_names): Reworked to
return a substring of the full string, based on zoom level.
* src/file-manager/fm-icon-text-window.h: New file
* src/file-manager/fm-icon-text-window.c: New file, handles creating
and maintaining state for window from which user chooses text to
display beneath icons.
* src/file-manager/Makefile.am: Build these two new files.
* src/nautilus-bookmarks-window.c:
(create_bookmarks_window): Capitalized "Nautilus" in window title.
2000-02-07 Andy Hertzfeld <andy@eazel.com>
first cut at real tabs for index panel, still incomplete and not
hooked up yet, but will be soon.
* icons/tableft.png, tabright.png:
small pixmaps for nice rounded edges for the tabs
* icons/Makefile.am
added tableft.png and tabright.png
* src/nautilus-index-tabs.c,h
new class for drawing the index tabs
* src/Makefile.am
added index-tabs class to build
2000-02-07 Elliot Lee <sopwith@redhat.com>
* idl/*.idl: Include the .idl files of other modules that we use.
* libnautilus/Makefile.am, src/Makefile.am, src/file-manager/Makefile.am:
Define -D_REENTRANT, just in case.
* src/file-manager/Makefile.am: Add cflags for .idl compilation.
* components/help/Makefile.am: Build converters. Stop installing
the now-unneeded .schemes file.
* components/websearch/ntl-web-search.c: Get rid of
gnome_button_can_default()
* libnautilus/nautilus-icons-view-icon-item.c: Get rid of missing
prototypes and associated warnings by including needed headers.
* src/ntl-types.h, src/ntl-uri-map.[ch], src/ntl-window.h,
src/ntl-window-msgs.c: Remove scheme mapping functionality (now
done in gnome-vfs). Use asynchronous version of get_file_info.
2000-02-04 John Sullivan <sullivan@eazel.com>
Zooming now shows different information at different
zoom levels. Currently uses hardwired pattern. Next
I'll make the pattern configurable.
* src/file-manager/fm-directory-view-icons.c:
* src/file-manager/fm-directory-view-icons.h:
(fm_directory_view_icons_get_icon_text_attribute_names):
New function, returns set of attribute names representing
text to appear in icon label. The set varies depending on
zoom level, but is otherwise currently hardwired.
* src/file-manager/fm-icons-controller.c:
(fm_icons_controller_get_text): Now gets attribute names
from icon view, then creates & returns a newline-delimited
string using nautilus_file_get_string_attribute.
* libnautilus/gnome-icon-container.c:
(synch_icon_with_controller): New function, reinstalls item's
label and image.
(icon_new): Reworked to call synch_icon_with_controller.
(gnome_icon_container_set_zoom_level): Now iterates through the
icons, calling synch_icon_with_controller so text (and, later, image)
is updated when zoom level changes.
* libnautilus/nautilus-directory.c:
(nautilus_file_get_size_as_string): Changed to return empty
string instead of "--" for directories, because this looked
better in icon view. Might change list view back to use "--"
later.
* libnautilus/nautilus-icons-view-icon-item.c:
(draw_or_measure_text_box): Made it display blank lines
instead of collapsing them out.
(nautilus_icons_view_icon_item_draw): Took out special case
for not showing text at tiniest zoom level. This is now handled
the same way as the other levels.
2000-02-04 Darin Adler <darin@eazel.com>
Make optimized builds succeed.
* configure.in: Turn off uninitialized variable warnings.
At some point, we should turn these off only for the ORBit-
generated stub files, since they are meaningful and useful in
other files. For now, though, since we use -Werror, we need be
sure these warnings don't cause trouble for people who do
optimized builds.
* src/ntl-main.c (main): Added GnomeUI to the list of domains
to "stop on warning/critical".
2000-02-04 John Sullivan <sullivan@eazel.com>
Some renaming and reorganization heading towards supporting
icons with more info in label at higher zoom levels.
* libnautilus/nautilus-icons-controller.c:
* libnautilus/nautilus-icons-controller.h:
(nautilus_icons_controller_get_icon_name): Renamed to
nautilus_icons_controller_get_icon_text since it won't always
just be the name.
* src/file-manager/fm-icons-controller.c:
(fm_icons_controller_get_icon_name): Renamed to
fm_icons_controller_get_icon_text to match.
* libnautilus/gnome-icon-container.c:
(icon_new): Updated for name change.
* libnautilus/nautilus-directory.c:
* libnautilus/nautilus-directory.h:
(nautilus_file_get_string_attribute): New function, consolidates
nautilus_file_get_date_as_string, nautilus_file_get_size_as_string,
and nautilus_file_get_type_as_string (and more to come). These old
functions are now private.
* src/file-manager/fm-directory-view-list.c:
Changed column-identifying strings stored in metadata to be attribute
names recognized by nautilus_file_get_string_attribute. Added
LIST_VIEW_DEFAULT_SORTING_ATTRIBUTE.
(get_column_from_metadata_value): Renamed to get_column_from_attribute
(get_metadata_value_from_column): Renamed to get_attribute_from_column
(get_sort_column_from_attribute): New function, handles unknown attributes
by using LIST_VIEW_DEFAULT_SORTING_ATTRIBUTE.
(add_to_flist): Rewrote to use column attributes and nautilus_file_
get_string_attribute.
(fm_directory_view_list_begin_loading): Now calls get_sort_column_
from_attribute to handle the case where saved sorting attribute is unknown.
2000-02-04 Ettore Perazzoli <ettore@helixcode.com>
* components/html/Makefile.am: Use `GTKHTML_LIBS' and
`GTKHTML_CFLAGS'.
* configure.in: Added a GtkHTML test. If GtkHTML is not
installed, abort. Otherwise, set `GTKHTML_LIBS' and
`GTKHTML_CFLAGS' to the appropriate values to compile and link
with GtkHTML.
2000-02-04 John Sullivan <sullivan@eazel.com>
* libnautilus/nautilus-icon-factory.c:
(nautilus_icon_factory_scale): Changed back to ART_FILTER_BILINEAR
once again after jrb & federico both pointed out that the
black-scaled-icons problem should be fixed (and was) in the latest
gdk-pixbuf.
2000-02-03 Andy Hertzfeld <andy@eazel.com>
* src/nautilus-zoom-control.c:
made clicking in the middle set zoom to 100%;
made right-clicking on the control bring up a context menu allowing
you to select any of the available choices
2000-02-03 Jonathan Blandford <jrb@redhat.com>
* configure.in: added
components/help/converters/gnome-db2html2/Makefile to the list.
2000-02-03 John Sullivan <sullivan@eazel.com>
* libnautilus/nautilus-icon-factory.c:
(nautilus_icon_factory_scale): Changed back to ART_FILTER_NEAREST
because ART_FILTER_BILINEAR caused scaled icons in list view &
bookmarks menu to appear nearly black.
* libnautilus/nautilus-icons-view-icon-item.c:
(draw_or_measure_text_box): Renamed from nautilus_icons_view_draw_text_box
for clarity.
(nautilus_icons_view_draw_text_box): New cover for draw_or_measure_text_box,
with fewer parameters.
(nautilus_icons_view_measure_text_box): New cover for
draw_or_measure_text_box, with fewer parameters.
(nautilus_icons_view_icon_item_update): Now calls
nautilus_icons_view_measure_text_box.
(nautilus_icons_view_icon_item_draw): Removed extra parameter from call
to nautilus_icons_view_draw_text_box.
(draw_or_measure_text_box): Took out special case for one-line labels,
after measuring to determine that it wasn't making a significant speed
difference. It had bugs with baseline alignment and made updating the
code tricky. Added support for carriage returns in icon labels, by
looping through the measuring code for each carriage-return-delimited
piece. (I tested this with temporary code, so there are no current
carriage-return cases, but there will be soon.)
2000-02-02 Andy Hertzfeld <andy@eazel.com>
* src/nautilus-zoom-control.c:
fixed bug where the zoom size wasn't updating properly by overriding
expose. Also, disable the appropriate arrow at min and max zoom levels
* icons/nautilus3.jpg:
crassly slapped our logo on the nautilus image
2000-02-02 Elliot Lee <sopwith@redhat.com>
* src/ntl-window-msgs.c: If an error happens, we need to reset the
location bar to current location, in case the location change
happened via a drop on the location bar.
* src/file-manager/fm-directory-view.c: Consensus is to use
individual headers rather than catch-alls.
* libnautilus/gnome-icon-container-dnd.c,
libnautilus/nautilus-icons-view-icon-item.c,
libnautilus/nautilus-icon-factory.c: Use bilinear scaling - almost
as fast, much nicer looking.
2000-02-02 Darin Adler <darin@eazel.com>
(on John Sullivan's machine)
* libnautilus/nautilus-directory.c:
(nautilus_directory_get): Changed a ! to a == NULL
(nautilus_directory_start_monitoring): Bail out if directory
is already loaded; this fixes bug where switching views added
an item each time.
2000-02-02 Andy Hertzfeld <andy@eazel.com>
added a zoom control to location bar, not yet wired up to the content view
* icons/Makefile.am:
* icons/zoom.png:
added zoom image for use in zoom control
* src/nautilus-zoom-control.h:
* src/nautilus-zoom-control.c:
* src/Makefile.am
new zoom control widget
* src/ntl-window.c:
added zoom control to location bar
2000-02-01 Darin Adler <darin@eazel.com>
* libnautilus/nautilus-icon-factory.h:
* libnautilus/nautilus-icon-factory.c:
(nautilus_icon_factory_new):
(nautilus_icon_factory_destroy):
(nautilus_get_current_icon_factory):
(nautilus_icon_factory_get_icon_for_file):
(nautilus_icon_factory_set_theme):
(nautilus_icon_factory_get_icon_by_name):
(nautilus_icon_factory_get_pixbuf_for_icon):
(nautilus_scalable_icon_ref):
(nautilus_scalable_icon_unref):
(nautilus_scalable_icon_get_name):
(scalable_icon_get):
(icon_set_possibly_free):
(scalable_icon_new):
Changed the icon factory interface in a few ways: 1) There's no
longer a NautilusIconFactory object. There's just a single global
icon factory. If we find that we need multiple factories, we can
implement that later. 2) Instead of going straight from a file to
a pixbuf, you get a scalable icon, and then get a pixbuf from
that. This allows you to choose the icon and then get
different-sized versions of it without going through the icon
selection process over and over again. There's also a name for
each icon which can be stored in the metafile so you can get the
same icon again before you have full information on a file.
* src/nautilus-bookmark.c:
(nautilus_bookmark_get_pixmap_and_mask):
* src/file-manager/fm-directory-view-list.c:
(install_icon):
* src/file-manager/fm-icons-controller.c:
(fm_icons_controller_get_icon_image):
Changed icon factory clients to use the new interface. Maybe
after a while I'll add a convenience function that's as simple as
the old interface was for the common case where you want to go
straight to the pixbuf, but lets try it this way for a while.
* libnautilus/nautilus-string.h:
* libnautilus/nautilus-string.c:
(nautilus_has_prefix):
Added nautilus_has_prefix. This checks to see if a string has a
particular prefix. It's both clearer to read and more efficient
than Andy's typical trick of calling strstr.
* libnautilus/nautilus-lib-self-check-functions.h:
* libnautilus/nautilus-string.c:
Added self-checks for nautilus-string.c. The tests uncovered a
bug in nautilus_string_to_int that I fixed.
* nautilus-glib-extensions.c:
Just a stray new-line.
2000-02-01 John Sullivan <sullivan@eazel.com>
Fixed bug where selection info didn't appear in the status bar when
Select All was performed in the list view.
* libnautilus/gtkflist.c:
(select_or_unselect_row_cb): New function, emits SELECTION_CHANGED
signal.
(gtk_flist_initialize): Connect parent class's "select_row" and
"unselect_row" signals to select_or_unselect_row_cb.
(select_row): Remove emission of SELECTION_CHANGED signal here since
it's now handled at the correct bottleneck.
2000-02-01 Darin Adler <darin@eazel.com>
Started work on icon stretching. In the process, I am doing some
cleanup on the icon container, and I am checking in some of that
before the stretching is implemented.
* libnautilus/gnome-icon-container-private.h:
* libnautilus/gnome-icon-container.c:
(icon_is_in_region):
Got rid of width and height stored in each icon.
* libnautilus/gnome-icon-container.c:
A lot of cleanup, including getting rid of the
icon_get_text_bounding_box function.
* libnautilus/gnome-icon-container.c:
(gnome_icon_container_begin_stretch):
(gnome_icon_container_stretch):
(gnome_icon_container_end_stretch):
(button_release_event):
(motion_notify_event):
(handle_icon_button_press):
First cut at adding stretching hooks in button handlers.
* libnautilus/nautilus-icons-view-icon-item.c:
(nautilus_icons_view_draw_text_box):
Rewrote to fix bug with position of text when it's too long for
a single line.
* libnautilus/nautilus-glib-extensions.h:
Added a macro named NAUTILUS_N_ELEMENTS.
src/ntl-index-panel.c:
src/explorer-location-bar.c:
libnautilus/gtkflist.c:
Used the NAUTILUS_N_ELEMENTS macro.
2000-01-31 Andy Hertzfeld <andy@eazel.com>
made the keyboard selection rectangle work again. It's no longer a
separate canvas object, but rather a state reflected by the icon_item
like regular selection
* libnautilus/gnome-icon-container-private.h:
removed the kdb_navigation_item field
* libnautilus/gnome-icon-container.c:
removed code that manipulated the kbd_navigation_item, replaced
with setting and clearing the "alt_selection" item attribute
* libnautilus/nautilus-icons-view-icon-item.c:
if the alt_selected attribute is set, frame the item's text with
a gray-stippled rectangle
2000-01-31 John Sullivan <sullivan@eazel.com>
Now saves/restores zoom level in icon & list views, and
sort column & direction in list view.
* nautilus-metadata.h: New #defines for ICON_VIEW_ZOOM_LEVEL_METADATA_KEY,
LIST_VIEW_ZOOM_LEVEL_METADATA_KEY, LIST_VIEW_SORT_COLUMN_METADATA_KEY,
LIST_VIEW_SORT_REVERSED_METADATA_KEY.
* src/file-manager/fm-directory-view.c:
(fm_directory_view_load_uri): Now emits the BEGIN_LOADING signal. This
signal was already defined but its use had been removed.
* src/file-manager/fm-directory-view-icons.c:
(fm_directory_view_icons_set_zoom_level): Stores new zoom level in
the metadata.
(fm_directory_view_icons_begin_loading): Sets zoom level to the one
read from the metadata.
* src/file-manager/fm-directory-view-list.c:
Created #defines for column names stored in metadata.
(get_metadata_value_from_column), (get_column_from_metadata_value):
Helper functions for converting between column number and string to
store in metadata.
(fm_directory_view_list_begin_loading): New function: sets zoom level,
sort column, and sort direction to the values read from the metadata.
(fm_directory_view_initialize_class): Wire up begin_loading function
pointer.
(fm_directory_view_initialize): Change initial value of sort column
to LIST_VIEW_COLUMN_NONE, so when it changes later the right updating
will occur.
(compare_rows): Added another g_return_val_if_fail condition.
(create_flist): Removed some of the sorting set-up; it is now done
in begin_loading instead.
(fm_directory_view_list_set_zoom_level): Stores new zoom level in
the metadata.
(fm_directory_view_list_sort_items): Stores new sort column and
direction in metadata.
2000-01-31 Andy Hertzfeld <andy@eazel.com>
implemented the "select all" command in the context menus
* src/file-manager/directory_view.c,h:
added a directory_view_select_all slot for subclasses to override,
enabled "select all" item and attached a signal to the item, whose
callback calls fm_directory_view_select_all
* src/file-manager/directory_view_icons.c:
implemented directory_view_icons_select_all by invoking the "select all"
operation of GnomeIconContainer.
* src/file-manager/directory_view_list.c:
implemented directory_view_list_select_all by invoking the "select all"
operation of the clist widget
2000-01-31 Elliot Lee <sopwith@redhat.com>
* src/ntl-window-msgs.c, src/ntl-window-private.h: Update debugging messages. Allow
synchronous state changes (needed to avoid race conditions), and
don't reset the idle handler if the idle handler is already running.
* src/file-manager/fm-directory-view.c: Include
<libnautilus/libnautilus.h> rather than just
<libnautilus/nautilus-alloc.h> - nitpick in passing.
* src/ntl-uri-map.c: OK, don't check for NULL here, in an attempt to flush out bugs elsewhere.
2000-01-31 Darin Adler <darin@eazel.com>
* nautilus-icons-view-icon-item.c:
(nautilus_icons_view_draw_text_box):
Changed it to not attempt to create a GC just to measure the text.
This makes it work when the widget is not realized.
* nautilus-icons-view-icon-item.h:
nautilus-icons-view-icon-item.c:
gnome-icon-container-dnd.c:
(nautilus_icons_view_icon_item_center_offset):
Changed the parameter type to NautilusIconsViewIconItem.
* fm-directory-view.c:
(stop_load):
(fm_directory_view_load_uri):
Fixed code so that if you stop loading more than once, or
stop before you even start, it won't send extra progress
requests to the Nautilus shell or call stop_monitoring
extra times on the NautilusDirectory object.
* nautilus-icons-view-icon-item.h:
nautilus-icons-view-icon-item.c:
gnome-icon-container-dnd.c:
Quick cleanup of the new NautilusIconsViewIconItem class.
* libnautilus/gdk-extensions.c:
libnautilus/gnome-icon-container-dnd.c:
libnautilus/gnome-icon-container.c:
libnautilus/gtkflist.c:
libnautilus/nautilus-background-canvas-group.c:
libnautilus/nautilus-background.c:
libnautilus/nautilus-debug.c:
libnautilus/nautilus-default-file-icon.c:
libnautilus/nautilus-directory.c:
libnautilus/nautilus-icon-factory.c:
libnautilus/nautilus-icons-controller.c:
libnautilus/nautilus-icons-view-icon-item.c:
libnautilus/nautilus-lib-self-check-functions.c:
libnautilus/nautilus-self-checks.c:
libnautilus/nautilus-string.c:
src/explorer-location-bar.c:
src/file-manager/dfos-corba.c:
src/file-manager/dfos-xfer-progress-dialog.c:
src/file-manager/dfos-xfer.c:
src/file-manager/dfos.c:
src/file-manager/fm-directory-view-icons.c:
src/file-manager/fm-directory-view-list.c:
src/file-manager/fm-directory-view.c:
src/file-manager/fm-icons-controller.c:
src/file-manager/fm-main.c:
src/nautilus-self-check-functions.c:
src/ntl-index-panel.c:
Got rid of #ifdef HAVE_CONFIG_H. Elliot says that we must always
include <config.h>, but there's no reason to include that ifdef
since we don't plan on building without a <config.h> ever.
2000-01-31 Andy Hertzfeld <andy@eazel.com>
* libnautilus/gnome-icon-container-dnd.c:
fixed bug where icons were horizontally mis-positioned after dragging;
fixed by taking the center offset into account
2000-01-31 John Sullivan <sullivan@eazel.com>
* libnautilus/nautilus-directory.h:
* libnautilus/nautilus-directory.c:
(nautilus_directory_get_boolean_metadata),
(nautilus_directory_set_boolean_metadata),
(nautilus_directory_get_integer_metadata),
(nautilus_directory_set_integer_metadata): New convenience functions
for getting/setting metadata that's naturally in boolean or integer form.
I'll be adding clients for these next.
2000-01-31 Darin Adler <darin@eazel.com>
NautilusDirectory is now in charge of loading directories.
FMDirectoryView has been relieved of that responsibility.
* nautilus-directory.h:
nautilus-directory.c:
(nautilus_directory_start_monitoring):
(nautilus_directory_stop_monitoring):
(nautilus_directory_is_ready_for_layout):
(nautilus_directory_new_file):
(nautilus_directory_are_all_files_seen):
Added monitoring API that's used to read the contents of
a directory. Made nautilus_directory_new_file private since
we now use the monitoring API instead.
* fm-directory-view.c:
(fm_directory_view_initialize):
(stop_load):
(display_pending_entries):
(display_pending_files):
(display_pending_idle_cb):
(display_timeout_cb):
(display_pending_timeout_cb):
(directory_load_cb):
(schedule_idle_display_of_pending_files):
(schedule_timeout_display_of_pending_files):
(unschedule_idle_display_of_pending_files):
(unschedule_timeout_display_of_pending_files):
(unschedule_display_of_pending_files):
(add_files_cb):
(fm_directory_view_activate_entry):
(fm_directory_view_load_uri):
(disconnect_model_handlers):
(fm_directory_view_stop):
Changed to use monitoring instead of directly calling
gnome_vfs_async_load_directory directly.
* fm-directory-view.c:
(update_zoom_menu_items):
(zoom_in_cb):
(zoom_out_cb):
(pop_up_context_menu):
(pop_up_temporary_context_menu):
(append_background_items):
(create_background_context_menu):
(fm_directory_view_popup_item_context_menu):
(fm_directory_view_popup_background_context_menu):
Changed to re-created background menu each time instead of
keeping a single global menu up to date. This is simpler, and
the imperceptible additional delay from recreating the menu
each time should not be a problem.
* ntl-window.c: (nautilus_window_up):
ntl-map.c: (nautilus_navinfo_new):
Handle the case where the current URI is NULL.
* fm-directory-view-icons.c: (create_icon_container):
Removed the leftover puts calls in here.
This gets rid of "A", "B", "C" on each start of nautilus.
2000-01-31 John Sullivan <sullivan@eazel.com>
Put all metadata keys in a central place so we can keep
track of them.
* libnautilus/nautilus-metadata.h: New file, contains
#defines for all the metadata keys currently in use.
* libnautilus/Makefile.am: add nautilus-metadata.h to list of headers.
* src/ntl-index-panel.c:
* src/file-manager/fm-directory-view-icons.c:
* src/file-manager/fm-directory-view-list.c:
Update all non-test callers of nautilus_directory_get_metadata and
nautilus_directory_set_metadata to use new #defines
2000-01-31 John Sullivan <sullivan@eazel.com>
Improved zooming API and made zoom items on item context
menu disable properly. (There's still a bug with disabling
the background menu if an item menu ever appears; Darin will
fix this in his next checkin.)
* src/file-manager/fm-directory-view.c:
* src/file-manager/fm-directory-view.h:
(can_zoom_in), (can_zoom_out): New function pointers for subclasses
to replace.
(fm_directory_view_can_zoom_in), (fm_directory_view_can_zoom_out):
New functions that call through to the new function pointers.
(bump_zoom_level), (fm_directory_view_bump_zoom_level):
Removed return value in favor of new functions.
(update_zoom_menu_items): Helper function to update sensitivity of
background context menu Zoom In and Zoom Out items. Darin will eliminate
this with his next checkin.
(zoom_in_cb), (zoom_out_cb): Now use update_zoom_menu_items to share code.
(append_background_items): Set sensitivity of Zoom In and Zoom Out items
at creation time.
* src/file-manager/fm-directory-view-list.c:
(fm_directory_view_list_bump_zoom_level): Removed return value.
(fm_directory_view_list_can_zoom_in), (fm_directory_view_list_can_zoom_out):
New functions, compare current zoom level against limits.
(fm_directory_view_list_get_zoom_level),
(fm_directory_view_list_set_zoom_level): New convenience functions,
deployed throughout this file.
(fm_directory_view_list_initialize_class): Replace can_zoom_in and
can_zoom_out function pointers.
* src/file-manager/fm-directory-view-icons.c:
(fm_directory_view_icons_bump_zoom_level): Removed return value.
(fm_directory_view_icons_can_zoom_in), (fm_directory_view_icons_can_zoom_out):
New functions, compare current zoom level against limits.
(fm_directory_view_icons_get_zoom_level): New convenience function,
deployed throughout this file.
(fm_directory_view_icons_initialize_class): Replace can_zoom_in and
can_zoom_out function pointers.
2000-01-30 Andy Hertzfeld <andy@eazel.com>
made fonts scale according to the zoom level:
* libnautilus/gnome-icon-container-private.h:
replaced label font with array of fonts
* libnautilus/gnome-icon-container.c:
load a font for each zoom level
* libnautilus/nautilus_icons_view_icon_item:c
use a font selected by the zoom level
enabled/disabled zoom items as necessary in context menu:
* src/file-manager/fm-directory-view-icons.c:
made bump_zoom_level return a boolean indicating if it can zoom further
* src/file-manager/fm-directory-view-list.c:
made bump_zoom_level return a boolean indicating if it can zoom further
* src/file-manager/fm-directory-view-list.c:
enable/disable items in zoom level according to the passed-back booleans
2000-01-28 Andy Hertzfeld <andy@eazel.com>
* libnautilus/gnome-icon-container-dnd.c:
made shadow rectangles track icons properly by adding in the center offset
2000-01-28 John Sullivan <sullivan@eazel.com>
A little zoom cleanup:
* libnautilus/gnome-icon-container-private.h: #include
nautilus-icon-factory.h and remove copy of NautilusZoomLevel enum.
* libnautilus/gnome-icon-container.c:
(gnome_icon_container_set_zoom_level): Now uses ratios of standard
NAUTILUS_ICON_SIZEs to compute canvas pixels/unit instead of locally
storing ratios.
* libnautilus/nautilus-icon-factory.h:
Changed pixel sizes of some NAUTILUS_ICON_SIZE #defines to match
the ratios formerly used in gnome-icon-container.c
Added icons to bookmarks menu and window:
* libnautilus/nautilus-directory.c: (nautilus_file_get): Changed
options passed to gnome_vfs_get_file_info to match those used in
directory view; this causes the mime type to be read so the custom
image icon can appear.
* src/nautilus-bookmark.c:
* src/nautilus-bookmark.h:
Now uses details structure to hold implementation details.
(nautilus_bookmark_get_pixmap_and_mask): New utility function to
get image suitable for use in a GtkMenuItem or GtkCList
(nautilus_bookmark_destroy): Free details structure
(init): Alloc details structure
* src/nautilus-bookmarks-menu.c:
(create_pixmap_widget_for_bookmark): New utility function to create
the kind of pixmap widget that a menu item likes.
(bookmark_menu_item_new): New utility function that returns a menu
item with bookmark's icon & name installed.
(nautilus_bookmarks_menu_repopulate): Uses bookmark_menu_item_new.
* src/nautilus-bookmarks-window.c:
Now uses #defines for the list columns (icon & name)
(create_bookmarks_window): Create one more column to hold icon;
set column width & row height taking new icon column into account.
(install_bookmark_icon): New function, installs pixmap & mask for
bookmark into GtkCList cell.
(repopulate): Fill in icon column as well as name column.
Fixed storage leaks:
* src/file-manager/fm-directory-view-icons.c:
(fm_directory_view_destroy): free details structure
* src/file-manager/fm-directory-view-list.c:
(fm_directory_view_list_destroy): free details structure
* src/file-manager/fm-directory-view.c:
(fm_directory_view_icons_destroy): free details structure; also,
don't bother setting details->icons_not_positioned to NULL since
details is about to be freed.
2000-01-28 Andy Hertzfeld <andy@eazel.com>
* libnautilus/nautilus_icons_view_icon_item.c,h:
made icons be centered in their box by adding a center_offset method
and using it where appropriate.
* libnautilus/gnome-icon-container-dnd.c:
used center_offset in drag offset calculation
2000-01-28 John Sullivan <sullivan@eazel.com>
Moved FMIconCache to libnautilus, renaming it
NautilusIconFactory at the same time. Renamed all public
and private functions accordingly.
* RENAMING: removed this finished item.
* src/file-manager/fm-default-file-icon.c: Removed file
* src/file-manager/fm-default-file-icon.h: Removed file
* src/file-manager/fm-icon-cache.c: Removed file
* src/file-manager/fm-icon-cache.h: Removed file
* src/file-manager/Makefile.am: Took out mentions of removed files.
* libnautilus/nautilus-default-file-icon.c: New file
* libnautilus/nautilus-default-file-icon.h: New file
* libnautilus/nautilus-icon-factory.c: New file
* libnautilus/nautilus-icon-factory.h: New file
* libnautilus/Makefile.am: Added new files to build.
* src/file-manager/fm-directory-view-icons.c: Took out
#include for fm-icon-cache, which was obsolete in this file.
* src/file-manager/fm-directory-view-list.c: Renamed #include
and affected function calls.
* src/file-manager/fm-icons-controller.c: Renamed #include
and affected function calls.
2000-01-28 John Sullivan <sullivan@eazel.com>
Made zooming work in directory list view. Also made
right-click menu on a directory view always include
the non-icon-specific items.
* src/file-manager/fm-icon-cache.h:
* src/file-manager/fm-icon-cache.c:
(nautilus_icon_size_for_zoom_level): New function, maps
between NautilusZoomLevel and nominal icon sizes.
* src/file-manager/fm-directory-view.c:
(append_background_items): New utility function, adds the
non-file-specific context menu items to a menu.
(create_background_context_menu): Moved most of guts to
new append_background_items, which this now calls.
(create_item_context_menu): Now adds a separator and then
calls append_background_items. This means right-clicking on
an icon will show the icon-specific commands followed by the
non-icon-specific ones. This makes the non-icon-specific ones
easier to discover and access, especially in list view where
anywhere you click in a long list gives the item's context menu.
* src/file-manager/fm-directory-view-list.c:
Now stores zoom level rather than icon size in details structure.
(fm_directory_view_list_bump_zoom_level),
(fm_directory_view_list_set_zoom_level): New functions for setting
the zoom level.
(fm_directory_view_list_initialize_class): Wire up bump_zoom_level to
slot in parent class structure.
(compare_rows), (add_to_flist): Changed mechanism that temporarily
stores pending row data to use object data rather than a static variable
so it will work with multiple list views at the same time.
(fm_directory_view_list_get_icon_size): New function, gets icon size
from zoom level stored in details structure.
(create_flist): Deploy fm_directory_view_list_get_icon_size where
details structure was examined before.
(install_icon): Removed NautilusFile and column parameters; made function
compute these internally.
2000-01-28 Elliot Lee <sopwith@redhat.com>
* components/html/ntl-web-browser.c: Remove use of gtk_html_parse() - deprecated
in latest GtkHTML.
2000-01-28 Andy Hertzfeld <andy@eazel.com>
*libnautilus/gnome-icon-container-dnd.c:
fixed dragging when zoomed by scaling the pixbuf and offsets if necessary
2000-01-27 Andy Hertzfeld <andy@eazel.com>
*libnautilus/nautilus-icons-view-icon-item.c:
some fixes to improve positioning when zoomed by multiplying by pixel_per_unit
when appropriate
2000-01-27 John Sullivan <sullivan@eazel.com>
Finished this round of sorting architecture improvements.
* libnautilus/nautilus-directory.c:
(nautilus_file_compare_for_sort_internal): Made sorting NautilusFiles
by name be case-insensitive.
* src/file-manager/fm-directory-view.h:
* src/file-manager/fm-directory-view.c:
Removed enum FMDirectoryViewSortType (replaced by recently-added
NautilusFileSortType)
(fm_directory_view_sort): Removed this function; subclasses now
must handle sorting internally.
(fm_directory_view_repopulate): Removed this function, formerly
called only by fm_directory_view_sort.
* src/file-manager/fm-directory-view-list.c:
(fm_directory_view_list_initialize): list_view->details->sort_column
now starts out at LIST_VIEW_COLUMN_NAME.
(compare_rows): New function to compare rows for sorting GtkCList-style.
(create_flist): Set up GtkCList sorting mechanism; formerly I had been
ignoring it (unaware) and handling sorting from scratch.
(add_to_flist): Don't assume that newly-added item will be at end; also
add hack to make pending row data accessible to compare function.
(sort_criterion_from_column): New function, broken out of
fm_directory_view_list_sort_items.
(fm_directory_view_list_sort_items): Broke out sort criterion choosing,
now uses GtkCList-style sorting instead of asking FMDirectoryView to sort.
(install_icon): Added a couple more g_return_if_fails.
2000-01-27 Darin Adler <darin@eazel.com>
* src/ntl-app.c: Added missing includes to get it to compile.
* components/help/converters/.cvsignore:
components/help/converters/gnome-info2html2/.cvsignore:
components/help/converters/gnome-man2html2/.cvsignore:
Added Makefile.
2000-01-27 Maciej Stachowiak <mjs@eazel.com>
* src/Makefile.am, src/nautilus.goad, src/ntl-app.c,
src/file-manager/Makefile.am: Made the file manager component
statically linked in again.
* src/file-manager/ntl-file-manager.goad: Removed.
2000-01-27 Elliot Lee <sopwith@redhat.com>
* configure.in: Add components/help/converters/* makefiles.
* libnautilus/nautilus-directory.c: Check for NULL directory
result before doing stuff with it.
* src/ntl-index-panel.c: Ditto.
* src/ntl-prefs.c: Add help browser nav tree to list of possibilities.
* src/ntl-window-msgs.c: Handle non-VFS-handleable URIs correctly WRT 'up' button.
2000-01-27 Andy Hertzfeld <andy@eazel.com>
* libnautilus/nautilus-icons-view-icon-item.c:
made the canvas item respect the scale factor by removing code in
compute_viewport_affine that was defeating it. There's still a
bunch more to do to make it right for non-unity scale factors, but
at least we can start that now.
2000-01-27 Andy Hertzfeld <andy@eazel.com>
hooked zooming up to the background context menu; right now the canvas item
doesn't work at different zoom levels properly, which we'll fix soon.
* libnautilus/fm-directory-view.c,h:
enable zoom in and zoom out items and hooked them up to callback
added a bump_zoom_level slot, to be overriden by subclasses, which the zoom callback use
* libnautilus/fm-directory-view-icons.c:
added method for bump_zoom_index that calls the icon container to do the work
* libnautilus/gnome-icon-container-private.h:
added a private instance variable for zoom level
* libnautilus/gnome-icon-container.c,.h:
added methods for get_zoom_level and set_zoom_level
2000-01-27 Darin Adler <darin@eazel.com>
* libnautilus/gnome-icon-container.c:
(icon_select):
Fixed a bug that was causing some icons to not get
selected or unselected properly due to strangeness of
bit fields.
* libnautilus/gnome-progressive-loader.h:
libnautilus/gnome-progressive-loader.c:
libnautilus/Makefile.am:
Got rid of GnomeProgressiveLoader.
We're not going to use it.
* RENAMING: Andy added a new file that matched RENAMING,
but then I changed my mind about a renaming, spawning yet
more renaming!
* src/file-manager/fm-directory-view-icons.c:
Just tiny reformatting.
2000-01-27 John Sullivan <sullivan@eazel.com>
More work towards changing the sorting framework, and
fixed some bugs in nautilus_file_get.
* libnautilus/nautilus-directory.h:
Added NautilusFileSortType enum.
(nautilus_file_compare_for_sort): New function
(nautilus_file_compare_for_sort_reversed): New function
* libnautilus/nautilus-directory.c:
(nautilus_file_ref): New function (prototype already existed).
(nautilus_file_get): file_info had been stack variable,
but that didn't work right, so now it's xxx_new()ed.
Also ref'ed file before returning.
(nautilus_file_compare_for_sort),
(nautilus_file_compare_for_sort_reversed),
(nautilus_file_compare_for_sort_internal): New functions.
(nautilus_self_check_directory): Added some simple tests for
nautilus_file_get and nautilus_file_compare_xxx.
* src/file-manager/fm-directory-view.c:
(fm_directory_view_load_uri): Removed sort_rules that were
passed in to gnome_vfs_asynch_load_directory_uri, since they
had no effect and we're changing the sorting framework.
2000-01-27 Elliot Lee <sopwith@redhat.com>
* libnautilus/Makefile.am: Link to $(BONOBO_LIBS)
* libnautilus/gnome-icon-container.c: Include <string.h> to get
prototype for memset.
2000-01-26 Maciej Stachowiak <mjs@eazel.com>
* components/help/hyperbola-main.c,
components/help/hyperbola-nav-tree.c,
components/history/ntl-history-view.c, components/html/main.c,
components/html/ntl-web-browser.c,
components/websearch/ntl-web-search.c, idl/nautilus.idl,
libnautilus/gnome-icon-container.c,
libnautilus/gnome-progressive-loader.c,
libnautilus/gnome-progressive-loader.h, libnautilus/libnautilus.h,
libnautilus/ntl-content-view-frame.c,
libnautilus/ntl-meta-view-frame.c, libnautilus/ntl-view-frame.c,
libnautilus/ntl-view-frame.h, src/nautilus.h,
src/ntl-index-panel.c, src/ntl-view-bonobo-control.c,
src/ntl-view-bonobo-subdoc.c, src/ntl-view-frame-svr.c,
src/ntl-view-nautilus.c, src/ntl-view-private.h, src/ntl-view.c,
src/ntl-view.h, src/ntl-window.c, src/ntl-window.h,
src/file-manager/dfos-corba.h, src/file-manager/dfos-xfer.c,
src/file-manager/dfos-xfer.h, src/file-manager/fm-main.c: Build
with the recent Bonobo global renaming, and Havoc's changes. A
patch from Kjartan Maraas <kmaraas@online.no> and scripts from Nat
Friedman <nat@helixcode.com> were a very helpful starting point.
2000-01-26 Havoc Pennington <hp@pobox.com>
* src/nautilus-gconf.h, src/nautilus-gconf.c: Trivial files I'd
written before getting stuck on the OAF thing, that might be of
interest. I have some other bits I did that aren't worth checking
in, Ramiro said he's doing the prefs dialog.
2000-01-26 John Sullivan <sullivan@eazel.com>
Moved list view sort indicator to left of right-justified
columns.
* src/file-manager/fm-directory-view-list.c:
(create_flist): Marked the sort indicators with special
data/value pairs so they can be located later regardless
of view order. Made right-justified ones use pack_start
instead of pack_end.
(get_sort_indicator): Find sort indicators from special
data/value pairs rather than relying on view order.
2000-01-26 John Sullivan <sullivan@eazel.com>
A few changes in the direction of improving the directory
view sorting architecture. No visible effects yet.
* src/file-manager/fm-directory-view-icons.c:
(create_icon_container): Took out useless call to
fm_directory_view_populate().
* src/file-manager/fm-directory-view-list.c:
(fm_directory_view_list_sort_items): New function, extracted
from column_clicked_cb, that does the actual sorting.
(column_clicked_cb): Replaced actual sorting code with
call to new fm_directory_view_list_sort_items; retained
setup code.
(create_flist): Took out useless call to
fm_directory_view_populate().
* src/file-manager/fm-directory-view.h:
(fm_directory_view_populate): Removed this call from public API.
* src/file-manager/fm-directory-view.c:
(fm_directory_view_populate): Made static and renamed to
..._repopulate now that I better understand its use. Soon it will
go away entirely.
2000-01-26 Andy Hertzfeld <andy@eazel.com>
* libnautilus/gnome-icon-container-dnd.c:
made the drag shadow have the same dimensions as the icon being dragged;
fixed bug where it was confusing the width and height order in the
custom uri it built for dragging within Nautilus
2000-01-26 Darin Adler <darin@eazel.com>
* libnautilus/nautilus-directory.c:
(nautilus_file_get_name):
Fixed an assert I missed.
2000-01-26 Darin Adler <darin@eazel.com>
* libnautilus/nautilus-directory.h:
libnautilus/nautilus-directory.c:
(nautilus_file_get):
(nautilus_file_detach):
(nautilus_directory_finalize):
(nautilus_file_unref):
Added interface to get a NautilusFile for a specific file rather than
a file from a directory that we are scanning.
* libnautilus/nautilus-glib-extensions.c:
(check_tm_to_g_date):
A little cleanup of the self-check code.
* libnautilus/Makefile.am:
libnautilus/libnautilus.h:
libnautilus/nautilus-alloc.h:
libnautilus/nautilus-directory.h:
Moved g_alloca into its own header file so you don't have to include
all the Bonobo stuff just to use g_alloca.
2000-01-26 Andy Hertzfeld <andy@eazel.com>
* src/file-manager/fm-icon-cache.c:
first cut at making images with small file sizes display as themselves
* libnautilus/nautilus-icons-view-icon-item.c:
clean-ups, plus added alternate selection boolean for keyboard selection
2000-01-25 John Sullivan <sullivan@eazel.com>
* libnautilus/nautilus-directory.c:
(nautilus_file_get_date_as_string): A few cleanups
based on feedback from Darin and Havoc.
2000-01-25 Andy Hertzfeld <andy@eazel.com>
* libnautilus/nautilus-icons-view-icon-item.c
disabled icon centering code that was causing glitchey updates
2000-01-25 Darin Adler <darin@eazel.com>
* libnautilus/gnome-icon-container-dnd.c:
(create_selection_shadow):
(set_gnome_icon_list_selection):
(get_gnome_icon_list_selection):
(gnome_icon_container_receive_dropped_icons):
Redid drag code so that it will work if there are multiple
windows involved, although we still don't handle copies.
Changed selection to include the width and height of the icon,
and to hold the top left of the icon.
* libnautilus/gnome-icon-container-private.h:
libnautilus/gnome-icon-container.c:
(move_icon):
(gnome_icon_container_move_icon):
Made move_icon visible to the DnD code, and added a raise boolean
so it could move and icon and bring it to the front.
(gnome_icon_container_get_icon_by_uri):
(gnome_icon_container_select_list_unselect_others):
Added new functions for use by DnD code.
* libnautilus/gnome-icon-container-private.h:
libnautilus/gnome-icon-container.c:
(handle_icon_button_press):
Got rid of unused drag_x_offset and drag_y_offset.
* libnautilus/gnome-icon-container.c:
(icon_select):
(icon_toggle_selected):
(select_icon):
(select_one_unselect_others):
(toggle_icon):
(unselect_all_but_one):
(unselect_all):
(rubberband_select_in_cell):
(kbd_move_to):
(kbd_space):
(linger_select_timeout_cb):
(handle_icon_button_press):
(gnome_icon_container_select_all):
(gnome_icon_container_unselect_all):
Cleaned up selection logic and made it simpler.
* libnautilus/gnome-icon-container.h:
libnautilus/gnome-icon-container.c:
(gnome_icon_container_xlate_selected):
Got rid of unused function.
* libnautilus/nautilus-self-checks.h:
libnautilus/nautilus-self-checks.c:
(nautilus_self_checks_failed):
(nautilus_exit_if_self_checks_failed):
src/ntl-main.c:
(main):
Added blank lines before and after the first and last failed
checks when at least one check fails.
* src/ntl-view.c:
(nautilus_view_destroy):
Removed a straggler message. (I hope Elliot's not still using it.)
* RENAMING: Some new name ideas.
2000-01-25 John Sullivan <sullivan@eazel.com>
Better text for displayed file dates. This is currently used only
in the list view date column, but will be used later in icon view
when we get multiple lines of text per icon working.
* libnautilus/nautilus-glib-extensions.c:
* libnautilus/nautilus-glib-extensions.h:
New files, intended to hold nautilus code that logically belongs
in glib. Now contains a g_date constructor that takes a struct tm,
and a strdup_strftime function that returns a new string of exactly
the right size.
* libnautilus/Makefile.am: Build and install these two new files.
* libnautilus/nautilus-lib-self-check-functions.h: include the
new self-check function for nautilus-glib-extensions.
* libnautilus/nautilus-directory.c:
#include nautilus-glib-extensions.h
(nautilus_file_get_date_as_string): Replaced simple ctime version
with fancy version that uses shorter date format, the words
"today" and "yesterday" when appropriate, and the weekday name if
the date is in the last week (other than today or yesterday).
2000-01-25 Andy Hertzfeld <andy@eazel.com>
* libnautilus/nautilus-icons-view-icon-item.c,h:
new canvas item class for icon items. Now we use a single
canvas item to draw the icons instead of a group with two subitems.
This will pay-off when we implement the emblems, zooming and
special icons for text, etc. This is the first cut, I'm pretty
sure it doesn't work when pixels_per_item isn't 1.0 and there
are other small problems.
* libnautilus/gnome-icon-container-private.h:
removed old fields for sub-items
* libnautilus/Makefile.am:
added new item class to makefile
* libnautilus/gnome-icon-container-dnd.c:
drag asks main item for pixbuf instead of image item
* libnautilus/gnome-icon-container.c:
use new icon item instead of making group with two sub-items
2000-01-24 Maciej Stachowiak <mjs@eazel.com>
* src/file-manager/fm-directory-view.c,
src/file-manager/fm-directory-view.h
(fm_directory_view_popup_item_context_menu,
fm_directory_view_popup_background_context_menu): New functions
for subclasses to call, to implement right-click menus. Most of
the guts are here now. Machinery to merge view-specific items with
generic ones will be added here.
* src/file-manager/fm-directory-view-icons.c,
src/file-manager/fm-directory-view-list.c: Use the new interface
for right-click stuff.
* src/file-manager/fm-directory-view-icons.c: Corrected memory
management for background and item popup menus.
2000-01-24 Darin Adler <darin@eazel.com>
* gnome-icon-container-dnd.c:
(gnome_icon_container_receive_dropped_icons):
Removed bogus warning. Need to do some more work to get
dragging working with multiple windows, but there's no
easy way to detect that case, so just let it go.
* fm-directory-view-icons.c:
(icon_container_context_click_icon_cb):
(icon_container_context_click_background_cb):
Fixed the callbacks to match the new interface without the
icon name. I missed this in my check-in earlier today.
2000-01-24 John Sullivan <sullivan@eazel.com>
Added sort indicators to list view column titles
* src/file-manager/fm-directory-view-list.c:
Added #define LIST_VIEW_COLUMN_NONE
Added tiny in-line XPMs for up & down sort indicators.
(struct _FMDirectoryViewListDetails): Replaced
sort_type field with sort_column field.
(fm_directory_view_initalize): initialize details->sort_column
to LIST_VIEW_COLUMN_NONE
(get_sort_indicator), (hide_sort_indicator), (show_sort_indicator):
New functions for setting the sort indicators' states.
(column_clicked_cb): update details->sort_column and call
hide_sort_indicator and show_sort_indicator
(create_flist): Add sort indicator widgets to column titles,
initially hidden
(flist_activate_cb): Renamed "ignored" parameter and tested its
value, to make mjs happy.
2000-01-24 Maciej Stachowiak <mjs@eazel.com>
* libnautilus/gtkflist.c, libnautilus/gtkflist.h: Rename
"row_popup_menu" and "empty_popup_menu" signals to
"context_click_row" and "context_click_background" for more
consistency with the way the icon container does it. Removed
GdkEvent parameters from these signals. Added an int indicating
the row right-clicked.
(gtk_flist_button_press): Do not change the selection to the row
that gets right-clicked. It was inconsistent with the icon view
and most of the known universe.
2000-01-24 Darin Adler <darin@eazel.com>
Added a controller object that lets GnomeIconContainer
ask questions and perform actions, even though only the
FMDirectoryViewIcons knows how to answer the questions
and perform the actions.
Replaced use of nautilus_file_get_info with specific
accessors for various file info.
* libnautilus/Makefile.am:
libnautilus/nautilus-icons-controller.h:
libnautilus/nautilus-icons-controller.c:
libnautilus/gnome-icon-container-private.h:
libnautilus/gnome-icon-container.h:
libnautilus/gnome-icon-container.c:
(icon_new_pixbuf):
(gnome_icon_container_new):
(gnome_icon_container_add):
(gnome_icon_container_add_auto):
Added NautilusIconsController, an interface provided so that the
file manager can connect the icons up with the file code. This is
all so we can keep the view/controller separation. This eliminates
the need to pass around the icon name all the time, so the signals
have changed to not take the icon name as a parameter.
* src/file-manager/Makefile.am:
src/file-manager/fm-icons-controller.c:
src/file-manager/fm-icons-controller.h:
Added FMIconsController, the actual controller used by the file
manager instance of GnomeIconContainer.
src/file-manager/fm-directory-view-icons.c:
(create_icon_container):
(add_icon_if_already_positioned):
(add_icon_at_free_position):
(icon_container_activate_cb):
(fm_directory_view_icons_icon_moved_cb):
Create and use the FMIconController.
* libnautilus/gnome-icon-container-private.h:
libnautilus/gnome-icon-container-dnd.c:
(set_gnome_icon_list_selection):
(set_uri_list_selection):
libnautilus/gnome-icon-container.c:
(gnome_icon_container_set_base_uri):
src/file-manager/fm-directory-view-icons.c:
(set_up_base_uri):
(fm_directory_view_icons_begin_loading):
Get rid of the old base_uri technique for handling drags. Instead
the icon controller supplies URIs for icons when requested.
* RENAMING: Proposed that we use NautilusIconsView as the new name
for GnomeIconContainer instead of NautilusIconContainer.
* libnautilus/gnome-icon-container-private.h:
libnautilus/gnome-icon-container.h:
libnautilus/gnome-icon-container.c:
(gnome_icon_container_initialize):
(handle_icon_enter_notify):
(handle_icon_leave_notify):
Renamed browser mode to linger selection mode.
* libnautilus/gnome-icon-container-private.h:
libnautilus/gnome-icon-container.h:
libnautilus/gnome-icon-container.c:
(icon_configure):
(icon_position):
(change_icon_mode):
(gnome_icon_container_initialize):
(gnome_icon_container_set_icon_mode):
(gnome_icon_container_get_icon_mode):
src/file-manager/fm-directory-view-icons.c:
(fm_directory_view_icons_initialize):
Got rid of icon mode, since we won't be using it.
* libnautilus/gnome-icon-container-dnd.c:
(get_gnome_icon_list_selection):
Changed geometry parsing so it will not ignore extra characters
after the numeric geometry.
(gnome_icon_container_receive_dropped_icons):
The code here tried to work when dragging icons between windows,
but the implementation was actually only good within the same
window, so I modified it to check for that case.
* libnautilus/gnome-icon-container-dnd.c:
(create_selection_shadow):
(set_gnome_icon_list_selection):
libnautilus/gnome-icon-container.c:
(icon_position):
Renamed GNOME_ICON_CONTAINER_ICON_XOFFSET to
GNOME_ICON_CONTAINER_ICON_X_OFFSET and
GNOME_ICON_CONTAINER_ICON_YOFFSET to
GNOME_ICON_CONTAINER_ICON_Y_OFFSET. We use an underscore between
words in identifiers.
* libnautilus/gnome-icon-container.c:
(destroy):
Added code to remove timeouts and idles when the container is
destroyed.
* libnautilus/nautilus-directory.h:
libnautilus/nautilus-directory.c:
(nautilus_file_get_info):
Get rid of the direct call to get GnomeVFSFileInfo. All info is
accessed through individual functions.
(nautilus_file_get_size):
(nautilus_file_get_type):
(nautilus_file_get_mime_type):
(nautilus_file_is_executable):
(nautilus_file_is_symbolic_link):
Added new accessor functions as needed.
src/file-manager/fm-directory-view.c:
(display_selection_info):
src/file-manager/fm-icon-cache.c:
(fm_icon_cache_get_icon_set_for_file):
(fm_icon_cache_get_icon_for_file):
Change code to use the accessors instead of get_info.
* libnautilus/nautilus-gtk-macros.h:
(NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL):
Changed macro to take a class pointer of the right type instead
of taking both a casting macro name and a class pointer.
src/file-manager/fm-directory-view.c:
(fm_directory_view_initialize_class):
Changed existing uses of macro to match.
* src/file-manager/Makefile.am:
src/file-manager/fm-icon-cache.c:
src/file-manager/fm-default-file-icon.h:
src/file-manager/fm-default-file-icon.c:
Moved the default icon into its own file.
2000-01-24 John Sullivan <sullivan@eazel.com>
* libnautilus/gnome-icon-container.c:
(button_event_modifies_selection): New function, encapsulates idea
of which button events modify the selection. Formerly this was
done in several places and the answer was "those with the Control
key down". Now the answer is "those with the Control or Shift key
down" to match list view (and traditional, i.e. Mac) behavior more
closely.
(button_press_event), (button_release_event),
(handle_icon_button_press): Deployed
button_event_modifies_selection.
(button_release_event): Check whether modifying selection and
don't activate on single-click if so.
(kbd_move_to): Just added comment.
2000-01-22 Havoc Pennington <hp@pobox.com>
* configure.in: check for libwww
* components/html/Makefile.am: add libwww flags
2000-01-21 Maciej Stachowiak <mjs@eazel.com>
* src/file-manager/fm-directory-view-icons.c: Added background and
item context click menus. Right now they only work for the
directory view, and contain only insensitive items. This needs
more work but I wanted to check in something basic.
2000-01-21 Havoc Pennington <hp@redhat.com>
* src/file-manager/Makefile.am (INCLUDES): fix to gnomecanvaspixbuf
* src/Makefile.am (INCLUDES): fix to gnomecanvaspixbuf
* libnautilus/Makefile.am (INCLUDES): fix to use gnomecanvaspixbuf
flags
* configure.in: Look for gnomecanvaspixbuf properly (via
gnome-config)
2000-01-21 John Sullivan <sullivan@eazel.com>
* src/ntl-window.c: Move Preferences item to Edit menu, its
traditional home.
2000-01-21 John Sullivan <sullivan@eazel.com>
Make icons appear in list view, and do some of the restructuring
necessary for supporting multiple icon sizes.
* src/file-manager/fm-icon-cache.h:
Added enum for Nautilus's 7 levels of zooming.
Added #defines for nominal icon sizes matching these 7 levels.
(fm_icon_cache_get_icon): Renamed to fm_icon_cache_get_icon_for_file,
and changed parameters to take a NautilusFile and a size (in pixels)
instead of a GnomeVFSFileInfo.
* src/file-manager/fm-icon-cache.c
Changed static vars fm_default_file_icon_width & height to use new
NAUTILUS_ICON_SIZE_STANDARD #define
(fm_icon_cache_get_icon_for_file): Renamed to
fm_icon_cache_get_icon_set_for_file to avoid collision with changed
public API call. Also changed parameters to take a NautilusFile instead
of a GnomeVFSFileInfo.
(fm_icon_cache_get_icon): Renamed to fm_icon_cache_get_icon_for_file,
and changed parameters to take a NautilusFile and a size (in pixels)
instead of a GnomeVFSFileInfo. If the size parameter is not the
standard size, calls fm_icon_cache_scale to get a scaled icon.
Eventually icons will be stored at various sizes, but for now we
always scale.
(fm_icon_cache_scale): New function, scales standard-sized GdkPixbuf
to given size.
* src/file-manager/fm-directory-view-icons.c:
(add_icon_if_already_positioned), (add_icon_at_free_position):
Updated callers of fm_icon_cache_get_icon, passing in
NAUTILUS_ICON_SIZE_STANDARD.
* src/file-manager/fm-directory-view-list.c:
(struct _FMDirectoryViewListDetails): Add icon_size field.
(fm_directory_view_list_initialize): Initialize icon_size field.
(create_flist): Determine icon column width and row height from icon size.
(add_to_flist): Change parameters to take FMDirectoryViewList
instead of GtkFList, and remove FMIconCache parameter. Now calls
install_icon.
(fm_directory_view_list_add_entry): Update add_to_flist parameters.
(install_icon): New function, gets an appropriately-sized icon for
a NautilusFile and puts it into icon column in list.
2000-01-21 Elliot Lee <sopwith@redhat.com>
* src/ntl-window.[ch], src/ntl-window-msgs.c,
src/ntl-window-private.h: Add a specific flag to indicate reload,
and make use of it.
* libnautilus/nautilus-directory.c: Allocate an extra byte in the
buffer, for safety's sake.
* src/ntl-window-msgs.c: Fix back/fwd buttons.
* src/ntl-window-msgs.c: Remove debugging printouts, and display
error dialogs.
* src/ntl-window-msgs.c, src/ntl-window.h: Fix the bug that was
causing list view to be blank.
2000-01-21 Darin Adler <darin@eazel.com>
Started some cleanup of the icon view.
* libnautilus/Makefile.am:
libnautilus/gnome-icon-container-layout.c:
libnautilus/gnome-icon-container-layout.h:
libnautilus/gnome-icon-container.c:
libnautilus/gnome-icon-container.h:
src/file-manager/fm-directory-view-icons.c:
src/file-manager/fm-directory-view-icons.h:
Got rid of the GnomeIconContainerLayout.
This was the old mechanism for saving and loading
icon positions and we have a better signal-based one.
Also made the new mechanism work more the way that
Ettore had intended to make the layout work, where
all the icons that have preassigned positions get
positioned first, then the ones that are auto positioned.
In the long run, we'll need something a bit fancier.
* libnautilus/gnome-icon-container-dnd.c:
libnautilus/gnome-icon-container.c:
libnautilus/gnome-icon-container.h:
libnautilus/gnome-icon-container-private.h:
Change the priv pointer to be named details to match
what we use in other places in Nautilus.
2000-01-21 John Sullivan <sullivan@eazel.com>
Made list view activation work on single click, like icon view.
* libnautilus/gtkflist.c
(struct _GtkFListDetails): Added single_click_mode
and button_down_time, renamed dnd_select_pending_row to
button_down_row.
Added #define MAX_CLICK_TIME, copied from gnome_icon_container.
(gtk_flist_initialize): Initialize single_click_mode to TRUE
(activate_row): New function, extracts code needed to activate
an item from its row number.
(gtk_flist_button_press): Save button_down_time, save
button_down_row more often, use activate_row () for double-click.
(gtk_flist_button_release): Activate on single click if single_click_mode
is true, selection isn't being extended, mouse hasn't moved to a different
row, and not too much time has passed.
(gtk_flist_motion): Deploy button_down_row name change.
2000-01-20 Andy Hertzfeld <andy@eazel.com>
* libnautilus/gnome-icon-container.c:
Disabled the pernicious call to relayout in size_allocate. We
will want to do automatic layout when the window size changes, but
this is the wrong level for it, it happens too frequently
2000-01-20 Elliot Lee <sopwith@redhat.com>
* src/ntl-window-msgs.c:
Missed piece in last commit.
John added this entry for Elliot, who made this change three
hours later than his last checkin. The comment is from the
cvs commit.
2000-01-20 Darin Adler <darin@eazel.com>
* src/file-manager/fm-directory-view.c:
(fm_directory_view_activate_entry):
Fixed double free that was causing lots of nasty errors in
the file manager.
(fm_directory_view_load_uri):
Made the old directory hang around a bit longer when loading
a new uri.
(display_selection_info):
(fm_directory_view_send_selection_change):
(display_selection_info_idle_cb):
Fixed a storage leak and broke out the selection change into
its own function instead of mixing it with the status line.
Also made the selection actually use URIs instead of just
names for the selected items.
* libnautilus/nautilus-directory.h:
libnautilus/nautilus-directory.c:
(nautilus_file_get_uri):
Added this function that gets a URI (rather than just a
leaf name).
* libnautilus/nautilus-directory.c:
(nautilus_directory_finalize):
(nautilus_self_check_directory):
Added more self checks and fixed a bug where a metadata
change would get lost if you delete the directory too soon
after making the change.
2000-01-20 John Sullivan <sullivan@eazel.com>
* libnautilus/gtkflist.c:
* libnautilus/gtkflist.h:
Move fields into details structure inside .c file.
2000-01-20 Jonathan Blandford <jrb@redhat.com>
* src/file-manager/fm-directory-view-list.c (column_clicked_cb):
more initialization to clean up an warning.
2000-01-20 Darin Adler <darin@eazel.com>
* src/gnome-icon-container.c:
(gnome_icon_container_xlate_selected):
Fixed a bug where dragging an icon would cause the "kbd_selected"
icon to scroll into view. Just passed FALSE instead of TRUE for
"schedule_visibility".
* libnautilus/nautilus-background.c:
(nautilus_background_draw_flat_box):
Tiny change, to fit our style rule against initializing.
2000-01-20 Jonathan Blandford <jrb@redhat.com>
* libnautilus/nautilus-background.c
(nautilus_background_draw_flat_box): fix warning.
2000-01-20 Elliot Lee <sopwith@redhat.com>
* src/ntl-uri-map.c: Async notification of navinfo - now we just need an async get_file_info call.
* src/ntl-view.[ch]: Better error handling.
* src/file-manager/fm-directory-view.c (display_selection_info): Send a 'selection change' request.
2000-01-19 Elliot Lee <sopwith@redhat.com>
* src/ntl-window-msgs.c: Totally rewrite the state changing machine. Now handles things slightly better.
* src/ntl-types.h: Remove requesting_view from the navigation info.
* src/ntl-window.h: Move all the state machine stuff into NautilusWindow itself.
* src/ntl-window.c: Update for new 'stop doing stuff' API.
2000-01-20 Darin Adler <darin@eazel.com>
Store icon positions as "x,y" in ICON_POSITION instead of
storing ICON_X and ICON_Y.
Take first step in moving the directory view to use the opaque
NautilusDirectory and NautilusFile instead of using gnome-vfs
directly. This will separate the controller from the model:
FMDirectoryView is a controller and NautilusDirectory a model.
* src/file-manager/fm-directory-view-icons.c:
(add_to_icon_container):
(fm_directory_view_icons_icon_moved_cb):
Store icons positions as "x,y" in ICON_POSITION instead of storing
separate numbers in ICON_X and ICON_Y.
* libnautilus/nautilus-directory.h:
libnautilus/nautilus-directory.c:
(nautilus_directory_get_uri):
Added a new call needed to replace fm_directory_view_get_uri.
(nautilus_directory_get_file_metadata):
(nautilus_directory_set_file_metadata):
(nautilus_file_get_metadata):
(nautilus_file_set_metadata):
Moved the calls for getting and setting file metadata into the
file objects.
(nautilus_directory_new_file):
(nautilus_file_get_info):
Added temporary interfaces for the current situation where we're
dealing with both NautilusFile and GnomeVFSFileInfo objects at
once.
(nautilus_directory_finalize):
Detach and unref all the files when the directory is destroyed.
(nautilus_file_unref):
(nautilus_file_get_name):
Implemented these functions now that we are using them.
* src/file-manager/fm-directory-view.h:
src/file-manager/fm-directory-view.c:
(fm_directory_view_add_entry):
(fm_directory_view_activate_entry):
(display_selection_info):
(fm_directory_view_get_selection):
src/file-manager/fm-directory-view-icons.c:
(add_to_icon_container):
(fm_directory_view_icons_icon_moved_cb):
(dm_directory_view_icons_add_entry):
(fm_directory_view_icons_get_selection):
(icon_container_activate_cb):
src/file-manager/fm-directory-view-list.c:
(add_to_flist):
(fm_directory_view_list_add_entry):
Change all the code to work with NautilusFile instead of
GnomeVFSFileInfo, except for the parts of FMDirectoryView dealing
with the directory_list.
* src/file-manager/fm-directory-view.h:
src/file-manager/fm-directory-view.c:
(nautilus_file_date_as_string):
(nautilus_file_size_as_string):
(nautilus_file_type_as_string):
libnautilus/nautilus-directory.h:
libnautilus/nautilus-directory.c:
(nautilus_file_get_date_as_string):
(nautilus_file_get_size_as_string):
(nautilus_file_get_type_as_string):
Moved and renamed these functions and made them work on
NautilusFile objects.
2000-01-20 John Sullivan <sullivan@eazel.com>
* src/file-manager/fm-directory-view.c: (display_selection_info):
Made selection info in status bar use name of item when only one
item. Also reorganized copy/pasted code in this function.
2000-01-20 Darin Adler <darin@eazel.com>
Made backgrounds work better in the list view. Gradients still
won't work because the list view draws its background with calls
to gdk_draw_rectangle explicitly, and doesn't call the functions
in the style, so it can't be overridden.
* libnautilus/nautilus-background.c:
(nautilus_background_set_widget_style): Fix bug where the list
items were not highlighting properly. Set only the NORMAL and
ACTIVE background color. That way we don't screw up the SELECTED
and other background colors.
2000-01-20 Darin Adler <darin@eazel.com>
* libnautilus/nautilus-directory.c:
(nautilus_directory_get_file_metadata): Fix segfault that was
happening when viewing a folder without a metafile.
2000-01-19 Darin Adler <darin@eazel.com>
The list view now has a background color just like the
icon view does. Some more code could be saved, but that's
a refactoring for another time.
* libnautilus/gtkflist.c: Added support for receiving dragged
colors to set the background of the list.
* src/file-manager/fm-directory-view-list.c:
(fm_directory_view_list_initialize_class):
(fm_directory_view_list_clear):
(fm_directory_view_list_background_changed_cb): Added code to load
and save the background color from metadata.
* libnautilus/nautilus-background.c: Put the background color in
all the bg and base colors in the style instead of putting it only
in bg[GTK_STATE_NORMAL].
* libnautilus/nautilus-gtk-macros.h:
(NAUTILUS_DEFINE_CLASS_BOILERPLATE): Make sure that the macro only
evaluates the parent_class_type argument once, like it says in the
comment. (NAUTILUS_CALL_PARENT_CLASS): Fix this macro so it can
be used in places where an expression is expected.
* RENAMING: Added this file to list name changes we are
planning for the future.
* libnautilus/gtkflist.h: libnautilus/gtkflist.c:
src/explorer-location-bar.h: src/explorer-location-bar.c:
Minimized includes.
* src/ntl-index-panel.c:
src/file-manager/fm-directory-view-icons.c: Fixed some comments
and formatting.
2000-01-19 Darin Adler <darin@eazel.com>
Icon positions are now written out when you drag an icon,
and read in when you visit a directory. But the code then
immediately re-lays out the icons, so the position is lost!
* src/file-manager/fm-directory-view-icons.c:
(fm_directory_view_icons_icon_moved_cb):
(fm_directory_view_icons_initialize): (add_container_icon): Save
icon position when an icon is moved. Get icon position when an
icon is first created.
* libnautilus/nautilus-directory.c:
(nautilus_directory_get_metadata_from_node):
(nautilus_directory_get_metadata):
(nautilus_directory_create_metafile_tree_root):
(nautilus_directory_get_metadata):
(nautilus_directory_set_metadata):
(nautilus_directory_get_file_metadata):
(nautilus_directory_set_file_metadata): Added the routines to get
and set metadata for individual files.
* libnautilus/nautilus-string.h: libnautilus/nautilus-string.c:
(nautilus_eat_strcmp): (nautilus_string_to_int):
(nautilus_eat_string_to_int): Made new string functions that free
the existing strings, and a function to convert an int to a
string.
* libnautilus/gnome-icon-container.h:
libnautilus/gnome-icon-container.c: (move_icon): (class_init):
(handle_icon_button_press): Added context_click_background and
icon_moved signals, and renamed context_click to
context_click_icon.
* configure.in: Turned -Wunused back on. I had to turn -W off,
but I think it's worth it.
2000-01-19 John Sullivan <sullivan@eazel.com>
* src/file-manager/fm-directory-view.c:
Added #include <libgnomevfs/gnome-vfs-file-info.h>
(fm_directory_view_populate), (display_pending_entries):
Bump refcount on file info before adding it to directory.
(fm_directory_view_load_uri): Destroy directory list
before setting it to NULL. With previous change, this
should prevent leaking GnomeVFSFileInfos and their
lists.
2000-01-19 Darin Adler <darin@eazel.com>
* libnautilus/nautilus-directory.c: (nautilus_directory_finalize):
(nautilus_directory_try_to_read_metafile):
(nautilus_directory_read_metafile):
(nautilus_directory_try_to_write_metafile):
(nautilus_directory_write_metafile):
(nautilus_directory_construct_alternate_metafile_uri):
(nautilus_directory_new): After Andy explained his change to me, I
realized that it would always write the metafile in the alternate
place if there was no pre-existing metafile. So I changed the
logic. The new rule is: read the metafile from the alternate
location first. If we find it there, write it back
there. Otherwise, try to write in the directory itself. If that
fails, write it in the alternate location instead.
* libnautilus/nautilus-directory.c:
(nautilus_directory_get_metadata): Allow get_metadata on a NULL
NautilusDirectory and return NULL for data.
2000-01-19 Darin Adler <darin@eazel.com>
Allow changing the background of the icon view by dropping colors
on the icon view.
* libnautilus/gnome-icon-container-dnd.h:
libnautilus/gnome-icon-container-dnd.c:
(gnome_icon_container_position_shadow): (drag_data_received_cb):
(gnome_icon_container_ensure_drag_data): (drag_motion_cb):
(drag_drop_cb): (gnome_icon_container_receive_dropped_icons):
(gnome_icon_container_free_drag_data): (drag_leave_cb): Added
support for receiving dropped colors to change the background of a
GnomeIconContainer.
* src/file-manager/fm-directory-view-icons.c:
(fm_directory_view_icons_initialize_class):
(fm_directory_view_icons_clear):
(fm_directory_view_icons_background_changed_cb): Added code to
load and save the background color from metadata.
* libnautilus/gdk-extensions.c: (nautilus_gradient_new): Changed
nautilus_gradient_new to handle NULLs in the same way that the
rest of the gradient functions do instead of NULL being an illegal
input value.
* src/file-manager/fm-directory-view.h:
src/file-manager/fm-directory-view.c:
(fm_directory_view_initialize): (fm_directory_view_destroy):
(fm_directory_view_get_model): (fm_directory_view_load_uri): Added
a NautilusDirectory object to each directory view, accessed by
subclasses with a call to fm_directory_view_get_model.
* libnautilus/nautilus-gtk-extensions.h:
libnautilus/nautilus-gtk-extensions.c:
(gnome_icon_container_dropped_icon_feedback):
(nautilus_gdk_selection_data_copy_deep): Added deep versions of
these GtkSelectionData functions.
* libnautilus/nautilus-gtk-macros.h:
(NAUTILUS_DEFINE_GET_TYPE_FUNCTION):
(NAUTILUS_DEFINE_CLASS_BOILERPLATE): Added definition and
initialization of the parent_class global to
NAUTILUS_DEFINE_GET_TYPE_FUNCTION and renamed it to
NAUTILUS_DEFINE_CLASS_BOILERPLATE.
* libnautilus/nautilus-background-canvas-group:
(nautilus_background_canvas_group_initialize_class):
libnautilus/nautilus-background.c:
(nautilus_background_initialize_class):
libnautilus/nautilus-directory.c:
(nautilus_directory_initialize_class): src/ntl-index-panel.c:
(nautilus_index_panel_initialize_class):
src/file-manager/fm-directory-view-icons.c:
(fm_directory_view_icons_initialize_class):
src/file-manager/fm-directory-view-list.c:
(fm_directory_view_list_initialize_class):
src/file-manager/fm-directory-view.c:
(fm_directory_view_initialize_class): Take advantage of the new
NAUTILUS_DEFINE_CLASS_BOILERPLATE and get rid of existing code to
set up parent_class.
* libnautilus/gnome-icon-container-dnd.h:
libnautilus/gnome-icon-container-dnd.c:
libnautilus/gnome-icon-container-layout.h:
libnautilus/gnome-icon-container-layout.c:
libnautilus/gnome-icon-container.c: Minimized includes.
2000-01-18 Andy Hertzfeld <andy@eazel.com>
* libnautilus/gnome-icon-container.c
made icon centered in cell by setting "x_set" pixbuf property so
it listens to our offset also, adjusted x_offset constant
* libnautilus/gnome-icon-container-dnd.c
made shadow be centered properly by taking difference between
cellwidth and iconwidth into account
2000-01-18 Ettore Perazzoli <ettore@helixcode.com>
* src/file-manager/dfos-xfer.c (xfer_info_destroy): Removed `#if
0'ed out function.
* src/ntl-uri-map.c (nautilus_navinfo_new): Use
`gnome_vfs_file_info_unref()' instead of
`gnome_vfs_file_info_destroy()'.
2000-01-18 Andy Hertzfeld <andy@eazel.com>
* libnautilus/gnome-icon-container-private.h:
added "button_down_time" field to private data structure
* libnautilus/gnome-icon-container.c
made it not activate objects if the button was held down too long
by remember the mouse down time and comparing it with the up time
2000-01-18 John Sullivan <sullivan@eazel.com>
* src/file-manager/fm-directory-view.c:
(fm_directory_view_load_uri): Set directory list to NULL
but don't destroy it; this fixes crash entering a directory
and then going up. Will ask Ettore about real fix.
2000-01-18 John Sullivan <sullivan@eazel.com>
* src/ntl-window-msgs.c:
(nautilus_window_refresh_title): Sets the window title to
Nautilus: x, where x is short name of current location.
(nautilus_window_change_location_internal): Call
nautilus_window_refresh_title.
2000-01-18 John Sullivan <sullivan@eazel.com>
* src/file-manager/fm-directory-view.c:
(display_selection_info): Call selection "items" rather than
"files" because users distinguish directories from files.
2000-01-18 John Sullivan <sullivan@eazel.com>
* src/file-manager/fm-directory-view.h:
(enum _FMDirectoryViewSortType): added FM_DIRECTORY_VIEW_SORT_NONE
and FM_DIRECTORY_VIEW_SORT_BYMTIME
(fm_directory_view_sort): added reverse_sort parameter.
(nautilus_file_date_as_string):
(nautilus_file_size_as_string): Changed parameter for these two
functions to be GnomeVFSFileInfo so they can handle special cases better.
(nautilus_file_type_as_string): New function
* src/file-manager/fm-directory-view.c
(stop_load): Removed code resetting directory_list and current_position.
This was the wrong place for it, and resetting directory_list was leaking.
(directory_load_cb): Changed commented assignment to assert.
(fm_directory_view_load_uri): Reset directory_list (without leaking old
value) and current_position here.
(fm_directory_view_sort): Pass through new reverse_sort parameter to
gnome_vfs_directory_view_sort; add new case for
FM_DIRECTORY_VIEW_SORT_BYMTIME; don't put directories first when sorting
by name.
(nautilus_file_date_as_string): Now takes a GnomeVFSFileInfo pointer
instead of a time_t (assumes mtime, with comment explaining why).
(nautilus_file_size_as_string): Now takes a GnomeVFSFileInfo pointer
instead of a size; uses this to special-case "--" for directory size.
(nautilus_file_type_as_string): New function, special-cases directories
to return "directory", otherwise returns mime_type.
* src/file-manager/fm-directory-view-list.h
Added private details structure to FMDirectoryViewList.
* src/file-manager/fm-directory-view-list.c
Added _FMDirectoryViewListDetails struct, containing sort_type and
sort_reversed.
(fm_directory_view_initialize): initialize details struct.
(column_clicked_cb): New function, sorts list by clicked column.
If list already sorted by that column, reverses sort. Still need
visual indicator of sort direction.
(create_flist): Added Type column, tweaked column widths, added
signal connection for "click_column"
(add_to_flist): now passes GnomeVFSFileInfo to
nautilus_file_size_as_string and nautilus_file_date_as_string;
uses new nautilus_file_type_as_string for type column.
2000-01-18 Andy Hertzfeld <andy@eazel.com>
* libnautilus/nautilus-directory:
* made reading metafile from directory where we don't have write
permissions work by changing error-check to look in common place on
any error instead of just access_denied.
2000-01-18 Andy Hertzfeld <andy@eazel.com>
* libnautilus/nautilus-directory.c:
fixed bug caused by Elliot where he used alloca but forgot to remove g_free
2000-01-18 Elliot Lee <sopwith@redhat.com>
* libnautilus/nautilus-gtk-macros.h: Since the prototypes for
GtkObjectInitFunc and GtkClassInitFunc just have a 'gpointer' for the args,
cast the given values to these function types, so that people can use the actual
pointer types as arguments without receiving a warning.
* src/ntl-index-panel.c: Change to match. Also set
object_klass->destroy & object_klass->finalize to point to our
implementation. Also remove unused variables
(nautilus_index_panel_initialize,
nautilus_index_panel_set_up_label).
* libnautilus/nautilus-background.c, src/ntl-window-msgs.c,
src/ntl-window.c, src/file-manager/fm-directory-icons.c: Remove
unused variables.
* src/ntl-window.h: Add a variable (unused) for future handling of content view loading.
* libnautilus/libnautilus.h: Add an interim g_alloca.
* libnautilus/nautilus-directory.c: Clean up a bit further, by
removing the need for another if(), and using g_alloca instead of
g_malloc.
2000-01-18 Darin Adler <darin@eazel.com>
* libnautilus/nautilus-directory.c:
(nautilus_directory_read_metafile):
(nautilus_directory_try_to_read_metafile):
(nautilus_directory_write_metafile):
(nautilus_directory_try_to_write_metafile):
(nautilus_directory_switch_to_alternate_metafile_uri):
(nautilus_directory_escape_slashes):
(nautilus_make_directory_and_parents): Added first cut at code to
put metafiles in the user's home directory if the directory is not
accessible and you can't read and write a metafile in the
directory itself. We'll have to refine this later to handle cases
where you end up with two metafiles.
* libnautilus/Makefile.am: libnautilus/nautilus-debug.h:
libnautilus/nautilus-debug.c: Took trick for getting into the
debugger and put it into a public header file so it can be used
outside of the nautilus executable.
* src/ntl-main.c: (stop_in_debugger):
(nautilus_stop_after_default_log_handler): (main): Use the new
calls from libnautilus to set up the drop into debugger for
criticals and warnings.
* src/file-manager/fm-main.c: (main): Minimized includes and used
the new calls from libnautilus to set up the drop into debugger
for criticals and warnings.
* src/ntl-uri-map.c: (nautilus_navinfo_add_mapping):
src/ntl-window.c: (nautilus_window_constructed):
src/file-manager/fm-directory-view.c:
(fm_directory_view_initialize): (fm_directory_view_destroy):
(notify_location_change_cb): (stop_location_change_cb):
(fm_directory_view_sort): Removed some messages that aren't so
useful.
* libnautilus/ntl-view-frame.h: Minimized includes.
* libnautilus/ntl-view-frame.c: Include "ntl-view-frame.h" first
so it tests to see that it has sufficient includes in it.
* src/ntl-view.c: (nautilus_view_load_client): Changed function so
that NULL for an iid is allowed and simply results in a failed
load instead of being illegal.
* src/ntl-window-msgs.c:
(nautilus_window_change_location_internal): src/ntl-window.c:
(nautilus_window_up): Got rid of calls to gnome_vfs_uri_destroy;
use gnome_vfs_uri_unref instead since it's safer and Federico is
getting rid of gnome_vfs_uri_destroy.
* src/file-manager/fm-directory-view-icons.h:
src/file-manager/fm-directory-view-icons.c:
(fm_directory_view_icons_new):
src/file-manager/fm-directory-view-list.h:
src/file-manager/fm-directory-view-list.c:
(fm_directory_view_list_new):
src/file-manager/fm-directory-view.h:
src/file-manager/fm-directory-view.c: (fm_directory_view_new):
Minimized includes and got rid of the unused _new functions.
* libnautilus/nautilus-directory.h: Added a missing 2000 copyright
date.
2000-01-17 John Sullivan <sullivan@eazel.com>
First steps towards making the list view non-degenerate.
* src/file-manager/fm-directory-view.h:
* src/file-manager/fm-directory-view.c:
(nautilus_file_date_as_string): New function, returns string suitable
for displaying in a list view column.
(nautilus_file_size_as_string): New function, calls newly-publicized
gnome_vfs_file_size_to_string.
(display_selection_info): Now calls gnome_vfs_file_size_to_string
instead of redoing the string-creation code here.
* src/file-manager/fm-directory-view-list.c
(create_flist): Creates new columns for icon, size, and mod date.
(add_to_flist): Fills columns for size & mod date. Icon column
is empty for the moment. Columns do not yet sort.
2000-01-17 Andy Hertzfeld <andy@eazel.com>
* libnautilus/gnome-icon-container-dnd.c:
made dragging work right by using gdk_pixbuf_render_pixmap_and_mask
to make a pixmap and mask to pass to the gtk dragging machinery
* libnautilus/gnome-icon-container.c:
changed xoffset constant for the icon mode positioning to make the
feedback box line up with the icon.
2000-01-16 Andy Hertzfeld <andy@eazel.com>
* libnautilus/gnome-icon-container-dnd.c:
made dragging use an image of the canvas item dragged
still disabled, though, because it's not handling the mask yet
2000-01-16 Andy Hertzfeld <andy@eazel.com>
* libnautilus/gnome-icon-container-private.h:
added "single_click_mode" boolean
* libnautilus/gnome-icon-container.h
made single-click open optionally work by adding code in
button_release_event to activate the icon if appropriate
enabled single-click mode by default
* libnautilus/gnome-icon-container-dnd.c
made dragging to desktop and else work by cleaning up code in set_uri_list_selection
did work toward better dragging feedback using an image but didn't finish that yet
2000-01-15 Andy Hertzfeld <andy@eazel.com>
*libnautilus/gnome-icon-container-dnd.c:
made dragging files within a window actually work graphically, and set the stage for dragging between windows
made drag_leave_cb no longer delete the selection_list
made drag_data_received_cb delete selection if present instead of asserting it's gone
made drag_drop_cb use the selection_list to determine the directory we're dragging from,
if it's the same, move within the window, otherwise copy between (coming soon)
didn't update positions in the metafile yet
2000-01-14 John Sullivan <sullivan@eazel.com>
* src/file-manager/fm-directory-view.c:
(display_selection_info):
Fixed a killer typo that caused selection to crash.
2000-01-14 John Sullivan <sullivan@eazel.com>
Finished refactoring FMDirectoryView and subclasses. I
don't plan any more major reworking on these files, so
feel free to change things without fear of stomping on
me.
* src/file-manager/fm-directory-view.c:
* src/file-manager/fm-directory-view.h:
* src/file-manager/fm-directory-view-icons.c:
* src/file-manager/fm-directory-view-icons.h:
* src/file-manager/fm-directory-view-list.c:
* src/file-manager/fm-directory-view-list.h:
Moved icon_layout and icons_not_in_layout fields from
FMDirectoryView to FMDirectoryViewIcons (where they hide
inside a details structure in fm-directory-view-icons.c)
Commented .h files and all public functions in .c files.
Removed unnecessary #includes.
Changed signatures on many static functions in subclasses
to take subclass type instead of superclass type.
(display_selection_info_idle_cb):
(fm_directory_view_get_selection):
(fm_directory_view_icons_get_selection):
(fm_directory_view_list_get_selection):
(fm_directory_view_notify_selection_changed):
New functions used to handle subclasses telling
superclass about the selection, so superclass can
display info about it.
(display_icon_container_selection_info_idle_cb):
(display_flist_selection_info_idle_cb): Removed these
old functions in favor of new cleaner mechanism.
(flist_activate_cb), (icon_container_activate_cb): Moved
common code into new superclass function...
(fm_directory_view_activate_entry): New home of that common
code.
* src/file-manager/fm-directory-view.c:
* src/file-manager/fm-directory-view.h:
Moved remaining fields of FMDirectoryView inside a private
details structure so they can change without affecting clients.
(fm_directory_view_get_uri): (fm_directory_view_get_view_frame):
New functions to use instead of peeking at structure directly.
(init): (class_init): (fm_directory_view_get_type): Renamed
the former two functions and removed the latter while
deploying NAUTILUS_DEFINE_GET_TYPE_FUNCTION macro.
* src/file-manager/fm-main.c:
(make_obj): Use fm_directory_view_get_view_frame() where it
had been peeking at structure directly.
2000-01-14 Darin Adler <darin@eazel.com>
Fixed our handling of warnings and criticals.
* src/ntl-main.c: Added new functions that stop in the debugger
when you hit a g_warning or a critical error, only if the
environment variable NAUTILUS_DEBUG is set. This is better than
the way the old code made everything fatal, since it doesn't do
anything if the debugger isn't running.
2000-01-14 Darin Adler <darin@eazel.com>
Turned on gradients for backgrounds.
* src/ntl-index-panel.c:
(nautilus_index_panel_drag_data_received): Use the new
accept_dropped_color function in NautilusBackground instead of
code in here. (nautilus_index_panel_background_changed):
(nautilus_index_panel_set_up_info): Save background to metadata
when the NautilusBackground object emits the changed signal.
* libnautilus/nautilus-background.h:
libnautilus/nautilus-background.c:
(nautilus_background_accept_dropped_color): Moved logic about
dropping a color coupon to change the background into the
NautilusBackground class. This includes a first cut at the rules
about gradients.
* libnautilus/nautilus-background.c:
(nautilus_background_get_color): Implemented this missing
function. It's used by the code in index panel now to save the
current background.
* libnautilus/nautilus-background.c:
(nautilus_background_draw_flat_box): Implemented gradient fills
through the GtkStyle subclass.
* src/ntl-main.c: (main): Made criticals and warnings be always
fatal. Next step is to make them drop into the debugger, but not
result in a core dump if the debugger is not running.
2000-01-14 Darin Adler <darin@eazel.com>
* src/ntl-index-panel.c: (nautilus_index_panel_set_up_label):
Changed code to use the new gnome_vfs_uri_extract_short_name
instead of its own private function.
2000-01-14 Darin Adler <darin@eazel.com>
First cut at some actual saving of metadata.
Neither the interface nor the implementation is great yet.
But it's a start.
* libnautilus/Makefile.am:
libnautilus/nautilus-directory.h:
libnautilus/nautilus-directory.c:
libnautilus/nautilus-lib-self-check-functions.h:
libnautilus/nautilus-lib-self-check-functions.c:
src/file-manager/Makefile.am:
src/file-manager/fm-directory-protected.h:
src/file-manager/fm-directory.h:
src/file-manager/fm-directory.c:
src/file-manager/fm-vfs-directory.h:
src/file-manager/fm-vfs-directory.c:
Moved the old FMDirectory class into the library and named it
NautilusDirectory. Added functions for reading and writing
metadata.
* src/ntl-index-panel.c: Added the code to save the index panel's
background color in metadata.
* libnautilus/Makefile.am: Added gnome-vfs and gnome-xml,
since the new code uses them.
* libnautilus/nautilus-self-checks.h:
libnautilus/nautilus-lib-self-check-functions.h:
libnautilus/nautilus-lib-self-check-functions.c:
src/nautilus-self-check-functions.h:
src/nautilus-self-check-functions.c:
Added macros to the self-check framework so the list of self check
functions appears in exactly one place for each directory/module.
* src/ntl-index-panel.h: src/ntl-index-panel.c: Moved the fields
of the index panel inside a private details structure so they can
change without affecting clients.
* libnautilus/nautilus-background.c: Just some reformatting.
2000-01-13 John Sullivan <sullivan@eazel.com>
More work pushing code from FMDirectoryView into subclasses.
Almost done now.
* src/file-manager/fm-directory-view.h:
Removed enum _FMDirectoryViewMode and its typedef.
Removed field entries_to_display.
Removed transition section holding function prototypes that
were on their way into subclasses.
(fm_directory_view_is_valid_mode): Removed.
(fm_directory_view_get_mode): Removed.
(fm_directory_view_set_mode): Removed.
(fm_directory_view_begin_adding_entries): New function & signal.
(fm_directory_view_add_entry): New function & signal.
(fm_directory_view_done_adding_entries): New function & signal.
(fm_directory_view_done_sorting_entries): New function & signal.
(fm_directory_view_begin_loading): New function & signal.
(fm_directory_view_display_selection_info): Newly exposed function.
* src/file-manager/fm-directory-view.c:
Removed some now-unnecessary #includes.
Added constants for new signals to enum.
Removed global variable for icon cache in favor of already-extant
fm_get_current_icon_cache().
Removed all references to entries_to_display.
(display_selection_info): Renamed to
fm_directory_view_display_selection_info now that it's public.
(view_has_icon_container): Removed.
(get_icon_container): Moved into subclass FMDirectoryViewIcons.
(add_to_icon_container): Moved into subclass FMDirectoryViewIcons.
(load_icon_container): Moved into subclass FMDirectoryViewIcons.
(display_icons_not_in_layout): Moved into subclass FMDirectoryViewIcons.
(setup_base_uri): Moved into subclass FMDirectoryViewIcons (and renamed
to set_up_base_uri).
(view_has_flist): Removed.
(get_flist): Moved into subclass FMDirectoryViewList.
(add_to_flist): Moved into subclass FMDirectoryViewList.
(class_init): Signal initialization code for begin_adding_entries,
add_entry, done_adding_entries, done_sorting_entries, and begin_loading.
(init): Removed mode-setting line.
(display_pending_entries): Replaced the bulk of this function with three
new signals: begin_adding_entries, add_entry, done_adding_entries. The
loop structure and GnomeVFSFileInfo retrieving part remains.
(directory_load_cb): Deployed new signal begin_loading where setup_base_uri
used to be.
(fm_directory_view_is_valid_mode): Removed.
(fm_directory_view_get_mode): Removed.
(fm_directory_view_set_mode): Removed.
(fm_directory_view_begin_adding_entries): New function, emits signal.
(fm_directory_view_add_entry): New function, emits signal.
(fm_directory_view_done_adding_entries): New function, emits signal.
(fm_directory_view_done_sorting_entries): New function, emits signal.
(fm_directory_view_begin_loading): New function, emits signal.
(fm_directory_view_sort): Replaced some icon-container-specific
code with fm_directory_view_done_sorting_entries().
* src/file-manager/fm-directory-view-icons.c:
(fm_directory_view_icons_initialize_class): Wired up signal handlers
for add_entry, done_adding_entries, done_sorting_entries, and begin_loading.
(fm_directory_view_icons_initialize): Removed set_mode call.
(display_icons_not_in_layout): Moved here from superclass FMDirectoryView.
(get_icon_container): Moved here from superclass FMDirectoryView.
(add_to_icon_container): Moved here from superclass FMDirectoryView.
(load_icon_container): Moved here from superclass FMDirectoryView.
(set_up_base_uri): Moved here from superclass FMDirectoryView.
(fm_directory_view_icons_add_entry): New signal handler function, code
taken and simplified from superclass FMDirectoryView.
(fm_directory_view_icons_done_adding_entries): New signal handler
function, code taken and simplified from superclass FMDirectoryView.
(fm_directory_view_icons_done_sorting_entries): New signal handler
function, code taken and simplified from superclass FMDirectoryView.
(fm_directory_view_icons_begin_loading): New signal handler function,
code taken and simplified from superclass FMDirectoryView.
* src/file-manager/fm-directory-view-list.c:
(fm_directory_view_list_initialize_class): Wired up signal handlers
for begin_adding_entries, add_entry, and done_adding_entries
(fm_directory_view_list_initialize): Removed set_mode call.
(get_flist): Moved here from superclass FMDirectoryView.
(add_to_flist): Moved here from superclass FMDirectoryView.
(fm_directory_view_list_begin_adding_entries): New signal handler
function, code taken and simplified from superclass FMDirectoryView.
(fm_directory_view_list_add_entry): New signal handler function, code
taken and simplified from superclass FMDirectoryView.
(fm_directory_view_list_done_adding_entries): New signal handler
function, code taken and simplified from superclass FMDirectoryView.
2000-01-13 John Sullivan <sullivan@eazel.com>
* libnautilus/nautilus-gtk-macros.h: Defined macros
for use when a signal must be overridden by subclasses.
* src/file-manager/fm-directory-view.c: Deployed these
new macros for the "clear" signal.
NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL is outside any
function, and
(class_init): NAUTILUS_MUST_OVERRIDE_SIGNAL is in here.
(fm_directory_view_real_clear): Eliminated this in favor
of the above macros.
* src/file-manager/fm-directory-view-icons.c:
(fm_directory_view_icons_get_type): Replaced function with
NAUTILUS_DEFINE_GET_TYPE_FUNCTION macro.
(fm_directory_view_icons_init): Renamed to
fm_directory_view_icons_initialize and standardized parameters
to work with NAUTILUS_DEFINE_GET_TYPE_FUNCTION macro.
(fm_directory_view_icons_class_init): Renamed to
fm_directory_view_icons_initialize_class and standardized
parameters to work with NAUTILUS_DEFINE_GET_TYPE_FUNCTION macro.
(fm_directory_view_icons_destroy): Deployed
NAUTILUS_CALL_PARENT_CLASS macro.
* src/file-manager/fm-directory-view-list.c:
(fm_directory_view_list_get_type): Replaced function with
NAUTILUS_DEFINE_GET_TYPE_FUNCTION macro.
(fm_directory_view_list_init): Renamed to
fm_directory_view_list_initialize and standardized parameters
to work with NAUTILUS_DEFINE_GET_TYPE_FUNCTION macro.
(fm_directory_view_list_class_init): Renamed to
fm_directory_view_list_initialize_class and standardized
parameters to work with NAUTILUS_DEFINE_GET_TYPE_FUNCTION macro.
(fm_directory_view_list_destroy): Deployed
NAUTILUS_CALL_PARENT_CLASS macro.
2000-01-12 John Sullivan <sullivan@eazel.com>
More work at pushing appropriate fm_directory_view code
into subclasses.
* src/file-manager/fm-directory-view.c:
(class_init): Register "clear" signal, make
fm_directory_view_real_clear be default handler.
(fm_directory_view_real_clear): New function, does
nothing but complain when it's called. (I'm going to
replace this with a debug-only mechanism soon.)
(fm_directory_view_clear): New function, emits "clear" signal.
(fm_directory_view_load_uri): Replaced "if icons clear this way,
if list clear that way" code with call to fm_directory_view_clear.
(mode_uses_flist): Eliminated, wrapped into only remaining caller
view_has_flist (which will itself go away soon).
(mode_uses_icon_container): Eliminated, wrapped into only remaining caller
view_has_icon_container (which will itself go away soon).
* src/file-manager/fm-directory-view-icons.c:
(fm_directory_view_icons_clear): New function, erases icon container.
(fm_directory_view_icons_init): Replace fm_directory_view's
"clear" signal handler with fm_directory_view_icons_clear
(fm_directory_view_icons_get_icon_layout): Moved to here.
(fm_directory_view_icons_set_icon_layout): Moved to here.
(fm_directory_view_icons_line_up_icons): Moved to here.
* src/file-manager/fm-directory-view-list.c:
(fm_directory_view_list_clear): New function, erases list contents.
(fm_directory_view_list_init): Replace fm_directory_view's
"clear" signal handler with fm_directory_view_list_clear
* src/file-manager/fm-directory-view.h:
(fm_directory_view_clear): Added "clear" signal, and
fm_directory_view_clear prototype.
(fm_directory_view_icons_get_icon_layout): Moved out of here.
(fm_directory_view_icons_set_icon_layout): Moved out of here.
(fm_directory_view_icons_line_up_icons): Moved out of here.
* src/file-manager/fm-directory-view-icons.h:
(fm_directory_view_icons_get_icon_layout): Moved to here.
(fm_directory_view_icons_set_icon_layout): Moved to here.
(fm_directory_view_icons_line_up_icons): Moved to here.
2000-01-12 John Sullivan <sullivan@eazel.com>
* src/ntl-window-msgs.c (nautilus_window_load_content_view_menu):
Made option menu say "View as Icons" (e.g.) instead of just "Icons"
2000-01-11 Andy Hertzfeld <andy@eazel.com>
* src/ntl-window:
added a debug menu, and it's first item to show a color picker to test dropping colors
2000-01-11 John Sullivan <sullivan@eazel.com>
Started moving icon-specific and list-specific code
into the subclasses. As a transition step, added some
private prototypes to the .h file (clearly marked).
* src/file-manager/fm-directory-view.c:
(setup_flist), (setup_icon_container): eliminated completely.
(display_icon_container_selection_info_idle_cb),
(icon_container_selection_changed_cb), (icon_container_activate_cb),
(create_icon_container), (display_flist_selection_info_idle_cb),
(flist_activate_cb), (flist_selection_changed_cb),
(create_flist): moved out.
(fm_directory_view_set_mode): removed the guts, which are now
in the init functions for the subclasses; now just sets the
field (which will go away eventually).
* src/file-manager/fm-directory-view.h:
(add_to_flist), (display_selection_info), (get_flist),
(get_icon_container), (load_icon_container): temporarily
added to .h file.
* src/file-manager/fm-directory-view-icons.c:
(display_icon_container_selection_info_idle_cb),
(icon_container_selection_changed_cb), (icon_container_activate_cb),
(create_icon_container): moved in.
(fm_directory_view_icons_init): Now creates icon_container here instead of
in fm_directory_view_set_mode (which will eventually go away).
* src/file-manager/fm-directory-view-list.c:
(display_flist_selection_info_idle_cb), (flist_activate_cb),
(flist_selection_changed_cb), (create_flist): moved in.
(fm_directory_view_list_init): Now creates flist here instead of
in fm_directory_view_set_mode (which will eventually go away).
* src/ntl-window.c:
(real_nautilus_window_set_content_view): Renamed to
nautilus_window_real_set_content_view. Also added
self as an author.
2000-01-11 Darin Adler <darin@eazel.com>
NautilusBackground is now used for the index panel background.
* libnautilus/nautilus-background.c:
(nautilus_background_attach_to_canvas):
(nautilus_get_widget_background):
(nautilus_gtk_style_get_default_class):
(nautilus_gdk_window_update_sizes):
(nautilus_background_draw_flat_box):
(nautilus_background_get_gtk_style_class):
(nautilus_background_set_widget_style):
(nautilus_background_set_up_canvas):
(nautilus_widget_background_changed):
(nautilus_get_widget_background):
Added new code that changes the background of a widget by
modifying the GtkStyle. For solid colors and tiled images we
can just modify the GtkStyle. For gradients we need to make
a GtkStyle subclass.
* libnautilus/nautilus-background.h:
(nautilus_background_attach_to_canvas):
(nautilus_get_widget_background):
Changed the old interface that was canvas-specific, to a new one
that allows attacking a background to any widget.
* src/ntl-index-panel.h:
Now that the background is attached to the widget, we don't need
a background field in NautilusIndexPanel.
* src/ntl-index-panel.c:
(nautilus_index_panel_set_up_background)
(nautilus_index_panel_finalize):
(nautilus_index_panel_drag_data_received):
(nautilus_index_panel_set_up_info):
Changed the index panel to use NautilusBackground.
* libnautilus/nautilus-background-canvas-group.h:
libnautilus/nautilus-background-canvas-group.c:
(nautilus_background_canvas_group_get_background):
(nautilus_background_canvas_group_set_background):
Moved the code that manages the background object out of the
canvas group code, since we can now attach a background to
any widget.
* libnautilus/gdk-extensions.c:
(nautilus_gdk_color_parse_with_white_default): Changed this helper
to accept NULLs and return the default instead of prohibiting
NULL. This is consistent with the gradient's use of NULL to
represent the default color.
2000-01-11 John Sullivan <sullivan@eazel.com>
* libnautilus/nautilus-gtk-extensions.h:
* libnautilus/nautilus-gtk-extensions.c:
(nautilus_gtk_signal_connect_free_data): New function,
convenience wrapper for gtk_signal_connect_full where
the destroy-function is g_free() and the other extra
values are the defaults.
* src/ntl-window-msgs.c: (nautilus_window_load_content_view_menu):
Use nautilus_gtk_signal_connect_free_data to avoid leaking the menu item's
signal's copy of the iid string.
2000-01-11 John Sullivan <sullivan@eazel.com>
Content view menu now works (can switch between List and Icon views).
* src/ntl-window-msgs.c:
(nautilus_window_load_content_view): Made it return the new
content view, so callers don't need a load_info structure to
determine the new view. Also made it accept NULL for
requesting_view.
(view_menu_switch_views_cb): New function, callback for when
a view is chosen from the list of available content views.
Elliot told me that this requires further work, so I checked
it in with comments for later fixing by Elliot or someone
else who understands the loading process better.
(nautilus_view_load_content_view_menu): Added explicit
parameter for NautilusNavigationInfo for clarity (had been
getting this from deep in window temporary state guts).
Connected view_menu_switch_views_cb to menu items.
* src/ntl-window.c:
(nautilus_window_set_arg): Fixed bug in ARG_CONTENT_VIEW case where
new view was sometimes being added to view hierarchy twice. Then
moved this code into...
(real_nautilus_window_set_content_view): New function, implements
guts of content-view changing so set_arg doesn't have a big block
of code in a switch statement.
(nautilus_window_set_content_view): Moved the gtk_widget_show call
from here to real_nautilus_window_set_content_view so it happens
even if set_arg is called from elsewhere.
(gtk_option_menu_do_resize): Removed this
obsolete function (I removed the callers yesterday but forgot this).
2000-01-11 Darin Adler <darin@eazel.com>
* libnautilus/ntl-view-frame.c: Fixed typos and oversights in
Maciej's check-in. He didn't compile his changes :-(
2000-01-11 Maciej Stachowiak <mjs@eazel.com>
* libnautilus/ntl-view-frame.c, libnautilus/ntl-view-frame.h: Redo
signals the conventional way, to avoid array size mismatches in
the future.
2000-01-10 Maciej Stachowiak <mjs@eazel.com>
* docs/architecture.txt: Some documentation on the nautilus
architecture including a block diagram and some conrol flow
explanations. Needs editing for both style and technical
completeness/accuracy, but it's a start.
* libnautilus/gnome-icon-container.c (handle_icon_button_press):
Reorder code so "context_click" is actually emitted on a button 3
press.
* src/file-manager/fm-main.c,
src/file-manager/fm-directory-view.c,
src/file-manager/fm-directory-view.h: Changed FMDirectoryView to
use a NautilusViewFrame rather than inheriting from one.
* libnautilus/ntl-view-frame.c (nautilus_view_frame_class_init):
Fixed marshall type for "stop_location_change" signal. How could
this ever have worked?
* src/ntl-view.c (nautilus_view_load_client): Once an appropriate
component type is found, do not keep looping.
2000-01-10 John Sullivan <sullivan@eazel.com>
First step at splitting the directory view into separate
icon and list views. List view compiles and runs now,
but is still inaccessible from the UI.
* src/file-manager/fm-directory-view-icons.h:
* src/file-manager/fm-directory-view-icons.c:
* src/file-manager/fm-directory-view-list.h:
* src/file-manager/fm-directory-view-list.c:
New files. These implement two subclasses of FMDirectoryView.
Currently the subclasses are trivial; the only code in the
subclasses other than boilerplate is the one line that sets
the view mode. Later I'll push the rest of the relevant code
down into the subclasses.
* src/file-manager/Makefile.am
Added the four new files to the build.
* src/file-manager/fm-directory-view.c: (init): Removed the
call to fm_directory_view_set_mode since the subclasses are
responsible for this now.
(setup_base_uri): Don't call get_icon_container for non-icon
views, as it asserts if you do; this was broken but since
you couldn't switch to a non-icon view we didn't realize it.
* src/file-manager/fm-main.c: (make_obj): Now calls either
fm_directory_view_icons_get_type() or fm_directory_view_list_get_type()
depending on the goad_id.
* src/file-manager/ntl-file-manager.goad: Replaced entry for
ntl_file_manager with two, one for ntl_file_manager_icon_view
and one for ntl_file_manager_list_view
* src/ntl-uri-map.c: (nautilus_navinfo_new): Now it sets up
the two content views for directories with their new goad ids.
2000-01-10 Maciej Stachowiak <mjs@eazel.com>
* libnautilus/ntl-view-frame.c, libnautilus/ntl-view-frame.c:
Fixed mismatch between declared signal array size and actual
number of signals (this should still be rewritten to follow proper
style).
* libnautilus/ntl-content-view-frame.c,
libnautilus/ntl-content-view-frame.h,
libnautilus/ntl-meta-view-frame.c,
libnautilus/ntl-meta-view-frame.h, libnautilus/ntl-view-frame.c,
libnautilus/ntl-view-frame.h, src/ntl-app.c,
src/ntl-view-bonobo-control.c, src/ntl-view-bonobo-subdoc.c,
src/ntl-view-frame-svr.c, src/ntl-view-nautilus.c,
src/ntl-view-private.h, src/ntl-view.c, src/ntl-view.h,
src/ntl-window-msgs.c, src/ntl-window-msgs.h,
src/ntl-window-state.c, src/ntl-window.c, src/ntl-window.h,
src/file-manager/fm-directory-view.c,
src/file-manager/fm-directory-view.h, src/file-manager/fm-main.c:
Added Eazel copyright to files I've changed non-trivially.
2000-01-10 Darin Adler <darin@eazel.com>
* src/ntl-index-panel.c: (nautilus_index_panel_set_up_label):
Added workaround to problem with basename and gnome-vfs.
2000-01-10 Maciej Stachowiak <mjs@eazel.com>
* libnautilus/ntl-view-frame.c, libnautilus/ntl-view-frame.h,
libnautilus/ntl-content-view-frame.c,
libnautilus/ntl-content-view-frame.h,
libnautilus/ntl-meta-view-frame.c,
libnautilus/ntl-meta-view-frame.h: Renamed from
libnautilus/ntl-view-client.c, libnautilus/ntl-view-client.h,
libnautilus/ntl-content-view-client.c,
libnautilus/ntl-content-view-client.h,
libnautilus/ntl-meta-view-client.c,
libnautilus/ntl-meta-view-client.h.
* libnautilus/Makefile.am, libnautilus/libnautilus.h: reflect this
renaming.
2000-01-10 Darin Adler <darin@eazel.com>
* ntl-window-msgs.c: (nautilus_window_request_progress_change):
(nautilus_window_advance_state):
(nautilus_window_switch_to_new_views):
(nautilus_window_revert_to_old_views):
(nautilus_window_free_load_info):
(nautilus_window_end_location_change):
(nautilus_window_change_location_2):
(nautilus_window_change_location): Got rid of the race condition
in the existing code and cleaned up the state machine a bit. The
new code separates the state of the nautilus window from the state
of the content view, which makes things a bit simpler.
2000-01-10 John Sullivan <sullivan@eazel.com>
Added some of the framework for supporting multiple
content views for the same uri. More to come later.
* src/ntl-types.h: added NautilusViewIdentifier struct
to keep track of iid and human-readable name. Renamed
NautilusNavigationInfo.content_iid to default_content_iid,
and added content_identifiers GSList.
* src/ntl-uri-map.c:
(nautilus_view_identifier_new): New function.
(nautilus_view_identifier_free): New function.
(nautilus_navinfo_new): Create a human-readable-name
for each content iid, and store them together in
content_identifiers list. I included a currently
unworking "List" choice for the directory case, to
test the framework.
(nautilus_navinfo_free): Free the content_identifiers list.
* src/ntl-window-msgs.c:
(nautilus_window_load_content_view_menu): New function,
iterates through the content_identifiers list to fill in
the menu of content view choices. The menu items don't do
anything yet.
(nautilus_window_change_location_internal): Added call to
nautilus_window_load_content_view_menu.
(nautilus_window_change_location_2): Fixed spelling and
grammar in a couple of error messages.
* src/ntl-window.c: (nautilus_window_constructed): Removed
"View as (placeholder)" text in menu; now it has no text
until the actual choices appear. Removed some option-menu-sizing
trickery that didn't work correctly when items were added later.
Now the entire menu is replaced when its contents change.
* src/ntl-window.h: Removed menu_cvtype field; code all uses
just option_cvtype now.
2000-01-10 Darin Adler <darin@eazel.com>
* libnautilus/Makefile.am, libnautilus/nautilus-background.h,
libnautilus/nautilus-background.c,
libnautilus/nautilus-background-canvas-group.h,
libnautilus/nautilus-background-canvas-group.c,
libnautilus/nautilus-lib-self-check-functions.h,
libnautilus/nautilus-lib-self-check-functions.c: Added first cut
at a new class to manage backgrounds that can be colors, color
gradients, or tiled images.
* libnautilus/Makefile.am, libnautilus/nautilus-string.h,
libnautilus/nautilus-string.c: Added functions that manipulate
strings that allow NULLs to reduce NULL checks in code that
treats NULL the same as an empty string.
* libnautilus/gdk_extensions.c: (nautilus_gradient_new):
(nautilus_gradient_is_gradient):
(nautilus_gradient_is_horizontal):
(nautilus_gradient_strip_trailing_direction_if_any):
(nautilus_gradient_get_start_color_spec):
(nautilus_gradient_get_end_color_spec):
(nautilus_gradient_set_edge_color): Changed gradient functions to
allow NULL and treat it the same as an empty string.
* libnautilus/gdk_extensions.h: libnautilus/gdk_extensions.c:
(nautilus_gdk_color_parse_with_default):
(nautilus_gdk_color_parse_with_white_default): Added alternate
version of gdk_color_parse that uses a default color instead of
just returning false. Added self-checks and updated some existing
self checks at the same time.
* src/ntl-index-panel.h, src/ntl-index-panel.c: Wholesale
cleanup and reformatting of NautilusIndexPanel. Fixed a number of
bugs, including storage leaks, and took first step toward using
NautilusBackground class.
* src/ntl-window.c: (nautilus_window_get_requested_uri):
Changed this so it works when window->ni is NULL.
* src/ntl-window.h: Changed index_panel to be a NautilusIndexPanel
now that the index panel interface uses the class instead of using
GtkWidget everywhere.
* src/file-manager/.cvsignore: Added *.la.
* src/file-manager/fm-directory.c: Minor reformatting to match
GNOME code style better.
2000-01-10 John Sullivan <sullivan@eazel.com>
* src/ntl-index-panel.c: (nautilus_index_panel_set_up_label):
Check for NULL filename
2000-01-10 Maciej Stachowiak <mjs@eazel.com>
* src/file-manager/.cvsignore: ignore ntl-file-manager rather than
libntl-file-manager.la
Made file manager view a CORBA server that lives in a separate
executable:
* src/file-manager/fm-main.c: New file which includes main()
function and basic framework to make the file manager an
executable CORBA server.
* src/file-manager/ntl-file-manager.goad: gnorba activation file
for the file manager.
* src/file-manager/Makefile.am: Build ntl-file-manager as an
executable rather than a library. Add fm-main.c to build. Install
ntl-file-manager.goad. Link in appropriate libraries.
* src/ntl-app.c: Remove nautilus_make_object() and other vestiges
of the attempt to be a CORBA server for file manager view objects.
* src/nautilus.gnorba: Removed.
* nautilus-self-check-functions.c: Remove call to test of
functions now in the separate ntl-file-manager executable.
* src/Makefile.am: Don't try to link in file manager. Don't try to
install nautilus.goad.
2000-01-10 Maciej Stachowiak <mjs@eazel.com>
* src/ntl-main.c (main): Added missing CORBA_exception_init() call.
2000-01-09 Maciej Stachowiak <mjs@eazel.com>
* libnautilus/ntl-view-client.c, libnautilus/ntl-view-client.h,
libnautilus/ntl-content-view-client.c,
libnautilus/ntl-content-view-client.h,
libnautilus/ntl-meta-view-client.c,
libnautilus/ntl-meta-view-client.h,: Rename NautilusViewClient to
NautilusViewFrame, NautilusContentViewClient to
NautilusContentViewFrame, and NautilusMetaViewClient to
NautilusMetaViewFrame.
* components/help/hyperbola-nav-tree.c,
components/history/ntl-history-view.c,
components/html/ntl-web-browser.c,
components/websearch/ntl-web-search.c, src/ntl-app.c,
src/file-manager/fm-directory-view.c,
src/file-manager/fm-directory-view.h: Reflect the above renaming.
2000-01-09 Andy Hertzfeld <andy@eazel.com>
* src/ntl-index-panel.c: made dropping a color from the color
picker set the background accordingly. It doesn't save the
meta-data yet, thought
2000-01-09 Maciej Stachowiak <mjs@eazel.com>
* components/websearch/.cvsignore: Added .deps, .libs,
ntl-web-search
2000-01-07 Andy Hertzfeld <andy@eazel.com>
changed the way the index panel gets notified of location changes
removed the index_panel_connect stuff
instead, calls index_panel_set_uri directly from nautilus_window_change_location
* src/ntl-index-panel.c, src/ntl-index-panel.h:
restructured the code that populates the view with the info,
added logic to use as large a font as possible for the title
fixed bug involving the path ending with a slash.
* src/ntl-window-msgs.c:
added explicit call to index_panel_set_uri as mentioned above
* src/ntl-window.c
removed call to index_panel_connect as mentioned above
2000-01-07 John Sullivan <sullivan@eazel.com>
Added and deployed utility routine for presenting a
window (in any current state) to user.
* libnautilus/nautilus-gtk-extensions.h:
* libnautilus/nautilus-gtk-extensions.c: New files
(nautilus_gtk_window_present): New function, presents
a window to user (opens it, brings it to front w/focus)
regardless of whether it was showing, buried, hidden, or
minimized.
* libnautilus/Makefile.am: added these two new files. Also
changed ".c" to ".h" for two self-check files in the HEADERS
list (apparent typo).
* src/nautilus-bookmarks-menu.c: (edit_bookmarks_cb):
Replaced call to nautilus_bookmarks_window_present with
call to nautilus_gtk_window_present.
* src/nautilus-bookmarks-window.c:
* src/nautilus-bookmarks-window.h:
(nautilus_bookmarks_window_present): Deleted this function.
* src/nautilus-bookmarks-window.c:
(create-bookmarks-window): Now calls nautilus_bookmarks_
window_restore_geometry just once here, instead of every
time window was shown.
* src/ntl-window.c: (nautilus_about_window_cb):
Now it keeps around a single About window, instead of
creating a new one each time (you could litter the screen
with About windows before). Also removed some obsolete
gtk_widget_set_sensitive calls.
2000-01-07 John Sullivan <sullivan@eazel.com>
Bookmarks window position is now saved & restored within
a session and across sessions. Some of this work can be
turned into general-purpose utilities but I didn't do
that yet (I will when we have a second need for it)
* src/nautilus-bookmarklist.c:
* src/nautilus-bookmarklist.h:
(nautilus_bookmarklist_set_window_geometry):
(nautilus_bookmarklist_get_window_geometry): New functions,
take/return a string representing the window position.
* src/nautilus-bookmarklist.c:
(nautilus_bookmarklist_load_file):
(nautilus_bookmarklist_save_file): read/write xml node for
window geometry in addition to bookmarks. Also cleaned up
a couple of leaked results from xmlGetProp and reformatted.
(set_window_geometry_internal): New utility function.
* src/nautilus-bookmarks-menu.c: (edit_bookmarks_cb): Moved
window-displaying logic out of this routine and into new
routine nautilus_bookmarks_window_present(), which is now
called here.
* src/nautilus-boomarks-menu.c:
* src/nautilus-boomarks-menu.h:
(nautilus_bookmarks_menu_exiting): New function, handles telling
bookmarks window to save itself when application exits.
* src/ntl-app.c: (nautilus_app_exiting): Now calls
nautilus_bookmarks_menu_exiting.
* src/nautilus.h: Now #includes "nautilus-bookmarks-menu.h"
* src/nautilus-bookmarks-window.h:
* src/nautilus-bookmarks-window.c:
(nautilus_bookmarks_window_present): New function, handles
presenting the bookmarks window on screen regardless of current state.
(nautilus_bookmarks_window_save_geometry): New function, reads window
position & size and passes them along to
nautilus_bookmarklist_set_window_geometry for safe-keeping.
* src/nautilus-bookmarks-window.c:
(nautilus_bookmarks_window_restore_geometry): New function, gets
window geometry from bookmarklist and sets window size & position
from it (after adjusting with some sanity checks)
(create_bookmarks_window): Replaced set_default_size call with
nautilus_bookmarks_window_restore_geometry call.
2000-01-07 Elliot Lee <sopwith@redhat.com>
* src/ntl-window.c, src/ntl-index-panel.c: Fix warnings.
2000-01-07 Andy Hertzfeld <andy@eazel.com>
* src/ntl-index-panel.h, src/ntl-index-panel.c: new files for index panel class
Initial bare-bones implementation of index panel still using notebook object instead of custom tabs
* src/ntl-window.h, src/ntl-window.c:
just use box instead of pane for nautilus window content,
index_panel now responsible for the meta-views allocate and
install index_panel instead of meta_notebook connect_signals calls
index_panel so it can connect, too added myself as an author
* src/Makefile.am:
added index_panel class
2000-01-06 Darin Adler <darin@eazel.com>
* libnautilus/Makefile.am,
libnautilus/nautilus-lib-self-check-functions.c,
libnautilus/nautilus-lib-self-check-functions.h,
libnautilus/nautilus-self-checks.c,
libnautilus/nautilus-self-checks.h, src/Makefile.am,
src/nautilus-self-check-functions.c,
src/nautilus-self-check-functions.h, src/nautilus-self-checks.c,
src/nautilus-self-checks.h, src/ntl-main.c (main),
src/file-manager/fm-directory.c,
src/file-manager/fm-vfs-directory.c: Moved self-check framework
into libnautilus. Added functions so each check will report if it
fails instead of just aborting.
* src/gdk-extensions.c, src/gdk-extensions.h
(nautilus_gradient_new, nautilus_gradient_is_gradient,
nautilus_gradient_get_start_color_spec,
nautilus_gradient_get_end_color_spec,
nautilus_gradient_is_horizontal,
nautilus_gradient_set_left_color_spec,
nautilus_gradient_set_top_color_spec,
nautilus_gradient_set_right_color_spec,
nautilus_gradient_set_bottom_color_spec): Added new functions to
manage a string that specifies a color or gradient, and added
tests for the new functions.
2000-01-06 John Sullivan <sullivan@eazel.com>
* src/ntl-app.h: src/ntl-app.c: (nautilus_app_exiting):
New function for doing app-wide cleanup. Moved call to
nautilus_prefs_save in here.
* src/ntl-app.c: (nautilus_app_destroy_window): Former
home of call to nautilus_prefs_save.
* src/ntl-main.c: (main): After event loop concludes,
call nautilus_app_exiting.
2000-01-06 Elliot Lee <sopwith@redhat.com>
* libnautilus/gnome-icon-container.c: Relayout when size changes.
2000-01-06 Andy Hertzfeld <andy@eazel.com>
* ntl-window.c: made location bar draggable to be consistent with the others by removing DOCK_LOCKED
flag
2000-01-06 Elliot Lee <sopwith@redhat.com>
* libnautilus/gnome-icon-container.c: Eliminate gratuitous scroll bars.
* src/ntl-window-msgs.c, components/help/hyperbola-filefmt.c, components/html/gnome-dialogs.c: Bug fixes.
2000-01-06 John Sullivan <sullivan@eazel.com>
* src/ntl-prefs.c: added NULLs to array initializers to
eliminate compiler warnings.
2000-01-06 Elliot Lee <sopwith@redhat.com>
* src/ntl-prefs.c, src/ntl-uri-map.c: Implement preferences for
which meta-views to always load with a page. Loading doesn't seem to quite work.
* src/ntl-window.c, src/ntl-view.c: Try to fix a crash that
happens when going to a new page, and a meta view is being
destroyed in the process. Still crashes.
2000-01-05 Maciej Stachowiak <mjs@eazel.com>
* src/ntl-uri-map.c (nautilus_navinfo_free): Fix warning.
2000-01-05 Elliot Lee <sopwith@redhat.com>
* src/ntl-types.h, src/ntl-uri-map.[ch], src/ntl-window-msgs.c, src/ntl-window.[ch]:
Add support for the location change state machine and related notifications,
to allow much better error handling.
* src/ntl-view.[ch]: Catch client failures, also allow for active sensing of client death.
* src/file-manager/fm-directory-view.c: Send progress notifications.
* components/html/ntl-web-browser.c: Send progress
notifications. Try to fix crashes caused by ending an error stream
twice.
* src/file-manager/fm-icon-cache.c: Update for gdk-pixbuf changes.
2000-01-05 John Sullivan <sullivan@eazel.com>
* src/nautilus-bookmarks-window.c: (create_bookmarks_window):
Remove horizontal scroll bar from list via set_policy.
2000-01-05 John Sullivan <sullivan@eazel.com>
* src/nautilus-bookmarks-menu.c: (nautilus_bookmarks_menu_fill):
Stopped using GNOMEUIINFO_ITEM_DATA macro, because it doesn't work
right (on some machines) when there's no pixmap for the item.
2000-01-04 John Sullivan <sullivan@eazel.com>
* src/nautilus-bookmarks-menu.c: comment changes only
* src/nautilus-bookmarks-window.c:
(create_bookmarks_window): added padding to "Remove" button
so it isn't so scrawny.
(on_remove_button_clicked): Removed item from clist explicitly
instead of relying on notification that bookmark list changed;
this correctly moves the selection to the next item instead of
jumping it back to the top of the list.
2000-01-04 Darin Adler <darin@eazel.com>
A couple of quick fixes to make "make check" work again.
* src/file-manager/fm-directory.c (fm_directory_initialize):
src/file-manager/fm-vfs-directory.c (fm_vfs_directory_initialize):
Use g_new0 instead of g_new for details structure to better
mimic what gtk_object_new does.
* src/file-manager/fm-directory.c (fm_directory_get):
Added an assert to check that the hash table key is set up
correctly. This was failing when John did a "make check".
* src/file-manager/fm-vfs-directory.c (fm_vfs_directory_new):
Set up the hash table key when creating the object. This
was causing a failure in "make check".
2000-01-04 John Sullivan <sullivan@eazel.com>
* src/nautilus-bookmarks-window.c (create_bookmarks_window):
Replaced hardwired numbers with constants; specified a minimum
size separate from default size and changed parameter to
gtk_window_set_policy to prevent shrinking below minimum size.
2000-01-04 John Sullivan <sullivan@eazel.com>
After talking with Sopwith and Darin, removed
my changes from earlier today. The current framework
handles bogus URIs better than I thought, though still
with some known problems. I can't implement the bookmarks
part until the problems are fixed. And the new functions
don't seem to be required in any case.
* libnautilus/nautilus-uri-utilities.c: removed file
* libnautilus/nautilus-uri-utilities.h: removed file
* libnautilus/Makefile.am: removed these two files
from the build, and removed GnomeVFS
* src/ntl-window.c: removed #include for nautilus-uri-utilitie.h.
Sopwith had removed the call from (nautilus_window_goto_uri_cb)
earlier (without a ChangeLog entry).
2000-01-04 Darin Adler <darin@eazel.com>
* src/Makefile.am, src/check-nautilus,
src/nautilus-self-check-functions.h, src/nautilus-self-checks.c,
src/nautilus-self-checks.h, src/ntl-main.c (main): Added self
checks to nautilus. The checks are invoked by "make check"
(actually need to do "make install check" if you changed
libnautilus) or by invoking the nautilus executable with "--check".
Later, nautilus-self-checks.h may include various helpful
functions for use by the self-checking code.
* src/file-manager/Makefile.am, src/file-manager/fm-directory.c,
src/file-manager/fm-directory.h,
src/file-manager/fm-directory-protected.h,
src/file-manager/fm-vfs-directory.c,
src/file-manager/fm-vfs-directory.h: Started work on an abstract
FMDirectory class that provides a model for what's viewed by the
file manager. Also began work on the FMVFSDirectory concrete child
class that implements this on top of VFS. It's not hooked up yet,
and there's a lot that needs to be done before it's ready to use.
* libnautilus/gdk-extensions.c, libnautilus/gdk-extensions.h:
Renamed functions to use nautilus_ prefix instead of gdk_
prefix. Added a tiny bit of self-check code.
* libnautilus/nautilus-gtk-macros.h: Added some macros (that will
no doubt be controversial) to do some basic GTK object
boilerplate.
2000-01-04 John Sullivan <sullivan@eazel.com>
Made location-entering field handle bogus URIs better
(next: bookmarks)
* libnautilus/nautilus-uri-utilities.c: new file
* libnautilus/nautilus-uri-utilities.h: new file
At this point there's just one uri utility function,
nautilus_path_known_not_to_exist(), which is a quick
check for a bogus URI. (It's not guaranteed to return
TRUE for all bad URIs, just the ones it can tell quickly
are bogus).
* libnautilus/Makefile.am: added these two new files
to the build, and linked with GnomeVFS (needed for new
function)
* src/ntl-window.c: (nautilus_window_goto_uri_cb):
If typed path can quickly be rejected, puts an error
message in the status bar and doesn't try to go there.
* components/websearch/.cvsignore: added Makefile
2000-01-03 Maciej Stachowiak <mjs@eazel.com>
* idl/nautilus.idl: Added stop_location_change method to NautilusView interface.
* ntl-view-client.c, ntl-view-client.h (stop_location_change): New
signal, triggered on receipt of stop_location_change request via
CORBA.
* ntl-view.c, ntl-view.h, ntl-view-private.h, ntl-view-nautilus.c,
ntl-view-bonobo-control.c, ntl-view-bonobo-subdoc.c
(nautilus_view_stop_location_change): Added this function; also
added implementation to nautilus view type function table and
NULL'd out for now for Bonobo control and subdoc view types (need
to find out if loading is synchronous or asynchronous for those,
and if there is a way to abort).
* ntl-window.c: Stop loading for all views when Stop button is
pressed.
* ntl-window-msgs.c: Enable stop button when we start loading;
enable Stop button when
* src/file-manager/fm-directory-view.c: Call
request_progress_change() when loading is done or an error is
reached; implement handler for stop_location_change signal.
2000-01-03 Maciej Stachowiak <mjs@eazel.com>
* src/ntl-prefs.c: Fix warnings.
* src/ntl-view.c, src/ntl-view.h, src/ntl-view-frame-svr.c
(nautilus_view_notify_location_change,
nautilus_view_notify_selection_change, nautilus_view_load_state,
nautilus_view_save_state, nautilus_view_show_properties): Made
these functions public and removed the corresponding signals;
these are operations you do to the NautilusView, not something it
informs other parts of the program of.
(request_location_change, request_selection_change,
request_status_change, request_progress_change): New
signals. These allow NautilusView to have less dependence on
NautilusWindow.
(nautilus_view_signals): Moved signal number table from view to
this static variable.
(nautilus_view_request_location_change,
nautilus_view_request_selection_change,
nautilus_view_request_status_change,
nautilus_view_request_progress_change): Move to ntl-view.c and
make them emit the proper signals in lieu of hardcoded handling.
* src/ntl-window.c, src/ntl-window.h src/ntl-window-msgs.c,
src/ntl-window-msgs.h, src/ntl-window-state.c
(request_location_change, request_selection_change,
request_status_change, request_progress_change): Removed these
signals; they are operations you do on a NautilusWindow, not
something it notifies you of, and any usefulness for inheritance
purposes is purely speculative right now.
(nautilus_window_connect_view, nautilus_window_disconnect_view):
Use these new helper functions to connect callbacks to
NautilusView's signals instead of expecting them to just get
called.
(nautilus_view_request_location_change,
nautilus_view_request_selection_change,
nautilus_view_request_status_change,
nautilus_view_request_progress_change): Execute bodies of real_
versions instead of emitting singals.
(nautilus_view_real_request_location_change,
nautilus_view_real_request_selection_change,
nautilus_view_real_request_status_change,
nautilus_view_real_request_progress_change): Removed these.
Finally, always call nautilus_winodow_set_content_view or
nautilus_window_add_meta_view before calling
nautilus_view_load_client to make sure no signals are lost.
2000-01-03 Elliot Lee <sopwith@redhat.com>
* components/websearch, configure.in: The ten minute version of kwebsearch.
* components/html/ntl-web-browser.c: Handle forms (POST is untested and probably buggy).
* src/ntl-uri-map.c: Check result of file_info retrieval. Load web search by default.
* src/ntl-prefs.[ch]: First (lame) attempt at implementing application preferences.
* src/ntl-app.c: Load prefs at startup
2000-01-03 John Sullivan <sullivan@eazel.com>
Added underline-accelerators to Add Bookmark and
Edit Bookmarks in Bookmarks menu. This was much
more difficult than I expected.
* src/nautilus-bookmarks-menu.c:
(init): Removed all the guts of this function.
(nautilus_bookmarks_menu_new): Now calls
nautilus_bookmarks_menu_fill() on freshly-created menu.
(nautilus_bookmarks_menu_fill): New function, takes over
the chore of initially populating the Bookmarks menu.
Uses GnomeUIInfo structs to set up Add Bookmarks and
Edit Bookmarks so they'll have underline-accelerators.
Also they now have tooltip strings (and I added a call
to gnome_app_install_menu_hints() to make the tooltips work).
2000-01-03 John Sullivan <sullivan@eazel.com>
Fixed memory leaks in bookmarks stuff
* src/nautilus-bookmarklist.c: (nautilus_bookmarklist_delete_item_at):
Destroy the bookmark when removing it from list.
* src/nautilus-bookmarks-menu.c:
(nautilus_bookmarks_menu_repopulate):
Store an index rather than a bookmark in the menu item, since the
item will be destroyed if the menu is reordered.
(bookmark_activated_cb): Find bookmark from the index stored in item.
2000-01-03 John Sullivan <sullivan@eazel.com>
Started new file for file-related utilities in Nautilus.
* libnautilus/nautilus-file-utilities.h : new file
* libnautilus/nautilus-file-utilities.c : new file
* libnautilus/Makefile.am : added these two new files to the build.
* src/nautilus_bookmarklist.c:
(nautilus_bookmarklist_get_file_path): Deployed
nautilus_make_path() and nautilus_user_directory()
2000-01-03 Darin Adler <darin@eazel.com>
* configure.in: Added "-Wall -Wno-unused" to list of warnings.
It seems to me that at one point we got these from the gnome
default warnings, but this seems to have stopped. There's no
harm in repeating them in here and it fixes the problem for
now, but I'd like to know what happened.
* components/html/.cvsignore: Added some generated files.
* components/html/gnome-dialogs.c: (glibwww_progress):
Replaced an incorrect "%l" in a printf format string with
the correct "%ld".
* libnautilus/.cvsignore: Added some generated files.
2000-01-03 John Sullivan <sullivan@eazel.com>
* src/nautilus_bookmarklist.c:
(nautilus_bookmarklist_save_file): Took out unused local
variables. My compiler didn't notice these because -Wall
isn't in our compile flags. Darin is fixing the compile flags.
2000-01-03 Elliot Lee <sopwith@redhat.com>
* All files: Update copyright notices.
1999-12-30 John Sullivan <sullivan@eazel.com>
* src/nautilus_bookmarklist.c: (nautilus_bookmarklist_get_file_path):
Create directory that contains bookmarks file if it's not already
there. Saving bookmarks would have failed (silently) for anyone
who didn't already have a ~/.gnomad directory without this change.
1999-12-30 John Sullivan <sullivan@eazel.com>
Made NautilusBookmark use gchar * instead of GString
since it wasn't using any special GString features.
* src/nautilus-bookmark.h: changed definition in struct
* str/nautilus-bookmark.c:
(nautilus_bookmark_destroy): changed g_string_free to g_free
(init): eliminated g_string_new
(nautilus_bookmark_get_name): replaced bookmark->uri->name
with bookmark->name
(nautilus_bookmark_get-uri): replaced bookmark->uri->str
with bookmark->uri
(nautilus_bookmark_new): changed initializers from
GString style to gchar * style
Save/restore bookmarks across sessions with XML file.
* src/nautilus_bookmarklist.c:
(append_bookmark_node): new foreach static function
(destroy_bookmark): new foreach static function
(nautilus_bookmarklist_get_file_path): new static function
(nautilus_bookmarklist_load_file): new static function
(nautilus_bookmarklist_save_file): new static function
(init): renamed to nautilus_bookmark_init
(class_init): renamed to nautilus_bookmark_class_init
(nautilus_bookmarklist_contents_changed): now calls
nautilus_bookmarklist_save_file
(nautilus_bookmarklist_init): now calls
nautilus_bookmarklist_load_file
1999-12-30 John Sullivan <sullivan@eazel.com>
Linked in GNOME-XML library, since I'll need it for bookmarks.
* configure.in: defined XML-related macros (copied from gconf)
* src/Makefile.am: included $(XML_CFLAGS) and $(XML_LIBS)
1999-12-30 John Sullivan <sullivan@eazel.com>
The bookmark-editing window is now functional, though simple.
It allows editing names & uris, reordering bookmarks via
dragging in the list, and removing bookmarks. Coming next:
bookmarks persisting across sessions.
* src/nautilus-bookmarks-window.h: New file.
* src/nautilus-bookmarks-window.c: New file.
* src/Makefile.am: added nautilus-bookmarks-window.[ch]
* src/nautilus-bookmarklist.h, nautilus-bookmarklist.c:
(nautilus_bookmarklist_delete_item_at): New function
(nautilus_bookmarklist_insert_item): New function
* src/nautilus-bookmarks-menu.c: (init): Removed
insensitization of Edit Bookmarks item.
Added parameter names to prototypes where they were missing
* src/nautilus-bookmark.h
* src/nautilus-bookmarklist.h
* src/nautilus-bookmarks-menu.h
Fixed bug where activating bookmarks failed in any but the
first window
* src/nautilus-bookmarks-menu.c
(bookmark_activated_cb):
(nautilus_bookmarks_menu_repopulate):
Changed bookmark menu items to keep a pointer to their
menu, rather than the menu's window, because sometimes
the menu's window isn't set when the menu item is created.
1999-12-29 John Sullivan <sullivan@eazel.com>
* src/nautilus-bookmarklist.c:
(nautilus_bookmarklist_contains):
changed two g_return_if_fail to g_return_val_if_fail. Eek! I
accidentally checked this in yesterday without compiling. I
should be tarred and feathered.
(nautilus_bookmarklist_append): Now calls new nautilus_bookmark_copy
* src/nautilus-bookmark.c:
(nautilus_bookmark_copy): New method
* src/nautilus-bookmark.h:
(nautilus_bookmark_copy): New method
1999-12-28 John Sullivan <sullivan@eazel.com>
* src/nautilus-bookmark.c:
* src/nautilus-bookmarklist.c:
* src/nautilus-bookmarks-menu.c:
Removed unnecessary g_return_if_fail (obj != NULL) calls
since the g_return_if_fail (NAUTILUS_IS_WHATEVER (obj)) call
also handles the NULL case. Also added some more calls of
the latter type.
1999-12-28 John Sullivan <sullivan@eazel.com>
* src/nautilus-bookmark.c, src/nautilus-bookmark.h:
(nautilus_bookmark_compare_with):
new function, compares two bookmarks for equivalence, used by:
* src/nautilus-bookmarklist.c, src/nautilus-bookmarklist.h:
(nautilus_bookmarklist_contains):
new function, checks whether a given bookmark is already in the
list, used by:
* src/nautilus-bookmarks-menu.c, src/nautilus-bookmarks-menu.h:
(add_bookmark_cb): now silently refuses to add another bookmark
for the current location if there's one already in the list.
(init): now uses connect_signal_while_alive to avoid nastiness
when trying to add a bookmark after one or more windows were closed.
* src/ntl-window.c: (file_menu_new_window_cb): Now calls
nautilus_app_create_window() instead of creating the new window
in line, so that the window count gets properly updated and closing
windows works correctly.
1999-12-28 John Sullivan <sullivan@eazel.com>
* src/ntl-view.c: (nautilus_view_load_client):
Undid the previous change. It turned out I
needed to rebuild the latest ORBit and then
the latest gnome-libs. I had built them in
the wrong order before.
1999-12-28 John Sullivan <sullivan@eazel.com>
* src/ntl-view.c: (nautilus_view_load_client): cast
a const CORBA_char * to a CORBA_char * in call to
GNOME_Unknown_query_interface to fix the build.
Darin thinks this is a mistake in the API and is
investigating fixing the API.
1999-12-22 Elliot Lee <sopwith@redhat.com>
* src/ntl-uri-map.[ch]: Add initialization function. Implement scheme mapping.
* components/history/ntl-history-view.c: Testbed for UIHandler usage.
* src/ntl-*view*.c: Better error checking, support UIHandler usage.
* src/ntl-window-msgs.c: Better error checking.
* src/ntl-window.c: Better error checking, plus move menu creation so that UIHandler usage is easier.
1999-12-21 Elliot Lee <sopwith@redhat.com>
* idl/nautilus.idl, libnautilus/ntl-view-client.[ch], src/ntl-window*.[ch], src/ntl-view-frame-svr.c:
Add request_progress_change notification
* src/ntl-view-*: Fix/finish various mjs changes: Do the component type abstraction properly,
lose ntl-view-frame-svr.h, add ntl-view-private.h, add various component type implementations.
* src/ntl-view-frame-svr.h: Add 'extern' so everyone doesn't get their
own vepv variable.
1999-12-20 Maciej Stachowiak <mjs@eazel.com>
* src/ntl-view.h: Remove request_* calls from public API (they are
just an implementation detail of the fact that NautilusView
implements a Nautilus:ViewFrame CORBA server - the nautilus app
should not need to call these).
* src/ntl-view.c: Split all the three way conditional stuff out so
there is a separate function for each branch of the condition. Not
a big win yet, but will provide opportunities for more
refactoring.
* src/ntl-view-frame-svr.c, ntl-view-frame-svr.h: Move
implementation of Nautilus:ViewFrame CORBA server here as much as
possible.
* src/ntl-view.c: Remove it from here.
* src/nautilus.h: #include ntl-view-frame-svr.h
* src/Makefile.am: add ntl-view-frame-svr.[ch] to build.
* src/ntl-window.c: Add myself to About box (pout).
* components/html/ntl-web-browser.c: Fix warnings.
1999-12-20 Elliot Lee <sopwith@redhat.com>
* configure.in, components/Makefile.am: Add HTML component to build.
* components/help/hyperbola-main.c, components/history/ntl-history-view.c: Make process die when
all objects have been destroyed.
* components/history/ntl-history-view.c: Bug fixes.
* components/html/*.[ch]: Copy glibwww over, write new NautilusViewClient for HTML browsing.
* src/ntl-uri-map.c: Cleanup, and use ntl_web_browser as default HTML display engine.
* src/ntl-view.c: Try to handle Bonobo views for data display.
1999-12-20 John Sullivan <sullivan@eazel.com>
* src/nautilus-bookmark.h,c: new files
* src/nautilus-bookmarklist.h,c: new files
* src/nautilus-bookmarks-menu.h,c: new files
* src/Makefile.am: added these six new files to nautilus_SOURCES
* src/ntl-window.c: now #includes nautilus-bookmarks-menu.h
(bookmarks_menu_info[]): removed all items except GNOMEUIINFO_END;
subtree is added dynamically later.
(nautilus-window-constructed): insert bookmarks menu
(nautilus-window-constructed): add padding to status bar so text
isn't jammed against frame.
The bookmark menu is now limping along. The Add Bookmark item works,
and the items that get added do the right thing. Edit Bookmarks is
still insensitive, so there's no way to remove items. Except by
quitting, because they aren't yet being saved/restored across sessions.
1999-12-20 Havoc Pennington <hp@redhat.com>
* src/file-manager/fm-icon-cache.c: Add inline RGB data for
default icon.
(fm_icon_cache_load_icon): only
ref the pixbuf if it exists
(fm_icon_cache_new): add a new fallback special icon set
(fm_icon_cache_load_icon): load fallback if the icon name is ""
1999-12-20 Havoc Pennington <hp@redhat.com>
* libnautilus/gnome-icon-container.c (set_kbd_current): return if
the icon being set is NULL. This may be fixing a symptom rather
than a problem.
1999-12-20 Elliot Lee <sopwith@redhat.com>
* src/ntl-*.[ch]: Support multiple view types (Nautilus/View, GNOME/Control, GNOME/Embeddable)
* src/ntl-window.[ch]: Add nautilus_window_get_uih()
* idl/*.idl: Reindent.
1999-12-19 Havoc Pennington <hp@pobox.com>
* src/file-manager/desktop-window.c (desktop_window_realize): turn
on window decorations for debugging
(desktop_window_init): debug comment-out the no-resize policy
* src/file-manager/desktop-layout.c (desktop_layout_arrange):
fool with layout routines
* src/file-manager/desktop-canvas.c
(desktop_canvas_size_allocate): debugging border to detect layout screwups
* src/file-manager/desktop-item.c (icon_realize): set the canvas
item, oops.
1999-12-19 Havoc Pennington <hp@pobox.com>
* src/file-manager/desktop-layout.c: don't do an arrangement
on every change
* src/file-manager/desktop-canvas.c
(desktop_canvas_load_desktop_icons): connect to finished_load and
arrange the icons when we get it. This is a temporary hack,
because the DesktopLayout engine isn't progressive yet.
* src/file-manager/fm-directory-list.c
(fm_directory_list_class_init): add a finished_load signal
* src/file-manager/desktop-window.c (desktop_window_init): for
now, don't fill the whole screen so we can see gdb.
* src/file-manager/desktop-item.c: Move user data accessors into
the .c file, these are private.
1999-12-17 Havoc Pennington <hp@redhat.com>
* src/file-manager/desktop-item.h: New module, for items
on the desktop
* src/file-manager/fm-directory-view.c: Change to use
get_current_icon_cache() (it wasn't ever freeing the icon cache anyway)
* src/file-manager/fm-icon-cache.c (fm_get_current_icon_cache):
function to get a global icon cache, we will share this throughout
the program.
1999-12-19 Havoc Pennington <hp@pobox.com>
* src/file-manager/desktop-canvas.c
(desktop_canvas_load_desktop_icons): new function, loads icons
from a given directory - don't get too excited, it doesn't yet
_display_ any icons!
* src/file-manager/desktop-canvas.h: Add directory list field.
* src/file-manager/Makefile.am (gnome_desktop_SOURCES): Add
fm-directory-list.[hc]
(libntl_file_manager_la_SOURCES): add fm_directory_list.[hc]
* src/file-manager/fm-directory-list.h, fm-directory-list.c:
New files, the non-GUI portion of a directory listing. Handles
loading the dir listing and the icons.
1999-12-17 Maciej Stachowiak <mjs@eazel.com>
* src/ntl-window.c, src/ntl-window-msgs.c: Added up, reload, home,
stop toolbar buttons. Stop is not implemented yet. Up needs more
thought with respect to various protocols.
* src/ntl-window.c, src/ntl-window.h: Added calls to
allow/disallow some of the toolbar operations.
1999-12-17 Havoc Pennington <hp@redhat.com>
* src/file-manager/fm-directory-view.c: Change to use
get_current_icon_cache() (it wasn't ever freeing the icon cache anyway)
* src/file-manager/fm-icon-cache.c (fm_get_current_icon_cache):
function to get a global icon cache, we will share this throughout
the program.
1999-12-17 Havoc Pennington <hp@redhat.com>
* src/ntl-window.c (nautilus_window_realize): set the mini icon.
(nautilus_window_class_init): init parent_class and install
realize method
* src/ntl-miniicon.c: new files, to set mini icon
1999-12-16 Elliot Lee <sopwith@redhat.com>
* libnautilus/{gdk-extensions.c,gnome-icon-container.c}: Fix warnings
* libnautilus/gnome-icon-container.c: Try (unsuccessfully) to get
proper icon reflow by calling icon_grid_resize() instead of
icon_grid_set_visible_width(), in size_allocate().
* src/*.*: Add ntl-app.[ch].
* src/file-manager/desktop-*.c: Fix warnings.
* src/file-manager/fm-directory-view.c: Remove incorrect warning,
allow turning off use of icon_layout altogether.
1999-12-16 John Sullivan <sullivan@eazel.com>
* src/ntl-window.c:
* src/ntl-main.c:
* src/file-manager/fm-directory-view.c:
Changed evil // comments to /* */. Sorry about that!
* src/ntl-window.c: added insensitive rudimentary Bookmark menu
1999-12-16 Havoc Pennington <hp@redhat.com>
* src/ntl-window-state.c (nautilus_window_save_state): lookup
signum before it's first used.
* src/file-manager/desktop-layout.c: new layout module, not yet
done
* src/file-manager/desktop-canvas.c (desktop_canvas_init): Create
the right-click menu.
* src/file-manager/desktop-menu.c (desktop_menu_new): New module
to stick the right-click menu code in
1999-12-16 Maciej Stachowiak <mjs@eazel.com>
* src/ntl-window.c: Put meta-views on the right.
* src/ntl-window.c, src/ntl-main.c, src/ntl-window.h,
src/ntl-window-msgs.c, src/ntl-window-state.c: Enabled multiple
main windows and new window menu entry. In the process replaced
url with uri where appropriate and added
nautilus_window_get_requested_uri accessor.
1999-12-16 Darin Adler <darin@eazel.com>
* libnautilus/.cvsignore: Ignore all *.lo instead of listing each.
* libnautilus/Makefile.am: Added gdk-extensions.c and $(WERROR).
* libnautilus/gdk-extensions.[ch]: Added functions for filling with a
gradient. Currently they are named gdk_fill_rectangle_with_gradient
and gdk_interpolate_color, but perhaps the gdk_ prefix should be
replaced with another one. These functions are not yet tested, but they
compile and I want to get them in here before I leave for vacation.
* src/ntl-uri-map.c: (nautilus_navinfo_new): Some null checks in
the "click on an item" hack. This was a halfhearted attempt to get
the program to not segfault when you open icons.
* src/ntl-window-msgs.c: (nautilus_window_load_content_view):
Some g_return_if_fail in here. I'll add a ton more at some point.
These were part of the halfhearted attempt to get the program to
not segfault when you open icons.
* src/file-manager/.cvsignore: Igore all *.lo instead of listing each.
1999-12-16 Elliot Lee <sopwith@redhat.com>
* components/history/ntl-history-view.c: Now works.
* src/ntl-uri-map.c: Duplicate the URI being requested, since we
don't know what the lifetime of the original value will be.
* src/ntl-window.c: Use the paned instead of hbox, use create_menus_with_data instead.
* src/file-manager: Misc warning fixes.
* src/gtkscrollframe.c: Try to get rid of scrollbar chopping.
1999-12-16 John Sullivan <sullivan@eazel.com>
* src/ntl-window.c (file_menu_new_window_cb):
New, currently empty callback.
* src/ntl-window.c (file_menu_info[]):
Added New Window item.
* src/ntl-window.c (edit_menu_info[]):
Added standard menu items, all unimplemented as of now.
* src/ntl-window.c (help_menu_info[]):
Added About item, unimplemented as of now.
* src/ntl-window.c (main_menu[]):
Now includes edit and help menus.
* src/ntl-window.c (nautilus_window_constructed):
Changed the way the toolbar is created, to fix bug
where Back failed because data parameter was NULL.
Also desensitized all the new unimplemented menu items.
1999-12-16 Maciej Stachowiak <mjs@eazel.com>
* src/file-manager/gnome-desktop.c (main): Quiet some warnings.
1999-12-16 Havoc Pennington <hp@redhat.com>
* src/file-manager/gnome-desktop.c (main): warning fixes
* src/file-manager/desktop-canvas.c
(desktop_canvas_update_background): start actually honoring
background settings.
* src/file-manager/fm-icon-cache.c: add copyright and Emacs magic.
* src/file-manager/fm-icon-cache.h (fm_icon_cache_get_icon): Run
egtk-format-protos on these prototypes, add copyright and Emacs magic
1999-12-16 Havoc Pennington <hp@redhat.com>
* src/file-manager/desktop-canvas.h: Added API for controlling the
background, so we can connect that to the IDL interface.
* src/file-manager/desktop-canvas.h: New file
* src/file-manager/desktop-window.h: tweaks
* idl/gnome-desktop.idl: Change BackgroundInfo to not be a union.
1999-12-16 John Sullivan <sullivan@eazel.com>
* src/file-manager/fm-directory-view.c (directory_load_cb):
changed assert to warning
1999-12-16 Elliot Lee <sopwith@redhat.com>
* components/help/hyperbola-nav-tree.c: Translate strings.
* components/history/ntl-history-view.c: Bug fixes, use API
function for setting meta-view label.
* libnautilus/ntl-meta-view-client.[ch]:
s/meta_view_set_label/meta_view_client_set_label/
* src/ntl-uri-map.c: Use history view instead of help view as the
default meta view for now.
* src/ntl-window.c: As per the comment that was removed from
ntl-window.c, gnome_app_install_menu_hints() needs to be called
after_ statusbar creation
* src/file-manager/fm-directory-view.c: Add more debugging assertions
and messages.
1999-12-15 John Sullivan <sullivan@eazel.com>
* src/ntl-window.c: (nautilus_window_constructed): Added beginnings
of a menu bar, and reorganized toolbar a little. There's a rudimentary
File menu now. The View As option menu moved down to the location bar
line. This is by no means a complete or final organization, but it's
a start.
* (file_menu_close_cb): new callback for File/Close menu item
* (file_menu_exit_cb): new callback for File/Quit menu item
* file_menu_info[]: new GNOMEUIINFO struct for File menu
* toolbar_info[]: new GNOMEUIINFO struct for toolbar
1999-12-15 Elliot Lee <sopwith@redhat.com>
* Warning fixes throughout.
* Use $(WERROR) in Makefiles to get -Werror.
1999-12-15 Darin Adler <darin@eazel.com>
* components/help/.cvsignore: Ignore more generated files.
* components/help/hyperbols-filefmt.c: Fix warnings.
* components/help/hyperbols-main.c: Fix warnings.
* components/help/hyperbols-nav-tree.c: Fix warnings.
1999-12-15 Elliot Lee <sopwith@redhat.com>
* components/Makefile.am: Turn on compilation of hyperbola component.
* components/help/*: Compile and run.
* libnautilus/ntl-meta-view-client.c: Create & set the property bag if it doesn't exist.
* src/ntl-uri-map.c: Load the hyperbola nav tree component as a test meta view.
* src/ntl-view.c: Fill in NULL fields with empty strings, so that ORBit doesn't segfault.
* src/ntl-window-msgs.c: When creating new meta views, they should
be meta views and not content views (cut & paste error).
* src/file-manager/fm-directory-view.c: Don't redisplay every time a new entry comes in.
1999-12-15 Darin Adler <darin@eazel.com>
* configure.in: Turned "-Wshadow" and "-Wundef" off for now, since they
fire in some existing code.
* gnome-icon-container.c: (handle_icon_button_press): Null out the drag
variables before sending the activate signal. This makes activating an
icon with a double-click work without crashing.
* ntl-main.c: (main): Make critical and warning messages fatal if
NAUTILUS_DEBUG is set in the environment. Make sure you have a new
gnome-vfs that doesn't use g_warning for status messages.
* ntl-window-msgs.c: (nautilus_window_change_location_internal):
Made the history store away the current position as the new "previous"
instead of storing away the new position. This makes the forward and
back buttons work better.
* ntl-window.c: (nautilus_window_back, nautilus_window_fwd):
Had to make a corresponding change here after the change to the
history mechanism.
* fm-directory-view.c: (display_selection_info): Some fixes to the
selection info display: "file"/"files" was backwards, text said "in"
before the file size, and the display was not cleared when the
selection was made empty. I still see problems where the selection
info gets cleared when the window is lowered and then raised.
1999-12-15 Andy Hertzfeld <andy@eazel.com>
* my first change: changed ntl-window-state.c
(nautilus_window_set_initial_state): changed initial path
to be the user's home directory, getting rid of confusing "localhost"
1999-12-15 Elliot Lee <sopwith@redhat.com>
* configure.in: Add --enable-more-warnings and --enable-fatal-warnings switches.
* src/ntl-uri-map.c: Add comment about functionality-in-waiting.
1999-12-15 Darin Adler <darin@eazel.com>
* libnautilus/gtkscrollframe.c (gtk_scroll_frame_size_allocate):
Rolled out my change. I was confused. Elliot had this fixed
already but I forgot to "make install".
1999-12-15 Darin Adler <darin@eazel.com>
* libnautilus/gtkscrollframe.c (gtk_scroll_frame_size_allocate):
Fixed overflow problem caused by gint16 local variable.
1999-12-15 Darin Adler <darin@eazel.com>
* src/ntl-window.c (nautilus_window_constructed):
Fixed signal handler to point to nautilus_window_goto_url_cb
instead of nautilus_window_goto_url. This was causing a bad
cast when a new URL was typed.
1999-12-15 Darin Adler <darin@eazel.com>
* src/ntl-uri-map.c (nautilus_navinfo_new): Changed back to
const gchar*. To compile, you need to install the latest
gnome-vfs.
1999-12-15 Elliot Lee <sopwith@redhat.com>
* libnautilus/gtkscrollframe.c: Fix size_allocate.
1999-12-14 Maciej Stachowiak <mjs@eazel.com>
* src/ntl-uri-map.c (nautilus_navinfo_new): a const char* can't be
passed where a gchar* is expected.
1999-12-14 Darin Adler <darin@eazel.com>
* configure.in: Turned on more warnings, including -Werror.
I found one or two real bugs, and made some minor changes
to quiet the compiler so I could turn on some useful warnings
that triggered on the existing code.
* src/file-manager/dfos-xfer.c: (handle_xfer_vfs_error):
Fixed a place where it was calling the gnome error(), but using
the parameters from the old gnome-fm error() function.
* libnautilus/ntl-meta-view-client.c:
(nautilus_meta_view_set_label): Fixed a place where we
were passing in string literals to code that will free them.
We need to call g_strdup before passing them to gnome_property_bag_add.
* libnautilus/gnome-icon-container.c: Fixed a warning.
* libnautilus/gtkscrollframe.c: Fixed a warning.
* libnautilus/ntl-content-view-client.c: Fixed a warning.
* libnautilus/ntl-view-client.c: Fixed a warning.
* libnautilus/ntl-content-view.c: Fixed a warning.
* src/ntl-main.c: Fixed a warning.
* src/ntl-meta-view.c: Fixed a warning.
* src/ntl-types.h: Fixed a warning.
* src/ntl-view.c: Fixed a warning.
* src/ntl-window.c: Fixed a warning.
* src/file-manager/dfos-xfer-progress-dialog.c: Fixed a warning.
* src/file-manager/fm-icon-cache.c: Fixed a warning.
1999-12-14 Elliot Lee <sopwith@redhat.com>
* src/*.c: Restructure the whole NautilusWindow code for sanity's sake.
* src/ntl-uri-map.[ch]: Instead of just passing in various pieces of information about the old URL,
pass in the Nautilus_NavigationInfo that has to be kept around anyways.
* idl/nautilus.idl: Allow a selection to be multiple URI's.
1999-12-14 Darin Adler <darin@eazel.com>
* src/ntl-window.c: (nautilus-window-constructed): Forward-button signal
was connected with NULL parameter instead of window. Fixed that so it
has a chance of working.
* .cvsignore: Ignore more generated files.
* components/.cvsignore: Ignore more generated files.
* help/.cvsignore: Ignore more generated files.
* history/.cvsignore: Ignore more generated files.
* icons/.cvsignore: Ignore more generated files.
* idl/.cvsignore: Ignore more generated files.
* libnautilus/.cvsignore: Ignore more generated files.
* src/.cvsignore: Ignore more generated files.
* src/file-manager/.cvsignore: Ignore more generated files.
1999-12-14 John Sullivan <sullivan@eazel.com>
* src/ntl-window.c: (nautilus-window-constructed): Reordered option menu
creation code to fix bug where it wasn't sizing itself properly. Changed
label of placeholder item and desensitized it to make it more obvious that
it's a non-working placeholder.
1999-12-14 Elliot Lee <sopwith@redhat.com>
* configure.in, Makefile.am, icons/: Add icons
* src/file-manager/fm-directory-view.c: Everything goes inside the scroll-frame, not the view itself.
1999-12-13 Elliot Lee <sopwith@redhat.com>
* libnautils/g*.[ch]: Switch from imlib to pixbuf.
* src/file-manager: Import from gnome-fm.
* idl/nautilus.idl: Add a 'main_window' attribute on a ViewFrame, so that views can talk to the main window.
1999-12-10 Elliot Lee <sopwith@redhat.com>
* libnautilus/ntl-meta-view.[ch]: Add a convenience function for
setting the label.
* Throughout: Rename the meta view "description" property to "label",
which more accurately describes its use.
* components/help: Start turning hyperbola into component.
1999-12-09 Elliot Lee <sopwith@redhat.com>
* Start migration from gnome-fm.
src/explorer-location-bar.[ch]:
Copy over from gnome-fm, change signal to include new URI.
src/ntl-window.c:
Make NautilusWindow use it.
|