m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some layer functions plugged to layer menu bar

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1185 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud 2009-11-14 19:19:05 +00:00
parent 01ca8d1565
commit 04f7c56179
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -287,7 +287,7 @@ endif
.PHONY : all debug release clean depend zip version force install uninstall .PHONY : all debug release clean depend zip version force install uninstall
# This is the list of the objects we want to build. Dependancies are built by "make depend" automatically. # This is the list of the objects we want to build. Dependancies are built by "make depend" automatically.
OBJ = $(OBJDIR)/main.o $(OBJDIR)/init.o $(OBJDIR)/graph.o $(OBJDIR)/sdlscreen.o $(OBJDIR)/misc.o $(OBJDIR)/special.o $(OBJDIR)/buttons.o $(OBJDIR)/palette.o $(OBJDIR)/help.o $(OBJDIR)/operatio.o $(OBJDIR)/pages.o $(OBJDIR)/loadsave.o $(OBJDIR)/readline.o $(OBJDIR)/engine.o $(OBJDIR)/filesel.o $(OBJDIR)/op_c.o $(OBJDIR)/readini.o $(OBJDIR)/saveini.o $(OBJDIR)/shade.o $(OBJDIR)/keyboard.o $(OBJDIR)/io.o $(OBJDIR)/version.o $(OBJDIR)/text.o $(OBJDIR)/SFont.o $(OBJDIR)/setup.o $(OBJDIR)/pxsimple.o $(OBJDIR)/pxtall.o $(OBJDIR)/pxwide.o $(OBJDIR)/pxdouble.o $(OBJDIR)/pxtriple.o $(OBJDIR)/pxtall2.o $(OBJDIR)/pxwide2.o $(OBJDIR)/pxquad.o $(OBJDIR)/windows.o $(OBJDIR)/brush.o $(OBJDIR)/realpath.o $(OBJDIR)/mountlist.o $(OBJDIR)/input.o $(OBJDIR)/hotkeys.o $(OBJDIR)/transform.o $(OBJDIR)/pversion.o $(OBJDIR)/factory.o $(PLATFORMOBJ) $(OBJDIR)/fileformats.o $(OBJDIR)/miscfileformats.o $(OBJDIR)/libraw2crtc.o $(OBJDIR)/brush_ops.o $(OBJDIR)/buttons_effects.o OBJ = $(OBJDIR)/main.o $(OBJDIR)/init.o $(OBJDIR)/graph.o $(OBJDIR)/sdlscreen.o $(OBJDIR)/misc.o $(OBJDIR)/special.o $(OBJDIR)/buttons.o $(OBJDIR)/palette.o $(OBJDIR)/help.o $(OBJDIR)/operatio.o $(OBJDIR)/pages.o $(OBJDIR)/loadsave.o $(OBJDIR)/readline.o $(OBJDIR)/engine.o $(OBJDIR)/filesel.o $(OBJDIR)/op_c.o $(OBJDIR)/readini.o $(OBJDIR)/saveini.o $(OBJDIR)/shade.o $(OBJDIR)/keyboard.o $(OBJDIR)/io.o $(OBJDIR)/version.o $(OBJDIR)/text.o $(OBJDIR)/SFont.o $(OBJDIR)/setup.o $(OBJDIR)/pxsimple.o $(OBJDIR)/pxtall.o $(OBJDIR)/pxwide.o $(OBJDIR)/pxdouble.o $(OBJDIR)/pxtriple.o $(OBJDIR)/pxtall2.o $(OBJDIR)/pxwide2.o $(OBJDIR)/pxquad.o $(OBJDIR)/windows.o $(OBJDIR)/brush.o $(OBJDIR)/realpath.o $(OBJDIR)/mountlist.o $(OBJDIR)/input.o $(OBJDIR)/hotkeys.o $(OBJDIR)/transform.o $(OBJDIR)/pversion.o $(OBJDIR)/factory.o $(PLATFORMOBJ) $(OBJDIR)/fileformats.o $(OBJDIR)/miscfileformats.o $(OBJDIR)/libraw2crtc.o $(OBJDIR)/brush_ops.o $(OBJDIR)/buttons_effects.o $(OBJDIR)/layers.o
SKIN_FILES = skins/skin_classic.png skins/skin_modern.png skins/font_Classic.png skins/font_Fun.png SKIN_FILES = skins/skin_classic.png skins/skin_modern.png skins/font_Classic.png skins/font_Fun.png

15
init.c
View File

@ -71,6 +71,7 @@
#include "struct.h" #include "struct.h"
#include "transform.h" #include "transform.h"
#include "windows.h" #include "windows.h"
#include "layers.h"
char Gui_loading_error_message[512]; char Gui_loading_error_message[512];
@ -1239,49 +1240,49 @@ void Init_buttons(void)
0,0, 0,0,
57,9, 57,9,
BUTTON_SHAPE_RECTANGLE, BUTTON_SHAPE_RECTANGLE,
Do_nothing, Do_nothing, Button_Layer_menu, Button_Layer_menu,
Do_nothing, Do_nothing,
FAMILY_TOOLBAR); FAMILY_TOOLBAR);
Init_button(BUTTON_LAYER_COLOR, Init_button(BUTTON_LAYER_COLOR,
58,0, 58,0,
13,9, 13,9,
BUTTON_SHAPE_RECTANGLE, BUTTON_SHAPE_RECTANGLE,
Do_nothing, Do_nothing, Button_Layer_color, Button_Layer_color,
Do_nothing, Do_nothing,
FAMILY_TOOLBAR); FAMILY_TOOLBAR);
Init_button(BUTTON_LAYER_MERGE, Init_button(BUTTON_LAYER_MERGE,
72,0, 72,0,
13,9, 13,9,
BUTTON_SHAPE_RECTANGLE, BUTTON_SHAPE_RECTANGLE,
Do_nothing, Do_nothing, Button_Layer_merge, Button_Layer_merge,
Do_nothing, Do_nothing,
FAMILY_TOOLBAR); FAMILY_TOOLBAR);
Init_button(BUTTON_LAYER_ADD, Init_button(BUTTON_LAYER_ADD,
86,0, 86,0,
13,9, 13,9,
BUTTON_SHAPE_RECTANGLE, BUTTON_SHAPE_RECTANGLE,
Do_nothing, Do_nothing, Button_Layer_add, Button_Layer_add,
Do_nothing, Do_nothing,
FAMILY_TOOLBAR); FAMILY_TOOLBAR);
Init_button(BUTTON_LAYER_REMOVE, Init_button(BUTTON_LAYER_REMOVE,
100,0, 100,0,
13,9, 13,9,
BUTTON_SHAPE_RECTANGLE, BUTTON_SHAPE_RECTANGLE,
Do_nothing, Do_nothing, Button_Layer_remove, Button_Layer_remove,
Do_nothing, Do_nothing,
FAMILY_TOOLBAR); FAMILY_TOOLBAR);
Init_button(BUTTON_LAYER_UP, Init_button(BUTTON_LAYER_UP,
114,0, 114,0,
13,9, 13,9,
BUTTON_SHAPE_RECTANGLE, BUTTON_SHAPE_RECTANGLE,
Do_nothing, Do_nothing, Button_Layer_up, Button_Layer_up,
Do_nothing, Do_nothing,
FAMILY_TOOLBAR); FAMILY_TOOLBAR);
Init_button(BUTTON_LAYER_DOWN, Init_button(BUTTON_LAYER_DOWN,
128,0, 128,0,
13,9, 13,9,
BUTTON_SHAPE_RECTANGLE, BUTTON_SHAPE_RECTANGLE,
Do_nothing, Do_nothing, Button_Layer_down, Button_Layer_down,
Do_nothing, Do_nothing,
FAMILY_TOOLBAR); FAMILY_TOOLBAR);

10
special.c
View File

@ -531,13 +531,3 @@ void Layer_activate(short layer, short side)
Display_cursor(); Display_cursor();
} }
void Special_add_layer()
{
}
void Special_delete_layer()
{
}