diff options
| author | Vasily_Makarov <danilka.pro@gmail.com> | 2012-02-08 10:20:45 +0400 |
|---|---|---|
| committer | Vasily_Makarov <danilka.pro@gmail.com> | 2012-02-08 10:20:45 +0400 |
| commit | cae5aac0f4ad09a3b0a660216b7de11657fec507 (patch) | |
| tree | 6a10ad70cc71a90dbf6a7a4d966c96a2db46dbfd /saedit | |
| parent | 0c9df28b0a3f7d3576f9cbe6df8233b7883abe71 (diff) | |
| download | tools-cae5aac0f4ad09a3b0a660216b7de11657fec507.tar.gz tools-cae5aac0f4ad09a3b0a660216b7de11657fec507.tar.bz2 tools-cae5aac0f4ad09a3b0a660216b7de11657fec507.tar.xz tools-cae5aac0f4ad09a3b0a660216b7de11657fec507.zip | |
Porting to GTK+ 3
Diffstat (limited to 'saedit')
| -rw-r--r-- | saedit/icon.svg | 701 | ||||
| -rw-r--r-- | saedit/interface.ui | 202 | ||||
| -rw-r--r-- | saedit/main.c | 6 |
3 files changed, 768 insertions, 141 deletions
diff --git a/saedit/icon.svg b/saedit/icon.svg index a696db3..e09862f 100644 --- a/saedit/icon.svg +++ b/saedit/icon.svg @@ -14,10 +14,578 @@ height="256" id="svg2" version="1.1" - inkscape:version="0.48.0 r9654" + inkscape:version="0.48.2 r9819" sodipodi:docname="icon.svg"> <defs - id="defs4" /> + id="defs4"> + <linearGradient + y2="445.16745" + x2="726.91016" + y1="388.45044" + x1="726.91016" + gradientTransform="matrix(0.2400412,0,0,1.0091871,-59.607089,50.7501)" + gradientUnits="userSpaceOnUse" + id="linearGradient2980" + xlink:href="#linearGradient3164" + inkscape:collect="always" /> + <linearGradient + y2="445.16745" + x2="726.91016" + y1="388.45044" + x1="726.91016" + gradientTransform="matrix(1.2809327,0,0,1.0091871,-753.11664,-9.2499)" + gradientUnits="userSpaceOnUse" + id="linearGradient2978" + xlink:href="#linearGradient3164" + inkscape:collect="always" /> + <radialGradient + r="7.1330748" + fy="469.36499" + fx="506.24673" + cy="471.40497" + cx="508.29752" + gradientTransform="matrix(1,0,0,3.9254336,22.460937,-1381.7662)" + gradientUnits="userSpaceOnUse" + id="radialGradient2976" + xlink:href="#linearGradient4850" + inkscape:collect="always" /> + <linearGradient + y2="502.34891" + x2="480.07483" + y1="443.00705" + x1="480.07483" + gradientTransform="translate(22.460937,0.5)" + gradientUnits="userSpaceOnUse" + id="linearGradient2974" + xlink:href="#linearGradient4800" + inkscape:collect="always" /> + <radialGradient + r="7.1330748" + fy="469.36499" + fx="506.24673" + cy="471.40497" + cx="508.29752" + gradientTransform="matrix(1,0,0,3.9254336,0,-1382.2662)" + gradientUnits="userSpaceOnUse" + id="radialGradient2972" + xlink:href="#linearGradient4850" + inkscape:collect="always" /> + <linearGradient + y2="502.34891" + x2="480.07483" + y1="443.00705" + x1="480.07483" + gradientUnits="userSpaceOnUse" + id="linearGradient2970" + xlink:href="#linearGradient4800" + inkscape:collect="always" /> + <radialGradient + r="7.1330748" + fy="469.36499" + fx="506.24673" + cy="471.40497" + cx="508.29752" + gradientTransform="matrix(1,0,0,3.9254336,0,-1382.2662)" + gradientUnits="userSpaceOnUse" + id="radialGradient2968" + xlink:href="#linearGradient4850" + inkscape:collect="always" /> + <linearGradient + y2="502.34891" + x2="480.07483" + y1="443.00705" + x1="480.07483" + gradientUnits="userSpaceOnUse" + id="linearGradient2966" + xlink:href="#linearGradient4800" + inkscape:collect="always" /> + <radialGradient + r="7.1330748" + fy="469.36499" + fx="506.24673" + cy="471.40497" + cx="508.29752" + gradientTransform="matrix(1,0,0,3.9254336,0,-1382.2662)" + gradientUnits="userSpaceOnUse" + id="radialGradient2964" + xlink:href="#linearGradient4850" + inkscape:collect="always" /> + <linearGradient + y2="502.34891" + x2="480.07483" + y1="443.00705" + x1="480.07483" + gradientUnits="userSpaceOnUse" + id="linearGradient2962" + xlink:href="#linearGradient4800" + inkscape:collect="always" /> + <radialGradient + r="7.1330748" + fy="469.36499" + fx="506.24673" + cy="471.40497" + cx="508.29752" + gradientTransform="matrix(1,0,0,3.9254336,0,-1382.2662)" + gradientUnits="userSpaceOnUse" + id="radialGradient2960" + xlink:href="#linearGradient4850" + inkscape:collect="always" /> + <linearGradient + y2="502.34891" + x2="480.07483" + y1="443.00705" + x1="480.07483" + gradientUnits="userSpaceOnUse" + id="linearGradient2958" + xlink:href="#linearGradient4800" + inkscape:collect="always" /> + <radialGradient + r="7.1330748" + fy="469.36499" + fx="506.24673" + cy="471.40497" + cx="508.29752" + gradientTransform="matrix(1,0,0,3.9254336,0,-1382.2662)" + gradientUnits="userSpaceOnUse" + id="radialGradient2956" + xlink:href="#linearGradient4850" + inkscape:collect="always" /> + <linearGradient + y2="502.34891" + x2="480.07483" + y1="443.00705" + x1="480.07483" + gradientUnits="userSpaceOnUse" + id="linearGradient2954" + xlink:href="#linearGradient4800" + inkscape:collect="always" /> + <radialGradient + r="7.1330748" + fy="469.36499" + fx="506.24673" + cy="471.40497" + cx="508.29752" + gradientTransform="matrix(1,0,0,3.9254336,0,-1382.2662)" + gradientUnits="userSpaceOnUse" + id="radialGradient2952" + xlink:href="#linearGradient4850" + inkscape:collect="always" /> + <linearGradient + y2="502.34891" + x2="480.07483" + y1="443.00705" + x1="480.07483" + gradientUnits="userSpaceOnUse" + id="linearGradient2950" + xlink:href="#linearGradient4800" + inkscape:collect="always" /> + <radialGradient + r="7.1330748" + fy="469.36499" + fx="506.24673" + cy="471.40497" + cx="508.29752" + gradientTransform="matrix(1,0,0,3.9254336,0,-1382.2662)" + gradientUnits="userSpaceOnUse" + id="radialGradient2948" + xlink:href="#linearGradient4850" + inkscape:collect="always" /> + <linearGradient + y2="502.34891" + x2="480.07483" + y1="443.00705" + x1="480.07483" + gradientUnits="userSpaceOnUse" + id="linearGradient2946" + xlink:href="#linearGradient4800" + inkscape:collect="always" /> + <linearGradient + y2="445.16745" + x2="726.91016" + y1="388.45044" + x1="726.91016" + gradientTransform="matrix(0.3012701,0,0,1.0091871,209.77505,50.7501)" + gradientUnits="userSpaceOnUse" + id="linearGradient2944" + xlink:href="#linearGradient3164" + inkscape:collect="always" /> + <linearGradient + y2="445.16745" + x2="726.91016" + y1="388.45044" + x1="726.91016" + gradientTransform="matrix(0.1680072,0,0,1.0091871,508.68297,50.7501)" + gradientUnits="userSpaceOnUse" + id="linearGradient2942" + xlink:href="#linearGradient3164" + inkscape:collect="always" /> + <linearGradient + y2="445.16745" + x2="726.91016" + y1="388.45044" + x1="726.91016" + gradientTransform="matrix(0.2400412,0,0,1.0091871,-59.607089,50.7501)" + gradientUnits="userSpaceOnUse" + id="linearGradient25734" + xlink:href="#linearGradient3164" + inkscape:collect="always" /> + <linearGradient + y2="445.16745" + x2="726.91016" + y1="388.45044" + x1="726.91016" + gradientTransform="matrix(1.2809327,0,0,1.0091871,-753.11664,-9.2499)" + gradientUnits="userSpaceOnUse" + id="linearGradient25732" + xlink:href="#linearGradient3164" + inkscape:collect="always" /> + <radialGradient + r="7.1330748" + fy="469.36499" + fx="506.24673" + cy="471.40497" + cx="508.29752" + gradientTransform="matrix(1,0,0,3.9254336,22.460937,-1381.7662)" + gradientUnits="userSpaceOnUse" + id="radialGradient25730" + xlink:href="#linearGradient4850" + inkscape:collect="always" /> + <linearGradient + y2="502.34891" + x2="480.07483" + y1="443.00705" + x1="480.07483" + gradientTransform="translate(22.460937,0.5)" + gradientUnits="userSpaceOnUse" + id="linearGradient25728" + xlink:href="#linearGradient4800" + inkscape:collect="always" /> + <radialGradient + r="7.1330748" + fy="469.36499" + fx="506.24673" + cy="471.40497" + cx="508.29752" + gradientTransform="matrix(1,0,0,3.9254336,0,-1382.2662)" + gradientUnits="userSpaceOnUse" + id="radialGradient25726" + xlink:href="#linearGradient4850" + inkscape:collect="always" /> + <linearGradient + y2="502.34891" + x2="480.07483" + y1="443.00705" + x1="480.07483" + gradientUnits="userSpaceOnUse" + id="linearGradient25724" + xlink:href="#linearGradient4800" + inkscape:collect="always" /> + <radialGradient + r="7.1330748" + fy="469.36499" + fx="506.24673" + cy="471.40497" + cx="508.29752" + gradientTransform="matrix(1,0,0,3.9254336,0,-1382.2662)" + gradientUnits="userSpaceOnUse" + id="radialGradient25722" + xlink:href="#linearGradient4850" + inkscape:collect="always" /> + <linearGradient + y2="502.34891" + x2="480.07483" + y1="443.00705" + x1="480.07483" + gradientUnits="userSpaceOnUse" + id="linearGradient25720" + xlink:href="#linearGradient4800" + inkscape:collect="always" /> + <radialGradient + r="7.1330748" + fy="469.36499" + fx="506.24673" + cy="471.40497" + cx="508.29752" + gradientTransform="matrix(1,0,0,3.9254336,0,-1382.2662)" + gradientUnits="userSpaceOnUse" + id="radialGradient25718" + xlink:href="#linearGradient4850" + inkscape:collect="always" /> + <linearGradient + y2="502.34891" + x2="480.07483" + y1="443.00705" + x1="480.07483" + gradientUnits="userSpaceOnUse" + id="linearGradient25716" + xlink:href="#linearGradient4800" + inkscape:collect="always" /> + <radialGradient + r="7.1330748" + fy="469.36499" + fx="506.24673" + cy="471.40497" + cx="508.29752" + gradientTransform="matrix(1,0,0,3.9254336,0,-1382.2662)" + gradientUnits="userSpaceOnUse" + id="radialGradient25714" + xlink:href="#linearGradient4850" + inkscape:collect="always" /> + <linearGradient + y2="502.34891" + x2="480.07483" + y1="443.00705" + x1="480.07483" + gradientUnits="userSpaceOnUse" + id="linearGradient25712" + xlink:href="#linearGradient4800" + inkscape:collect="always" /> + <radialGradient + r="7.1330748" + fy="469.36499" + fx="506.24673" + cy="471.40497" + cx="508.29752" + gradientTransform="matrix(1,0,0,3.9254336,0,-1382.2662)" + gradientUnits="userSpaceOnUse" + id="radialGradient25710" + xlink:href="#linearGradient4850" + inkscape:collect="always" /> + <linearGradient + y2="502.34891" + x2="480.07483" + y1="443.00705" + x1="480.07483" + gradientUnits="userSpaceOnUse" + id="linearGradient25708" + xlink:href="#linearGradient4800" + inkscape:collect="always" /> + <radialGradient + r="7.1330748" + fy="469.36499" + fx="506.24673" + cy="471.40497" + cx="508.29752" + gradientTransform="matrix(1,0,0,3.9254336,0,-1382.2662)" + gradientUnits="userSpaceOnUse" + id="radialGradient25706" + xlink:href="#linearGradient4850" + inkscape:collect="always" /> + <linearGradient + y2="502.34891" + x2="480.07483" + y1="443.00705" + x1="480.07483" + gradientUnits="userSpaceOnUse" + id="linearGradient25704" + xlink:href="#linearGradient4800" + inkscape:collect="always" /> + <radialGradient + r="7.1330748" + fy="469.36499" + fx="506.24673" + cy="471.40497" + cx="508.29752" + gradientTransform="matrix(1,0,0,3.9254336,0,-1382.2662)" + gradientUnits="userSpaceOnUse" + id="radialGradient25702" + xlink:href="#linearGradient4850" + inkscape:collect="always" /> + <linearGradient + y2="502.34891" + x2="480.07483" + y1="443.00705" + x1="480.07483" + gradientUnits="userSpaceOnUse" + id="linearGradient25700" + xlink:href="#linearGradient4800" + inkscape:collect="always" /> + <linearGradient + y2="445.16745" + x2="726.91016" + y1="388.45044" + x1="726.91016" + gradientTransform="matrix(0.3012701,0,0,1.0091871,209.77505,50.7501)" + gradientUnits="userSpaceOnUse" + id="linearGradient25698" + xlink:href="#linearGradient3164" + inkscape:collect="always" /> + <linearGradient + y2="445.16745" + x2="726.91016" + y1="388.45044" + x1="726.91016" + gradientTransform="matrix(0.1680072,0,0,1.0091871,508.68297,50.7501)" + gradientUnits="userSpaceOnUse" + id="linearGradient25696" + xlink:href="#linearGradient3164" + inkscape:collect="always" /> + <linearGradient + y2="445.16745" + x2="726.91016" + y1="388.45044" + x1="726.91016" + gradientTransform="matrix(0.2400412,0,0,1.0091871,-78.389613,-49.2499)" + gradientUnits="userSpaceOnUse" + id="linearGradient24956" + xlink:href="#linearGradient3164" + inkscape:collect="always" /> + <clipPath + id="clipPath24952" + clipPathUnits="userSpaceOnUse"> + <path + sodipodi:nodetypes="ccscc" + id="path24954" + d="M 75.200062,372.5 L 145.76888,400 C 152.63003,400 158.20638,387.68 158.20638,372.5 C 158.20638,357.32 152.63003,345 145.76888,345 L 75.200062,372.5 z" + style="opacity:1;fill:url(#linearGradient24956);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:36, 12;stroke-dashoffset:0;stroke-opacity:1" /> + </clipPath> + <filter + inkscape:collect="always" + id="filter4844"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="0.35133472" + id="feGaussianBlur4846" /> + </filter> + <linearGradient + id="linearGradient3164"> + <stop + style="stop-color:#383838;stop-opacity:1" + offset="0" + id="stop3166" /> + <stop + id="stop3172" + offset="0.05754738" + style="stop-color:#3b3b3b;stop-opacity:1" /> + <stop + style="stop-color:#626463;stop-opacity:1" + offset="0.07978155" + id="stop3174" /> + <stop + id="stop3176" + offset="0.12359595" + style="stop-color:#bfbfbf;stop-opacity:1" /> + <stop + style="stop-color:#808080;stop-opacity:1" + offset="0.18899058" + id="stop3178" /> + <stop + id="stop3180" + offset="0.25765494" + style="stop-color:#e0e0e0;stop-opacity:1" /> + <stop + style="stop-color:#ececec;stop-opacity:1" + offset="0.37405738" + id="stop3182" /> + <stop + id="stop3184" + offset="0.52577293" + style="stop-color:#828282;stop-opacity:1" /> + <stop + style="stop-color:#818181;stop-opacity:1" + offset="0.57285708" + id="stop3186" /> + <stop + id="stop3188" + offset="0.67356479" + style="stop-color:#acacac;stop-opacity:1" /> + <stop + style="stop-color:#bcbcbc;stop-opacity:1" + offset="0.73765153" + id="stop3190" /> + <stop + id="stop3192" + offset="0.86451715" + style="stop-color:#505050;stop-opacity:1" /> + <stop + style="stop-color:#333333;stop-opacity:1" + offset="0.90767759" + id="stop3194" /> + <stop + id="stop3196" + offset="0.96260905" + style="stop-color:#7a7a7c;stop-opacity:1" /> + <stop + style="stop-color:#c9c6c1;stop-opacity:1" + offset="1" + id="stop3168" /> + </linearGradient> + <linearGradient + id="linearGradient4800"> + <stop + id="stop4802" + offset="0" + style="stop-color:#383838;stop-opacity:1" /> + <stop + style="stop-color:#3b3b3b;stop-opacity:1" + offset="0.05754738" + id="stop4804" /> + <stop + id="stop4806" + offset="0.07978155" + style="stop-color:#626463;stop-opacity:1" /> + <stop + style="stop-color:#bfbfbf;stop-opacity:1" + offset="0.12359595" + id="stop4808" /> + <stop + id="stop4810" + offset="0.18899058" + style="stop-color:#808080;stop-opacity:1" /> + <stop + style="stop-color:#e0e0e0;stop-opacity:1" + offset="0.25765494" + id="stop4812" /> + <stop + id="stop4814" + offset="0.37405738" + style="stop-color:#ececec;stop-opacity:1" /> + <stop + style="stop-color:#828282;stop-opacity:1" + offset="0.52577293" + id="stop4816" /> + <stop + id="stop4818" + offset="0.57285708" + style="stop-color:#818181;stop-opacity:1" /> + <stop + style="stop-color:#acacac;stop-opacity:1" + offset="0.67356479" + id="stop4820" /> + <stop + id="stop4822" + offset="0.73765153" + style="stop-color:#bcbcbc;stop-opacity:1" /> + <stop + style="stop-color:#505050;stop-opacity:1" + offset="0.86451715" + id="stop4824" /> + <stop + id="stop4826" + offset="0.90767759" + style="stop-color:#333333;stop-opacity:1" /> + <stop + style="stop-color:#7a7a7c;stop-opacity:1" + offset="0.96260905" + id="stop4828" /> + <stop + id="stop4830" + offset="1" + style="stop-color:#c9c6c1;stop-opacity:1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient4850"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop4852" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop4854" /> + </linearGradient> + </defs> <sodipodi:namedview id="base" pagecolor="#ffffff" @@ -25,16 +593,16 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2" - inkscape:cx="86.462223" - inkscape:cy="116.31401" + inkscape:zoom="1.4142136" + inkscape:cx="248.88321" + inkscape:cy="120.52923" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1680" - inkscape:window-height="977" + inkscape:window-height="1001" inkscape:window-x="0" - inkscape:window-y="24" + inkscape:window-y="20" inkscape:window-maximized="1" /> <metadata id="metadata7"> @@ -55,141 +623,98 @@ <text xml:space="preserve" style="font-size:120px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - x="21.387226" - y="884.78589" + x="45.520271" + y="849.03656" id="text2993" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan2995" - x="21.387226" - y="884.78589" + x="45.520271" + y="849.03656" style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Monospace;-inkscape-font-specification:Monospace"><sprite></tspan><tspan sodipodi:role="line" - x="21.387226" - y="912.28589" + x="45.520271" + y="876.53656" style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Monospace;-inkscape-font-specification:Monospace" id="tspan2997"> <imageset></tspan><tspan sodipodi:role="line" - x="21.387226" - y="939.78589" + x="45.520271" + y="904.03656" style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Monospace;-inkscape-font-specification:Monospace" id="tspan2999"> <action></tspan><tspan sodipodi:role="line" - x="21.387226" - y="967.28589" + x="45.520271" + y="931.53656" style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Monospace;-inkscape-font-specification:Monospace" id="tspan3003"> <frame></tspan><tspan sodipodi:role="line" - x="21.387226" - y="994.78589" + x="45.520271" + y="959.03656" style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Monospace;-inkscape-font-specification:Monospace" id="tspan3001"> <sequence></tspan><tspan sodipodi:role="line" - x="21.387226" - y="1022.2859" + x="45.520271" + y="986.53656" style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Monospace;-inkscape-font-specification:Monospace" id="tspan3005"> </action></tspan><tspan sodipodi:role="line" - x="21.387226" - y="1049.7859" + x="45.520271" + y="1014.0366" style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Monospace;-inkscape-font-specification:Monospace" id="tspan3007"></sprite></tspan></text> <text xml:space="preserve" style="font-size:22px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - x="0.90429688" - y="885.36206" + x="25.037344" + y="849.61273" id="text3009" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3011" - x="0.90429688" - y="885.36206" + x="25.037344" + y="849.61273" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Monospace;-inkscape-font-specification:Monospace">1</tspan><tspan sodipodi:role="line" - x="0.90429688" - y="912.86206" + x="25.037344" + y="877.11273" id="tspan3013" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Monospace;-inkscape-font-specification:Monospace">2</tspan><tspan sodipodi:role="line" - x="0.90429688" - y="940.36206" + x="25.037344" + y="904.61273" id="tspan3015" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Monospace;-inkscape-font-specification:Monospace">3</tspan><tspan sodipodi:role="line" - x="0.90429688" - y="967.86206" + x="25.037344" + y="932.11273" id="tspan3017" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Monospace;-inkscape-font-specification:Monospace">4</tspan><tspan sodipodi:role="line" - x="0.90429688" - y="995.36206" + x="25.037344" + y="959.61273" id="tspan3019" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Monospace;-inkscape-font-specification:Monospace">5</tspan><tspan sodipodi:role="line" - x="0.90429688" - y="1022.8621" + x="25.037344" + y="987.11273" id="tspan3021" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Monospace;-inkscape-font-specification:Monospace">6</tspan><tspan sodipodi:role="line" - x="0.90429688" - y="1050.3621" + x="25.037344" + y="1014.6127" id="tspan3023" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Monospace;-inkscape-font-specification:Monospace">7</tspan></text> <path style="fill:none;stroke:#000000;stroke-width:0.99732631px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 18,1051.8634 18,866.35946" + d="m 42.133047,1016.1141 0,-185.50398" id="path3793" inkscape:connector-curvature="0" /> - <path - style="fill:none;stroke:#000000;stroke-width:0.95017451px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 0.47504339,865.387 255.04991661,0" - id="path3795" - inkscape:connector-curvature="0" /> <image - y="799.36206" - x="96" + y="835.08643" + x="38.72435" id="image3805" - xlink:href="data:image/png;base64,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 -AAAAAElFTkSuQmCC -" - height="64" - width="64" /> + xlink:href="data:image/png;base64,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 AAAAAElFTkSuQmCC " + height="178.5513" + width="178.5513" /> </g> </svg> diff --git a/saedit/interface.ui b/saedit/interface.ui index 4141f93..5c21d81 100644 --- a/saedit/interface.ui +++ b/saedit/interface.ui @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.24"/> + <!-- interface-requires gtk+ 3.2 --> <!-- interface-requires gtksourceview 0.0 --> - <!-- interface-naming-policy project-wide --> <object class="GtkAboutDialog" id="about_dialog"> <property name="can_focus">False</property> <property name="border_width">5</property> @@ -12,18 +11,19 @@ <property name="transient_for">win_main</property> <property name="program_name">Sprite Animation Editor</property> <property name="version">⍺0.1.1</property> - <property name="copyright" translatable="yes">Copyleft ↄ Vasily_Makarov 2011</property> + <property name="copyright" translatable="yes">Copyleft ↄ Vasily_Makarov 2011-2012</property> <property name="comments" translatable="yes">Sprite Animation Editor could be used to edit animations from Evol and The Mana World projects</property> <property name="authors">Dan "Vasily_Makarov" Sagunov <danilka.pro@gmail.com> Reid Yaro <reidyaro@gmail.com></property> <property name="logo">icon.svg</property> + <property name="license_type">gpl-2-0</property> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox3"> + <object class="GtkBox" id="dialog-vbox3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">2</property> <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area3"> + <object class="GtkButtonBox" id="dialog-action_area3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="layout_style">end</property> @@ -47,18 +47,19 @@ Reid Yaro <reidyaro@gmail.com></property> <property name="title" translatable="yes">Open file</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox1"> + <object class="GtkBox" id="dialog-vbox1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">2</property> <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area1"> + <object class="GtkButtonBox" id="dialog-action_area1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="layout_style">end</property> <child> <object class="GtkButton" id="button1"> <property name="label">gtk-open</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -74,6 +75,7 @@ Reid Yaro <reidyaro@gmail.com></property> <child> <object class="GtkButton" id="button2"> <property name="label">gtk-cancel</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -119,18 +121,19 @@ Reid Yaro <reidyaro@gmail.com></property> <property name="transient_for">win_main</property> <signal name="response" handler="search_find_dialog_response_callback" object="find_dialog_entry" swapped="no"/> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox4"> + <object class="GtkBox" id="dialog-vbox4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">2</property> <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area4"> + <object class="GtkButtonBox" id="dialog-action_area4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="layout_style">end</property> <child> <object class="GtkButton" id="button4"> <property name="label">gtk-find</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -146,6 +149,7 @@ Reid Yaro <reidyaro@gmail.com></property> <child> <object class="GtkButton" id="button5"> <property name="label">gtk-cancel</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -173,8 +177,6 @@ Reid Yaro <reidyaro@gmail.com></property> <property name="invisible_char">•</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> - <property name="primary_icon_sensitive">True</property> - <property name="secondary_icon_sensitive">True</property> </object> <packing> <property name="expand">True</property> @@ -230,9 +232,9 @@ Reid Yaro <reidyaro@gmail.com></property> <property name="can_focus">False</property> <child> <object class="GtkMenuItem" id="menuitem1"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="use_action_appearance">False</property> <property name="label" translatable="yes">_File</property> <property name="use_underline">True</property> <child type="submenu"> @@ -241,9 +243,9 @@ Reid Yaro <reidyaro@gmail.com></property> <property name="can_focus">False</property> <child> <object class="GtkMenuItem" id="menuitem4"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="use_action_appearance">False</property> <property name="label" translatable="yes">_New</property> <property name="use_underline">True</property> <signal name="activate" handler="file_new" swapped="no"/> @@ -251,9 +253,9 @@ Reid Yaro <reidyaro@gmail.com></property> </child> <child> <object class="GtkMenuItem" id="menuitem5"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="use_action_appearance">False</property> <property name="label" translatable="yes">_Open...</property> <property name="use_underline">True</property> <signal name="activate" handler="open_menu_item_activate_callback" object="fcdialog1" swapped="no"/> @@ -261,9 +263,9 @@ Reid Yaro <reidyaro@gmail.com></property> </child> <child> <object class="GtkMenuItem" id="menuitem6"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="use_action_appearance">False</property> <property name="label" translatable="yes">_Reload</property> <property name="use_underline">True</property> <signal name="activate" handler="open_xml_file" swapped="no"/> @@ -271,16 +273,16 @@ Reid Yaro <reidyaro@gmail.com></property> </child> <child> <object class="GtkSeparatorMenuItem" id="menuitem15"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="use_action_appearance">False</property> </object> </child> <child> <object class="GtkMenuItem" id="menuitem7"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="use_action_appearance">False</property> <property name="label" translatable="yes">_Save</property> <property name="use_underline">True</property> <signal name="activate" handler="save_menu_item_activate_callback" swapped="no"/> @@ -288,9 +290,9 @@ Reid Yaro <reidyaro@gmail.com></property> </child> <child> <object class="GtkMenuItem" id="menuitem8"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="use_action_appearance">False</property> <property name="label" translatable="yes">Save _As...</property> <property name="use_underline">True</property> <signal name="activate" handler="save_dialog_show" swapped="no"/> @@ -302,9 +304,9 @@ Reid Yaro <reidyaro@gmail.com></property> </child> <child> <object class="GtkMenuItem" id="menuitem2"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="use_action_appearance">False</property> <property name="label" translatable="yes">_Search</property> <property name="use_underline">True</property> <child type="submenu"> @@ -313,9 +315,9 @@ Reid Yaro <reidyaro@gmail.com></property> <property name="can_focus">False</property> <child> <object class="GtkMenuItem" id="menuitem9"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="use_action_appearance">False</property> <property name="label" translatable="yes">_Find...</property> <property name="use_underline">True</property> <signal name="activate" handler="find_menu_item_activate_callback" swapped="no"/> @@ -323,9 +325,9 @@ Reid Yaro <reidyaro@gmail.com></property> </child> <child> <object class="GtkMenuItem" id="menuitem10"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="use_action_appearance">False</property> <property name="label" translatable="yes">Find _Next</property> <property name="use_underline">True</property> <signal name="activate" handler="search_find_next" swapped="no"/> @@ -337,9 +339,9 @@ Reid Yaro <reidyaro@gmail.com></property> </child> <child> <object class="GtkMenuItem" id="menuitem3"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="use_action_appearance">False</property> <property name="label" translatable="yes">_View</property> <property name="use_underline">True</property> <child type="submenu"> @@ -348,9 +350,9 @@ Reid Yaro <reidyaro@gmail.com></property> <property name="can_focus">False</property> <child> <object class="GtkCheckMenuItem" id="menuitem11"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="use_action_appearance">False</property> <property name="label" translatable="yes">Show _Grid</property> <property name="use_underline">True</property> <signal name="toggled" handler="show_grid_menu_item_toggled_callback" swapped="no"/> @@ -358,10 +360,10 @@ Reid Yaro <reidyaro@gmail.com></property> </child> <child> <object class="GtkMenuItem" id="menuitem12"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">False</property> - <property name="use_action_appearance">False</property> <property name="label" translatable="yes">_Imageset view</property> <property name="use_underline">True</property> <signal name="activate" handler="show_imageset_dialog" swapped="no"/> @@ -373,9 +375,9 @@ Reid Yaro <reidyaro@gmail.com></property> </child> <child> <object class="GtkMenuItem" id="menuitem13"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="use_action_appearance">False</property> <property name="label" translatable="yes">_Help</property> <property name="use_underline">True</property> <child type="submenu"> @@ -384,9 +386,9 @@ Reid Yaro <reidyaro@gmail.com></property> <property name="can_focus">False</property> <child> <object class="GtkMenuItem" id="menuitem14"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="use_action_appearance">False</property> <property name="label" translatable="yes">_About</property> <property name="use_underline">True</property> <signal name="activate" handler="show_about_dialog" swapped="no"/> @@ -466,19 +468,20 @@ Reid Yaro <reidyaro@gmail.com></property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">3</property> </packing> </child> <child> - <object class="GtkButton" id="xmlfobutton"> - <property name="label">gtk-open</property> + <object class="GtkButton" id="xmlfsbutton"> + <property name="label">gtk-save</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="use_action_appearance">False</property> <property name="use_stock">True</property> - <signal name="clicked" handler="open_xml_file" swapped="no"/> + <signal name="clicked" handler="xml_file_save_button_callback" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -487,14 +490,15 @@ Reid Yaro <reidyaro@gmail.com></property> </packing> </child> <child> - <object class="GtkButton" id="xmlfsbutton"> - <property name="label">gtk-save</property> + <object class="GtkButton" id="xmlfobutton"> + <property name="label">gtk-open</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="use_action_appearance">False</property> <property name="use_stock">True</property> - <signal name="clicked" handler="xml_file_save_button_callback" swapped="no"/> + <signal name="clicked" handler="open_xml_file" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -505,6 +509,7 @@ Reid Yaro <reidyaro@gmail.com></property> <child> <object class="GtkButton" id="button3"> <property name="label" translatable="yes">Parse XML Buffer</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -514,7 +519,7 @@ Reid Yaro <reidyaro@gmail.com></property> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child> @@ -534,16 +539,17 @@ Reid Yaro <reidyaro@gmail.com></property> </child> <child> <object class="GtkComboBoxText" id="imagesetscbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">liststore1</property> - <property name="active">0</property> - <signal name="changed" handler="imagesets_combo_box_changed_callback" swapped="no"/> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="active">0</property> + <property name="model">liststore1</property> + <property name="entry_text_column">0</property> + <signal name="changed" handler="imagesets_combo_box_changed_callback" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">9</property> + <property name="position">8</property> </packing> </child> <child> @@ -565,14 +571,15 @@ Reid Yaro <reidyaro@gmail.com></property> <object class="GtkComboBoxText" id="actionscbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="model">liststore2</property> <property name="active">0</property> + <property name="model">liststore2</property> + <property name="entry_text_column">0</property> <signal name="changed" handler="actions_combo_box_changed_callback" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">11</property> + <property name="position">10</property> </packing> </child> <child> @@ -594,8 +601,9 @@ Reid Yaro <reidyaro@gmail.com></property> <object class="GtkComboBoxText" id="animationscbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="model">liststore3</property> <property name="active">0</property> + <property name="model">liststore3</property> + <property name="entry_text_column">0</property> <signal name="changed" handler="animations_combo_box_changed_callback" swapped="no"/> </object> <packing> @@ -616,14 +624,110 @@ Reid Yaro <reidyaro@gmail.com></property> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <object class="GtkDrawingArea" id="darea1"> - <property name="height_request">120</property> - <property name="visible">True</property> + <object class="GtkVBox" id="vbox2"> <property name="can_focus">False</property> - <signal name="draw" handler="darea_draw_event" swapped="no"/> + <child> + <object class="GtkDrawingArea" id="darea1"> + <property name="height_request">120</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <signal name="draw" handler="darea_draw_event" swapped="no"/> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkToolbar" id="toolbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkToolButton" id="toolbar-to-first"> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="use_action_appearance">False</property> + <property name="label" translatable="yes">First frame</property> + <property name="use_underline">True</property> + <property name="stock_id">gtk-goto-first</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="toolbar-prev-frame"> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="use_action_appearance">False</property> + <property name="label" translatable="yes">Previous frame</property> + <property name="use_underline">True</property> + <property name="stock_id">gtk-go-back</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="toolbar-play"> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="use_action_appearance">False</property> + <property name="label" translatable="yes">Continue sequencing</property> + <property name="use_underline">True</property> + <property name="stock_id">gtk-media-play</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="toolbar-next-frame"> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="use_action_appearance">False</property> + <property name="label" translatable="yes">Next frame</property> + <property name="use_underline">True</property> + <property name="stock_id">gtk-go-forward</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="toolbar-to-end"> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="use_action_appearance">False</property> + <property name="label" translatable="yes">Last frame</property> + <property name="use_underline">True</property> + <property name="stock_id">gtk-goto-last</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> - <property name="resize">True</property> + <property name="resize">False</property> <property name="shrink">True</property> </packing> </child> @@ -631,8 +735,6 @@ Reid Yaro <reidyaro@gmail.com></property> <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <child> <object class="GtkSourceView" id="source_view"> <property name="visible">True</property> diff --git a/saedit/main.c b/saedit/main.c index adce108..87f52a4 100644 --- a/saedit/main.c +++ b/saedit/main.c @@ -238,12 +238,12 @@ void show_imageset_dialog() { int x, y; for (y = 0; y < h; y++) { - hbox = gtk_hbox_new(TRUE, 0); - gtk_container_add(GTK_CONTAINER(content_area), hbox); + hbox = gtk_hbox_new(TRUE, 2); + gtk_box_pack_start(GTK_BOX(content_area), hbox, TRUE, TRUE, 2); for (x = 0; x < w; x++) { int id = w * y + x; event_box = gtk_event_box_new(); - g_signal_connect(G_OBJECT(event_box), "button-press-event", G_CALLBACK(frame_image_button_press_event_callback), &id); + g_signal_connect(G_OBJECT(event_box), "button-press-event", G_CALLBACK(frame_image_button_press_event_callback), (gpointer)id); gtk_box_pack_start(GTK_BOX(hbox), event_box, TRUE, TRUE, 0); image = gtk_image_new_from_pixbuf(get_sprite_by_index(w * y + x, gen_sae_info)); |
