Download as
Browse Code »

Commit a3808178f411b01207efe27d3f86753b1583d576

Authored by Perry Werneck
Committed by GitHub
2 parents b35006fb fa6ce83f
Exists in master and in 2 other branches develop, script-support

Merge pull request #13 from PerryWerneck/develop 

Visual adjustments.
Showing 14 changed files with 333 additions and 315 deletions   Show diff stats
branding/Makefile.in
  Diff comments   View file @a380817
@@ -42,72 +42,46 @@ INSTALL=@INSTALL@ @@ -42,72 +42,46 @@ INSTALL=@INSTALL@
42 INSTALL_DATA=@INSTALL_DATA@ 42 INSTALL_DATA=@INSTALL_DATA@
43 INSTALL_PROGRAM=@INSTALL_PROGRAM@ 43 INSTALL_PROGRAM=@INSTALL_PROGRAM@
44 CONVERT=@CONVERT@ 44 CONVERT=@CONVERT@
45 -OPTIPNG=@OPTIPNG@  
46 DESKTOP_INSTALL=@DESKTOP_INSTALL@ 45 DESKTOP_INSTALL=@DESKTOP_INSTALL@
47 SCOUR=@SCOUR@ 46 SCOUR=@SCOUR@
48 APPSTREAMCLI=@APPSTREAMCLI@ 47 APPSTREAMCLI=@APPSTREAMCLI@
49 48
50 #---[ Rules ]---------------------------------------------------------------------------- 49 #---[ Rules ]----------------------------------------------------------------------------
51 50
52 -$(BINDIR)/%.png: \  
53 - %.svg 51 +%.ico: \
  52 + $(PRODUCT_NAME).svg
54 53
55 @echo $@ ... 54 @echo $@ ...
56 @$(MKDIR) `dirname $@` 55 @$(MKDIR) `dirname $@`
  56 + @$(CONVERT) -density 384 -background transparent $< -define icon:auto-resize -colors 256 $@
57 57
58 - @$(CONVERT) \  
59 - -strip \  
60 - -background transparent \  
61 - $< \  
62 - $@  
63 -  
64 -ifeq ($(OPTIPNG),no)  
65 - @chmod 644 $@  
66 -else  
67 - @$(OPTIPNG) -o7 $@  
68 -endif  
69 -  
70 -$(BINDIR)/%.png: \  
71 - $(PRODUCT_NAME).svg 58 +$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/%.svg: \
  59 + %.svg
72 60
73 @echo $@ ... 61 @echo $@ ...
74 @$(MKDIR) `dirname $@` 62 @$(MKDIR) `dirname $@`
75 - @$(CONVERT) \  
76 - -strip \  
77 - -background transparent \  
78 - $< \  
79 - $@  
80 63
81 -ifeq ($(OPTIPNG),no)  
82 - @chmod 644 $@ 64 +ifeq ($(SCOUR),no)
  65 + @$(INSTALL_DATA) $< $@
83 else 66 else
84 - @$(OPTIPNG) -o7 $@ 67 + @$(SCOUR) -i $< -o $@
85 endif 68 endif
86 69
87 -%.ico: \ 70 + @chmod 644 $@
  71 +
  72 +$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME)-logo.svg: \
88 $(PRODUCT_NAME).svg 73 $(PRODUCT_NAME).svg
89 74
90 @echo $@ ... 75 @echo $@ ...
91 @$(MKDIR) `dirname $@` 76 @$(MKDIR) `dirname $@`
92 - @$(CONVERT) -density 384 -background transparent $< -define icon:auto-resize -colors 256 $@  
93 -  
94 -$(BINDIR)/%.png: \  
95 - %.png  
96 77
97 - @echo $@ ...  
98 - @$(MKDIR) `dirname $@`  
99 -ifeq ($(OPTIPNG),no) 78 +ifeq ($(SCOUR),no)
100 @$(INSTALL_DATA) $< $@ 79 @$(INSTALL_DATA) $< $@
101 else 80 else
102 - @$(OPTIPNG) -out $@ -o7 $< 81 + @$(SCOUR) -i $< -o $@
103 endif 82 endif
104 83
105 -$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/%.png: \  
106 - $(BINDIR)/%.png  
107 -  
108 - @echo $@ ...  
109 - @$(MKDIR) `dirname $@`  
110 - @$(INSTALL_DATA) $< $@ 84 + @chmod 644 $@
111 85
112 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/icons/%.svg: \ 86 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/icons/%.svg: \
113 %.svg 87 %.svg
@@ -123,13 +97,6 @@ endif @@ -123,13 +97,6 @@ endif
123 97
124 @chmod 644 $@ 98 @chmod 644 $@
125 99
126 -$(DESTDIR)$(datarootdir)/pixmaps/%.png: \  
127 - $(BINDIR)/%.png  
128 -  
129 - @echo $@ ...  
130 - @$(MKDIR) `dirname $@`  
131 - @$(INSTALL_DATA) $< $@  
132 -  
133 validate: 100 validate:
134 101
135 ifneq ($(SCOUR),no) 102 ifneq ($(SCOUR),no)
@@ -141,10 +108,8 @@ install: \ @@ -141,10 +108,8 @@ install: \
141 install-@OSNAME@ 108 install-@OSNAME@
142 109
143 install-linux: \ 110 install-linux: \
144 - $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME).png \  
145 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/icons/$(PRODUCT_NAME).svg \ 111 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/icons/$(PRODUCT_NAME).svg \
146 - $(DESTDIR)$(datarootdir)/pixmaps/$(PRODUCT_NAME).png \  
147 - $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME)-logo.png 112 + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME)-logo.svg
148 113
149 @$(INSTALL_DATA) \ 114 @$(INSTALL_DATA) \
150 launcher.desktop \ 115 launcher.desktop \
@@ -169,8 +134,8 @@ install-linux: \ @@ -169,8 +134,8 @@ install-linux: \
169 $(DESTDIR)$(datarootdir)/appdata/$(PRODUCT_NAME).appdata.xml 134 $(DESTDIR)$(datarootdir)/appdata/$(PRODUCT_NAME).appdata.xml
170 135
171 install-windows: \ 136 install-windows: \
172 - $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME).png \  
173 - $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME)-logo.png \ 137 + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME).svg \
  138 + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME)-logo.svg \
174 $(DESTDIR)$(bindir)/$(PRODUCT_NAME).ico 139 $(DESTDIR)$(bindir)/$(PRODUCT_NAME).ico
175 140
176 141
branding/pw3270-logo.svg
View file @b35006f
@@ -1,155 +0,0 @@ @@ -1,155 +0,0 @@
1 -<?xml version="1.0" encoding="UTF-8" standalone="no"?>  
2 -<!-- Created with Inkscape (http://www.inkscape.org/) -->  
3 -  
4 -<svg  
5 - xmlns:dc="http://purl.org/dc/elements/1.1/"  
6 - xmlns:cc="http://creativecommons.org/ns#"  
7 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"  
8 - xmlns:svg="http://www.w3.org/2000/svg"  
9 - xmlns="http://www.w3.org/2000/svg"  
10 - xmlns:xlink="http://www.w3.org/1999/xlink"  
11 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"  
12 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"  
13 - width="300"  
14 - height="154"  
15 - id="svg2685"  
16 - sodipodi:version="0.32"  
17 - inkscape:version="0.48.2 r9819"  
18 - sodipodi:docname="pw3270-logo.svg"  
19 - inkscape:output_extension="org.inkscape.output.svg.inkscape"  
20 - inkscape:export-filename="/home/perry/Project/3270/v4/image/icon.png"  
21 - inkscape:export-xdpi="90"  
22 - inkscape:export-ydpi="90"  
23 - version="1.1">  
24 - <defs  
25 - id="defs2687">  
26 - <linearGradient  
27 - id="linearGradient3687">  
28 - <stop  
29 - style="stop-color:#ffffff;stop-opacity:1;"  
30 - offset="0"  
31 - id="stop3689" />  
32 - <stop  
33 - style="stop-color:#000000;stop-opacity:1;"  
34 - offset="1"  
35 - id="stop3691" />  
36 - </linearGradient>  
37 - <radialGradient  
38 - inkscape:collect="always"  
39 - xlink:href="#linearGradient3687"  
40 - id="radialGradient2560"  
41 - gradientUnits="userSpaceOnUse"  
42 - gradientTransform="matrix(-1.2214651,1.3481449,-1.1114864,-1.0070438,1777.1401,13.255979)"  
43 - cx="593.03772"  
44 - cy="437.90591"  
45 - fx="593.03772"  
46 - fy="437.90591"  
47 - r="19.115074" />  
48 - <inkscape:perspective  
49 - sodipodi:type="inkscape:persp3d"  
50 - inkscape:vp_x="0 : 32 : 1"  
51 - inkscape:vp_y="0 : 1000 : 0"  
52 - inkscape:vp_z="64 : 32 : 1"  
53 - inkscape:persp3d-origin="32 : 21.333333 : 1"  
54 - id="perspective2693" />  
55 - </defs>  
56 - <sodipodi:namedview  
57 - id="base"  
58 - pagecolor="#ffffff"  
59 - bordercolor="#666666"  
60 - borderopacity="1.0"  
61 - inkscape:pageopacity="0.0"  
62 - inkscape:pageshadow="2"  
63 - inkscape:zoom="0.97227183"  
64 - inkscape:cx="-308.24386"  
65 - inkscape:cy="32"  
66 - inkscape:current-layer="layer1"  
67 - showgrid="true"  
68 - inkscape:document-units="px"  
69 - inkscape:grid-bbox="true"  
70 - inkscape:window-width="1280"  
71 - inkscape:window-height="966"  
72 - inkscape:window-x="0"  
73 - inkscape:window-y="26"  
74 - inkscape:window-maximized="1" />  
75 - <metadata  
76 - id="metadata2690">  
77 - <rdf:RDF>  
78 - <cc:Work  
79 - rdf:about="">  
80 - <dc:format>image/svg+xml</dc:format>  
81 - <dc:type  
82 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" />  
83 - </cc:Work>  
84 - </rdf:RDF>  
85 - </metadata>  
86 - <g  
87 - id="layer1"  
88 - inkscape:label="Layer 1"  
89 - inkscape:groupmode="layer"  
90 - transform="translate(0,90)">  
91 - <g  
92 - id="g3348"  
93 - transform="matrix(3.0573113,0,0,3.0573113,-1546.2767,-1196.7198)"  
94 - inkscape:export-filename="/home/perry/Desktop/g3484.png"  
95 - inkscape:export-xdpi="750"  
96 - inkscape:export-ydpi="750">  
97 - <path  
98 - inkscape:export-ydpi="750"  
99 - inkscape:export-xdpi="750"  
100 - inkscape:export-filename="/home/perry/Desktop/path4684.png"  
101 - sodipodi:nodetypes="ccccc"  
102 - id="path3877"  
103 - d="m 571.75652,365.09989 c -12.28362,1.49404 -24.71615,1.60564 -36.92919,3.70417 1.15828,9.37275 0.97923,23.2044 1.63094,30.14689 11.55053,-1.50408 27.01785,-2.59907 38.36698,-5.35307 -0.036,-8.87303 -1.02762,-19.15 -3.06873,-28.49799 z"  
104 - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#cccccc;stroke-width:2.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"  
105 - inkscape:connector-curvature="0" />  
106 - <path  
107 - inkscape:export-ydpi="750"  
108 - inkscape:export-xdpi="750"  
109 - inkscape:export-filename="/home/perry/Desktop/path4684.png"  
110 - sodipodi:nodetypes="cccccccccccccccc"  
111 - id="path3879"  
112 - d="m 558.70672,398.73456 c -3.79163,0.10309 -7.64598,0.11185 -11.30721,1.27926 -2.13143,0.66011 -4.04568,2.24121 -4.70985,4.42348 -0.0967,1.1177 0.76001,2.18842 1.46457,3.02352 2.25351,2.29719 5.65545,2.82771 8.73539,2.89271 4.42579,0.006 8.86831,-0.8458 12.96682,-2.52003 1.55025,-0.88162 3.33996,-2.06142 3.56963,-3.9936 -0.59735,-2.25901 -2.87075,-3.51224 -4.96561,-4.11636 -1.84964,-0.54894 -3.83129,-0.95601 -5.75374,-0.98898 z m 0.0446,1.40178 c 2.78739,0.0968 5.75567,0.21409 8.11548,1.83476 0.87991,0.58405 1.95351,1.77677 1.15706,2.83974 -0.76499,1.1501 -2.05182,1.80199 -3.22326,2.45978 -3.23561,1.57133 -6.96349,1.61384 -10.45172,1.06373 -9.12914,-0.40554 -4.60594,-6.64603 1.06647,-7.80087 1.09861,-0.25448 2.19774,-0.40573 3.33597,-0.39714 z"  
113 - style="fill:#b6b6b6;fill-opacity:1;fill-rule:evenodd;stroke:none"  
114 - inkscape:connector-curvature="0" />  
115 - <g  
116 - transform="matrix(0.8126522,0,0,1,135.51705,-68.411175)"  
117 - id="g3881">  
118 - <path  
119 - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#00ff00;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:50.90000153;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0"  
120 - d="m 496.23743,451.70467 c 37.88072,-3.53554 37.62819,-3.53554 37.62819,-3.53554"  
121 - id="path3883"  
122 - inkscape:connector-curvature="0" />  
123 - <path  
124 - style="font-size:9.27298832px;font-style:normal;font-weight:bold;fill:#00ff00;fill-opacity:1;stroke:#00ff00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans Bold"  
125 - d="m 496.41233,442.38795 2.69056,-0.26631 c 0.80001,-0.0792 1.40822,0.0667 1.82464,0.43776 0.41931,0.36749 0.61951,0.93195 0.60062,1.69338 -0.019,0.76469 -0.24833,1.37492 -0.68806,1.83067 -0.43685,0.45224 -1.05527,0.71795 -1.85529,0.79713 l -1.06948,0.10586 -0.0627,2.52833 -1.62108,0.16046 0.18082,-7.28728 m 1.58729,1.20133 -0.0505,2.03536 0.89685,-0.0888 c 0.31439,-0.0311 0.55938,-0.14299 0.73498,-0.33567 0.17566,-0.19591 0.26753,-0.45656 0.27561,-0.78196 0.008,-0.3254 -0.0713,-0.56748 -0.23819,-0.72626 -0.16688,-0.15875 -0.4075,-0.22257 -0.7219,-0.19147 l -0.89684,0.0888 m 4.19384,-1.77354 1.5537,-0.15378 0.95492,5.18832 1.20932,-5.40254 1.56212,-0.15461 0.9465,5.18915 1.21774,-5.40337 1.54107,-0.15253 -1.66294,7.43397 -1.8695,0.18504 -1.00361,-5.42695 -1.2659,5.65159 -1.86949,0.18504 -1.31393,-7.13933 m 13.19263,2.04406 c 0.4207,0.085 0.73663,0.27442 0.94775,0.56837 0.214,0.29044 0.31498,0.67808 0.30296,1.16291 -0.0179,0.72239 -0.27018,1.29593 -0.75673,1.72062 -0.48649,0.42144 -1.18728,0.67745 -2.10238,0.76803 -0.32281,0.0319 -0.64626,0.0331 -0.97034,0.004 -0.32136,-0.0266 -0.63914,-0.0844 -0.95336,-0.17343 l 0.036,-1.44965 c 0.29879,0.14571 0.59584,0.2494 0.89113,0.31106 0.29817,0.0581 0.59182,0.0729 0.88095,0.0443 0.42948,-0.0425 0.76005,-0.16124 0.99169,-0.35622 0.23446,-0.19524 0.35568,-0.45393 0.36368,-0.77608 0.008,-0.3319 -0.10345,-0.57079 -0.33503,-0.71665 -0.22872,-0.1494 -0.57184,-0.20145 -1.02939,-0.15618 l -0.64842,0.0642 0.03,-1.21047 0.68211,-0.0675 c 0.40702,-0.0403 0.712,-0.1435 0.91493,-0.30966 0.20302,-0.16941 0.30828,-0.40542 0.31579,-0.70805 0.007,-0.27983 -0.0845,-0.48663 -0.27442,-0.62041 -0.18989,-0.13376 -0.46168,-0.18313 -0.81537,-0.14814 -0.26105,0.0258 -0.52577,0.0861 -0.79413,0.18086 -0.26837,0.0947 -0.53613,0.22186 -0.80331,0.38138 l 0.0341,-1.37642 c 0.32259,-0.1358 0.64172,-0.2453 0.95741,-0.32848 0.31568,-0.0832 0.6251,-0.13977 0.92826,-0.16979 0.81685,-0.0808 1.42351,0.0149 1.81998,0.28729 0.39934,0.26884 0.59127,0.71565 0.57577,1.3404 -0.0106,0.42629 -0.1161,0.78567 -0.31657,1.07816 -0.20039,0.28927 -0.49143,0.50796 -0.87312,0.6561 m 4.39998,2.10611 2.76635,-0.27381 -0.0343,1.3813 -4.56848,0.45219 0.0343,-1.38131 2.35302,-2.57489 c 0.21024,-0.23504 0.36703,-0.45992 0.47036,-0.67465 0.10334,-0.21472 0.15774,-0.43272 0.16324,-0.65399 0.008,-0.34167 -0.0844,-0.60676 -0.27848,-0.7953 -0.19133,-0.1888 -0.45121,-0.26694 -0.77963,-0.23445 -0.25263,0.025 -0.5307,0.11584 -0.8342,0.27247 -0.30343,0.15338 -0.62944,0.37068 -0.97804,0.65186 l 0.0397,-1.60096 c 0.36838,-0.17603 0.73172,-0.31748 1.08999,-0.42437 0.35835,-0.11012 0.70876,-0.18212 1.05122,-0.21603 0.75228,-0.0745 1.33139,0.0597 1.73731,0.40259 0.40872,0.34257 0.60456,0.85715 0.58752,1.54373 -0.01,0.397 -0.10747,0.77671 -0.29287,1.13912 -0.18533,0.35918 -0.56865,0.8548 -1.14996,1.48687 l -1.37709,1.49963 m 4.23502,-6.31064 4.7369,-0.46886 -0.0263,1.05916 -2.60509,6.47067 -1.57897,0.15629 2.46658,-6.13561 -3.02741,0.29965 0.0343,-1.3813 m 9.29515,2.70736 c 0.0226,-0.91111 -0.0359,-1.54479 -0.17544,-1.90102 -0.13669,-0.35974 -0.37906,-0.5224 -0.72714,-0.48796 -0.34807,0.0345 -0.60114,0.24616 -0.75919,0.63508 -0.15799,0.38568 -0.24828,1.03408 -0.27088,1.94519 -0.0229,0.92088 0.0354,1.56268 0.17484,1.92541 0.1394,0.36274 0.38314,0.52689 0.73122,0.49243 0.34526,-0.0342 0.59696,-0.24736 0.75511,-0.63954 0.15814,-0.39219 0.24863,-1.04872 0.27148,-1.96959 m 1.62071,-0.14581 c -0.03,1.20722 -0.27765,2.16172 -0.74308,2.86347 -0.46537,0.6985 -1.11069,1.0886 -1.93596,1.17029 -0.82807,0.082 -1.45856,-0.18186 -1.89146,-0.79146 -0.43282,-0.61284 -0.63425,-1.52288 -0.6043,-2.73011 0.03,-1.21048 0.27773,-2.16496 0.74309,-2.86347 0.46544,-0.70176 1.1122,-1.09361 1.94028,-1.17559 0.82527,-0.0817 1.45431,0.18391 1.88714,0.79676 0.43289,0.6096 0.63432,1.51963 0.60429,2.73011"  
126 - id="path3885"  
127 - inkscape:connector-curvature="0" />  
128 - <path  
129 - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#00ff00;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:50.90000153;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0"  
130 - d="m 498.4652,453.42295 c 37.88072,-3.53554 37.62819,-3.53554 37.62819,-3.53554"  
131 - id="path3887"  
132 - inkscape:connector-curvature="0" />  
133 - <path  
134 - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#00ff00;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:50.90000153;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0"  
135 - d="m 496.77866,455.87356 c 37.88072,-3.53554 37.62819,-3.53554 37.62819,-3.53554"  
136 - id="path3889"  
137 - inkscape:connector-curvature="0" />  
138 - <path  
139 - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#00ff00;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:50.90000153;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0"  
140 - d="m 499.54207,457.86404 c 37.88072,-3.53554 37.62819,-3.53554 37.62819,-3.53554"  
141 - id="path3891"  
142 - inkscape:connector-curvature="0" />  
143 - </g>  
144 - <path  
145 - inkscape:export-ydpi="750"  
146 - inkscape:export-xdpi="750"  
147 - inkscape:export-filename="/home/perry/Desktop/path4684.png"  
148 - sodipodi:nodetypes="ccccc"  
149 - id="path3893"  
150 - d="m 571.18683,366.21059 c -11.74072,1.38257 -23.62379,1.48585 -35.29705,3.42783 1.10709,8.67351 0.93595,21.47328 1.55887,27.89784 11.04002,-1.39187 25.82375,-2.40517 36.67128,-4.95371 -0.0344,-8.21108 -0.9822,-17.72136 -2.9331,-26.37196 z"  
151 - style="opacity:0.43404254;fill:url(#radialGradient2560);fill-opacity:1;fill-rule:evenodd;stroke:#cccccc;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"  
152 - inkscape:connector-curvature="0" />  
153 - </g>  
154 - </g>  
155 -</svg>  
@@ -129,7 +129,7 @@ dnl --------------------------------------------------------------------------- @@ -129,7 +129,7 @@ dnl ---------------------------------------------------------------------------
129 129
130 AC_PATH_TOOL([AR], [ar], [ar]) 130 AC_PATH_TOOL([AR], [ar], [ar])
131 AC_PATH_TOOL([CONVERT], [convert], [no]) 131 AC_PATH_TOOL([CONVERT], [convert], [no])
132 -AC_PATH_TOOL([OPTIPNG],[optipng],[no]) 132 +dnl AC_PATH_TOOL([OPTIPNG],[optipng],[no])
133 AC_PATH_TOOL([ZIP],[zip],[no]) 133 AC_PATH_TOOL([ZIP],[zip],[no])
134 AC_PATH_TOOL([DLLTOOL],[dlltool],[no]) 134 AC_PATH_TOOL([DLLTOOL],[dlltool],[no])
135 AC_PATH_TOOL([WINDRES], [windres], [no]) 135 AC_PATH_TOOL([WINDRES], [windres], [no])
icons/connect-symbolic.svg 0 → 100644
  Diff comments   View file @a380817
@@ -0,0 +1,84 @@ @@ -0,0 +1,84 @@
  1 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
  2 +<svg
  3 + xmlns:dc="http://purl.org/dc/elements/1.1/"
  4 + xmlns:cc="http://creativecommons.org/ns#"
  5 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
  6 + xmlns:svg="http://www.w3.org/2000/svg"
  7 + xmlns="http://www.w3.org/2000/svg"
  8 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
  9 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
  10 + version="1.1"
  11 + id="svg851"
  12 + width="256"
  13 + height="256"
  14 + viewBox="0 0 256 256"
  15 + sodipodi:docname="gtk-connect-symbolic.svg"
  16 + inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
  17 + <metadata
  18 + id="metadata857">
  19 + <rdf:RDF>
  20 + <cc:Work
  21 + rdf:about="">
  22 + <dc:format>image/svg+xml</dc:format>
  23 + <dc:type
  24 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
  25 + <dc:title></dc:title>
  26 + </cc:Work>
  27 + </rdf:RDF>
  28 + </metadata>
  29 + <defs
  30 + id="defs855">
  31 + <marker
  32 + style="overflow:visible"
  33 + id="Arrow1Lstart"
  34 + refX="0.0"
  35 + refY="0.0"
  36 + orient="auto"
  37 + inkscape:stockid="Arrow1Lstart"
  38 + inkscape:isstock="true">
  39 + <path
  40 + transform="scale(0.8) translate(12.5,0)"
  41 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
  42 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
  43 + id="path1007" />
  44 + </marker>
  45 + </defs>
  46 + <sodipodi:namedview
  47 + pagecolor="#ffffff"
  48 + bordercolor="#666666"
  49 + borderopacity="1"
  50 + objecttolerance="10"
  51 + gridtolerance="10"
  52 + guidetolerance="10"
  53 + inkscape:pageopacity="0"
  54 + inkscape:pageshadow="2"
  55 + inkscape:window-width="1366"
  56 + inkscape:window-height="713"
  57 + id="namedview853"
  58 + showgrid="false"
  59 + inkscape:zoom="1.3921165"
  60 + inkscape:cx="99.069109"
  61 + inkscape:cy="184.6652"
  62 + inkscape:window-x="0"
  63 + inkscape:window-y="25"
  64 + inkscape:window-maximized="1"
  65 + inkscape:current-layer="g859"
  66 + inkscape:document-rotation="0" />
  67 + <g
  68 + inkscape:groupmode="layer"
  69 + inkscape:label="Image"
  70 + id="g859">
  71 + <g
  72 + id="g923"
  73 + transform="matrix(3.7795276,0,0,3.7795276,-118.40429,8.6123775)">
  74 + <path
  75 + id="rect883-3"
  76 + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.858311;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
  77 + d="m 92.554935,8.5779117 c -1.798383,-0.1481724 -3.650627,1.2722474 -3.264892,3.1739583 0,13.525103 0,27.050206 0,40.575309 -0.01033,1.949711 3.647396,3.05186 4.472053,1.706431 0,-15.097123 0,-30.194245 0,-45.2913683 -0.392532,-0.1087998 -0.799794,-0.1644515 -1.207161,-0.16433 z m 4.073796,-9.29504033 c -2.07079,-0.0714654 -3.476923,2.03267503 -3.165182,3.95774393 0.01085,19.2643707 -0.0217,38.5298257 0.01628,57.7935187 0.126716,2.110405 2.653929,3.534377 4.522972,2.533701 0,-21.322901 0,-42.645803 0,-63.96870376 -0.426607,-0.20655366 -0.89981,-0.31703838 -1.374071,-0.31625987 z" />
  78 + <path
  79 + id="path930-7"
  80 + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.11486;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
  81 + d="M 82.489067,12.90927 A 15.467497,18.678622 0 0 0 68.038271,24.929209 H 52.736878 c -1.91384,0 -3.45457,1.540729 -3.45457,3.454569 v 6.097817 c 0,1.913843 1.54073,3.454572 3.45457,3.454572 h 15.205791 a 15.467497,18.678622 0 0 0 14.546398,12.330512 15.467497,18.678622 0 0 0 7.232118,-2.168342 V 15.077612 A 15.467497,18.678622 0 0 0 82.489067,12.90927 Z" />
  82 + </g>
  83 + </g>
  84 +</svg>
icons/disconnect-symbolic.svg 0 → 100644
  Diff comments   View file @a380817
@@ -0,0 +1,84 @@ @@ -0,0 +1,84 @@
  1 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
  2 +<svg
  3 + xmlns:dc="http://purl.org/dc/elements/1.1/"
  4 + xmlns:cc="http://creativecommons.org/ns#"
  5 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
  6 + xmlns:svg="http://www.w3.org/2000/svg"
  7 + xmlns="http://www.w3.org/2000/svg"
  8 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
  9 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
  10 + version="1.1"
  11 + id="svg851"
  12 + width="256"
  13 + height="256"
  14 + viewBox="0 0 256 256"
  15 + sodipodi:docname="gtk-disconnect-symbolic.svg"
  16 + inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
  17 + <metadata
  18 + id="metadata857">
  19 + <rdf:RDF>
  20 + <cc:Work
  21 + rdf:about="">
  22 + <dc:format>image/svg+xml</dc:format>
  23 + <dc:type
  24 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
  25 + <dc:title></dc:title>
  26 + </cc:Work>
  27 + </rdf:RDF>
  28 + </metadata>
  29 + <defs
  30 + id="defs855">
  31 + <marker
  32 + style="overflow:visible"
  33 + id="Arrow1Lstart"
  34 + refX="0.0"
  35 + refY="0.0"
  36 + orient="auto"
  37 + inkscape:stockid="Arrow1Lstart"
  38 + inkscape:isstock="true">
  39 + <path
  40 + transform="scale(0.8) translate(12.5,0)"
  41 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
  42 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
  43 + id="path1007" />
  44 + </marker>
  45 + </defs>
  46 + <sodipodi:namedview
  47 + pagecolor="#ffffff"
  48 + bordercolor="#666666"
  49 + borderopacity="1"
  50 + objecttolerance="10"
  51 + gridtolerance="10"
  52 + guidetolerance="10"
  53 + inkscape:pageopacity="0"
  54 + inkscape:pageshadow="2"
  55 + inkscape:window-width="1366"
  56 + inkscape:window-height="713"
  57 + id="namedview853"
  58 + showgrid="false"
  59 + inkscape:zoom="1.3921165"
  60 + inkscape:cx="108.83539"
  61 + inkscape:cy="125.36992"
  62 + inkscape:window-x="0"
  63 + inkscape:window-y="25"
  64 + inkscape:window-maximized="1"
  65 + inkscape:current-layer="g859"
  66 + inkscape:document-rotation="0" />
  67 + <g
  68 + inkscape:groupmode="layer"
  69 + inkscape:label="Image"
  70 + id="g859">
  71 + <g
  72 + id="g927"
  73 + transform="matrix(3.7795276,0,0,3.7795276,-161.57965,-402.67362)">
  74 + <path
  75 + id="rect883-3-6"
  76 + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.858311;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
  77 + d="m 103.7142,117.39733 c -1.79838,-0.14817 -3.65063,1.27225 -3.26489,3.17396 0,13.5251 0,27.0502 0,40.5753 -0.0103,1.94971 3.6474,3.05189 4.47205,1.70644 0,-15.09713 0,-30.19425 0,-45.29137 -0.39253,-0.1088 -0.79979,-0.16445 -1.20716,-0.16433 z m 4.0738,-9.29504 c -2.07079,-0.0715 -3.47692,2.03267 -3.16518,3.95774 0.0108,19.26437 -0.0217,38.52983 0.0163,57.79352 0.12672,2.11041 2.65393,3.53439 4.52297,2.5337 0,-21.3229 0,-42.6458 0,-63.9687 -0.42661,-0.20656 -0.89981,-0.31704 -1.37407,-0.31626 z" />
  78 + <path
  79 + id="path930"
  80 + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.11486;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
  81 + d="M 77.280561,122.17098 A 15.467497,18.678622 0 0 0 62.829766,134.19091 H 47.528374 c -1.913834,0 -3.45457,1.54073 -3.45457,3.45457 v 6.09782 c 0,1.91384 1.540736,3.45457 3.45457,3.45457 h 15.20579 a 15.467497,18.678622 0 0 0 14.546397,12.33051 15.467497,18.678622 0 0 0 7.463112,-2.3182 v -4.08812 h 8.846487 c 1.75914,0 3.175,-1.41638 3.175,-3.17552 v -2.35489 c 0,-1.75914 -1.41586,-3.17552 -3.175,-3.17552 h -8.846487 v -7.1329 h 8.901264 c 1.759143,0 3.175518,-1.41638 3.175518,-3.17552 v -2.35489 c 0,-1.75914 -1.416375,-3.17552 -3.175518,-3.17552 h -8.901264 v -4.0876 a 15.467497,18.678622 0 0 0 -7.463112,-2.31872 z" />
  82 + </g>
  83 + </g>
  84 +</svg>
locale/pt_BR.po
  Diff comments   View file @a380817
@@ -5,7 +5,7 @@ msgid &quot;&quot; @@ -5,7 +5,7 @@ msgid &quot;&quot;
5 msgstr "" 5 msgstr ""
6 "Project-Id-Version: pw3270 5.0\n" 6 "Project-Id-Version: pw3270 5.0\n"
7 "Report-Msgid-Bugs-To: \n" 7 "Report-Msgid-Bugs-To: \n"
8 -"POT-Creation-Date: 2020-10-15 13:43-0300\n" 8 +"POT-Creation-Date: 2020-10-29 19:50-0300\n"
9 "PO-Revision-Date: 2020-10-15 13:45-0300\n" 9 "PO-Revision-Date: 2020-10-15 13:45-0300\n"
10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 "Language-Team: Português <>\n" 11 "Language-Team: Português <>\n"
@@ -20,7 +20,7 @@ msgstr &quot;&quot; @@ -20,7 +20,7 @@ msgstr &quot;&quot;
20 "11) ? 2 : 3;\n" 20 "11) ? 2 : 3;\n"
21 "X-Generator: Gtranslator 2.91.7\n" 21 "X-Generator: Gtranslator 2.91.7\n"
22 22
23 -#: src/objects/application/application.c:206 23 +#: src/objects/application/application.c:203
24 #, c-format 24 #, c-format
25 msgid "\"%s\" is not a valid user interface name" 25 msgid "\"%s\" is not a valid user interface name"
26 msgstr "\"%s\" não é um nome válido para interface de usuário" 26 msgstr "\"%s\" não é um nome válido para interface de usuário"
@@ -63,11 +63,11 @@ msgstr &quot;Nome da ação&quot; @@ -63,11 +63,11 @@ msgstr &quot;Nome da ação&quot;
63 msgid "Action Names" 63 msgid "Action Names"
64 msgstr "Nome das ações" 64 msgstr "Nome das ações"
65 65
66 -#: ui/window.xml:379 ui/window.xml:494 ui/application.xml:509 66 +#: ui/window.xml:384 ui/window.xml:499 ui/application.xml:509
67 msgid "Alert sound" 67 msgid "Alert sound"
68 msgstr "Aviso sonoro" 68 msgstr "Aviso sonoro"
69 69
70 -#: src/main/tools.c:99 src/tools/entry.c:88 70 +#: src/main/tools.c:99
71 msgid "All files" 71 msgid "All files"
72 msgstr "Todos os arquivos" 72 msgstr "Todos os arquivos"
73 73
@@ -107,7 +107,7 @@ msgstr &quot;Disponível&quot; @@ -107,7 +107,7 @@ msgstr &quot;Disponível&quot;
107 msgid "Based on X3270 from" 107 msgid "Based on X3270 from"
108 msgstr "Baseado no X3270 por" 108 msgstr "Baseado no X3270 por"
109 109
110 -#: ui/window.xml:408 ui/application.xml:474 110 +#: ui/window.xml:413 ui/application.xml:474
111 msgid "Blank Fill" 111 msgid "Blank Fill"
112 msgstr "Completar com espaços" 112 msgstr "Completar com espaços"
113 113
@@ -129,7 +129,6 @@ msgid &quot;Can&#39;t use \&quot;%s\&quot;&quot; @@ -129,7 +129,6 @@ msgid &quot;Can&#39;t use \&quot;%s\&quot;&quot;
129 msgstr "Não posso usar %s" 129 msgstr "Não posso usar %s"
130 130
131 #: src/objects/application/actions/open.c:49 src/objects/window/page.c:265 131 #: src/objects/application/actions/open.c:49 src/objects/window/page.c:265
132 -#: src/tools/entry.c:71  
133 msgid "Cancel" 132 msgid "Cancel"
134 msgstr "_Cancelar" 133 msgstr "_Cancelar"
135 134
@@ -166,8 +165,8 @@ msgstr &quot;Fecha todas as janelas e encerra a aplicação&quot; @@ -166,8 +165,8 @@ msgstr &quot;Fecha todas as janelas e encerra a aplicação&quot;
166 msgid "Close the window" 165 msgid "Close the window"
167 msgstr "Fechar a janela" 166 msgstr "Fechar a janela"
168 167
169 -#: src/objects/window/actions/close.c:60 ui/window.xml:280 ui/window.xml:473  
170 -#: ui/window.xml:580 ui/application.xml:216 168 +#: src/objects/window/actions/close.c:60 ui/window.xml:280 ui/window.xml:478
  169 +#: ui/window.xml:585 ui/application.xml:216
171 msgid "Close window" 170 msgid "Close window"
172 msgstr "Fechar janela" 171 msgstr "Fechar janela"
173 172
@@ -191,14 +190,10 @@ msgstr &quot;Conectar ao iniciar&quot; @@ -191,14 +190,10 @@ msgstr &quot;Conectar ao iniciar&quot;
191 msgid "Connect to host" 190 msgid "Connect to host"
192 msgstr "Conectar ao servidor" 191 msgstr "Conectar ao servidor"
193 192
194 -#: src/objects/window/window.c:753 src/objects/window/page.c:218 193 +#: src/objects/window/window.c:772 src/objects/window/page.c:218
195 msgid "Connected to host" 194 msgid "Connected to host"
196 msgstr "Conectado no servidor" 195 msgstr "Conectado no servidor"
197 196
198 -#: src/tools/entry.c:131  
199 -msgid "Continue"  
200 -msgstr "Continuar"  
201 -  
202 #: src/objects/application/actions/about.c:130 197 #: src/objects/application/actions/about.c:130
203 msgid "Contributors" 198 msgid "Contributors"
204 msgstr "Contribuidores" 199 msgstr "Contribuidores"
@@ -251,16 +246,16 @@ msgstr &quot;Recortar&quot; @@ -251,16 +246,16 @@ msgstr &quot;Recortar&quot;
251 msgid "Delete Field" 246 msgid "Delete Field"
252 msgstr "Apagar campo" 247 msgstr "Apagar campo"
253 248
254 -#: ui/window.xml:275 ui/window.xml:468 249 +#: ui/window.xml:275 ui/window.xml:473
255 msgid "Disconnect" 250 msgid "Disconnect"
256 msgstr "Desconectar" 251 msgstr "Desconectar"
257 252
258 -#: src/objects/window/window.c:753 src/objects/window/window.c:780 253 +#: src/objects/window/window.c:772 src/objects/window/window.c:799
259 #: src/objects/window/page.c:207 254 #: src/objects/window/page.c:207
260 msgid "Disconnected from host" 255 msgid "Disconnected from host"
261 msgstr "Desconectado do servidor" 256 msgstr "Desconectado do servidor"
262 257
263 -#: ui/window.xml:391 ui/window.xml:507 ui/application.xml:524 258 +#: ui/window.xml:396 ui/window.xml:512 ui/application.xml:524
264 msgid "Dynamic font spacing" 259 msgid "Dynamic font spacing"
265 msgstr "Espaçamento dinâmico" 260 msgstr "Espaçamento dinâmico"
266 261
@@ -302,13 +297,13 @@ msgstr &quot;Apagar até o final da linha&quot; @@ -302,13 +297,13 @@ msgstr &quot;Apagar até o final da linha&quot;
302 297
303 #: ui/application.xml:352 298 #: ui/application.xml:352
304 msgid "Field attributes" 299 msgid "Field attributes"
305 -msgstr "Mostra atributos de campo" 300 +msgstr "Atributos de campo"
306 301
307 #: ui/application.xml:454 302 #: ui/application.xml:454
308 msgid "Full Screen" 303 msgid "Full Screen"
309 msgstr "Tela cheia" 304 msgstr "Tela cheia"
310 305
311 -#: ui/window.xml:246 ui/window.xml:417 ui/window.xml:512 306 +#: ui/window.xml:246 ui/window.xml:422 ui/window.xml:517
312 msgid "Full screen" 307 msgid "Full screen"
313 msgstr "Tela cheia" 308 msgstr "Tela cheia"
314 309
@@ -328,7 +323,7 @@ msgstr &quot;Ajuda&quot; @@ -328,7 +323,7 @@ msgstr &quot;Ajuda&quot;
328 msgid "Host properties" 323 msgid "Host properties"
329 msgstr "Propriedades do Servidor" 324 msgstr "Propriedades do Servidor"
330 325
331 -#: src/objects/window/window.c:552 src/objects/os/linux/savedesktopicon.c:102 326 +#: src/objects/window/window.c:561 src/objects/os/linux/savedesktopicon.c:102
332 msgid "IBM 3270 Terminal emulator" 327 msgid "IBM 3270 Terminal emulator"
333 msgstr "Emulador 3270" 328 msgstr "Emulador 3270"
334 329
@@ -368,7 +363,7 @@ msgstr &quot;Apenas ícones&quot; @@ -368,7 +363,7 @@ msgstr &quot;Apenas ícones&quot;
368 msgid "If the action can be activated" 363 msgid "If the action can be activated"
369 msgstr "Se a ação pode ser ativada" 364 msgstr "Se a ação pode ser ativada"
370 365
371 -#: ui/window.xml:484 366 +#: ui/window.xml:489
372 msgid "Insert" 367 msgid "Insert"
373 msgstr "Inserção" 368 msgstr "Inserção"
374 369
@@ -440,7 +435,7 @@ msgstr &quot;Menu principal&quot; @@ -440,7 +435,7 @@ msgstr &quot;Menu principal&quot;
440 msgid "Main Toolbar" 435 msgid "Main Toolbar"
441 msgstr "Barra de ferramentas" 436 msgstr "Barra de ferramentas"
442 437
443 -#: ui/window.xml:555 438 +#: ui/window.xml:560
444 msgid "Main menu" 439 msgid "Main menu"
445 msgstr "Menu principal" 440 msgstr "Menu principal"
446 441
@@ -452,23 +447,23 @@ msgstr &quot;Mantenedores&quot; @@ -452,23 +447,23 @@ msgstr &quot;Mantenedores&quot;
452 msgid "Menu" 447 msgid "Menu"
453 msgstr "Menu" 448 msgstr "Menu"
454 449
455 -#: ui/window.xml:521 ui/application.xml:403 450 +#: ui/window.xml:526 ui/application.xml:403
456 msgid "Model 2 - 80x24" 451 msgid "Model 2 - 80x24"
457 msgstr "Modelo 2 - 80x24" 452 msgstr "Modelo 2 - 80x24"
458 453
459 -#: ui/window.xml:526 ui/application.xml:408 454 +#: ui/window.xml:531 ui/application.xml:408
460 msgid "Model 3 - 80x32" 455 msgid "Model 3 - 80x32"
461 msgstr "Modelo 3 - 80x32" 456 msgstr "Modelo 3 - 80x32"
462 457
463 -#: ui/window.xml:531 ui/application.xml:413 458 +#: ui/window.xml:536 ui/application.xml:413
464 msgid "Model 4 - 80x43" 459 msgid "Model 4 - 80x43"
465 msgstr "Modelo 4 - 80x43" 460 msgstr "Modelo 4 - 80x43"
466 461
467 -#: ui/window.xml:536 ui/application.xml:418 462 +#: ui/window.xml:541 ui/application.xml:418
468 msgid "Model 5 - 132x27" 463 msgid "Model 5 - 132x27"
469 msgstr "Modelo 5 - 132x27" 464 msgstr "Modelo 5 - 132x27"
470 465
471 -#: ui/window.xml:386 ui/application.xml:444 466 +#: ui/window.xml:391 ui/application.xml:444
472 msgid "Monocase" 467 msgid "Monocase"
473 msgstr "Só Maiúsculas" 468 msgstr "Só Maiúsculas"
474 469
@@ -524,7 +519,7 @@ msgstr &quot;Abrir sessão em nova aba&quot; @@ -524,7 +519,7 @@ msgstr &quot;Abrir sessão em nova aba&quot;
524 msgid "Open session in New window" 519 msgid "Open session in New window"
525 msgstr "Abrir sessão em nova janela" 520 msgstr "Abrir sessão em nova janela"
526 521
527 -#: ui/window.xml:222 ui/window.xml:364 ui/window.xml:504 ui/application.xml:431 522 +#: ui/window.xml:222 ui/window.xml:364 ui/window.xml:509 ui/application.xml:431
528 msgid "Options" 523 msgid "Options"
529 msgstr "Opções" 524 msgstr "Opções"
530 525
@@ -544,7 +539,7 @@ msgstr &quot;Colar de um arquivo texto&quot; @@ -544,7 +539,7 @@ msgstr &quot;Colar de um arquivo texto&quot;
544 msgid "Paste next" 539 msgid "Paste next"
545 msgstr "Colar próximo" 540 msgstr "Colar próximo"
546 541
547 -#: ui/window.xml:403 ui/application.xml:469 542 +#: ui/window.xml:408 ui/application.xml:469
548 msgid "Paste with left margin" 543 msgid "Paste with left margin"
549 msgstr "Colar com margem esquerda" 544 msgstr "Colar com margem esquerda"
550 545
@@ -560,7 +555,7 @@ msgstr &quot;Preferências&quot; @@ -560,7 +555,7 @@ msgstr &quot;Preferências&quot;
560 msgid "Print" 555 msgid "Print"
561 msgstr "Imprimir" 556 msgstr "Imprimir"
562 557
563 -#: ui/window.xml:454 558 +#: ui/window.xml:459
564 msgid "Print screen" 559 msgid "Print screen"
565 msgstr "Imrpimir o conteúdo da tela" 560 msgstr "Imrpimir o conteúdo da tela"
566 561
@@ -585,7 +580,7 @@ msgstr &quot;Renomear sessão&quot; @@ -585,7 +580,7 @@ msgstr &quot;Renomear sessão&quot;
585 msgid "Reselect" 580 msgid "Reselect"
586 msgstr "Reselecionar" 581 msgstr "Reselecionar"
587 582
588 -#: ui/window.xml:374 ui/application.xml:464 583 +#: ui/window.xml:379 ui/application.xml:464
589 msgid "Resize on alternate screen" 584 msgid "Resize on alternate screen"
590 msgstr "Mudar tamanho do terminal em tela alternativa" 585 msgstr "Mudar tamanho do terminal em tela alternativa"
591 586
@@ -601,7 +596,7 @@ msgstr &quot;Salvar&quot; @@ -601,7 +596,7 @@ msgstr &quot;Salvar&quot;
601 msgid "Save current session preferences to file" 596 msgid "Save current session preferences to file"
602 msgstr "Salvar preferências da sessão para arquivo" 597 msgstr "Salvar preferências da sessão para arquivo"
603 598
604 -#: ui/window.xml:449 599 +#: ui/window.xml:454
605 msgid "Save screen" 600 msgid "Save screen"
606 msgstr "Salvar tela" 601 msgstr "Salvar tela"
607 602
@@ -625,7 +620,7 @@ msgstr &quot;Salvar para arquivo de sessão&quot; @@ -625,7 +620,7 @@ msgstr &quot;Salvar para arquivo de sessão&quot;
625 msgid "Save to shortcut file" 620 msgid "Save to shortcut file"
626 msgstr "Salvar para atalho" 621 msgstr "Salvar para atalho"
627 622
628 -#: ui/window.xml:518 ui/application.xml:400 623 +#: ui/window.xml:523 ui/application.xml:400
629 msgid "Screen size" 624 msgid "Screen size"
630 msgstr "Tamanho da tela" 625 msgstr "Tamanho da tela"
631 626
@@ -658,7 +653,7 @@ msgstr &quot;Área selecionada&quot; @@ -658,7 +653,7 @@ msgstr &quot;Área selecionada&quot;
658 msgid "Send/Receive" 653 msgid "Send/Receive"
659 msgstr "Enviar/Receber" 654 msgstr "Enviar/Receber"
660 655
661 -#: src/objects/window/actions/filetransfer.c:46 ui/window.xml:459 656 +#: src/objects/window/actions/filetransfer.c:46 ui/window.xml:464
662 #: ui/application.xml:195 657 #: ui/application.xml:195
663 msgid "Send/Receive files" 658 msgid "Send/Receive files"
664 msgstr "Enviar/Receber arquivos" 659 msgstr "Enviar/Receber arquivos"
@@ -671,7 +666,7 @@ msgstr &quot;Separador&quot; @@ -671,7 +666,7 @@ msgstr &quot;Separador&quot;
671 msgid "Session" 666 msgid "Session"
672 msgstr "Sessão" 667 msgstr "Sessão"
673 668
674 -#: ui/window.xml:440 ui/window.xml:560 ui/application.xml:76 669 +#: ui/window.xml:445 ui/window.xml:565 ui/application.xml:76
675 msgid "Session Trace" 670 msgid "Session Trace"
676 msgstr "Trace da sessão" 671 msgstr "Trace da sessão"
677 672
@@ -692,11 +687,11 @@ msgid &quot;Session name&quot; @@ -692,11 +687,11 @@ msgid &quot;Session name&quot;
692 msgstr "Nome da sessão" 687 msgstr "Nome da sessão"
693 688
694 #: src/objects/window/actions/sessionproperties.c:46 ui/window.xml:98 689 #: src/objects/window/actions/sessionproperties.c:46 ui/window.xml:98
695 -#: ui/window.xml:574 ui/application.xml:163 690 +#: ui/window.xml:579 ui/application.xml:163
696 msgid "Session preferences" 691 msgid "Session preferences"
697 msgstr "Preferências da sessão" 692 msgstr "Preferências da sessão"
698 693
699 -#: src/objects/application/application.c:219 694 +#: src/objects/application/application.c:216
700 msgid "Set the user-interface type" 695 msgid "Set the user-interface type"
701 msgstr "Define o tipo de interface do usuário" 696 msgstr "Define o tipo de interface do usuário"
702 697
@@ -744,7 +739,7 @@ msgstr &quot;Mostrar barra de ferramentas&quot; @@ -744,7 +739,7 @@ msgstr &quot;Mostrar barra de ferramentas&quot;
744 msgid "Small" 739 msgid "Small"
745 msgstr "Pequeno" 740 msgstr "Pequeno"
746 741
747 -#: ui/window.xml:398 ui/application.xml:504 742 +#: ui/window.xml:403 ui/application.xml:504
748 msgid "Smart paste" 743 msgid "Smart paste"
749 msgstr "Colar inteligente" 744 msgstr "Colar inteligente"
750 745
@@ -891,7 +886,7 @@ msgstr &quot;Barra de título&quot; @@ -891,7 +886,7 @@ msgstr &quot;Barra de título&quot;
891 msgid "Title bar actions" 886 msgid "Title bar actions"
892 msgstr "Ações da barra de título" 887 msgstr "Ações da barra de título"
893 888
894 -#: src/objects/toolbar/settings.c:87 ui/window.xml:430 ui/window.xml:550 889 +#: src/objects/toolbar/settings.c:87 ui/window.xml:435 ui/window.xml:555
895 #: ui/application.xml:342 890 #: ui/application.xml:342
896 msgid "Toolbar" 891 msgid "Toolbar"
897 msgstr "Barra de ferramentas" 892 msgstr "Barra de ferramentas"
@@ -904,7 +899,7 @@ msgstr &quot;Estilo da barra de ferramentas&quot; @@ -904,7 +899,7 @@ msgstr &quot;Estilo da barra de ferramentas&quot;
904 msgid "Toolbar s_tyle" 899 msgid "Toolbar s_tyle"
905 msgstr "Est_ilo da barra de ferramentas" 900 msgstr "Est_ilo da barra de ferramentas"
906 901
907 -#: ui/window.xml:435 902 +#: ui/window.xml:440
908 msgid "Top menu" 903 msgid "Top menu"
909 msgstr "Menu principal" 904 msgstr "Menu principal"
910 905
@@ -912,7 +907,7 @@ msgstr &quot;Menu principal&quot; @@ -912,7 +907,7 @@ msgstr &quot;Menu principal&quot;
912 msgid "Trace" 907 msgid "Trace"
913 msgstr "Trace" 908 msgstr "Trace"
914 909
915 -#: ui/window.xml:489 ui/application.xml:449 910 +#: ui/window.xml:494 ui/application.xml:449
916 msgid "Track Cursor" 911 msgid "Track Cursor"
917 msgstr "Mostrar posição do cursor" 912 msgstr "Mostrar posição do cursor"
918 913
@@ -924,7 +919,7 @@ msgstr &quot;Interface de usuário&quot; @@ -924,7 +919,7 @@ msgstr &quot;Interface de usuário&quot;
924 msgid "Unselect" 919 msgid "Unselect"
925 msgstr "Remover seleção" 920 msgstr "Remover seleção"
926 921
927 -#: ui/application.xml:514 922 +#: ui/window.xml:374 ui/application.xml:514
928 msgid "Use +/- for field navigation" 923 msgid "Use +/- for field navigation"
929 msgstr "Usar teclas +/- para navegar por campos" 924 msgstr "Usar teclas +/- para navegar por campos"
930 925
@@ -933,7 +928,7 @@ msgstr &quot;Usar teclas +/- para navegar por campos&quot; @@ -933,7 +928,7 @@ msgstr &quot;Usar teclas +/- para navegar por campos&quot;
933 msgid "Version %s-%s" 928 msgid "Version %s-%s"
934 msgstr "Versão %s-%s" 929 msgstr "Versão %s-%s"
935 930
936 -#: src/objects/window/header.c:66 ui/window.xml:427 ui/window.xml:547 931 +#: src/objects/window/header.c:66 ui/window.xml:432 ui/window.xml:552
937 #: ui/application.xml:63 932 #: ui/application.xml:63
938 msgid "View" 933 msgid "View"
939 msgstr "Exibir" 934 msgstr "Exibir"
@@ -959,7 +954,7 @@ msgstr &quot;_Cancelar&quot; @@ -959,7 +954,7 @@ msgstr &quot;_Cancelar&quot;
959 msgid "_Close session" 954 msgid "_Close session"
960 msgstr "_Fechar sessão" 955 msgstr "_Fechar sessão"
961 956
962 -#: ui/window.xml:569 ui/application.xml:368 957 +#: ui/window.xml:574 ui/application.xml:368
963 msgid "_Connect" 958 msgid "_Connect"
964 msgstr "_Conectar" 959 msgstr "_Conectar"
965 960
@@ -1681,6 +1676,9 @@ msgstr &quot;translator-credits&quot; @@ -1681,6 +1676,9 @@ msgstr &quot;translator-credits&quot;
1681 #~ msgid "Connection state" 1676 #~ msgid "Connection state"
1682 #~ msgstr "Estado da conexão" 1677 #~ msgstr "Estado da conexão"
1683 1678
  1679 +#~ msgid "Continue"
  1680 +#~ msgstr "Continuar"
  1681 +
1684 #~ msgid "Copiar tudo" 1682 #~ msgid "Copiar tudo"
1685 #~ msgstr "Copiar tudo" 1683 #~ msgstr "Copiar tudo"
1686 1684
locale/pw3270.pot
  Diff comments   View file @a380817
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2020-10-15 13:43-0300\n" 11 +"POT-Creation-Date: 2020-10-29 19:50-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr &quot;&quot; @@ -17,7 +17,7 @@ msgstr &quot;&quot;
17 "Content-Type: text/plain; charset=CHARSET\n" 17 "Content-Type: text/plain; charset=CHARSET\n"
18 "Content-Transfer-Encoding: 8bit\n" 18 "Content-Transfer-Encoding: 8bit\n"
19 19
20 -#: src/objects/application/application.c:206 20 +#: src/objects/application/application.c:203
21 #, c-format 21 #, c-format
22 msgid "\"%s\" is not a valid user interface name" 22 msgid "\"%s\" is not a valid user interface name"
23 msgstr "" 23 msgstr ""
@@ -60,11 +60,11 @@ msgstr &quot;&quot; @@ -60,11 +60,11 @@ msgstr &quot;&quot;
60 msgid "Action Names" 60 msgid "Action Names"
61 msgstr "" 61 msgstr ""
62 62
63 -#: ui/window.xml:379 ui/window.xml:494 ui/application.xml:509 63 +#: ui/window.xml:384 ui/window.xml:499 ui/application.xml:509
64 msgid "Alert sound" 64 msgid "Alert sound"
65 msgstr "" 65 msgstr ""
66 66
67 -#: src/main/tools.c:99 src/tools/entry.c:88 67 +#: src/main/tools.c:99
68 msgid "All files" 68 msgid "All files"
69 msgstr "" 69 msgstr ""
70 70
@@ -104,7 +104,7 @@ msgstr &quot;&quot; @@ -104,7 +104,7 @@ msgstr &quot;&quot;
104 msgid "Based on X3270 from" 104 msgid "Based on X3270 from"
105 msgstr "" 105 msgstr ""
106 106
107 -#: ui/window.xml:408 ui/application.xml:474 107 +#: ui/window.xml:413 ui/application.xml:474
108 msgid "Blank Fill" 108 msgid "Blank Fill"
109 msgstr "" 109 msgstr ""
110 110
@@ -126,7 +126,6 @@ msgid &quot;Can&#39;t use \&quot;%s\&quot;&quot; @@ -126,7 +126,6 @@ msgid &quot;Can&#39;t use \&quot;%s\&quot;&quot;
126 msgstr "" 126 msgstr ""
127 127
128 #: src/objects/application/actions/open.c:49 src/objects/window/page.c:265 128 #: src/objects/application/actions/open.c:49 src/objects/window/page.c:265
129 -#: src/tools/entry.c:71  
130 msgid "Cancel" 129 msgid "Cancel"
131 msgstr "" 130 msgstr ""
132 131
@@ -163,8 +162,8 @@ msgstr &quot;&quot; @@ -163,8 +162,8 @@ msgstr &quot;&quot;
163 msgid "Close the window" 162 msgid "Close the window"
164 msgstr "" 163 msgstr ""
165 164
166 -#: src/objects/window/actions/close.c:60 ui/window.xml:280 ui/window.xml:473  
167 -#: ui/window.xml:580 ui/application.xml:216 165 +#: src/objects/window/actions/close.c:60 ui/window.xml:280 ui/window.xml:478
  166 +#: ui/window.xml:585 ui/application.xml:216
168 msgid "Close window" 167 msgid "Close window"
169 msgstr "" 168 msgstr ""
170 169
@@ -188,14 +187,10 @@ msgstr &quot;&quot; @@ -188,14 +187,10 @@ msgstr &quot;&quot;
188 msgid "Connect to host" 187 msgid "Connect to host"
189 msgstr "" 188 msgstr ""
190 189
191 -#: src/objects/window/window.c:753 src/objects/window/page.c:218 190 +#: src/objects/window/window.c:772 src/objects/window/page.c:218
192 msgid "Connected to host" 191 msgid "Connected to host"
193 msgstr "" 192 msgstr ""
194 193
195 -#: src/tools/entry.c:131  
196 -msgid "Continue"  
197 -msgstr ""  
198 -  
199 #: src/objects/application/actions/about.c:130 194 #: src/objects/application/actions/about.c:130
200 msgid "Contributors" 195 msgid "Contributors"
201 msgstr "" 196 msgstr ""
@@ -248,16 +243,16 @@ msgstr &quot;&quot; @@ -248,16 +243,16 @@ msgstr &quot;&quot;
248 msgid "Delete Field" 243 msgid "Delete Field"
249 msgstr "" 244 msgstr ""
250 245
251 -#: ui/window.xml:275 ui/window.xml:468 246 +#: ui/window.xml:275 ui/window.xml:473
252 msgid "Disconnect" 247 msgid "Disconnect"
253 msgstr "" 248 msgstr ""
254 249
255 -#: src/objects/window/window.c:753 src/objects/window/window.c:780 250 +#: src/objects/window/window.c:772 src/objects/window/window.c:799
256 #: src/objects/window/page.c:207 251 #: src/objects/window/page.c:207
257 msgid "Disconnected from host" 252 msgid "Disconnected from host"
258 msgstr "" 253 msgstr ""
259 254
260 -#: ui/window.xml:391 ui/window.xml:507 ui/application.xml:524 255 +#: ui/window.xml:396 ui/window.xml:512 ui/application.xml:524
261 msgid "Dynamic font spacing" 256 msgid "Dynamic font spacing"
262 msgstr "" 257 msgstr ""
263 258
@@ -305,7 +300,7 @@ msgstr &quot;&quot; @@ -305,7 +300,7 @@ msgstr &quot;&quot;
305 msgid "Full Screen" 300 msgid "Full Screen"
306 msgstr "" 301 msgstr ""
307 302
308 -#: ui/window.xml:246 ui/window.xml:417 ui/window.xml:512 303 +#: ui/window.xml:246 ui/window.xml:422 ui/window.xml:517
309 msgid "Full screen" 304 msgid "Full screen"
310 msgstr "" 305 msgstr ""
311 306
@@ -325,7 +320,7 @@ msgstr &quot;&quot; @@ -325,7 +320,7 @@ msgstr &quot;&quot;
325 msgid "Host properties" 320 msgid "Host properties"
326 msgstr "" 321 msgstr ""
327 322
328 -#: src/objects/window/window.c:552 src/objects/os/linux/savedesktopicon.c:102 323 +#: src/objects/window/window.c:561 src/objects/os/linux/savedesktopicon.c:102
329 msgid "IBM 3270 Terminal emulator" 324 msgid "IBM 3270 Terminal emulator"
330 msgstr "" 325 msgstr ""
331 326
@@ -365,7 +360,7 @@ msgstr &quot;&quot; @@ -365,7 +360,7 @@ msgstr &quot;&quot;
365 msgid "If the action can be activated" 360 msgid "If the action can be activated"
366 msgstr "" 361 msgstr ""
367 362
368 -#: ui/window.xml:484 363 +#: ui/window.xml:489
369 msgid "Insert" 364 msgid "Insert"
370 msgstr "" 365 msgstr ""
371 366
@@ -437,7 +432,7 @@ msgstr &quot;&quot; @@ -437,7 +432,7 @@ msgstr &quot;&quot;
437 msgid "Main Toolbar" 432 msgid "Main Toolbar"
438 msgstr "" 433 msgstr ""
439 434
440 -#: ui/window.xml:555 435 +#: ui/window.xml:560
441 msgid "Main menu" 436 msgid "Main menu"
442 msgstr "" 437 msgstr ""
443 438
@@ -449,23 +444,23 @@ msgstr &quot;&quot; @@ -449,23 +444,23 @@ msgstr &quot;&quot;
449 msgid "Menu" 444 msgid "Menu"
450 msgstr "" 445 msgstr ""
451 446
452 -#: ui/window.xml:521 ui/application.xml:403 447 +#: ui/window.xml:526 ui/application.xml:403
453 msgid "Model 2 - 80x24" 448 msgid "Model 2 - 80x24"
454 msgstr "" 449 msgstr ""
455 450
456 -#: ui/window.xml:526 ui/application.xml:408 451 +#: ui/window.xml:531 ui/application.xml:408
457 msgid "Model 3 - 80x32" 452 msgid "Model 3 - 80x32"
458 msgstr "" 453 msgstr ""
459 454
460 -#: ui/window.xml:531 ui/application.xml:413 455 +#: ui/window.xml:536 ui/application.xml:413
461 msgid "Model 4 - 80x43" 456 msgid "Model 4 - 80x43"
462 msgstr "" 457 msgstr ""
463 458
464 -#: ui/window.xml:536 ui/application.xml:418 459 +#: ui/window.xml:541 ui/application.xml:418
465 msgid "Model 5 - 132x27" 460 msgid "Model 5 - 132x27"
466 msgstr "" 461 msgstr ""
467 462
468 -#: ui/window.xml:386 ui/application.xml:444 463 +#: ui/window.xml:391 ui/application.xml:444
469 msgid "Monocase" 464 msgid "Monocase"
470 msgstr "" 465 msgstr ""
471 466
@@ -521,7 +516,7 @@ msgstr &quot;&quot; @@ -521,7 +516,7 @@ msgstr &quot;&quot;
521 msgid "Open session in New window" 516 msgid "Open session in New window"
522 msgstr "" 517 msgstr ""
523 518
524 -#: ui/window.xml:222 ui/window.xml:364 ui/window.xml:504 ui/application.xml:431 519 +#: ui/window.xml:222 ui/window.xml:364 ui/window.xml:509 ui/application.xml:431
525 msgid "Options" 520 msgid "Options"
526 msgstr "" 521 msgstr ""
527 522
@@ -541,7 +536,7 @@ msgstr &quot;&quot; @@ -541,7 +536,7 @@ msgstr &quot;&quot;
541 msgid "Paste next" 536 msgid "Paste next"
542 msgstr "" 537 msgstr ""
543 538
544 -#: ui/window.xml:403 ui/application.xml:469 539 +#: ui/window.xml:408 ui/application.xml:469
545 msgid "Paste with left margin" 540 msgid "Paste with left margin"
546 msgstr "" 541 msgstr ""
547 542
@@ -557,7 +552,7 @@ msgstr &quot;&quot; @@ -557,7 +552,7 @@ msgstr &quot;&quot;
557 msgid "Print" 552 msgid "Print"
558 msgstr "" 553 msgstr ""
559 554
560 -#: ui/window.xml:454 555 +#: ui/window.xml:459
561 msgid "Print screen" 556 msgid "Print screen"
562 msgstr "" 557 msgstr ""
563 558
@@ -582,7 +577,7 @@ msgstr &quot;&quot; @@ -582,7 +577,7 @@ msgstr &quot;&quot;
582 msgid "Reselect" 577 msgid "Reselect"
583 msgstr "" 578 msgstr ""
584 579
585 -#: ui/window.xml:374 ui/application.xml:464 580 +#: ui/window.xml:379 ui/application.xml:464
586 msgid "Resize on alternate screen" 581 msgid "Resize on alternate screen"
587 msgstr "" 582 msgstr ""
588 583
@@ -598,7 +593,7 @@ msgstr &quot;&quot; @@ -598,7 +593,7 @@ msgstr &quot;&quot;
598 msgid "Save current session preferences to file" 593 msgid "Save current session preferences to file"
599 msgstr "" 594 msgstr ""
600 595
601 -#: ui/window.xml:449 596 +#: ui/window.xml:454
602 msgid "Save screen" 597 msgid "Save screen"
603 msgstr "" 598 msgstr ""
604 599
@@ -622,7 +617,7 @@ msgstr &quot;&quot; @@ -622,7 +617,7 @@ msgstr &quot;&quot;
622 msgid "Save to shortcut file" 617 msgid "Save to shortcut file"
623 msgstr "" 618 msgstr ""
624 619
625 -#: ui/window.xml:518 ui/application.xml:400 620 +#: ui/window.xml:523 ui/application.xml:400
626 msgid "Screen size" 621 msgid "Screen size"
627 msgstr "" 622 msgstr ""
628 623
@@ -655,7 +650,7 @@ msgstr &quot;&quot; @@ -655,7 +650,7 @@ msgstr &quot;&quot;
655 msgid "Send/Receive" 650 msgid "Send/Receive"
656 msgstr "" 651 msgstr ""
657 652
658 -#: src/objects/window/actions/filetransfer.c:46 ui/window.xml:459 653 +#: src/objects/window/actions/filetransfer.c:46 ui/window.xml:464
659 #: ui/application.xml:195 654 #: ui/application.xml:195
660 msgid "Send/Receive files" 655 msgid "Send/Receive files"
661 msgstr "" 656 msgstr ""
@@ -668,7 +663,7 @@ msgstr &quot;&quot; @@ -668,7 +663,7 @@ msgstr &quot;&quot;
668 msgid "Session" 663 msgid "Session"
669 msgstr "" 664 msgstr ""
670 665
671 -#: ui/window.xml:440 ui/window.xml:560 ui/application.xml:76 666 +#: ui/window.xml:445 ui/window.xml:565 ui/application.xml:76
672 msgid "Session Trace" 667 msgid "Session Trace"
673 msgstr "" 668 msgstr ""
674 669
@@ -689,11 +684,11 @@ msgid &quot;Session name&quot; @@ -689,11 +684,11 @@ msgid &quot;Session name&quot;
689 msgstr "" 684 msgstr ""
690 685
691 #: src/objects/window/actions/sessionproperties.c:46 ui/window.xml:98 686 #: src/objects/window/actions/sessionproperties.c:46 ui/window.xml:98
692 -#: ui/window.xml:574 ui/application.xml:163 687 +#: ui/window.xml:579 ui/application.xml:163
693 msgid "Session preferences" 688 msgid "Session preferences"
694 msgstr "" 689 msgstr ""
695 690
696 -#: src/objects/application/application.c:219 691 +#: src/objects/application/application.c:216
697 msgid "Set the user-interface type" 692 msgid "Set the user-interface type"
698 msgstr "" 693 msgstr ""
699 694
@@ -741,7 +736,7 @@ msgstr &quot;&quot; @@ -741,7 +736,7 @@ msgstr &quot;&quot;
741 msgid "Small" 736 msgid "Small"
742 msgstr "" 737 msgstr ""
743 738
744 -#: ui/window.xml:398 ui/application.xml:504 739 +#: ui/window.xml:403 ui/application.xml:504
745 msgid "Smart paste" 740 msgid "Smart paste"
746 msgstr "" 741 msgstr ""
747 742
@@ -886,7 +881,7 @@ msgstr &quot;&quot; @@ -886,7 +881,7 @@ msgstr &quot;&quot;
886 msgid "Title bar actions" 881 msgid "Title bar actions"
887 msgstr "" 882 msgstr ""
888 883
889 -#: src/objects/toolbar/settings.c:87 ui/window.xml:430 ui/window.xml:550 884 +#: src/objects/toolbar/settings.c:87 ui/window.xml:435 ui/window.xml:555
890 #: ui/application.xml:342 885 #: ui/application.xml:342
891 msgid "Toolbar" 886 msgid "Toolbar"
892 msgstr "" 887 msgstr ""
@@ -899,7 +894,7 @@ msgstr &quot;&quot; @@ -899,7 +894,7 @@ msgstr &quot;&quot;
899 msgid "Toolbar s_tyle" 894 msgid "Toolbar s_tyle"
900 msgstr "" 895 msgstr ""
901 896
902 -#: ui/window.xml:435 897 +#: ui/window.xml:440
903 msgid "Top menu" 898 msgid "Top menu"
904 msgstr "" 899 msgstr ""
905 900
@@ -907,7 +902,7 @@ msgstr &quot;&quot; @@ -907,7 +902,7 @@ msgstr &quot;&quot;
907 msgid "Trace" 902 msgid "Trace"
908 msgstr "" 903 msgstr ""
909 904
910 -#: ui/window.xml:489 ui/application.xml:449 905 +#: ui/window.xml:494 ui/application.xml:449
911 msgid "Track Cursor" 906 msgid "Track Cursor"
912 msgstr "" 907 msgstr ""
913 908
@@ -919,7 +914,7 @@ msgstr &quot;&quot; @@ -919,7 +914,7 @@ msgstr &quot;&quot;
919 msgid "Unselect" 914 msgid "Unselect"
920 msgstr "" 915 msgstr ""
921 916
922 -#: ui/application.xml:514 917 +#: ui/window.xml:374 ui/application.xml:514
923 msgid "Use +/- for field navigation" 918 msgid "Use +/- for field navigation"
924 msgstr "" 919 msgstr ""
925 920
@@ -928,7 +923,7 @@ msgstr &quot;&quot; @@ -928,7 +923,7 @@ msgstr &quot;&quot;
928 msgid "Version %s-%s" 923 msgid "Version %s-%s"
929 msgstr "" 924 msgstr ""
930 925
931 -#: src/objects/window/header.c:66 ui/window.xml:427 ui/window.xml:547 926 +#: src/objects/window/header.c:66 ui/window.xml:432 ui/window.xml:552
932 #: ui/application.xml:63 927 #: ui/application.xml:63
933 msgid "View" 928 msgid "View"
934 msgstr "" 929 msgstr ""
@@ -954,7 +949,7 @@ msgstr &quot;&quot; @@ -954,7 +949,7 @@ msgstr &quot;&quot;
954 msgid "_Close session" 949 msgid "_Close session"
955 msgstr "" 950 msgstr ""
956 951
957 -#: ui/window.xml:569 ui/application.xml:368 952 +#: ui/window.xml:574 ui/application.xml:368
958 msgid "_Connect" 953 msgid "_Connect"
959 msgstr "" 954 msgstr ""
960 955
rpm/pw3270.spec
  Diff comments   View file @a380817
@@ -30,14 +30,14 @@ License: GPL-2.0 @@ -30,14 +30,14 @@ License: GPL-2.0
30 Group: System/X11/Terminals 30 Group: System/X11/Terminals
31 Url: https://github.com/PerryWerneck/pw3270 31 Url: https://github.com/PerryWerneck/pw3270
32 32
33 -Source: pw3270-%{version}.tar.xz 33 +Source: pw3270-%{version}.tar.xz
34 34
35 BuildRoot: %{_tmppath}/%{name}-%{version}-build 35 BuildRoot: %{_tmppath}/%{name}-%{version}-build
36 36
37 Requires: shared-mime-info 37 Requires: shared-mime-info
38 Requires: %{name}-branding = %{version} 38 Requires: %{name}-branding = %{version}
39 39
40 -BuildRequires: update-desktop-files 40 +BuildRequires: update-desktop-files
41 41
42 %glib2_gsettings_schema_requires 42 %glib2_gsettings_schema_requires
43 43
@@ -122,9 +122,9 @@ Based on the original x3270 code, pw3270 was originally created for Banco do Bra @@ -122,9 +122,9 @@ Based on the original x3270 code, pw3270 was originally created for Banco do Bra
122 %package branding 122 %package branding
123 Summary: Default branding for %{name} 123 Summary: Default branding for %{name}
124 Group: System/X11/Terminals 124 Group: System/X11/Terminals
125 -Requires: %{name} = %{version}  
126 125
127 -Requires(post): desktop-file-utils 126 +Requires: %{name} = %{version}
  127 +Requires(post): desktop-file-utils
128 Requires(postun): desktop-file-utils 128 Requires(postun): desktop-file-utils
129 129
130 %description branding 130 %description branding
@@ -138,7 +138,6 @@ Group: System/X11/Terminals @@ -138,7 +138,6 @@ Group: System/X11/Terminals
138 Requires: %{name} = %{version} 138 Requires: %{name} = %{version}
139 BuildArch: noarch 139 BuildArch: noarch
140 140
141 -Provides: pw3270-keypads = %{version}  
142 Conflicts: otherproviders(pw3270-keypads) 141 Conflicts: otherproviders(pw3270-keypads)
143 Enhances: %{name} 142 Enhances: %{name}
144 143
@@ -170,9 +169,8 @@ make all -j1 @@ -170,9 +169,8 @@ make all -j1
170 169
171 %fdupes %{buildroot}/%{_prefix} 170 %fdupes %{buildroot}/%{_prefix}
172 171
173 -#---[ Files ]---------------------------------------------------------------------------------------------------------  
174 -  
175 %files -f langfiles 172 %files -f langfiles
  173 +%defattr(-,root,root)
176 %license LICENSE 174 %license LICENSE
177 %doc AUTHORS README.md 175 %doc AUTHORS README.md
178 176
@@ -181,27 +179,35 @@ make all -j1 @@ -181,27 +179,35 @@ make all -j1
181 %dir %{_datadir}/%{_product}/ui 179 %dir %{_datadir}/%{_product}/ui
182 %dir %{_datadir}/%{_product}/keypad 180 %dir %{_datadir}/%{_product}/keypad
183 %dir %{_libdir}/%{_product}-plugins 181 %dir %{_libdir}/%{_product}-plugins
  182 +%dir %{_datadir}/%{_product}/icons
184 183
185 %{_bindir}/%{_product} 184 %{_bindir}/%{_product}
186 185
  186 +# Configuration & Themes
187 %{_datadir}/glib-2.0/schemas/*.xml 187 %{_datadir}/glib-2.0/schemas/*.xml
  188 +%{_datadir}/%{_product}/icons/gtk-*.svg
  189 +
  190 +%{_datadir}/pixmaps/*.png
  191 +
  192 +%{_datadir}/applications/*.desktop
  193 +%{_datadir}/appdata/%{_product}.appdata.xml
  194 +
  195 +%{_datadir}/mime/packages/*.xml
188 196
189 %files branding 197 %files branding
  198 +%defattr(-,root,root)
  199 +
190 %{_datadir}/%{_product}/ui/* 200 %{_datadir}/%{_product}/ui/*
191 %{_datadir}/%{_product}/*.png 201 %{_datadir}/%{_product}/*.png
192 -%{_datadir}/applications/*.desktop  
193 -%{_datadir}/pixmaps/*.png  
194 -%{_datadir}/mime/packages/*.xml 202 +%{_datadir}/%{_product}/icons/%{_product}.svg
195 203
196 %files keypads 204 %files keypads
197 %{_datadir}/%{_product}/keypad/* 205 %{_datadir}/%{_product}/keypad/*
198 206
199 -#---[ Scripts ]-------------------------------------------------------------------------------------------------------  
200 -  
201 -%post branding 207 +%posttrans
202 /usr/bin/update-desktop-database 208 /usr/bin/update-desktop-database
203 209
204 -%postun branding 210 +%postun
205 /usr/bin/update-desktop-database 211 /usr/bin/update-desktop-database
206 212
207 %changelog 213 %changelog
schemas/linux/window.gschema.xml.in
  Diff comments   View file @a380817
@@ -111,7 +111,7 @@ @@ -111,7 +111,7 @@
111 </key> 111 </key>
112 112
113 <key name="header-action-names" type="s"> 113 <key name="header-action-names" type="s">
114 - <default>':menu.open-menu,win.disconnect,win.reconnect'</default> 114 + <default>'app.new.tab:menu.open-menu,win.disconnect,win.reconnect'</default>
115 <summary>The title bar action list</summary> 115 <summary>The title bar action list</summary>
116 <description></description> 116 <description></description>
117 </key> 117 </key>
src/objects/actions/button.c
  Diff comments   View file @a380817
@@ -42,8 +42,9 @@ @@ -42,8 +42,9 @@
42 42
43 g_autofree gchar * icon_name = g_action_get_icon_name(action); 43 g_autofree gchar * icon_name = g_action_get_icon_name(action);
44 if(icon_name) { 44 if(icon_name) {
45 - if(symbolic && !strstr(icon_name,"-symbolic")) {  
46 - g_autofree gchar * name = g_strconcat(icon_name,"-symbolic",NULL); 45 +
  46 + if(symbolic && !g_str_has_suffix(icon_name,"-symbolic")) {
  47 + g_autofree gchar * name = g_strconcat(icon_name + (g_str_has_prefix(icon_name,"gtk-") ? 4 : 0),"-symbolic",NULL);
47 return gtk_button_new_from_icon_name(name,icon_size); 48 return gtk_button_new_from_icon_name(name,icon_size);
48 } 49 }
49 return gtk_button_new_from_icon_name(icon_name,icon_size); 50 return gtk_button_new_from_icon_name(icon_name,icon_size);
src/objects/application/actions/about.c
  Diff comments   View file @a380817
@@ -37,8 +37,42 @@ @@ -37,8 +37,42 @@
37 37
38 // Get application logo 38 // Get application logo
39 { 39 {
40 - lib3270_autoptr(char) logo = lib3270_build_data_filename(G_STRINGIFY(PRODUCT_NAME) "-logo.png",NULL); 40 +#ifdef DEBUG
  41 + static const char * logo = "./branding/" G_STRINGIFY(PRODUCT_NAME) "-logo.svg";
  42 + static const char * icon = "./branding/" G_STRINGIFY(PRODUCT_NAME) ".svg";
  43 +#else
  44 + lib3270_autoptr(char) logo = lib3270_build_data_filename(G_STRINGIFY(PRODUCT_NAME) "-logo.svg",NULL);
  45 + lib3270_autoptr(char) icon = lib3270_build_data_filename("icons", G_STRINGIFY(PRODUCT_NAME) ".svg",NULL);
  46 +#endif // DEBUG
  47 +
  48 + const char * imgs[] = {
  49 + logo,
  50 + icon
  51 + };
  52 +
  53 + size_t ix;
  54 +
  55 + for(ix = 0; ix < G_N_ELEMENTS(imgs);ix++) {
  56 +
  57 + if(!g_file_test(imgs[ix],G_FILE_TEST_IS_REGULAR))
  58 + continue;
  59 +
  60 + GError * error = NULL;
  61 + g_autoptr(GdkPixbuf) pix = gdk_pixbuf_new_from_file_at_size(imgs[ix],-1,150,&error);
  62 + if(error) {
  63 + g_warning("Can't load \"%s\": %s",imgs[ix],error->message);
  64 + g_error_free(error);
  65 + continue;
  66 + }
  67 +
  68 + if(pix) {
  69 + gtk_about_dialog_set_logo(dialog,pix);
  70 + break;
  71 + }
  72 +
  73 + }
41 74
  75 + /*
42 if(g_file_test(logo,G_FILE_TEST_EXISTS)) { 76 if(g_file_test(logo,G_FILE_TEST_EXISTS)) {
43 GError * error = NULL; 77 GError * error = NULL;
44 GdkPixbuf * pix = gdk_pixbuf_new_from_file(logo,&error); 78 GdkPixbuf * pix = gdk_pixbuf_new_from_file(logo,&error);
@@ -61,6 +95,7 @@ @@ -61,6 +95,7 @@
61 g_message("%s: %s",logo,strerror(ENOENT)); 95 g_message("%s: %s",logo,strerror(ENOENT));
62 96
63 } 97 }
  98 + */
64 99
65 } 100 }
66 101
src/objects/keypad/attribute.c
  Diff comments   View file @a380817
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 /*---[ Implement ]----------------------------------------------------------------------------------*/ 41 /*---[ Implement ]----------------------------------------------------------------------------------*/
42 42
43 43
44 - static void parse_error (GMarkupParseContext *context, GError *error, gpointer data) { 44 + static void parse_error (GMarkupParseContext G_GNUC_UNUSED(*context), GError G_GNUC_UNUSED(*error), gpointer data) {
45 g_free(data); 45 g_free(data);
46 } 46 }
47 47
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 53
54 GParamSpec *spec = ((struct Attribute *) user_data)->spec; 54 GParamSpec *spec = ((struct Attribute *) user_data)->spec;
55 55
56 - debug("%s=\"%s\"",spec->name,text); 56 +// debug("%s=\"%s\"",spec->name,text);
57 57
58 GValue value = G_VALUE_INIT; 58 GValue value = G_VALUE_INIT;
59 g_value_init(&value,spec->value_type); 59 g_value_init(&value,spec->value_type);
src/objects/keypad/model.c
  Diff comments   View file @a380817
@@ -243,7 +243,7 @@ @@ -243,7 +243,7 @@
243 243
244 static void element_start(GMarkupParseContext *context, const gchar *element_name, const gchar **names,const gchar **values, KeypadModel *keypad, GError **error) { 244 static void element_start(GMarkupParseContext *context, const gchar *element_name, const gchar **names,const gchar **values, KeypadModel *keypad, GError **error) {
245 245
246 - debug("%s(%s)",__FUNCTION__,element_name); 246 +// debug("%s(%s)",__FUNCTION__,element_name);
247 247
248 if(!g_ascii_strcasecmp(element_name,"button")) { 248 if(!g_ascii_strcasecmp(element_name,"button")) {
249 249
@@ -304,7 +304,7 @@ @@ -304,7 +304,7 @@
304 304
305 static void element_end(GMarkupParseContext *context, const gchar *element_name, KeypadModel *keypad, GError G_GNUC_UNUSED(**error)) { 305 static void element_end(GMarkupParseContext *context, const gchar *element_name, KeypadModel *keypad, GError G_GNUC_UNUSED(**error)) {
306 306
307 - debug("%s(%s)",__FUNCTION__,element_name); 307 +// debug("%s(%s)",__FUNCTION__,element_name);
308 308
309 if(!g_ascii_strcasecmp(element_name,"button")) { 309 if(!g_ascii_strcasecmp(element_name,"button")) {
310 g_markup_parse_context_pop(context); 310 g_markup_parse_context_pop(context);
src/objects/window/window.c
  Diff comments   View file @a380817
@@ -297,6 +297,7 @@ @@ -297,6 +297,7 @@
297 gtk_notebook_set_show_border(widget->notebook, FALSE); 297 gtk_notebook_set_show_border(widget->notebook, FALSE);
298 gtk_notebook_set_group_name(widget->notebook,PACKAGE_NAME ":Terminals"); 298 gtk_notebook_set_group_name(widget->notebook,PACKAGE_NAME ":Terminals");
299 299
  300 + /*
300 { 301 {
301 // Create new tab action widget 302 // Create new tab action widget
302 GtkWidget * new_tab = gtk_button_new_from_icon_name("tab-new-symbolic",GTK_ICON_SIZE_LARGE_TOOLBAR); 303 GtkWidget * new_tab = gtk_button_new_from_icon_name("tab-new-symbolic",GTK_ICON_SIZE_LARGE_TOOLBAR);
@@ -312,6 +313,7 @@ @@ -312,6 +313,7 @@
312 gtk_widget_show_all(new_tab); 313 gtk_widget_show_all(new_tab);
313 gtk_notebook_set_action_widget(widget->notebook,new_tab,GTK_PACK_START); 314 gtk_notebook_set_action_widget(widget->notebook,new_tab,GTK_PACK_START);
314 } 315 }
  316 + */
315 317
316 // Create boxes 318 // Create boxes
317 GtkBox * hBox = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL,0)); 319 GtkBox * hBox = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL,0));
@@ -611,9 +613,11 @@ @@ -611,9 +613,11 @@
611 #ifdef G_OS_UNIX 613 #ifdef G_OS_UNIX
612 style = PW3270_UI_STYLE_GNOME; 614 style = PW3270_UI_STYLE_GNOME;
613 g_settings_set_boolean(settings,"menubar-visible",FALSE); 615 g_settings_set_boolean(settings,"menubar-visible",FALSE);
  616 + g_settings_set_int(settings,"header-icon-type",1);
614 #else 617 #else
615 style = PW3270_UI_STYLE_CLASSICAL; 618 style = PW3270_UI_STYLE_CLASSICAL;
616 g_settings_set_boolean(settings,"menubar-visible",TRUE); 619 g_settings_set_boolean(settings,"menubar-visible",TRUE);
  620 + g_settings_set_int(settings,"header-icon-type",0);
617 #endif // G_OS_UNIX 621 #endif // G_OS_UNIX
618 622
619 g_settings_set_boolean(settings,"toolbar-visible",TRUE); 623 g_settings_set_boolean(settings,"toolbar-visible",TRUE);
@@ -622,6 +626,7 @@ @@ -622,6 +626,7 @@
622 626
623 } 627 }
624 628
  629 +
625 if(style == PW3270_UI_STYLE_GNOME) { 630 if(style == PW3270_UI_STYLE_GNOME) {
626 631
627 // Create header bar 632 // Create header bar