diff options
author | Vasily_Makarov <danilka.pro@gmail.com> | 2011-06-09 23:12:40 +0400 |
---|---|---|
committer | Vasily_Makarov <danilka.pro@gmail.com> | 2011-06-09 23:12:40 +0400 |
commit | 68a094142ee556f356e99d2f30e05bb654b46b3d (patch) | |
tree | 83ea61ee2e0a9b4cf8a4841e4bf9c937a17213c8 | |
parent | 87b6103aa0fdf47b1bfee54f68be0dcb88fe5dc0 (diff) | |
download | tools-68a094142ee556f356e99d2f30e05bb654b46b3d.tar.gz tools-68a094142ee556f356e99d2f30e05bb654b46b3d.tar.bz2 tools-68a094142ee556f356e99d2f30e05bb654b46b3d.tar.xz tools-68a094142ee556f356e99d2f30e05bb654b46b3d.zip |
saedit: Move some lines from main.c to main.h
-rw-r--r-- | saedit/main.c | 39 | ||||
-rw-r--r-- | saedit/main.h | 41 |
2 files changed, 41 insertions, 39 deletions
diff --git a/saedit/main.c b/saedit/main.c index 1115074..e4153ae 100644 --- a/saedit/main.c +++ b/saedit/main.c @@ -8,47 +8,8 @@ | Copyleft Vasily_Makarov 2011 | | | \*=======================================*/ -#include <stdlib.h> -#include <gtk/gtk.h> -#include <gtksourceview/gtksourceview.h> -#include <gtksourceview/gtksourcelanguagemanager.h> -#include <ibusxml.h> -#include <cairo.h> -#include <glib/gi18n.h> - #include "main.h"; -const int MIN_WIDTH = 600; -const int MIN_HEIGHT = 600; -const int SPRITE_WIDTH_DEFAULT = 64; -const int SPRITE_HEIGHT_DEFAULT = 64; -const int GRID_SIZE = 32; - -int sprite_width = 64, sprite_height = 64; -int spriteset_width, spriteset_height; - -GtkWidget *win = NULL; -GtkWidget *darea = NULL; -GtkWidget *datafoldcbutton = NULL; -GtkWidget *xmlfcbutton = NULL; -GtkWidget *xmlfsbutton = NULL; -GtkWidget *xmlfobutton = NULL; -GtkWidget *imagesetscombobox = NULL; -GtkWidget *actionscombobox = NULL; -GtkWidget *animationscombobox = NULL; - -GdkPixbuf *spriteset = NULL; - -GList *imagesets = NULL; -GList *actions = NULL; -GList *animations = NULL; - -XMLNode *root = NULL; -imageset_info *imageset = NULL; - -sprite_info *current_sprite; -guint running_animation = 0; - sprite_info *sprite_info_new(int index, int offsetX, int offsetY) { sprite_info *res = g_new0(sprite_info, 1); res->index = index; diff --git a/saedit/main.h b/saedit/main.h index 02f060f..0a7d03c 100644 --- a/saedit/main.h +++ b/saedit/main.h @@ -8,6 +8,15 @@ | Copyleft Vasily_Makarov 2011 | | | \*=======================================*/ + +#include <stdlib.h> +#include <gtk/gtk.h> +#include <gtksourceview/gtksourceview.h> +#include <gtksourceview/gtksourcelanguagemanager.h> +#include <ibusxml.h> +#include <cairo.h> +#include <glib/gi18n.h> + typedef struct { XMLNode *node; GList *next; @@ -30,6 +39,38 @@ static imageset_info *imageset_info_new() { return g_new0(imageset_info, 1); } + +const int MIN_WIDTH = 600; +const int MIN_HEIGHT = 600; +const int SPRITE_WIDTH_DEFAULT = 64; +const int SPRITE_HEIGHT_DEFAULT = 64; +const int GRID_SIZE = 32; + +int sprite_width = 64, sprite_height = 64; +int spriteset_width, spriteset_height; + +GtkWidget *win = NULL; +GtkWidget *darea = NULL; +GtkWidget *datafoldcbutton = NULL; +GtkWidget *xmlfcbutton = NULL; +GtkWidget *xmlfsbutton = NULL; +GtkWidget *xmlfobutton = NULL; +GtkWidget *imagesetscombobox = NULL; +GtkWidget *actionscombobox = NULL; +GtkWidget *animationscombobox = NULL; + +GdkPixbuf *spriteset = NULL; + +GList *imagesets = NULL; +GList *actions = NULL; +GList *animations = NULL; + +XMLNode *root = NULL; +imageset_info *imageset = NULL; + +sprite_info *current_sprite; +guint running_animation = 0; + static gboolean show_animation_by_sub_nodes (GList *sub_nodes); static gchar *markup_bold(gchar *str); static void format_src_string(gchar *src); |