From cae5aac0f4ad09a3b0a660216b7de11657fec507 Mon Sep 17 00:00:00 2001 From: Vasily_Makarov Date: Wed, 8 Feb 2012 10:20:45 +0400 Subject: Porting to GTK+ 3 --- saedit/icon.svg | 701 +++++++++++++++++++++++++++++++++++++++++++++------- saedit/interface.ui | 202 +++++++++++---- 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"> + id="defs4"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -55,141 +623,98 @@ <sprite> <imageset> <action> <frame> <sequence> </action></sprite> 1234567 - + xlink:href="data:image/png;base64,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 AAAAAElFTkSuQmCC " + height="178.5513" + width="178.5513" /> 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 @@ - + - False 5 @@ -12,18 +11,19 @@ win_main Sprite Animation Editor ⍺0.1.1 - Copyleft ↄ Vasily_Makarov 2011 + Copyleft ↄ Vasily_Makarov 2011-2012 Sprite Animation Editor could be used to edit animations from Evol and The Mana World projects Dan "Vasily_Makarov" Sagunov <danilka.pro@gmail.com> Reid Yaro <reidyaro@gmail.com> icon.svg + gpl-2-0 - + True False 2 - + True False end @@ -47,18 +47,19 @@ Reid Yaro <reidyaro@gmail.com> Open file dialog - + True False 2 - + True False end gtk-open + False True True True @@ -74,6 +75,7 @@ Reid Yaro <reidyaro@gmail.com> gtk-cancel + False True True True @@ -119,18 +121,19 @@ Reid Yaro <reidyaro@gmail.com> win_main - + True False 2 - + True False end gtk-find + False True True True @@ -146,6 +149,7 @@ Reid Yaro <reidyaro@gmail.com> gtk-cancel + False True True True @@ -173,8 +177,6 @@ Reid Yaro <reidyaro@gmail.com> • False False - True - True True @@ -230,9 +232,9 @@ Reid Yaro <reidyaro@gmail.com> False + False True False - False _File True @@ -241,9 +243,9 @@ Reid Yaro <reidyaro@gmail.com> False + False True False - False _New True @@ -251,9 +253,9 @@ Reid Yaro <reidyaro@gmail.com> + False True False - False _Open... True @@ -261,9 +263,9 @@ Reid Yaro <reidyaro@gmail.com> + False True False - False _Reload True @@ -271,16 +273,16 @@ Reid Yaro <reidyaro@gmail.com> + False True False - False + False True False - False _Save True @@ -288,9 +290,9 @@ Reid Yaro <reidyaro@gmail.com> + False True False - False Save _As... True @@ -302,9 +304,9 @@ Reid Yaro <reidyaro@gmail.com> + False True False - False _Search True @@ -313,9 +315,9 @@ Reid Yaro <reidyaro@gmail.com> False + False True False - False _Find... True @@ -323,9 +325,9 @@ Reid Yaro <reidyaro@gmail.com> + False True False - False Find _Next True @@ -337,9 +339,9 @@ Reid Yaro <reidyaro@gmail.com> + False True False - False _View True @@ -348,9 +350,9 @@ Reid Yaro <reidyaro@gmail.com> False + False True False - False Show _Grid True @@ -358,10 +360,10 @@ Reid Yaro <reidyaro@gmail.com> + False True False False - False _Imageset view True @@ -373,9 +375,9 @@ Reid Yaro <reidyaro@gmail.com> + False True False - False _Help True @@ -384,9 +386,9 @@ Reid Yaro <reidyaro@gmail.com> False + False True False - False _About True @@ -466,19 +468,20 @@ Reid Yaro <reidyaro@gmail.com> False - False + True 3 - - gtk-open + + gtk-save + False True True True False True - + False @@ -487,14 +490,15 @@ Reid Yaro <reidyaro@gmail.com> - - gtk-save + + gtk-open + False True True True False True - + False @@ -505,6 +509,7 @@ Reid Yaro <reidyaro@gmail.com> Parse XML Buffer + False True True True @@ -514,7 +519,7 @@ Reid Yaro <reidyaro@gmail.com> False False - 6 + 7 @@ -534,16 +539,17 @@ Reid Yaro <reidyaro@gmail.com> - True - False - liststore1 - 0 - + True + False + 0 + liststore1 + 0 + False False - 9 + 8 @@ -565,14 +571,15 @@ Reid Yaro <reidyaro@gmail.com> True False - liststore2 0 + liststore2 + 0 False False - 11 + 10 @@ -594,8 +601,9 @@ Reid Yaro <reidyaro@gmail.com> True False - liststore3 0 + liststore3 + 0 @@ -616,14 +624,110 @@ Reid Yaro <reidyaro@gmail.com> True True - - 120 - True + False - + + + 120 + True + False + + + + True + True + 0 + + + + + True + False + + + False + True + False + False + First frame + True + gtk-goto-first + + + True + True + + + + + False + True + False + False + Previous frame + True + gtk-go-back + + + True + True + + + + + False + True + False + False + Continue sequencing + True + gtk-media-play + + + True + True + + + + + False + True + False + False + Next frame + True + gtk-go-forward + + + True + True + + + + + False + True + False + False + Last frame + True + gtk-goto-last + + + True + True + + + + + False + True + 1 + + - True + False True @@ -631,8 +735,6 @@ Reid Yaro <reidyaro@gmail.com> True True - automatic - automatic True 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)); -- cgit v1.2.3-70-g09d2