|
From: <bla...@us...> - 2008-07-21 20:59:09
|
Revision: 19066
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19066&view=rev
Author: blackystardust
Date: 2008-07-21 20:59:16 +0000 (Mon, 21 Jul 2008)
Log Message:
-----------
Added amiga UI for x64dtv.
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/intl.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/intl.txt
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/make-bindist.sh
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/uires.h
Added Paths:
-----------
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvui.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvuires.h
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/mui/uic64dtv.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/mui/uic64dtv.h
branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/x64dtvns.c
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/Makefile.am
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/Makefile.am 2008-07-21 20:44:51 UTC (rev 19065)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/Makefile.am 2008-07-21 20:59:16 UTC (rev 19066)
@@ -1,9 +1,11 @@
# Makefile.am for the AMIGAOS version of `libarch.a'.
-bin_PROGRAMS = x64ns x128ns xvicns xplus4ns xcbm2ns xpetns
+bin_PROGRAMS = x64ns x64dtvns x128ns xvicns xplus4ns xcbm2ns xpetns
x64ns_SOURCES = x64ns.c
+x64dtvns_SOURCES = x64dtvns.c
+
x128ns_SOURCES = x128ns.c
xvicns_SOURCES = xvicns.c
@@ -19,6 +21,7 @@
-I$(top_builddir)/src \
-I$(top_srcdir)/src/drive \
-I$(top_srcdir)/src/c64 \
+ -I$(top_srcdir)/src/c64dtv \
-I$(top_srcdir)/src/c128 \
-I$(top_srcdir)/src/vic20 \
-I$(top_srcdir)/src/pet \
@@ -41,6 +44,8 @@
c128uires.h \
c64ui.c \
c64uires.h \
+ c64dtvui.c \
+ c64dtvuires.h \
catweaselmkiii.c \
cbm2ui.c \
cbm2uires.h \
@@ -108,6 +113,8 @@
mui/uiacia.h \
mui/uic64_256k.c \
mui/uic64_256k.h \
+ mui/uic64dtv.c \
+ mui/uic64dtv.h \
mui/uic128settings.c \
mui/uic128settings.h \
mui/uicbm2settings.c \
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvui.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvui.c (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvui.c 2008-07-21 20:59:16 UTC (rev 19066)
@@ -0,0 +1,103 @@
+/*
+ * c64dtvui.c
+ *
+ * Written by
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program 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.
+ *
+ * This program 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#include "vice.h"
+
+#define UI_C64DTV
+#define UI_MENU_NAME c64dtv_ui_translation_menu
+#define UI_TRANSLATED_MENU_NAME c64dtv_ui_menu
+
+#include "private.h"
+#include "c64ui.h"
+#include "c64dtvuires.h"
+
+#include "mui/uic64dtv.h"
+#include "mui/uidrivec64vic20.h"
+#include "mui/uiromc64vic20settings.h"
+#include "mui/uisid.h"
+#include "mui/uivicii.h"
+#include "mui/uivideoc64plus4vic20.h"
+
+static const ui_menu_toggle_t c64dtv_ui_menu_toggles[] = {
+ { "VICIIDoubleSize", IDM_TOGGLE_DOUBLESIZE },
+ { "VICIIDoubleScan", IDM_TOGGLE_DOUBLESCAN },
+ { "VICIIScale2x", IDM_TOGGLE_SCALE2X },
+ { "PALEmulation", IDM_TOGGLE_FASTPAL },
+ { "VICIIVideoCache", IDM_TOGGLE_VIDEOCACHE },
+ { "Mouse", IDM_MOUSE },
+ { "ps2mouse", IDM_PS2_MOUSE },
+ { "EmuID", IDM_TOGGLE_EMUID },
+ { NULL, 0 }
+};
+
+static int c64dtv_ui_specific(video_canvas_t *canvas, int idm)
+{
+ uic64cart_proc(canvas, idm);
+
+ switch (idm) {
+ case IDM_C64DTV_SETTINGS:
+ ui_c64dtv_settings_dialog(canvas);
+ break;
+ case IDM_VICII_SETTINGS:
+ ui_vicii_settings_dialog();
+ break;
+ case IDM_SID_SETTINGS:
+ ui_sid_settings_dialog();
+ break;
+ case IDM_COMPUTER_ROM_SETTINGS:
+ ui_c64vic20_computer_rom_settings_dialog(canvas);
+ break;
+ case IDM_DRIVE_ROM_SETTINGS:
+ ui_c64vic20_drive_rom_settings_dialog(canvas);
+ break;
+ case IDM_VIDEO_SETTINGS:
+ ui_video_c64plus4vic20_settings_dialog(canvas, "VICIIExternalPalette", "VICIIPaletteFile");
+ break;
+ case IDM_DRIVE_SETTINGS:
+ uidrivec64vic20_settings_dialog();
+ break;
+ case IDM_KEYBOARD_SETTINGS:
+// uikeyboard_settings_dialog(hwnd, &uikeyboard_config);
+ break;
+ }
+
+ return 0;
+}
+
+int c64dtvui_init(void)
+{
+ ui_register_menu_translation_layout(c64dtv_ui_translation_menu);
+ ui_register_menu_layout(c64dtv_ui_menu);
+ ui_register_machine_specific(c64dtv_ui_specific);
+ ui_register_menu_toggles(c64dtv_ui_menu_toggles);
+// ui_register_res_values(const ui_res_value_list_t *valuelist);
+
+ return 0;
+}
+
+void c64dtvui_shutdown(void)
+{
+}
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvui.c
___________________________________________________________________
Added: svn:executable
+ *
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvuires.h
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvuires.h (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvuires.h 2008-07-21 20:59:16 UTC (rev 19066)
@@ -0,0 +1,194 @@
+/*
+ * c64dtvuires.h
+ *
+ * Written by
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program 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.
+ *
+ * This program 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#ifndef _C64UIRES_H_
+#define _C64UIRES_H_
+
+#include "uires.h"
+#include "intl.h"
+
+static struct TranslateNewMenu UI_MENU_NAME[] = {
+ TITLE(IDMS_FILE, NULL)
+#ifndef AMIGA_AROS
+ ITEM(IDMS_AUTOSTART_IMAGE, NULL, IDM_AUTOSTART)
+ ITEMSEPARATOR()
+#endif
+ ITEM(IDMS_ATTACH_DISK_IMAGE, NULL, NULL)
+ SUB(IDMS_DRIVE_8, "8", IDM_ATTACH_8)
+ SUB(IDMS_DRIVE_9, "9", IDM_ATTACH_9)
+ SUB(IDMS_DRIVE_10, "0", IDM_ATTACH_10)
+ SUB(IDMS_DRIVE_11, "1", IDM_ATTACH_11)
+ ITEM(IDMS_DETACH_DISK_IMAGE, NULL, NULL)
+ SUB(IDMS_DRIVE_8, NULL, IDM_DETACH_8)
+ SUB(IDMS_DRIVE_9, NULL, IDM_DETACH_9)
+ SUB(IDMS_DRIVE_10, NULL, IDM_DETACH_10)
+ SUB(IDMS_DRIVE_11, NULL, IDM_DETACH_11)
+ SUBSEPARATOR()
+ SUB(IDMS_ALL, "A", IDM_DETACH_ALL)
+ ITEM(IDMS_FLIP_LIST, NULL, NULL)
+ SUB(IDMS_ADD_CURRENT_IMAGE, "I", IDM_FLIP_ADD)
+ SUB(IDMS_REMOVE_CURRENT_IMAGE, "K", IDM_FLIP_REMOVE)
+ SUB(IDMS_ATTACH_NEXT_IMAGE, "N", IDM_FLIP_NEXT)
+ SUB(IDMS_ATTACH_PREVIOUS_IMAGE, "B", IDM_FLIP_PREVIOUS)
+ SUBSEPARATOR()
+ SUB(IDMS_LOAD_FLIP_LIST, NULL, IDM_FLIP_LOAD)
+ SUB(IDMS_SAVE_FLIP_LIST, NULL, IDM_FLIP_SAVE)
+ ITEMSEPARATOR()
+ ITEMTOGGLE(IDMS_PAUSE, NULL, IDM_PAUSE)
+ ITEM(IDMS_MONITOR, "M", IDM_MONITOR)
+ ITEM(IDMS_RESET, NULL, NULL)
+ SUB(IDMS_HARD, NULL, IDM_RESET_HARD)
+ SUB(IDMS_SOFT, "R", IDM_RESET_SOFT)
+ SUBSEPARATOR()
+ SUB(IDMS_DRIVE_8, NULL, IDM_RESET_DRIVE8)
+ SUB(IDMS_DRIVE_9, NULL, IDM_RESET_DRIVE9)
+ SUB(IDMS_DRIVE_10, NULL, IDM_RESET_DRIVE10)
+ SUB(IDMS_DRIVE_11, NULL, IDM_RESET_DRIVE11)
+ ITEMSEPARATOR()
+ ITEM(IDMS_EXIT, "X", IDM_EXIT)
+ TITLE(IDMS_EDIT, NULL)
+ ITEM(IDMS_COPY, NULL, IDM_COPY)
+ ITEM(IDMS_PASTE, NULL, IDM_PASTE)
+ TITLE(IDMS_SNAPSHOT, NULL)
+ ITEM(IDMS_LOAD_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_LOAD)
+ ITEM(IDMS_SAVE_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_SAVE)
+ ITEMSEPARATOR()
+ ITEM(IDMS_START_STOP_RECORDING, NULL, IDM_EVENT_TOGGLE_RECORD)
+ ITEM(IDMS_START_STOP_PLAYBACK, NULL, IDM_EVENT_TOGGLE_PLAYBACK)
+ ITEM(IDMS_SET_MILESTONE, "G", IDM_EVENT_SETMILESTONE)
+ ITEM(IDMS_RETURN_TO_MILESTONE, "H", IDM_EVENT_RESETMILESTONE)
+ ITEM(IDMS_RECORDING_START_MODE, NULL, NULL)
+ SUBTOGGLE(IDMS_SAVE_NEW_SNAPSHOT, NULL, IDM_EVENT_START_MODE_SAVE)
+ SUBTOGGLE(IDMS_LOAD_EXISTING_SNAPSHOT, NULL, IDM_EVENT_START_MODE_LOAD)
+ SUBTOGGLE(IDMS_START_WITH_RESET, NULL, IDM_EVENT_START_MODE_RESET)
+ SUBTOGGLE(IDMS_OVERWRITE_PLAYBACK, NULL, IDM_EVENT_START_MODE_PLAYBACK)
+ ITEM(IDMS_SELECT_HISTORY_DIR, NULL, IDM_EVENT_DIRECTORY)
+ ITEMSEPARATOR()
+ ITEM(IDMS_SAVE_STOP_MEDIA_FILE, "C", IDM_MEDIAFILE)
+ ITEMSEPARATOR()
+ ITEM(IDMS_START_SOUND_RECORD, NULL, IDM_SOUND_RECORD_START)
+ ITEM(IDMS_STOP_SOUND_RECORD, NULL, IDM_SOUND_RECORD_STOP)
+ ITEMSEPARATOR()
+ ITEM(IDMS_NETPLAY, NULL, IDM_NETWORK_SETTINGS)
+ TITLE(IDMS_OPTIONS, NULL)
+ ITEM(IDMS_REFRESH_RATE, NULL, NULL)
+ SUBTOGGLE(IDMS_AUTO, NULL, IDM_REFRESH_RATE_AUTO)
+ SUBTOGGLE(IDMS_1_1, NULL, IDM_REFRESH_RATE_1)
+ SUBTOGGLE(IDMS_1_2, NULL, IDM_REFRESH_RATE_2)
+ SUBTOGGLE(IDMS_1_3, NULL, IDM_REFRESH_RATE_3)
+ SUBTOGGLE(IDMS_1_4, NULL, IDM_REFRESH_RATE_4)
+ SUBTOGGLE(IDMS_1_5, NULL, IDM_REFRESH_RATE_5)
+ SUBTOGGLE(IDMS_1_6, NULL, IDM_REFRESH_RATE_6)
+ SUBTOGGLE(IDMS_1_7, NULL, IDM_REFRESH_RATE_7)
+ SUBTOGGLE(IDMS_1_8, NULL, IDM_REFRESH_RATE_8)
+ SUBTOGGLE(IDMS_1_9, NULL, IDM_REFRESH_RATE_9)
+ SUBTOGGLE(IDMS_1_10, NULL, IDM_REFRESH_RATE_10)
+ ITEM(IDMS_MAXIMUM_SPEED, NULL, NULL)
+ SUBTOGGLE(IDMS_200_PERCENT, NULL, IDM_MAXIMUM_SPEED_200)
+ SUBTOGGLE(IDMS_100_PERCENT, NULL, IDM_MAXIMUM_SPEED_100)
+ SUBTOGGLE(IDMS_50_PERCENT, NULL, IDM_MAXIMUM_SPEED_50)
+ SUBTOGGLE(IDMS_20_PERCENT, NULL, IDM_MAXIMUM_SPEED_20)
+ SUBTOGGLE(IDMS_10_PERCENT, NULL, IDM_MAXIMUM_SPEED_10)
+ SUBTOGGLE(IDMS_NO_LIMIT, NULL, IDM_MAXIMUM_SPEED_NO_LIMIT)
+ SUBSEPARATOR()
+ SUBTOGGLE(IDMS_CUSTOM, NULL, IDM_MAXIMUM_SPEED_CUSTOM)
+ ITEMTOGGLE(IDMS_WARP_MODE, "W", IDM_TOGGLE_WARP_MODE)
+ ITEMSEPARATOR()
+ ITEMTOGGLE(IDMS_FULLSCREEN, "D", IDM_TOGGLE_FULLSCREEN)
+ ITEMTOGGLE(IDMS_FULLSCREEN_STATUSBAR, NULL, IDM_TOGGLE_STATUSBAR)
+ ITEMSEPARATOR()
+ ITEMTOGGLE(IDMS_VIDEO_CACHE, NULL, IDM_TOGGLE_VIDEOCACHE)
+ ITEMTOGGLE(IDMS_DOUBLE_SIZE, NULL, IDM_TOGGLE_DOUBLESIZE)
+ ITEMTOGGLE(IDMS_DOUBLE_SCAN, NULL, IDM_TOGGLE_DOUBLESCAN)
+ ITEMTOGGLE(IDS_PAL_EMULATION, NULL, IDM_TOGGLE_FASTPAL)
+ ITEMTOGGLE(IDMS_SCALE2X, NULL, IDM_TOGGLE_SCALE2X)
+#if defined(HAVE_PROTO_CYBERGRAPHICS_H) && defined(HAVE_XVIDEO)
+ ITEMTOGGLE(IDMS_VIDEO_OVERLAY, NULL, IDM_TOGGLE_OVERLAY)
+#endif
+ ITEMSEPARATOR()
+ ITEM(IDMS_SWAP_JOYSTICKS, "J", IDM_SWAP_JOYSTICK)
+ ITEMSEPARATOR()
+ ITEMTOGGLE(IDMS_SOUND_PLAYBACK, NULL, IDM_TOGGLE_SOUND)
+ ITEMSEPARATOR()
+ ITEMTOGGLE(IDMS_TRUE_DRIVE_EMU, NULL, IDM_TOGGLE_DRIVE_TRUE_EMULATION)
+ ITEMTOGGLE(IDMS_VIRTUAL_DEVICE_TRAPS, NULL, IDM_TOGGLE_VIRTUAL_DEVICES)
+ ITEMSEPARATOR()
+ ITEM(IDMS_VIDEO_STANDARD, NULL, NULL)
+ SUBTOGGLE(IDMS_PAL_G, NULL, IDM_SYNC_FACTOR_PAL)
+ SUBTOGGLE(IDMS_NTSC_M, NULL, IDM_SYNC_FACTOR_NTSC)
+ ITEMSEPARATOR()
+ ITEMTOGGLE(IDMS_EMU_ID, NULL, IDM_TOGGLE_EMUID)
+ ITEMTOGGLE(IDMS_PS2_MOUSE, NULL, IDM_PS2_MOUSE)
+ ITEMTOGGLE(IDMS_GRAB_MOUSE, "Q", IDM_MOUSE)
+ TITLE(IDMS_SETTINGS, NULL)
+ ITEM(IDMS_VIDEO_SETTINGS, NULL, IDM_VIDEO_SETTINGS)
+ ITEM(IDMS_PERIPHERAL_SETTINGS, NULL,IDM_DEVICEMANAGER)
+ ITEM(IDMS_DRIVE_SETTINGS, NULL, IDM_DRIVE_SETTINGS)
+ ITEM(IDMS_VICII_SETTINGS, NULL, IDM_VICII_SETTINGS)
+#ifdef AMIGA_OS4
+ ITEM(IDMS_JOYSTICK_SETTINGS, NULL, IDM_JOY_SETTINGS)
+#else
+ ITEM(IDMS_JOYSTICK_SETTINGS, NULL, NULL)
+ SUB(IDMS_JOYSTICK_DEVICE_SELECT, NULL, IDM_JOY_DEVICE_SELECTION)
+ SUB(IDMS_JOYSTICK_FIRE_SELECT, NULL, IDM_JOY_FIRE_SELECTION)
+#endif
+ ITEM(IDMS_KEYBOARD_SETTINGS, NULL, IDM_KEYBOARD_SETTINGS)
+ ITEM(IDMS_SOUND_SETTINGS, NULL, IDM_SOUND_SETTINGS)
+ ITEM(IDMS_SID_SETTINGS, NULL, IDM_SID_SETTINGS)
+ ITEM(IDMS_COMPUTER_ROM_SETTINGS, NULL, IDM_COMPUTER_ROM_SETTINGS)
+ ITEM(IDMS_DRIVE_ROM_SETTINGS, NULL, IDM_DRIVE_ROM_SETTINGS)
+ ITEM(IDMS_RAM_SETTINGS, NULL, IDM_RAM_SETTINGS)
+ ITEM(IDMS_C64DTV_SETTINGS, NULL, IDM_C64DTV_SETTINGS)
+ ITEMSEPARATOR()
+ ITEM(IDMS_SAVE_CURRENT_SETTINGS, NULL, IDM_SETTINGS_SAVE)
+ ITEM(IDMS_LOAD_SAVED_SETTINGS, NULL, IDM_SETTINGS_LOAD)
+ ITEM(IDMS_SET_DEFAULT_SETTINGS, NULL, IDM_SETTINGS_DEFAULT)
+ ITEMSEPARATOR()
+ ITEMTOGGLE(IDMS_SAVE_SETTING_ON_EXIT, NULL, IDM_TOGGLE_SAVE_SETTINGS_ON_EXIT)
+ ITEMTOGGLE(IDMS_CONFIRM_ON_EXIT, NULL, IDM_TOGGLE_CONFIRM_ON_EXIT)
+ TITLE(IDMS_LANGUAGE, NULL)
+ ITEM(IDMS_LANGUAGE_ENGLISH, NULL, IDM_LANGUAGE_ENGLISH)
+ ITEM(IDMS_LANGUAGE_GERMAN, NULL, IDM_LANGUAGE_GERMAN)
+ ITEM(IDMS_LANGUAGE_FRENCH, NULL, IDM_LANGUAGE_FRENCH)
+ ITEM(IDMS_LANGUAGE_HUNGARIAN, NULL, IDM_LANGUAGE_HUNGARIAN)
+ ITEM(IDMS_LANGUAGE_ITALIAN, NULL, IDM_LANGUAGE_ITALIAN)
+ ITEM(IDMS_LANGUAGE_DUTCH, NULL, IDM_LANGUAGE_DUTCH)
+ ITEM(IDMS_LANGUAGE_POLISH, NULL, IDM_LANGUAGE_POLISH)
+ ITEM(IDMS_LANGUAGE_SWEDISH, NULL, IDM_LANGUAGE_SWEDISH)
+ TITLE(IDMS_HELP, NULL)
+ ITEM(IDMS_ABOUT, NULL, IDM_ABOUT)
+ ITEMSEPARATOR()
+ ITEM(IDMS_COMMAND_LINE_OPTIONS, NULL, IDM_CMDLINE)
+ ITEMSEPARATOR()
+ ITEM(IDMS_CONTRIBUTORS, NULL, IDM_CONTRIBUTORS)
+ ITEM(IDMS_LICENSE, NULL, IDM_LICENSE)
+ ITEM(IDMS_NO_WARRANTY, NULL, IDM_WARRANTY)
+ END()
+};
+
+static struct NewMenu UI_TRANSLATED_MENU_NAME[sizeof(UI_MENU_NAME)/sizeof(UI_MENU_NAME[0])];
+
+#endif /* _C64UIRES_H_ */
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/c64dtvuires.h
___________________________________________________________________
Added: svn:executable
+ *
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/intl.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/intl.c 2008-07-21 20:44:51 UTC (rev 19065)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/intl.c 2008-07-21 20:59:16 UTC (rev 19066)
@@ -1299,6 +1299,15 @@
/* pl */ {IDMS_GRAB_MOUSE_PL, ""}, /* fuzzy */
/* sv */ {IDMS_GRAB_MOUSE_SV, "F\xE5nga mush\xE4ndelser"},
+/* en */ {IDMS_PS2_MOUSE, "PS/2 mouse emulation"},
+/* de */ {IDMS_PS2_MOUSE_DE, ""}, /* fuzzy */
+/* fr */ {IDMS_PS2_MOUSE_FR, ""}, /* fuzzy */
+/* hu */ {IDMS_PS2_MOUSE_HU, ""}, /* fuzzy */
+/* it */ {IDMS_PS2_MOUSE_IT, ""}, /* fuzzy */
+/* nl */ {IDMS_PS2_MOUSE_NL, "PS/2 muis emulatie"},
+/* pl */ {IDMS_PS2_MOUSE_PL, ""}, /* fuzzy */
+/* sv */ {IDMS_PS2_MOUSE_SV, ""}, /* fuzzy */
+
/* en */ {IDMS_SETTINGS, "Settings"},
/* de */ {IDMS_SETTINGS_DE, "Einstellungen"},
/* fr */ {IDMS_SETTINGS_FR, "Param\xE8tres"},
@@ -1650,6 +1659,15 @@
/* pl */ {IDMS_SIDCART_SETTINGS_PL, ""}, /* fuzzy */
/* sv */ {IDMS_SIDCART_SETTINGS_SV, "SID-modulinst\xE4llningar..."},
+/* en */ {IDMS_C64DTV_SETTINGS, "C64DTV settings..."},
+/* de */ {IDMS_C64DTV_SETTINGS_DE, ""}, /* fuzzy */
+/* fr */ {IDMS_C64DTV_SETTINGS_FR, ""}, /* fuzzy */
+/* hu */ {IDMS_C64DTV_SETTINGS_HU, ""}, /* fuzzy */
+/* it */ {IDMS_C64DTV_SETTINGS_IT, ""}, /* fuzzy */
+/* nl */ {IDMS_C64DTV_SETTINGS_NL, "C64DTV instellingen"},
+/* pl */ {IDMS_C64DTV_SETTINGS_PL, ""}, /* fuzzy */
+/* sv */ {IDMS_C64DTV_SETTINGS_SV, ""}, /* fuzzy */
+
/* en */ {IDMS_RS232_USERPORT_SETTINGS, "RS232 userport settings..."},
/* de */ {IDMS_RS232_USERPORT_SETTINGS_DE, "RS232 Userport Einstellungen..."},
/* fr */ {IDMS_RS232_USERPORT_SETTINGS_FR, "Param\xE8tres RS232 userport..."},
@@ -2861,6 +2879,69 @@
/* pl */ {IDS_256K_SETTINGS_PL, ""}, /* fuzzy */
/* sv */ {IDS_256K_SETTINGS_SV, "256K-inst\xE4llningar"},
+/* en */ {IDS_C64DTV_ROM_FILENAME_SELECT, "Select file for C64DTV ROM"},
+/* de */ {IDS_C64DTV_ROM_FILENAME_SELECT_DE, ""}, /* fuzzy */
+/* fr */ {IDS_C64DTV_ROM_FILENAME_SELECT_FR, ""}, /* fuzzy */
+/* hu */ {IDS_C64DTV_ROM_FILENAME_SELECT_HU, ""}, /* fuzzy */
+/* it */ {IDS_C64DTV_ROM_FILENAME_SELECT_IT, ""}, /* fuzzy */
+/* nl */ {IDS_C64DTV_ROM_FILENAME_SELECT_NL, "Selecteer bestand voor C64DTV ROM"},
+/* pl */ {IDS_C64DTV_ROM_FILENAME_SELECT_PL, ""}, /* fuzzy */
+/* sv */ {IDS_C64DTV_ROM_FILENAME_SELECT_SV, ""}, /* fuzzy */
+
+/* en */ {IDS_C64DTV_ROM_FILENAME, "C64DTV ROM file"},
+/* de */ {IDS_C64DTV_ROM_FILENAME_DE, ""}, /* fuzzy */
+/* fr */ {IDS_C64DTV_ROM_FILENAME_FR, ""}, /* fuzzy */
+/* hu */ {IDS_C64DTV_ROM_FILENAME_HU, ""}, /* fuzzy */
+/* it */ {IDS_C64DTV_ROM_FILENAME_IT, ""}, /* fuzzy */
+/* nl */ {IDS_C64DTV_ROM_FILENAME_NL, "C64DTV ROM bestand"},
+/* pl */ {IDS_C64DTV_ROM_FILENAME_PL, ""}, /* fuzzy */
+/* sv */ {IDS_C64DTV_ROM_FILENAME_SV, ""}, /* fuzzy */
+
+/* en */ {IDS_C64DTV_REVISION, "C64DTV revision"},
+/* de */ {IDS_C64DTV_REVISION_DE, ""}, /* fuzzy */
+/* fr */ {IDS_C64DTV_REVISION_FR, ""}, /* fuzzy */
+/* hu */ {IDS_C64DTV_REVISION_HU, ""}, /* fuzzy */
+/* it */ {IDS_C64DTV_REVISION_IT, ""}, /* fuzzy */
+/* nl */ {IDS_C64DTV_REVISION_NL, "C64DTV revisie"},
+/* pl */ {IDS_C64DTV_REVISION_PL, ""}, /* fuzzy */
+/* sv */ {IDS_C64DTV_REVISION_SV, ""}, /* fuzzy */
+
+/* en */ {IDS_C64DTV_WRITE_ENABLE, "Writes to C64DTV ROM"},
+/* de */ {IDS_C64DTV_WRITE_ENABLE_DE, ""}, /* fuzzy */
+/* fr */ {IDS_C64DTV_WRITE_ENABLE_FR, ""}, /* fuzzy */
+/* hu */ {IDS_C64DTV_WRITE_ENABLE_HU, ""}, /* fuzzy */
+/* it */ {IDS_C64DTV_WRITE_ENABLE_IT, ""}, /* fuzzy */
+/* nl */ {IDS_C64DTV_WRITE_ENABLE_NL, "Schrijven naar C64DTV ROM"},
+/* pl */ {IDS_C64DTV_WRITE_ENABLE_PL, ""}, /* fuzzy */
+/* sv */ {IDS_C64DTV_WRITE_ENABLE_SV, ""}, /* fuzzy */
+
+/* en */ {IDS_C64DTV_HUMMER_JOY_ENABLE, "Hummer Userport joystick"},
+/* de */ {IDS_C64DTV_HUMMER_JOY_ENABLE_DE, ""}, /* fuzzy */
+/* fr */ {IDS_C64DTV_HUMMER_JOY_ENABLE_FR, ""}, /* fuzzy */
+/* hu */ {IDS_C64DTV_HUMMER_JOY_ENABLE_HU, ""}, /* fuzzy */
+/* it */ {IDS_C64DTV_HUMMER_JOY_ENABLE_IT, ""}, /* fuzzy */
+/* nl */ {IDS_C64DTV_HUMMER_JOY_ENABLE_NL, "Hummer Userport joystick"},
+/* pl */ {IDS_C64DTV_HUMMER_JOY_ENABLE_PL, ""}, /* fuzzy */
+/* sv */ {IDS_C64DTV_HUMMER_JOY_ENABLE_SV, ""}, /* fuzzy */
+
+/* en */ {IDS_C64DTV_HUMMER_JOY_PORT, "Joystick port mapped to Hummer Userport"},
+/* de */ {IDS_C64DTV_HUMMER_JOY_PORT_DE, ""}, /* fuzzy */
+/* fr */ {IDS_C64DTV_HUMMER_JOY_PORT_FR, ""}, /* fuzzy */
+/* hu */ {IDS_C64DTV_HUMMER_JOY_PORT_HU, ""}, /* fuzzy */
+/* it */ {IDS_C64DTV_HUMMER_JOY_PORT_IT, ""}, /* fuzzy */
+/* nl */ {IDS_C64DTV_HUMMER_JOY_PORT_NL, "Joystick omgeleidt naar Hummer Userport"},
+/* pl */ {IDS_C64DTV_HUMMER_JOY_PORT_PL, ""}, /* fuzzy */
+/* sv */ {IDS_C64DTV_HUMMER_JOY_PORT_SV, ""}, /* fuzzy */
+
+/* en */ {IDS_C64DTV_SETTINGS, "C64DTV Settings"},
+/* de */ {IDS_C64DTV_SETTINGS_DE, ""}, /* fuzzy */
+/* fr */ {IDS_C64DTV_SETTINGS_FR, ""}, /* fuzzy */
+/* hu */ {IDS_C64DTV_SETTINGS_HU, ""}, /* fuzzy */
+/* it */ {IDS_C64DTV_SETTINGS_IT, ""}, /* fuzzy */
+/* nl */ {IDS_C64DTV_SETTINGS_NL, "C64DTV Instellingen"},
+/* pl */ {IDS_C64DTV_SETTINGS_PL, ""}, /* fuzzy */
+/* sv */ {IDS_C64DTV_SETTINGS_SV, ""}, /* fuzzy */
+
/* en */ {IDS_MODEL_LINE, "model line"},
/* de */ {IDS_MODEL_LINE_DE, "modell linie"},
/* fr */ {IDS_MODEL_LINE_FR, "ligne du modele"},
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/intl.txt
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/intl.txt 2008-07-21 20:44:51 UTC (rev 19065)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/intl.txt 2008-07-21 20:59:16 UTC (rev 19066)
@@ -262,6 +262,8 @@
IDMS_GRAB_MOUSE
+IDMS_PS2_MOUSE
+
IDMS_SETTINGS
IDMS_VIDEO_SETTINGS
@@ -336,6 +338,8 @@
IDMS_SIDCART_SETTINGS
+IDMS_C64DTV_SETTINGS
+
IDMS_RS232_USERPORT_SETTINGS
IDMS_SAVE_CURRENT_SETTINGS
@@ -610,6 +614,20 @@
IDS_256K_SETTINGS
+IDS_C64DTV_ROM_FILENAME_SELECT
+
+IDS_C64DTV_ROM_FILENAME
+
+IDS_C64DTV_REVISION
+
+IDS_C64DTV_WRITE_ENABLE
+
+IDS_C64DTV_HUMMER_JOY_ENABLE
+
+IDS_C64DTV_HUMMER_JOY_PORT
+
+IDS_C64DTV_SETTINGS
+
IDS_MODEL_LINE
IDS_RAM_SIZE
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/make-bindist.sh
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/make-bindist.sh 2008-07-21 20:44:51 UTC (rev 19065)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/make-bindist.sh 2008-07-21 20:59:16 UTC (rev 19066)
@@ -14,7 +14,7 @@
TOPSCRDIR=$6
EXEEXT=$7
-if [ ! -e src/x64$EXEEXT -o ! -e src/x128$EXEEXT -o ! -e src/xvic$EXEEXT -o ! -e src/xpet$EXEEXT -o ! -e src/xplus4$EXEEXT -o ! -e src/xcbm2$EXEEXT -o ! -e src/c1541$EXEEXT -o ! -e src/petcat$EXEEXT -o ! -e src/cartconv$EXEEXT ]
+if [ ! -e src/x64$EXEEXT -o ! -e src/x64dtv$EXEEXT -o ! -e src/x128$EXEEXT -o ! -e src/xvic$EXEEXT -o ! -e src/xpet$EXEEXT -o ! -e src/xplus4$EXEEXT -o ! -e src/xcbm2$EXEEXT -o ! -e src/c1541$EXEEXT -o ! -e src/petcat$EXEEXT -o ! -e src/cartconv$EXEEXT ]
then
echo Error: executable file\(s\) not found, do a \"make all\" first
exit 1
@@ -52,6 +52,7 @@
mkdir VICE-$AMIGAFLAVOR
if test x"$HOSTSYSTEM" != "xaros"; then
$STRIP src/x64$EXEEXT
+ $STRIP src/x64dtv$EXEEXT
$STRIP src/x128$EXEEXT
$STRIP src/xvic$EXEEXT
$STRIP src/xpet$EXEEXT
@@ -61,6 +62,7 @@
$STRIP src/petcat$EXEEXT
$STRIP src/cartconv$EXEEXT
$STRIP src/arch/amigaos/x64ns$EXEEXT
+ $STRIP src/arch/amigaos/x64dtvns$EXEEXT
$STRIP src/arch/amigaos/x128ns$EXEEXT
$STRIP src/arch/amigaos/xvicns$EXEEXT
$STRIP src/arch/amigaos/xpetns$EXEEXT
@@ -68,6 +70,7 @@
$STRIP src/arch/amigaos/xcbm2ns$EXEEXT
else
$STRIP --strip-unneeded --remove-section .comment src/x64$EXEEXT
+ $STRIP --strip-unneeded --remove-section .comment src/x64dtv$EXEEXT
$STRIP --strip-unneeded --remove-section .comment src/x128$EXEEXT
$STRIP --strip-unneeded --remove-section .comment src/xvic$EXEEXT
$STRIP --strip-unneeded --remove-section .comment src/xpet$EXEEXT
@@ -77,6 +80,7 @@
$STRIP --strip-unneeded --remove-section .comment src/petcat$EXEEXT
$STRIP --strip-unneeded --remove-section .comment src/cartconv$EXEEXT
$STRIP --strip-unneeded --remove-section .comment src/arch/amigaos/x64ns$EXEEXT
+ $STRIP --strip-unneeded --remove-section .comment src/arch/amigaos/x64dtvns$EXEEXT
$STRIP --strip-unneeded --remove-section .comment src/arch/amigaos/x128ns$EXEEXT
$STRIP --strip-unneeded --remove-section .comment src/arch/amigaos/xvicns$EXEEXT
$STRIP --strip-unneeded --remove-section .comment src/arch/amigaos/xpetns$EXEEXT
@@ -85,6 +89,7 @@
fi
if test x"$HOSTSYSTEM" = "xmorphos"; then
cp src/x64$EXEEXT VICE-$AMIGAFLAVOR/x64
+ cp src/x64dtv$EXEEXT VICE-$AMIGAFLAVOR/x64dtv
cp src/x128$EXEEXT VICE-$AMIGAFLAVOR/x128
cp src/xvic$EXEEXT VICE-$AMIGAFLAVOR/xvic
cp src/xpet$EXEEXT VICE-$AMIGAFLAVOR/xpet
@@ -94,6 +99,7 @@
cp src/petcat$EXEEXT VICE-$AMIGAFLAVOR/petcat
cp src/cartconv$EXEEXT VICE-$AMIGAFLAVOR/cartconv
cp src/arch/amigaos/x64ns$EXEEXT VICE-$AMIGAFLAVOR/x64\ \(no\ sound\)
+ cp src/arch/amigaos/x64dtvns$EXEEXT VICE-$AMIGAFLAVOR/x64dtv\ \(no\ sound\)
cp src/arch/amigaos/x128ns$EXEEXT VICE-$AMIGAFLAVOR/x128\ \(no\ sound\)
cp src/arch/amigaos/xvicns$EXEEXT VICE-$AMIGAFLAVOR/xvic\ \(no\ sound\)
cp src/arch/amigaos/xpetns$EXEEXT VICE-$AMIGAFLAVOR/xpet\ \(no\ sound\)
@@ -101,6 +107,7 @@
cp src/arch/amigaos/xcbm2ns$EXEEXT VICE-$AMIGAFLAVOR/xcbm2\ \(no\ sound\)
else
cp src/x64$EXEEXT VICE-$AMIGAFLAVOR/x64.exe
+ cp src/x64dtv$EXEEXT VICE-$AMIGAFLAVOR/x64dtv.exe
cp src/x128$EXEEXT VICE-$AMIGAFLAVOR/x128.exe
cp src/xvic$EXEEXT VICE-$AMIGAFLAVOR/xvic.exe
cp src/xpet$EXEEXT VICE-$AMIGAFLAVOR/xpet.exe
@@ -110,20 +117,21 @@
cp src/petcat$EXEEXT VICE-$AMIGAFLAVOR/petcat.exe
cp src/cartconv$EXEEXT VICE-$AMIGAFLAVOR/cartconv.exe
cp src/arch/amigaos/x64ns$EXEEXT VICE-$AMIGAFLAVOR/x64\ \(no\ sound\).exe
+ cp src/arch/amigaos/x64dtvns$EXEEXT VICE-$AMIGAFLAVOR/x64dtv\ \(no\ sound\).exe
cp src/arch/amigaos/x128ns$EXEEXT VICE-$AMIGAFLAVOR/x128\ \(no\ sound\).exe
cp src/arch/amigaos/xvicns$EXEEXT VICE-$AMIGAFLAVOR/xvic\ \(no\ sound\).exe
cp src/arch/amigaos/xpetns$EXEEXT VICE-$AMIGAFLAVOR/xpet\ \(no\ sound\).exe
cp src/arch/amigaos/xplus4ns$EXEEXT VICE-$AMIGAFLAVOR/xplus4\ \(no\ sound\).exe
cp src/arch/amigaos/xcbm2ns$EXEEXT VICE-$AMIGAFLAVOR/xcbm2\ \(no\ sound\).exe
fi
-cp -a $TOPSCRDIR/data/C128 $TOPSCRDIR/data/C64 $TOPSCRDIR/data/CBM-II $TOPSCRDIR/data/DRIVES VICE-$AMIGAFLAVOR
+cp -a $TOPSCRDIR/data/C128 $TOPSCRDIR/data/C64 $TOPSCRDIR/data/C64DTV $TOPSCRDIR/data/CBM-II $TOPSCRDIR/data/DRIVES VICE-$AMIGAFLAVOR
cp -a $TOPSCRDIR/data/PET $TOPSCRDIR/data/PLUS4 $TOPSCRDIR/data/PRINTER $TOPSCRDIR/data/VIC20 VICE-$AMIGAFLAVOR
cp -a $TOPSCRDIR/data/fonts VICE-$AMIGAFLAVOR
cp -a $TOPSCRDIR/doc/html VICE-$AMIGAFLAVOR
cp $TOPSCRDIR/FEEDBACK $TOPSCRDIR/README $TOPSCRDIR/doc/cartconv.txt VICE-$AMIGAFLAVOR
cp $TOPSCRDIR/src/arch/amigaos/README.AMIGA VICE-$AMIGAFLAVOR
if test x"$HOSTSYSTEM" = "xwarpos"; then
- for i in cartconv.exe c1541.exe petcat.exe x64.exe x128.exe xcbm2.exe \
+ for i in cartconv.exe c1541.exe petcat.exe x64.exe x64dtv.exe x128.exe xcbm2.exe \
xpet.exe xplus4.exe xvic.exe
do
elf2exe VICE-$AMIGAFLAVOR/$i VICE-$AMIGAFLAVOR/$i.new
@@ -134,6 +142,8 @@
cp $TOPSCRDIR/src/arch/amigaos/info-files/morphos/VICE.info VICE-$AMIGAFLAVOR.info
cp $TOPSCRDIR/src/arch/amigaos/info-files/morphos/x*.info VICE-$AMIGAFLAVOR
cp VICE-$AMIGAFLAVOR/x64.info VICE-$AMIGAFLAVOR/x64\ \(no\ sound\).info
+ cp VICE-$AMIGAFLAVOR/x64.info VICE-$AMIGAFLAVOR/x64dtv.info
+ cp VICE-$AMIGAFLAVOR/x64.info VICE-$AMIGAFLAVOR/x64dtv\ \(no\ sound\).info
cp VICE-$AMIGAFLAVOR/x128.info VICE-$AMIGAFLAVOR/x128\ \(no\ sound\).info
cp VICE-$AMIGAFLAVOR/xvic.info VICE-$AMIGAFLAVOR/xvic\ \(no\ sound\).info
cp VICE-$AMIGAFLAVOR/xpet.info VICE-$AMIGAFLAVOR/xpet\ \(no\ sound\).info
@@ -143,6 +153,8 @@
cp $TOPSCRDIR/src/arch/amigaos/info-files/VICE.info VICE-$AMIGAFLAVOR.info
cp $TOPSCRDIR/src/arch/amigaos/info-files/*.exe.info VICE-$AMIGAFLAVOR
cp VICE-$AMIGAFLAVOR/x64.exe.info VICE-$AMIGAFLAVOR/x64\ \(no\ sound\).exe.info
+ cp VICE-$AMIGAFLAVOR/x64.exe.info VICE-$AMIGAFLAVOR/x64dtv.exe.info
+ cp VICE-$AMIGAFLAVOR/x64.exe.info VICE-$AMIGAFLAVOR/x64dtv\ \(no\ sound\).exe.info
cp VICE-$AMIGAFLAVOR/x128.exe.info VICE-$AMIGAFLAVOR/x128\ \(no\ sound\).exe.info
cp VICE-$AMIGAFLAVOR/xvic.exe.info VICE-$AMIGAFLAVOR/xvic\ \(no\ sound\).exe.info
cp VICE-$AMIGAFLAVOR/xpet.exe.info VICE-$AMIGAFLAVOR/xpet\ \(no\ sound\).exe.info
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/mui/uic64dtv.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/mui/uic64dtv.c (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/mui/uic64dtv.c 2008-07-21 20:59:16 UTC (rev 19066)
@@ -0,0 +1,156 @@
+/*
+ * uic64dtv.c
+ *
+ * Written by
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program 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.
+ *
+ * This program 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#include "vice.h"
+#ifdef AMIGA_M68K
+#define _INLINE_MUIMASTER_H
+#endif
+#include "mui.h"
+
+#include "uic64dtv.h"
+#include "intl.h"
+#include "translate.h"
+
+static video_canvas_t *c64dtv_canvas;
+
+static int ui_c64dtv_enable_translate[] = {
+ IDMS_DISABLED,
+ IDS_ENABLED,
+ 0
+};
+
+static char *ui_c64dtv_enable[countof(ui_c64dtv_enable_translate)];
+
+
+static const int ui_c64dtv_enable_values[] = {
+ 0,
+ 1,
+ -1
+};
+
+static char *ui_c64dtv_revision[] = {
+ "DTV2",
+ "DTV3",
+ NULL
+};
+
+static const int ui_c64dtv_revision_values[] = {
+ 2,
+ 3,
+ -1
+};
+
+static char *ui_c64dtv_hummer_joy_port[] = {
+ "Joy1",
+ "Joy2",
+ NULL
+};
+
+static const int ui_c64dtv_hummer_joy_port_values[] = {
+ 1,
+ 2,
+ -1
+};
+
+static ui_to_from_t ui_to_from[] = {
+ { NULL, MUI_TYPE_FILENAME, "c64dtvromfilename", NULL, NULL },
+ { NULL, MUI_TYPE_CYCLE, "DtvRevision", ui_c64dtv_revision, ui_c64dtv_revision_values },
+ { NULL, MUI_TYPE_CYCLE, "c64dtvromrw", ui_c64dtv_enable, ui_c64dtv_enable_values },
+ { NULL, MUI_TYPE_CYCLE, "HummerUserportJoy", ui_c64dtv_enable, ui_c64dtv_enable_values },
+ { NULL, MUI_TYPE_CYCLE, "HummerUserportJoyPort", ui_c64dtv_hummer_joy_port, ui_c64dtv_hummer_joy_port_values },
+ UI_END /* mandatory */
+};
+
+static ULONG Browse( struct Hook *hook, Object *obj, APTR arg )
+{
+ char *fname=NULL;
+
+ fname=BrowseFile(translate_text(IDS_C64DTV_ROM_FILENAME_SELECT), "#?", c64dtv_canvas);
+
+ if (fname!=NULL)
+ set(ui_to_from[0].object, MUIA_String_Contents, fname);
+
+ return 0;
+}
+
+static APTR build_gui(void)
+{
+ APTR app, ui, ok, browse_button, cancel;
+
+#ifdef AMIGA_MORPHOS
+ static const struct Hook BrowseFileHook = { { NULL,NULL },(VOID *)HookEntry,(VOID *)Browse, NULL};
+#else
+ static const struct Hook BrowseFileHook = { { NULL,NULL },(VOID *)Browse,NULL,NULL };
+#endif
+
+ app = mui_get_app();
+
+ ui = GroupObject,
+ FILENAME(ui_to_from[0].object, translate_text(IDS_C64DTV_ROM_FILENAME), browse_button)
+ CYCLE(ui_to_from[1].object, translate_text(IDS_C64DTV_REVISION), ui_c64dtv_revision)
+ CYCLE(ui_to_from[2].object, translate_text(IDS_C64DTV_WRITE_ENABLE), ui_c64dtv_enable)
+ CYCLE(ui_to_from[3].object, translate_text(IDS_C64DTV_HUMMER_JOY_ENABLE), ui_c64dtv_enable)
+ CYCLE(ui_to_from[4].object, translate_text(IDS_C64DTV_HUMMER_JOY_PORT), ui_c64dtv_hummer_joy_port)
+
+ OK_CANCEL_BUTTON
+ End;
+
+ if (ui != NULL) {
+ DoMethod(cancel,
+ MUIM_Notify, MUIA_Pressed, FALSE,
+ app, 2, MUIM_Application_ReturnID, MUIV_Application_ReturnID_Quit);
+
+ DoMethod(ok, MUIM_Notify, MUIA_Pressed, FALSE,
+ app, 2, MUIM_Application_ReturnID, BTN_OK);
+
+ DoMethod(browse_button, MUIM_Notify, MUIA_Pressed, FALSE,
+ app, 2, MUIM_CallHook, &BrowseFileHook);
+ }
+
+ return ui;
+}
+
+void ui_c64dtv_settings_dialog(video_canvas_t *canvas)
+{
+ APTR window;
+
+ c64dtv_canvas=canvas;
+ intl_convert_mui_table(ui_c64dtv_enable_translate, ui_c64dtv_enable);
+
+ window = mui_make_simple_window(build_gui(), translate_text(IDS_C64DTV_SETTINGS));
+
+ if (window != NULL) {
+ mui_add_window(window);
+ ui_get_to(ui_to_from);
+ set(window, MUIA_Window_Open, TRUE);
+ if (mui_run() == BTN_OK) {
+ ui_get_from(ui_to_from);
+ }
+ set(window, MUIA_Window_Open, FALSE);
+ mui_rem_window(window);
+ MUI_DisposeObject(window);
+ }
+}
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/mui/uic64dtv.c
___________________________________________________________________
Added: svn:executable
+ *
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/mui/uic64dtv.h
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/mui/uic64dtv.h (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/mui/uic64dtv.h 2008-07-21 20:59:16 UTC (rev 19066)
@@ -0,0 +1,32 @@
+/*
+ * uic64dtv.h
+ *
+ * Written by
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program 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.
+ *
+ * This program 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#ifndef _UIC64DTV_H
+#define _UIC64DTV_H
+
+extern void ui_c64dtv_settings_dialog(video_canvas_t *canvas);
+
+#endif
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/mui/uic64dtv.h
___________________________________________________________________
Added: svn:executable
+ *
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/uires.h
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/uires.h 2008-07-21 20:44:51 UTC (rev 19065)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/uires.h 2008-07-21 20:59:16 UTC (rev 19066)
@@ -92,6 +92,7 @@
IDM_SYNC_FACTOR_NTSCOLD,
IDM_TOGGLE_EMUID,
IDM_MOUSE,
+ IDM_PS2_MOUSE,
IDM_VIDEO_SETTINGS, IDM_DEVICEMANAGER, IDM_DRIVE_SETTINGS,
IDM_DATASETTE_SETTINGS, IDM_VICII_SETTINGS, IDM_JOY_SETTINGS,
@@ -105,6 +106,7 @@
IDM_PLUS4_SETTINGS, IDM_TFE_SETTINGS, IDM_ACIA_SETTINGS,
IDM_RS232USER_SETTINGS, IDM_NETWORK_SETTINGS, IDM_PETREU_SETTINGS,
IDM_MMC64_SETTINGS, IDM_SIDCART_SETTINGS, IDM_DIGIMAX_SETTINGS,
+ IDM_C64DTV_SETTINGS,
IDM_SETTINGS_SAVE, IDM_SETTINGS_LOAD, IDM_SETTINGS_DEFAULT,
IDM_TOGGLE_SAVE_SETTINGS_ON_EXIT, IDM_TOGGLE_CONFIRM_ON_EXIT,
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/x64dtvns.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/x64dtvns.c (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/x64dtvns.c 2008-07-21 20:59:16 UTC (rev 19066)
@@ -0,0 +1,33 @@
+/*
+ * x64dtvns.c - No Sound x64dtv launcher.
+ *
+ * Written by
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program 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.
+ *
+ * This program 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int main(void)
+{
+ return system("x64dtv.exe -sounddev dummy");
+}
Property changes on: branches/viceplus/v2.0-x64dtv/vice/src/arch/amigaos/x64dtvns.c
___________________________________________________________________
Added: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|