mirror of
https://github.com/jfdelnero/HxCFloppyEmulator.git
synced 2026-10-27 06:20:50 +00:00
file headers fix + oem mode.
git-svn-id: svn://svn.code.sf.net/p/hxcfloppyemu/code/HxCFloppyEmulator/HxCFloppyEmulator_software/trunk@1778 63fa2f70-6a9b-4bc4-b855-9c6a949b1d69
This commit is contained in:
Jean-François DEL NERO committed
1 parent
31bec20f4a
commit
d434f44ef0
3 files changed
+163
-35
No files matched your search
@@ -1,9 +1,59 @@
|
||||
/*
|
||||
//
|
||||
// Copyright (C) 2006-2019 Jean-François DEL NERO
|
||||
//
|
||||
// This file is part of HxCFloppyEmulator.
|
||||
//
|
||||
// HxCFloppyEmulator may be used and distributed without restriction provided
|
||||
// that this copyright statement is not removed from the file and that any
|
||||
// derivative work contains the original copyright notice and the associated
|
||||
// disclaimer.
|
||||
//
|
||||
// HxCFloppyEmulator is free software; you can redistribute it
|
||||
// and/or modify it under the terms of the GNU General Public License
|
||||
// as published by the Free Software Foundation; either version 2
|
||||
// of the License, or (at your option) any later version.
|
||||
//
|
||||
// HxCFloppyEmulator is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
// See the GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with HxCFloppyEmulator; if not, write to the Free Software
|
||||
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
//
|
||||
*/
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
//-------------------------------------------------------------------------------//
|
||||
//-------------------------------------------------------------------------------//
|
||||
//-----------H----H--X----X-----CCCCC----22222----0000-----0000------11----------//
|
||||
//----------H----H----X-X-----C--------------2---0----0---0----0--1--1-----------//
|
||||
//---------HHHHHH-----X------C----------22222---0----0---0----0-----1------------//
|
||||
//--------H----H----X--X----C----------2-------0----0---0----0-----1-------------//
|
||||
//-------H----H---X-----X---CCCCC-----222222----0000-----0000----1111------------//
|
||||
//-------------------------------------------------------------------------------//
|
||||
//----------------------------------------------------- http://hxc2001.free.fr --//
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// File : gui_strings.cxx
|
||||
// Contains: GUI texts
|
||||
//
|
||||
// Written by: Jean-François DEL NERO
|
||||
//
|
||||
// Change History (most recent first):
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "gui_strings.h"
|
||||
|
||||
string_entry strings_list[]=
|
||||
{
|
||||
#ifndef OEM_MODE
|
||||
{ STR_SDSETTINGSWINDOW_0001, "SDCard HxC Floppy Emulator settings" },
|
||||
{ STR_SDSETTINGSWINDOW_0002, "SD HxC Floppy Emulator Usage settings" },
|
||||
#else
|
||||
{ STR_SDSETTINGSWINDOW_0001, "Floppy Emulator settings" },
|
||||
{ STR_SDSETTINGSWINDOW_0002, "Floppy Emulator Usage settings" },
|
||||
#endif
|
||||
{ STR_SDSETTINGSWINDOW_0003, "User interface" },
|
||||
{ STR_SDSETTINGSWINDOW_0004, "UI Sound" },
|
||||
{ STR_SDSETTINGSWINDOW_0005, "Sound level" },
|
||||
@@ -28,7 +78,11 @@ string_entry strings_list[]=
|
||||
{ STR_SDSETTINGSWINDOW_0024, "Auto" },
|
||||
{ STR_SDSETTINGSWINDOW_0025, "Double Step" },
|
||||
{ STR_SDSETTINGSWINDOW_0026, "Mode" },
|
||||
#ifndef OEM_MODE
|
||||
{ STR_SDSETTINGSWINDOW_0027, "SD HxC Floppy Emulator Interface setting" },
|
||||
#else
|
||||
{ STR_SDSETTINGSWINDOW_0027, "Floppy Emulator Interface setting" },
|
||||
#endif
|
||||
{ STR_SDSETTINGSWINDOW_0028, "Mode" },
|
||||
{ STR_SDSETTINGSWINDOW_0029, "Pin 2" },
|
||||
{ STR_SDSETTINGSWINDOW_0030, "Pin 34" },
|
||||
@@ -99,8 +153,13 @@ string_entry strings_list[]=
|
||||
{ STR_EDITTOOLWINDOW_0023, "Reverse Tracks" },
|
||||
{ STR_EDITTOOLWINDOW_0024, "Add/Delete Side 1" },
|
||||
|
||||
#ifndef OEM_MODE
|
||||
{ STR_USBSETTINGSWINDOW_0001, "USB HxC Floppy Emulator settings and status" },
|
||||
{ STR_USBSETTINGSWINDOW_0002, "USB HxC Floppy Emulator status" },
|
||||
#else
|
||||
{ STR_USBSETTINGSWINDOW_0001, "Floppy Emulator settings and status" },
|
||||
{ STR_USBSETTINGSWINDOW_0002, "Floppy Emulator status" },
|
||||
#endif
|
||||
{ STR_USBSETTINGSWINDOW_0003, "Status" },
|
||||
{ STR_USBSETTINGSWINDOW_0004, "USB statistics and settings" },
|
||||
{ STR_USBSETTINGSWINDOW_0005, "Max settle time" },
|
||||
@@ -190,10 +249,17 @@ string_entry strings_list[]=
|
||||
{ STR_MAINWINDOW_0009, "Create / Browse a DOS floppy disk" },
|
||||
{ STR_MAINWINDOW_0010, "Export" },
|
||||
{ STR_MAINWINDOW_0011, "Export/save the loaded file image" },
|
||||
#ifndef OEM_MODE
|
||||
{ STR_MAINWINDOW_0012, "SD HxC Floppy\nEmulator settings" },
|
||||
{ STR_MAINWINDOW_0013, "Configure the SD HxC Floppy Emulator" },
|
||||
{ STR_MAINWINDOW_0014, "USB HxC Floppy\nEmulator settings" },
|
||||
{ STR_MAINWINDOW_0015, "Configure the USB HxC Floppy Emulator" },
|
||||
#else
|
||||
{ STR_MAINWINDOW_0012, "Floppy Emulator\nsettings" },
|
||||
{ STR_MAINWINDOW_0013, "Configure the Floppy Emulator" },
|
||||
{ STR_MAINWINDOW_0014, "" },
|
||||
{ STR_MAINWINDOW_0015, "" },
|
||||
#endif
|
||||
{ STR_MAINWINDOW_0016, "Floppy disk dump" },
|
||||
{ STR_MAINWINDOW_0017, "Read a real disk" },
|
||||
{ STR_MAINWINDOW_0018, "Track Analyzer" },
|
||||
@@ -202,7 +268,6 @@ string_entry strings_list[]=
|
||||
|
||||
{ 0x0000, 0x0000 }
|
||||
};
|
||||
|
||||
|
||||
char * getString(unsigned int str_id)
|
||||
{
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
// File : main_gui.cxx
|
||||
// Contains: Main GUI window
|
||||
//
|
||||
// Written by: DEL NERO Jean Francois
|
||||
// Written by: Jean-François DEL NERO
|
||||
//
|
||||
// Change History (most recent first):
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
@@ -805,7 +805,7 @@ static void tick_mw(void *v) {
|
||||
Main_Window::Main_Window()
|
||||
: Fl_Window(WINDOW_XSIZE,428)
|
||||
{
|
||||
int i;
|
||||
int i,j;
|
||||
HXCFE_XMLLDR* rfb;
|
||||
char * temp;
|
||||
infothread * infoth;
|
||||
@@ -839,39 +839,46 @@ Main_Window::Main_Window()
|
||||
this->icon((char *)LoadIcon(fl_display, MAKEINTRESOURCE(101)));
|
||||
#endif
|
||||
|
||||
#ifndef OEM_MODE
|
||||
bitmap_hxc2001_backgnd_bmp->unpacked_data=mi_unpack(bitmap_hxc2001_backgnd_bmp->data,bitmap_hxc2001_backgnd_bmp->csize ,bitmap_hxc2001_backgnd_bmp->data, bitmap_hxc2001_backgnd_bmp->size);
|
||||
convert8b24b(bitmap_hxc2001_backgnd_bmp,0x00);
|
||||
group.image(new Fl_Tiled_Image(new Fl_RGB_Image((const unsigned char*)bitmap_hxc2001_backgnd_bmp->unpacked_data,bitmap_hxc2001_backgnd_bmp->Xsize, bitmap_hxc2001_backgnd_bmp->Ysize, 3, 0)));
|
||||
group.align(FL_ALIGN_TEXT_OVER_IMAGE);
|
||||
#endif
|
||||
|
||||
j = 0;
|
||||
for(i=0;i<9;i++)
|
||||
{
|
||||
txt_buttons_main[i].button = new Fl_Button(BUTTON_XPOS, BUTTON_YPOS+(BUTTON_YSTEP*i), BUTTON_XSIZE, BUTTON_YSIZE, getString(txt_buttons_main[i].label_id));
|
||||
txt_buttons_main[i].button->labelsize(12);
|
||||
txt_buttons_main[i].button->callback(bt_clicked,(void*)i);
|
||||
if(strlen(getString(txt_buttons_main[i].label_id)))
|
||||
{
|
||||
txt_buttons_main[i].button = new Fl_Button(BUTTON_XPOS, BUTTON_YPOS+(BUTTON_YSTEP*j), BUTTON_XSIZE, BUTTON_YSIZE, getString(txt_buttons_main[i].label_id));
|
||||
txt_buttons_main[i].button->labelsize(12);
|
||||
txt_buttons_main[i].button->callback(bt_clicked,(void*)i);
|
||||
|
||||
Fl_Box *box = new Fl_Box(FL_NO_BOX,BUTTON_XPOS+BUTTON_XSIZE,BUTTON_YPOS+(BUTTON_YSIZE/4)+(BUTTON_YSTEP*i),BUTTON_XSIZE*4,BUTTON_YSIZE/2,getString(txt_buttons_main[i].desc_id));
|
||||
box->align(FL_ALIGN_INSIDE|FL_ALIGN_LEFT);
|
||||
//box->labelfont(FL_BOLD);
|
||||
box->labelsize(12);
|
||||
//box->labeltype(FL_EMBOSSED_LABEL);
|
||||
box->labeltype(FL_ENGRAVED_LABEL);
|
||||
Fl_Box *box = new Fl_Box(FL_NO_BOX,BUTTON_XPOS+BUTTON_XSIZE,BUTTON_YPOS+(BUTTON_YSIZE/4)+(BUTTON_YSTEP*j),BUTTON_XSIZE*4,BUTTON_YSIZE/2,getString(txt_buttons_main[i].desc_id));
|
||||
box->align(FL_ALIGN_INSIDE|FL_ALIGN_LEFT);
|
||||
//box->labelfont(FL_BOLD);
|
||||
box->labelsize(12);
|
||||
//box->labeltype(FL_EMBOSSED_LABEL);
|
||||
box->labeltype(FL_ENGRAVED_LABEL);
|
||||
j++;
|
||||
}
|
||||
}
|
||||
|
||||
file_name_txt = new Fl_Output(BUTTON_XPOS, BUTTON_YPOS+(BUTTON_YSTEP*i++), WINDOW_XSIZE-(BUTTON_XPOS*2), 25);
|
||||
file_name_txt = new Fl_Output(BUTTON_XPOS, BUTTON_YPOS+(BUTTON_YSTEP*j++), WINDOW_XSIZE-(BUTTON_XPOS*2), 25);
|
||||
file_name_txt->labelsize(12);
|
||||
file_name_txt->textsize(12);
|
||||
file_name_txt->align(FL_ALIGN_TOP_LEFT);
|
||||
file_name_txt->value("No disk loaded.");
|
||||
file_name_txt->box(FL_PLASTIC_UP_BOX);
|
||||
|
||||
track_pos_str = new Fl_Output(BUTTON_XPOS, BUTTON_YPOS+(BUTTON_YSTEP*i++)-10, WINDOW_XSIZE-(BUTTON_XPOS*2), 25);
|
||||
track_pos_str = new Fl_Output(BUTTON_XPOS, BUTTON_YPOS+(BUTTON_YSTEP*j++)-10, WINDOW_XSIZE-(BUTTON_XPOS*2), 25);
|
||||
track_pos_str->labelsize(12);
|
||||
track_pos_str->textsize(12);
|
||||
track_pos_str->align(FL_ALIGN_TOP_LEFT);
|
||||
track_pos_str->box(FL_PLASTIC_UP_BOX);
|
||||
|
||||
track_pos = new Fl_Progress(BUTTON_XPOS, BUTTON_YPOS+(BUTTON_YSTEP*i++)-18, WINDOW_XSIZE-(BUTTON_XPOS*2), 25);
|
||||
track_pos = new Fl_Progress(BUTTON_XPOS, BUTTON_YPOS+(BUTTON_YSTEP*j++)-18, WINDOW_XSIZE-(BUTTON_XPOS*2), 25);
|
||||
track_pos->box(FL_THIN_UP_BOX);
|
||||
track_pos->selection_color((Fl_Color)137);
|
||||
track_pos->minimum(0);
|
||||
@@ -906,6 +913,9 @@ Main_Window::Main_Window()
|
||||
user_data((void*)(this));
|
||||
|
||||
load_last_cfg();
|
||||
|
||||
resize (this->x_root(),this->y_root(),WINDOW_XSIZE,BUTTON_YPOS+(BUTTON_YSTEP*j) - 25);
|
||||
|
||||
guicontext->main_window = (Main_Window *)this;
|
||||
|
||||
//////////////////////////////////////////////
|
||||
|
||||
@@ -1,3 +1,48 @@
|
||||
/*
|
||||
//
|
||||
// Copyright (C) 2006-2019 Jean-François DEL NERO
|
||||
//
|
||||
// This file is part of HxCFloppyEmulator.
|
||||
//
|
||||
// HxCFloppyEmulator may be used and distributed without restriction provided
|
||||
// that this copyright statement is not removed from the file and that any
|
||||
// derivative work contains the original copyright notice and the associated
|
||||
// disclaimer.
|
||||
//
|
||||
// HxCFloppyEmulator is free software; you can redistribute it
|
||||
// and/or modify it under the terms of the GNU General Public License
|
||||
// as published by the Free Software Foundation; either version 2
|
||||
// of the License, or (at your option) any later version.
|
||||
//
|
||||
// HxCFloppyEmulator is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
// See the GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with HxCFloppyEmulator; if not, write to the Free Software
|
||||
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
//
|
||||
*/
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
//-------------------------------------------------------------------------------//
|
||||
//-------------------------------------------------------------------------------//
|
||||
//-----------H----H--X----X-----CCCCC----22222----0000-----0000------11----------//
|
||||
//----------H----H----X-X-----C--------------2---0----0---0----0--1--1-----------//
|
||||
//---------HHHHHH-----X------C----------22222---0----0---0----0-----1------------//
|
||||
//--------H----H----X--X----C----------2-------0----0---0----0-----1-------------//
|
||||
//-------H----H---X-----X---CCCCC-----222222----0000-----0000----1111------------//
|
||||
//-------------------------------------------------------------------------------//
|
||||
//----------------------------------------------------- http://hxc2001.free.fr --//
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// File : msg_txt.cxx
|
||||
// Contains: GUI menus
|
||||
//
|
||||
// Written by: Jean-François DEL NERO
|
||||
//
|
||||
// Change History (most recent first):
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "fl_includes.h"
|
||||
|
||||
#include <stdio.h>
|
||||
@@ -47,31 +92,39 @@ main_button_list txt_buttons_main[]=
|
||||
|
||||
Fl_Menu_Item menutable[] = {
|
||||
{"&Floppy image",0,0,0,FL_SUBMENU},
|
||||
{"&Load", FL_ALT+'l',load_file_image_pb,0},
|
||||
{"Load custom RAW file/Create custom floppy", FL_ALT+'r',menu_clicked,(void*)1},
|
||||
{"&Create DOS/AmigaDOS disk", FL_ALT+'c', menu_clicked,(void*)3},
|
||||
{"&Export disk/Save As", FL_ALT+'e', save_file_image, 0},
|
||||
{"Batch convert files images", FL_ALT+'b', menu_clicked,(void*)2},
|
||||
{"Dump a Floppy disk", FL_ALT+'d', menu_clicked,(void*)7},
|
||||
{"Track Analyzer", FL_ALT+'a', menu_clicked,(void*)10},
|
||||
{"&Load", FL_ALT+'l',load_file_image_pb,0},
|
||||
{"Load custom RAW file/Create custom floppy", FL_ALT+'r',menu_clicked,(void*)1},
|
||||
{"&Create DOS/AmigaDOS disk", FL_ALT+'c', menu_clicked,(void*)3},
|
||||
{"&Export disk/Save As", FL_ALT+'e', save_file_image, 0},
|
||||
{"Batch convert files images", FL_ALT+'b', menu_clicked,(void*)2},
|
||||
{"Dump a Floppy disk", FL_ALT+'d', menu_clicked,(void*)7},
|
||||
{"Track Analyzer", FL_ALT+'a', menu_clicked,(void*)10},
|
||||
|
||||
{0},
|
||||
{0},
|
||||
#ifndef OEM_MODE
|
||||
{"&Settings",FL_F+2,0,0,FL_SUBMENU},
|
||||
{"SD HxC FLoppy Emulator settings", FL_ALT+'l',menu_clicked,(void*)5},
|
||||
{"USB HxC Floppy Emulator settings", FL_ALT+'s',menu_clicked,(void*)6},
|
||||
{0},
|
||||
{"SD HxC Floppy Emulator settings", FL_ALT+'l',menu_clicked,(void*)5},
|
||||
{"USB HxC Floppy Emulator settings", FL_ALT+'s',menu_clicked,(void*)6},
|
||||
{0},
|
||||
#else
|
||||
{"&Settings",FL_F+2,0,0,FL_SUBMENU},
|
||||
{"Floppy Emulator settings", FL_ALT+'l',menu_clicked,(void*)5},
|
||||
{0},
|
||||
#endif
|
||||
{"&Look",FL_F+3,0,0,FL_SUBMENU},
|
||||
{"Classic", FL_ALT+'C',menu_clicked,(void*)11},
|
||||
{"Plastic", FL_ALT+'P',menu_clicked,(void*)12},
|
||||
{"Gtk+", FL_ALT+'G',menu_clicked,(void*)13},
|
||||
{"Classic", FL_ALT+'C',menu_clicked,(void*)11},
|
||||
{"Plastic", FL_ALT+'P',menu_clicked,(void*)12},
|
||||
{"Gtk+", FL_ALT+'G',menu_clicked,(void*)13},
|
||||
{"Gleam", FL_ALT+'E',menu_clicked,(void*)14},
|
||||
{0},
|
||||
{0},
|
||||
{"&Log",FL_F+4,0,0,FL_SUBMENU},
|
||||
{"&Log", FL_ALT+'l',menu_clicked,(void*)8},
|
||||
{0},
|
||||
{"&About",0,0,0,FL_SUBMENU},
|
||||
{"&HxCFloppyEmulator", FL_ALT+'h',menu_clicked,(void*)9},
|
||||
{0},
|
||||
{"&Log", FL_ALT+'l',menu_clicked,(void*)8},
|
||||
{0},
|
||||
#ifndef OEM_MODE
|
||||
{"&About",0,0,0,FL_SUBMENU},
|
||||
{"&HxCFloppyEmulator", FL_ALT+'h',menu_clicked,(void*)9},
|
||||
#endif
|
||||
{0},
|
||||
{0}
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user