Moved GUI skin files to "skins/" sub-directory.

Update makefile (install and uninstall only copy and delete the basic skin)
Added Ilkke's GUI skin to svn.
Skin can be specified by command-line argument "/skin <file>" (relative to program data).
Grafx2's default FG and BG colors are now white and black (instead of 15 and 0).
Credits: Fixed a typo caused by mass translation ("GRAFX2 CREATED (by)").
Credits: Added TeeEmCe to bugfinders.
Updated helpfiles (Resolution, Save, Freehand-draw)


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@707 416bcca6-2ee7-4201-b75f-2eb2f807beb1

Makefile

@@ -248,9 +248,9 @@ release : $(BIN)
 # Create a zip archive ready for upload to the website, including binaries and sourcecode
 ziprelease: version $(BIN) release
 	tar cvzf src-svn`svnversion | sed 's/:/-/'`.tgz *.c *.h Makefile Makefile.dep gfx2.ico 
-	$(ZIP) $(ZIPOPT) grafx2-svn`svnversion | sed 's/:/-/'`$(TTFLABEL)-$(PLATFORM).$(ZIP) $(BIN) gfx2def.ini gfx2gui.gif gfx2.gif doc/gpl-2.0.txt fonts/8pxfont.png doc/README-zlib1.txt doc/README-SDL.txt doc/README-SDL_image.txt doc/README-SDL_ttf.txt fonts/Tuffy.ttf src-svn`svnversion | sed 's/:/-/'`.tgz $(PLATFORMFILES)
+	$(ZIP) $(ZIPOPT) grafx2-svn`svnversion | sed 's/:/-/'`$(TTFLABEL)-$(PLATFORM).$(ZIP) $(BIN) gfx2def.ini skins/base.gif gfx2.gif doc/gpl-2.0.txt fonts/8pxfont.png doc/README-zlib1.txt doc/README-SDL.txt doc/README-SDL_image.txt doc/README-SDL_ttf.txt fonts/Tuffy.ttf src-svn`svnversion | sed 's/:/-/'`.tgz $(PLATFORMFILES)
 	$(DELCOMMAND) src-svn`svnversion | sed 's/:/-/'`.tgz
-	tar cvzf grafx2-svn`svnversion | sed 's/:/-/'`$(TTFLABEL)-src.tgz *.c *.h Makefile Makefile.dep gfx2def.ini gfx2gui.gif gfx2.ico gfx2.gif doc/gpl-2.0.txt fonts/8pxfont.png fonts/Tuffy.ttf
+	tar cvzf grafx2-svn`svnversion | sed 's/:/-/'`$(TTFLABEL)-src.tgz *.c *.h Makefile Makefile.dep gfx2def.ini skins/base.gif gfx2.ico gfx2.gif doc/gpl-2.0.txt fonts/8pxfont.png fonts/Tuffy.ttf
 
 $(BIN) : $(OBJ) $(OBJRES)
 	$(CC) $(OBJ) $(OBJRES) -o $(BIN) $(LOPT)
@@ -287,10 +287,11 @@ install : $(BIN)
 	$(if $(wildcard $(datadir)/grafx2),,$(MKDIR) $(datadir)/grafx2)
 	$(CP) $(BIN) $(datadir)/grafx2/
 	$(CP) gfx2def.ini $(datadir)/grafx2/
-	$(CP) gfx2gui.gif $(datadir)/grafx2/
 	$(CP) gfx2.gif $(datadir)/grafx2/
 	$(if $(wildcard $(datadir)/grafx2/fonts),,$(MKDIR) $(datadir)/grafx2/fonts)
-	cd fonts && $(CP) * $(datadir)/grafx2/fonts/
+	cd fonts && $(CP) * $(datadir)/grafx2/fonts/ && cd ..
+	$(if $(wildcard $(datadir)/grafx2/skins),,$(MKDIR) $(datadir)/grafx2/skins)
+	$(CP) skins/base.gif $(datadir)/grafx2/skins/
 	@echo Install complete
   
 # Linux uninstallation of the program
@@ -298,11 +299,11 @@ uninstall :
 	$(DELCOMMAND) $(bindir)/grafx2
 	$(DELCOMMAND) $(datadir)/grafx2/$(BIN)
 	$(DELCOMMAND) $(datadir)/grafx2/gfx2def.ini
-	$(DELCOMMAND) $(datadir)/grafx2/gfx2gui.gif
 	$(DELCOMMAND) $(datadir)/grafx2/gfx2.gif
 	$(DELCOMMAND) $(datadir)/grafx2/fonts/*
 	$(if $(wildcard $(datadir)/grafx2/fonts),,$(RMDIR) $(datadir)/grafx2/fonts)
-	$(if $(wildcard $(datadir)/grafx2),,$(RMDIR) $(datadir)/grafx2)
+	$(DELCOMMAND) $(datadir)/grafx2/skins/base.gif
+	$(if $(wildcard $(datadir)/grafx2/skins),,$(RMDIR) $(datadir)/grafx2/skins)
 	@echo Uninstall complete
 
 -include Makefile.dep

init.c

@@ -235,7 +235,7 @@ void Center_GUI_cursor(byte *cursor_buffer, int cursor_number)
       GFX_cursor_sprite[cursor_number][y][x]=cursor_buffer[(start_y+y)*29+start_x+x];
 }
 
-void Load_DAT(void)
+void Load_graphics(const char * skin_file)
 {
   int  index;
   char filename[MAX_PATH_CHARACTERS];
@@ -253,7 +253,8 @@ void Load_DAT(void)
   
   // Lecture du fichier "skin"
   strcpy(filename,Repertoire_des_donnees);
-  strcat(filename,"gfx2gui.gif");
+  strcat(filename,skin_file);
+  
   gui=IMG_Load(filename);
   if (!gui)
   {
@@ -374,7 +375,7 @@ void Load_DAT(void)
     else
       GUI_seek_right(gui, &cursor_x, cursor_y, neutral_color, "mouse cursor");
     Read_GUI_block(gui, cursor_x, cursor_y, mouse_cursor_area, 29, 29, "mouse cursor",1);
-    Center_GUI_cursor(mouse_cursor_area,i);
+    Center_GUI_cursor((byte *)mouse_cursor_area,i);
     cursor_x+=29;
   }
   cursor_y+=29;

init.h

@@ -18,7 +18,7 @@
     write to the Free Software Foundation, Inc.,
     59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-void Load_DAT(void);
+void Load_graphics(const char * skin_file);
 void Init_buttons(void);
 void Init_operations(void);
 int  Load_CFG(int reload_all);

main.c

@@ -72,8 +72,8 @@
   extern DECLSPEC int SDLCALL SDL_putenv(const char *variable);
 #endif
 
-byte Old_lines_number;                // old nombre de lignes de l'écran
-
+// filename for the current GUI skin file.
+static char Gui_skin_file[MAX_PATH_CHARACTERS]= "skins" PATH_SEPARATOR "base.gif";
 
 //--- Affichage de la syntaxe, et de la liste des modes vidéos disponibles ---
 void Display_syntax(void)
@@ -85,6 +85,7 @@ void Display_syntax(void)
   printf("\t/wide              to emulate a video mode with wide pixels (2x1)\n");
   printf("\t/tall              to emulate a video mode with tall pixels (1x2)\n");
   printf("\t/double            to emulate a video mode with double pixels (2x2)\n");
+  printf("\t/skin <filename>   use an alternate file with the menu graphics\n");
   printf("\t/mode <videomode>  to set a video mode\n\n");
   printf("Available video modes:\n\n");
   for (mode_index=0; mode_index<Nb_video_modes; mode_index++)
@@ -251,6 +252,21 @@ void Analyze_command_line(int argc,char * argv[])
         exit(0);
       }
     }
+    else if ( !strcmp(argv[index],"/skin") )
+    {
+      // GUI skin file
+      index++;
+      if (index<argc)
+      {
+        strcpy(Gui_skin_file,argv[index]);
+      }
+      else
+      {
+        Error(ERROR_COMMAND_LINE);
+        Display_syntax();
+        exit(0);
+      }
+    }
     else
     {
       // Si ce n'est pas un paramètre, c'est le nom du fichier à ouvrir
@@ -425,8 +441,6 @@ int Init_program(int argc,char * argv[])
   Pixel_in_menu=Pixel_in_toolbar;
   Menu_is_visible=1;
     // Données sur les couleurs et la palette:
-  Fore_color=15;
-  Back_color=0;
   First_color_in_palette=0;
     // Données sur le curseur:
   Cursor_shape=CURSOR_SHAPE_TARGET;
@@ -495,8 +509,6 @@ int Init_program(int argc,char * argv[])
 
   Windows_open=0;
   
-  // Charger les sprites et la palette
-  Load_DAT();
   // Charger la configuration des touches
   Set_config_defaults();
   switch(Load_CFG(1))
@@ -516,26 +528,33 @@ int Init_program(int argc,char * argv[])
   if (temp)
     Error(temp);
 
-  // Transfert des valeurs du .INI qui ne changent pas dans des variables
-  // plus accessibles:
-  Default_palette[MC_Black] =Fav_menu_colors[0]=Config.Fav_menu_colors[0];
-  Default_palette[MC_Dark]=Fav_menu_colors[1]=Config.Fav_menu_colors[1];
-  Default_palette[MC_Light]=Fav_menu_colors[2]=Config.Fav_menu_colors[2];
-  Default_palette[MC_White]=Fav_menu_colors[3]=Config.Fav_menu_colors[3];
-  memcpy(Main_palette,Default_palette,sizeof(T_Palette));
-
-  Compute_optimal_menu_colors(Default_palette);
-
   // Infos sur les trames (Sieve)
   Sieve_mode=0;
   Copy_preset_sieve(0);
 
+  Analyze_command_line(argc,argv);
+
+  // Charger les sprites et la palette
+  Load_graphics(Gui_skin_file);
+
+  // Transfert des valeurs du .INI qui ne changent pas dans des variables
+  // plus accessibles:
+  Default_palette[MC_Black]=Fav_menu_colors[0]=Config.Fav_menu_colors[0];
+  Default_palette[MC_Dark] =Fav_menu_colors[1]=Config.Fav_menu_colors[1];
+  Default_palette[MC_Light]=Fav_menu_colors[2]=Config.Fav_menu_colors[2];
+  Default_palette[MC_White]=Fav_menu_colors[3]=Config.Fav_menu_colors[3];
+  Compute_optimal_menu_colors(Default_palette);
+  Fore_color=MC_White;
+  Back_color=MC_Black;
+
   // Prise en compte de la fonte
   if (Config.Font)
     Menu_font=GFX_fun_font;
   else
     Menu_font=GFX_system_font;
 
+  memcpy(Main_palette,Default_palette,sizeof(T_Palette));
+
   // Allocation de mémoire pour la brosse
   if (!(Brush         =(byte *)malloc(   1*   1))) Error(ERROR_MEMORY);
   if (!(Smear_brush   =(byte *)malloc(MAX_PAINTBRUSH_SIZE*MAX_PAINTBRUSH_SIZE))) Error(ERROR_MEMORY);
@@ -546,7 +565,6 @@ int Init_program(int argc,char * argv[])
   Paintbrush_width=1;
   Paintbrush_height=1;
 
-  Analyze_command_line(argc,argv);
   starting_videomode=Current_resolution;
   Horizontal_line_buffer=NULL;
   Screen_width=Screen_height=Current_resolution=0;