vice-emu-commit Mailing List for VICE (Page 1059)

Revision: 19045
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19045&view=rev
Author:   strik
Date:     2008-07-18 19:14:16 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
provide a default value for ppaddress in tfe_store()

Modified Paths:
--------------
    trunk/vice/src/ChangeLog
    trunk/vice/src/c64/tfe.c

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-07-18 18:36:44 UTC (rev 19044)
+++ trunk/vice/src/ChangeLog	2008-07-18 19:14:16 UTC (rev 19045)
@@ -1,3 +1,8 @@
+2008-07-18  Spiro Trikaliotis  <spi...@gm...>
+
+	* c64/tfe.c: provide a default value for ppaddress in
+	tfe_store()
+
 2008-07-18  Christian Vogelgsang  <ch...@vo...>
 
 	* arch/unix/macosx/cocoa/video.m: fixed canvas registration

Modified: trunk/vice/src/c64/tfe.c
===================================================================
--- trunk/vice/src/c64/tfe.c	2008-07-18 18:36:44 UTC (rev 19044)
+++ trunk/vice/src/c64/tfe.c	2008-07-18 19:14:16 UTC (rev 19045)
@@ -1738,8 +1738,10 @@
 #endif
     } else {
         /* write a register */
-        WORD ppaddress;
 
+        /*! \TODO: Find a reasonable default */
+        WORD ppaddress = TFE_PP_ADDR_PRODUCTID;
+
         /* now determine address of write in packet page */
         switch(reg_base) {
         case TFE_ADDR_PP_DATA:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19044
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19044&view=rev
Author:   strik
Date:     2008-07-18 18:36:44 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
2008-07-18  Christian Vogelgsang  <ch...@vo...>

	* build/macosx/build-vice-release.sh: use provided autogen.sh

	* doc/ReadmeMacOSX.txt: updated mac docs

	* doc/html/macosx.html: Prepared for release of 2.0

	* src/arch/unix/macosx/cocoa/video.m: fixed canvas registration

	* src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.m: fixed
	compile without ffmpeg

Modified Paths:
--------------
    trunk/vice/ChangeLog
    trunk/vice/build/macosx/build-vice-release.sh
    trunk/vice/doc/ReadmeMacOSX.txt
    trunk/vice/doc/html/macosx.html
    trunk/vice/src/ChangeLog
    trunk/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.m
    trunk/vice/src/arch/unix/macosx/cocoa/video.m

Modified: trunk/vice/ChangeLog
===================================================================
--- trunk/vice/ChangeLog	2008-07-18 17:22:17 UTC (rev 19043)
+++ trunk/vice/ChangeLog	2008-07-18 18:36:44 UTC (rev 19044)
@@ -1,3 +1,11 @@
+2008-07-18  Christian Vogelgsang  <ch...@vo...>
+
+	* build/macosx/build-vice-release.sh: use provided autogen.sh
+
+	* doc/ReadmeMacOSX.txt: updated mac docs
+
+	* doc/html/macosx.html: Prepared for release of 2.0
+
 2008-07-17  Spiro Trikaliotis  <spi...@gm...>
 
 	* doc/vice.texi, doc/html/plain/NEWS, doc/html/index.html,

Modified: trunk/vice/build/macosx/build-vice-release.sh
===================================================================
--- trunk/vice/build/macosx/build-vice-release.sh	2008-07-18 17:22:17 UTC (rev 19043)
+++ trunk/vice/build/macosx/build-vice-release.sh	2008-07-18 18:36:44 UTC (rev 19044)
@@ -96,13 +96,8 @@
 
 # configure snapshot
 echo "configuring new source tree"
-(cd "$SRC_DIR/src/resid" && aclocal && automake && autoconf) >/dev/null 2>&1 
+(cd "$SRC_DIR" && ./autogen.sh)
 if [ $? != 0 ]; then
-  echo "ERROR: configuring resid..."
-  exit 1
-fi
-(cd "$SRC_DIR" && aclocal && autoheader && automake --add-missing && autoconf) >/dev/null 2>&1 
-if [ $? != 0 ]; then
   echo "ERROR: configuring VICE..."
   exit 1
 fi

Modified: trunk/vice/doc/ReadmeMacOSX.txt
===================================================================
--- trunk/vice/doc/ReadmeMacOSX.txt	2008-07-18 17:22:17 UTC (rev 19043)
+++ trunk/vice/doc/ReadmeMacOSX.txt	2008-07-18 18:36:44 UTC (rev 19044)
@@ -1,9 +1,9 @@
-MacOS X Port of VICE
+Mac OS X Port of VICE
 ====================
 
 This document contains information relevant for the Mac OS X Port of VICE.
 
-This official MacOS X Port is maintained by 
+This official Mac OS X Port is maintained by 
   Christian Vogelgsang <ch...@vo...>
 
 
@@ -11,35 +11,48 @@
   --------
 
   1. Installation
-  2. Usage
-  3. Building VICE
-  4. Feedback
+  2. Usage of Gtk+/X11 Port
+  3. Usage of Cocoa Port
+  4. Joystick Support
+  5. Building VICE
+  6. Feedback
 
 
 1. Installation
 ---------------
 
-1.1 Install X11
 
-Make sure to have X11.app installed on your Mac. It is provided on your Mac
+1.1 Choose Port
+
+The VICE Emulators for Macs are distributed in three versions that use
+different UI front ends: native Cocoa, X11/Xaw, and, Gtk+. The first one
+directly uses the well known Mac user interface. The other ones are based on
+the X11 Window System that is available additionally for Mac OS X.
+
+X11/Xaw is based on the original X11 interface of VICE and is very light but
+with limited UI interface. The second one is based on the Gtk+ widget library
+and has a feature rich UI with pull-down menus. Xaw is a slim port that needs
+no non-system extra libraries, Gtk+ requires a large set of external libs and
+thus is quite large.
+
+The ports are named with *-cocoa-*, *-x11-*, or *-gtk-* in the distribution
+archive name.
+
+The X11/Xaw and Gtk+ are complete ports, i.e. all features available on other
+systems are available and all emulators are included. The Cocoa port is still
+under construction and thus considered "experimental". It does not include all
+features available and some emulators are not complete.
+
+
+1.2 Install X11 (Only for X11/Xaw and Gtk+ Port)
+
+Make sure you have X11.app installed on your Mac. It is provided on your Mac
 OSX install CD/DVD (at least on Mac OS X 10.4 or later) and often not
 installed by default. Click on the corresponding "X11.pkg" to install it. On
 newer systems there is an "Optional Installs.pkg" installer that allows to
 install X11 in the "Custom Installation" section.
 
-1.2 Choose Version
 
-The VICE Emulators for Macs are distributed in two versions that use different
-UI front ends: X11 or Gtk+. The first one is based on the original X11
-interface of VICE and is very light. The second one is based on the Gtk+
-widget library and has a feature rich UI with pull-down menus.
-
-X11 is a slim port that needs no non-system extra libraries, Gtk+ requires a
-large set of external libs and thus is quite large.
-
-The two ports are named with *-x11-* or *-gtk-* in the distribution archive
-name.
-
 1.3 Install Application
 
 The Mac OS X port is distributed as a disk image *.dmg. Just click on the
@@ -47,8 +60,11 @@
 disk image to your hard disk. Just create a new VICE directory in your
 applications folder (/Applications) and copy all files there.
 
-1.4 Create Bundles for each Emulator
+If you like, you can move the Application binaries anywhere you want.
 
+
+1.4 Create Bundles for each Emulator (Optional; Only for X11/Xaw and Gtk+ Port)
+
 The VICE distribution contains a single application bundle called VICE. If you
 run this one by double clicking on it then it will ask which emulator to run.
 
@@ -61,6 +77,7 @@
 The separate emulator application bundles are not distributed in the release
 dmg to save download time and server space.
 
+
 1.5 Setup Command Line Tools
 
 You can use the emulators and some additional tools (e.g. c1541, cardconv,
@@ -73,8 +90,10 @@
 The command line emulators are launched with a helper script that calls the
 binary embedded in the VICE.app application bundle. It is important to keep
 the VICE.app bundle in the directory directly next to the "tools" directory
-otherwise the command line emulators will not run.
+otherwise the command line emulators will not run. Similarly, the Cocoa port
+needs the emulator App bundle in the same directory.
 
+
 1.6 Network Setup
 
 This port of VICE supports the ethernet emulation available in some emulators
@@ -98,10 +117,15 @@
 libpcap-source distribution. Download from http://www.tcpdump.org and have a
 look at libpcap/README.macosx.
 
+Unfortunately, the WLAN adapter (usually device en1) on portable Macs does not
+support libpcap packet capturing (as of 10.4 and 10.5). So TFE emulation on a
+wireless network adapter may not work. Use the ethernet port instead.
 
-2. Usage
---------
 
+
+2. Usage of Gtk+ and X11/Xaw Ports
+----------------------------------
+
 2.1 Run VICE Bundle
 
 Simply run the emulator suite by clicking on the VICE.app icon. A chooser
@@ -109,15 +133,19 @@
 to launch an emulator directly then see section 1.4 for creating separate
 bundles for each emulator.
 
-The VICE Bundle supports a simple style of drag and drop: You can launch the
+On start up the bundle will first open a terminal window (xterm) for the VICE
+log messages and then the screen windows for the virtual displays.
+
+The VICE bundles support a simple style of drag and drop: You can launch the
 emulator by dragging a disk image (*.d64 *.d71 *.d81) or a program file (*.prg
 *.p00) on the bundle icon. This will smart-attach the given binary and launch
 the emulator. If the emulator is already running then drag and drop does not
 work.
 
-On start up the bundle will first open a terminal window (xterm) for the VICE
-log messages and then the screen windows for the virtual displays.
+Also, an emulator bundle will register the typical file types (see above) and
+then you can simply click on a disk image directly to launch it in VICE.
 
+
 2.2 Run from Command Line
 
 First add the "tools" directory to your PATH (see section 1.5) in your
@@ -125,10 +153,11 @@
 script in "tools" (e.g. x64, x128...). Any arguments passed to the launcher
 are directly forwarded to the emulator binary.
 
-On start up the launcher ensures that the X11 environment is available and
-redirects all console output directly to the console. An additional xterm
-window for log messages is not opened.
+For the Gtk+ and X11/Xaw ports on start up the launcher ensures that the X11
+environment is available and redirects all console output directly to the
+console. An additional xterm window for log messages is not opened.
 
+
 2.3 Use the X11 UI
 
 The X11 UI is very light and only presents the virtual display in a window
@@ -151,6 +180,7 @@
 Have a look at the official VICE manuals for an in-depth description of the
 available commands and options.
 
+
 2.4 Use the Gtk+ UI
 
 The Gtk+ UI is much more user-friendly. An emulator window with a pull-down
@@ -164,8 +194,9 @@
 Have a look at the official VICE manuals for an in-depth description of the
 available commands and options.
 
-2.5 Keyboard Mapping
 
+2.5 Keyboard Mapping in Gtk+/X11
+
 The keyboard mapping on X11 (and on your Mac) is done as follows:
  
  1. Map raw key code of your keyboard to X11 key code with Xmodmap
@@ -183,7 +214,7 @@
 choosing a file or by selecting a predefined one. Predefined symbolic and
 positional mappings are available.
 
-The symbolic mapping assigns the pressed Mac key to the same labeled key on
+The 'symbolic mapping' assigns the pressed Mac key to the same labeled key on
 the virtual cbm keyboard. So pressing F1 on the Mac presses F1 on the emulated
 machine. It also does automatic shifting/unshifting, e.g. pressing F2 on the
 Mac results in a virtual shift press and a virtual key F1 press (i.e. F2 is
@@ -205,12 +236,12 @@
    Left Arrow                Underscore (_)               
    Up Arrow                  Tilde (~) Backtick (`) Grave (^)
 
-The positional mappings try to map the physical location of a key on the Mac
+The 'positional mappings' try to map the physical location of a key on the Mac
 keyboard to a virtual key at a similar position. E.g. your top and leftmost
 key will be the top and leftmost key on your virtual machine. Unfortunately,
 this mapping does not work always as expected: It relies heavily on the
 national layout of your keymap. Furthermore, the physical layout of Mac and
-VICE machine do not match exactly so positional mapping will always be an
+VICE machine do not match exactly, so positional mapping will always be an
 approximation. This can be even more complicate if you use different key
 mappings on your Mac.
 
@@ -220,8 +251,56 @@
 keys to control software features". The hardware controls are then accessed by
 pressing F1-F12 + Fn key.
 
-2.6 Joystick Support
 
+
+3. Usage of Cocoa Port
+----------------------
+
+Note: The Cocoa port is still "experimental", i.e. it is not full featured and
+some things may be missing. This holds for the documentation as well ;)
+
+3.1 Features
+
+ * native Mac OS X user interface with modeless dialogs
+ * any-size/fullscreen OpenGL accelerated rendering
+ * multi-threaded emulation core
+
+
+3.2 Current State
+
+ * x64 90% complete, runs with UI and most menus and dialogs.
+ 
+ * All other emus: binaries are available, no menus and dialogs.
+   Use CMD+Q to quit such an emulator and drag&drop to attach disk images.
+   Some keyboard mappings already work, others not.
+
+
+3.3 Known Issues
+
+ * The Resource Inspector lacks correct input cells. All values have to
+   be entered as strings.
+ * Some Menu entries are not greyed out but still do nothing.
+
+
+3.4 Key Mapping
+
+The key mapping show the Mac key on a US extended mapping and the right one is
+the emulated Commodore key. Special keys are marked with <Symbol>.
+
+  § (Paragraph)                 <LEFT ARROW>
+  <Tab>                         <CONTROL>
+  ` (Backtick), Left Alt/Ctrl   <CBM>
+  <ESC>                         <RUN/STOP>
+  <Backspace>                   <DEL>
+  <F9>, <PgDown>                <POUND>
+  <F10>, <PgUp>                 <UP ARROW>
+  <F11>, <Home>                 <CLR/HOME>
+  <F12>                         <RESTORE>
+
+
+4. Joystick Support
+-------------------
+
 The Mac ports has support for USB joysticks. It requires a generic USB HID
 joystick device which is supported by most joystick models. Every button of
 the joystick is mapped to the single virtual fire button in the emulator. The
@@ -242,14 +321,15 @@
 should work with other models as well.
 
 
-3. Building VICE
+5. Building VICE
 ----------------
 
 This section is only relevant if you want to compile an own distribution of
 VICE from the source code.
 
-3.1 XCode
 
+5.1 XCode
+
 If you wan to compile VICE yourself then you first need to install Apple's
 XCode Development kit. It is available on your Mac OS X Installation DVD or
 can be downloaded for free (after registration) from the Apple Developer
@@ -260,10 +340,11 @@
 XCode itself is not required but the command line tools (compiler, linker...)
 and other development files (SDKs).
 
-3.2 Required Tools
 
-The following tools are required or optional for a successfull VICE build:
+5.2 Required Tools
 
+The following tools are required or optional for a successful VICE build:
+
  - Platypus  (Optional)
    
      http://www.sveinbjorn.org/platypus
@@ -276,8 +357,9 @@
    script does not support drag and drop and quits immediately afert start up
    (i.e. the VICE application icon disappears after the launch)!
 
-3.3 Required Library Sources
 
+5.3 Required Library Sources
+
 VICE for Macs relies on a number of external libraries. You have to get their
 source code as they are missing on a default Mac system. Some libs are
 optional, i.e. if they are available then some extra features of VICE are
@@ -317,8 +399,9 @@
     lame-3.97.tar.gz            http://lame.sourceforge.net/
     svn tree at                 svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-svn
 
-3.4 Building Required Libraries
 
+5.4 Building Required Libraries
+
 First, build all external libraries. The VICE source distribution contains
 build scripts to automatically perform this step.
 
@@ -342,8 +425,9 @@
 If all went well then the libraries are compiled and installed in the "extlib"
 directory. The libraries are now ready for the VICE build.
 
-3.5 Building VICE
 
+5.5 Building VICE
+
 The build process of VICE contains the following steps: Call "configure" in
 the source tree to determine the required "make" system setup and find
 available libs. Then compile the source tree to get binaries of all emulators
@@ -399,7 +483,7 @@
 disk image found in the "TEMP/x11/ub/" directory.
 
 
-4. Feedback
+6. Feedback
 -----------
 
 If you discover problems not listed above or just want to tell us your

Modified: trunk/vice/doc/html/macosx.html
===================================================================
--- trunk/vice/doc/html/macosx.html	2008-07-18 17:22:17 UTC (rev 19043)
+++ trunk/vice/doc/html/macosx.html	2008-07-18 18:36:44 UTC (rev 19044)
@@ -43,7 +43,7 @@
 On Intel Macs: Requires at least Mac OS X <b>10.4</b>
 </li>
 <li>
-<b>X11.app</b> Version 1.0 from Extra Installs on Mac OS X DVD
+<b>X11.app</b> Version 1.0 from Extra Installs on Mac OS X DVD for X11 and Gtk+ port.
 </li>
 </ul>
     
@@ -56,7 +56,7 @@
 <ul>
 <li>
 Tarball:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-1.22.tar.gz">vice-1.22.tar.gz</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0.tar.gz">vice-2.0.tar.gz</a>
 </li>
 </ul>
 
@@ -70,12 +70,12 @@
 
 <li>
 Universal Binary for <b>X11 Athena Widgets UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-x11-ub-1.22.dmg">vice-macosx-x11-ub-1.22.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-x11-ub-2.0.dmg">vice-macosx-x11-ub-2.0.dmg</a>
 </li>
 
 <li>
 Universal Binary for <b>X11 Gtk+ UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-gtk-ub-1.22.dmg">vice-macosx-gtk-ub-1.22.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-gtk-ub-2.0.dmg">vice-macosx-gtk-ub-2.0.dmg</a>
 </li>
 
 </ul>
@@ -87,7 +87,7 @@
 <ul>
 <li>
 Universal Binary for <b>native Cocoa UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-cocoa-ub-1.22.dmg">vice-macosx-cocoa-ub-1.22.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-cocoa-ub-2.0.dmg">vice-macosx-cocoa-ub-2.0.dmg</a>
 <p><b>Note:</b> The Cocoa Port is not complete yet. The archive contains a runnable x64 with a subset of the upcoming features.
 This binary is a technical preview of the new port and no full featured release of VICE. Please choose the X11/Athena or X11/Gtk+ port
 for a complete Mac release.</p>
@@ -102,14 +102,20 @@
 
 <li>
 Universal Binary for <b>X11 Athena Widgets UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-x11-ub-1.21.dmg">vice-macosx-x11-ub-1.21.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-x11-ub-1.22.dmg">vice-macosx-x11-ub-1.22.dmg</a>
 </li>
 
 <li>
 Universal Binary for <b>X11 Gtk+ UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-gtk-ub-1.21.dmg">vice-macosx-gtk-ub-1.21.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-gtk-ub-1.22.dmg">vice-macosx-gtk-ub-1.22.dmg</a>
 </li>
 
+<li>
+Universal Binary for <b>native Cocoa UI</b>:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-cocoa-ub-1.22.dmg">vice-macosx-gtk-ub-1.22.dmg</a>
+
+</li>
+
 </ul>
 
 The files are taken from

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-07-18 17:22:17 UTC (rev 19043)
+++ trunk/vice/src/ChangeLog	2008-07-18 18:36:44 UTC (rev 19044)
@@ -1,3 +1,10 @@
+2008-07-18  Christian Vogelgsang  <ch...@vo...>
+
+	* arch/unix/macosx/cocoa/video.m: fixed canvas registration
+
+	* arch/unix/macosx/cocoa/menu/vicemachinecontroller.m: fixed
+	compile without ffmpeg
+
 2008-07-18  Marco van den Heuvel  <bla...@ya...>
 
 	* translate.c, arch/amigaos/intl.c, arch/win32/rescbm2.rc,

Modified: trunk/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.m
===================================================================
--- trunk/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.m	2008-07-18 17:22:17 UTC (rev 19043)
+++ trunk/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.m	2008-07-18 18:36:44 UTC (rev 19044)
@@ -328,6 +328,7 @@
     // currently only FFMPEG here
     int i;
     NSMutableArray *a = [[NSMutableArray alloc] init];
+#ifdef HAVE_FFMPEG 
     for (i=0;ffmpegdrv_formatlist[i].name!=NULL;i++) {
         NSString *fname = [NSString stringWithCString:ffmpegdrv_formatlist[i].name encoding:NSUTF8StringEncoding];
         
@@ -356,6 +357,7 @@
 
         [a addObject:[NSArray arrayWithObjects:fname,video,audio,nil]];
     }
+#endif
     return [a autorelease];
 }
 

Modified: trunk/vice/src/arch/unix/macosx/cocoa/video.m
===================================================================
--- trunk/vice/src/arch/unix/macosx/cocoa/video.m	2008-07-18 17:22:17 UTC (rev 19043)
+++ trunk/vice/src/arch/unix/macosx/cocoa/video.m	2008-07-18 18:36:44 UTC (rev 19044)
@@ -85,6 +85,9 @@
     // init rendering
     video_canvas_set_palette(canvas,canvas->palette);
 
+    // register canvas in machine controller (to allow access via id)
+    canvas->canvasId = [theVICEMachine registerCanvas:canvas];
+
     // re-post all required notifications for new window
     [[theVICEMachine machineNotifier] notifyNewWindow];
 
@@ -118,9 +121,6 @@
     canvas->width = width;
     canvas->height = height;
 
-    // register canvas in machine controller (to allow access via id)
-    canvas->canvasId = [theVICEMachine registerCanvas:canvas];
-
     // encapsulate canvas ptr
     video_canvas_t *canvasPtr = canvas;
     NSData *data = [NSData dataWithBytes:&canvasPtr length:sizeof(video_canvas_t *)];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19043
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19043&view=rev
Author:   cnvogelg
Date:     2008-07-18 17:22:17 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
* src/arch/unix/macosx/cocoa/video.m: fixed canvas registration
* src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.m: fixed compile without ffmpeg
* build/macosx/build-vice-release.sh: use provided autogen.sh
* doc/ReadmeMacOSX.txt: updated mac docs

Added Paths:
-----------
    tags/chris/v1.22.27-final-pre2.0/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19042
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19042&view=rev
Author:   strik
Date:     2008-07-18 17:22:02 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
Fixed a typo ("StarDIS" -> "StarDOS").

Modified Paths:
--------------
    trunk/vice/po/ChangeLog
    trunk/vice/po/de.po

Modified: trunk/vice/po/ChangeLog
===================================================================
--- trunk/vice/po/ChangeLog	2008-07-18 16:59:10 UTC (rev 19041)
+++ trunk/vice/po/ChangeLog	2008-07-18 17:22:02 UTC (rev 19042)
@@ -1,3 +1,7 @@
+2008-07-18  Spiro Trikaliotis  <spi...@gm...>
+
+	* de.po: Fixed a typo ("StarDIS" -> "StarDOS").
+
 2008-07-18  pottendo  <pot...@ao...>
 
 	* de.po: Updated.

Modified: trunk/vice/po/de.po
===================================================================
--- trunk/vice/po/de.po	2008-07-18 16:59:10 UTC (rev 19041)
+++ trunk/vice/po/de.po	2008-07-18 17:22:02 UTC (rev 19042)
@@ -7764,7 +7764,7 @@
 
 #: src/arch/win32/resc128.rc.po.c:69
 msgid "&StarDOS image..."
-msgstr "&StarDIS Image..."
+msgstr "&StarDOS Image..."
 
 #: src/arch/win32/resc128.rc.po.c:70 src/arch/win32/resc64.rc.po.c:70
 msgid "Atomic &Power image..."


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19041
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19041&view=rev
Author:   blackystardust
Date:     2008-07-18 16:59:10 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
Fixed my recent Changelog commit to have tabs instead of spaces

Modified Paths:
--------------
    trunk/vice/src/ChangeLog

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-07-18 16:58:14 UTC (rev 19040)
+++ trunk/vice/src/ChangeLog	2008-07-18 16:59:10 UTC (rev 19041)
@@ -1,9 +1,9 @@
 2008-07-18  Marco van den Heuvel  <bla...@ya...>
 
-        * translate.c, arch/amigaos/intl.c, arch/win32/rescbm2.rc,
-        arch/win32/resplus4.rc, arch/win32/resvic20.rc,
-        arch/win32/resc128.rc, arch/win32/resc64.rc, arch/win32/res.rc,
-        arch/win32/respet.rc: Updated the German text items.
+	* translate.c, arch/amigaos/intl.c, arch/win32/rescbm2.rc,
+	arch/win32/resplus4.rc, arch/win32/resvic20.rc,
+	arch/win32/resc128.rc, arch/win32/resc64.rc, arch/win32/res.rc,
+	arch/win32/respet.rc: Updated the German text items.
 
 2008-07-18  pottendo  <pot...@ao...>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19040
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19040&view=rev
Author:   blackystardust
Date:     2008-07-18 16:58:14 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
Updated the German text items

Modified Paths:
--------------
    trunk/vice/src/ChangeLog
    trunk/vice/src/arch/amigaos/intl.c
    trunk/vice/src/arch/win32/res.rc
    trunk/vice/src/arch/win32/resc128.rc
    trunk/vice/src/arch/win32/resc64.rc
    trunk/vice/src/arch/win32/rescbm2.rc
    trunk/vice/src/arch/win32/respet.rc
    trunk/vice/src/arch/win32/resplus4.rc
    trunk/vice/src/arch/win32/resvic20.rc
    trunk/vice/src/translate.c

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-07-18 16:26:06 UTC (rev 19039)
+++ trunk/vice/src/ChangeLog	2008-07-18 16:58:14 UTC (rev 19040)
@@ -1,3 +1,10 @@
+2008-07-18  Marco van den Heuvel  <bla...@ya...>
+
+        * translate.c, arch/amigaos/intl.c, arch/win32/rescbm2.rc,
+        arch/win32/resplus4.rc, arch/win32/resvic20.rc,
+        arch/win32/resc128.rc, arch/win32/resc64.rc, arch/win32/res.rc,
+        arch/win32/respet.rc: Updated the German text items.
+
 2008-07-18  pottendo  <pot...@ao...>
 
 	* arch/unix/x11/gnome/uipalcontrol.c (all): #ifdefed UI elements

Modified: trunk/vice/src/arch/amigaos/intl.c
===================================================================
--- trunk/vice/src/arch/amigaos/intl.c	2008-07-18 16:26:06 UTC (rev 19039)
+++ trunk/vice/src/arch/amigaos/intl.c	2008-07-18 16:58:14 UTC (rev 19040)
@@ -526,7 +526,7 @@
 /* sv */ {IDMS_ACTION_REPLAY4_IMAGE_SV, "Action Replay 4-fil..."},
 
 /* en */ {IDMS_STARDOS_IMAGE,    "StarDOS image..."},
-/* de */ {IDMS_STARDOS_IMAGE_DE, ""},  /* fuzzy */
+/* de */ {IDMS_STARDOS_IMAGE_DE, "StarDOS Image..."},
 /* fr */ {IDMS_STARDOS_IMAGE_FR, ""},  /* fuzzy */
 /* hu */ {IDMS_STARDOS_IMAGE_HU, ""},  /* fuzzy */
 /* it */ {IDMS_STARDOS_IMAGE_IT, ""},  /* fuzzy */
@@ -724,7 +724,7 @@
 /* sv */ {IDMS_EXIT_SV, "Avsluta"},
 
 /* en */ {IDMS_EDIT,    "Edit"},
-/* de */ {IDMS_EDIT_DE, ""},  /* fuzzy */
+/* de */ {IDMS_EDIT_DE, "Bearbeiten"},
 /* fr */ {IDMS_EDIT_FR, ""},  /* fuzzy */
 /* hu */ {IDMS_EDIT_HU, ""},  /* fuzzy */
 /* it */ {IDMS_EDIT_IT, ""},  /* fuzzy */
@@ -733,7 +733,7 @@
 /* sv */ {IDMS_EDIT_SV, ""},  /* fuzzy */
 
 /* en */ {IDMS_COPY,    "Copy"},
-/* de */ {IDMS_COPY_DE, ""},  /* fuzzy */
+/* de */ {IDMS_COPY_DE, "Kopie"},
 /* fr */ {IDMS_COPY_FR, ""},  /* fuzzy */
 /* hu */ {IDMS_COPY_HU, ""},  /* fuzzy */
 /* it */ {IDMS_COPY_IT, ""},  /* fuzzy */
@@ -742,7 +742,7 @@
 /* sv */ {IDMS_COPY_SV, ""},  /* fuzzy */
 
 /* en */ {IDMS_PASTE,    "Paste"},
-/* de */ {IDMS_PASTE_DE, ""},  /* fuzzy */
+/* de */ {IDMS_PASTE_DE, "Einf\xFAgen"},
 /* fr */ {IDMS_PASTE_FR, ""},  /* fuzzy */
 /* hu */ {IDMS_PASTE_HU, ""},  /* fuzzy */
 /* it */ {IDMS_PASTE_IT, ""},  /* fuzzy */
@@ -2466,7 +2466,7 @@
 /* sv */ {IDS_ATTACH_ACTION_REPLAY4_IMAGE_SV, "Anslut Action Replay 4-avbildningsfil"},
 
 /* en */ {IDS_ATTACH_STARDOS_IMAGE,    "Attach StarDOS cartridge image"},
-/* de */ {IDS_ATTACH_STARDOS_IMAGE_DE, ""},  /* fuzzy */
+/* de */ {IDS_ATTACH_STARDOS_IMAGE_DE, "Erweiterungsmodul StarDOS Image einlegen"},
 /* fr */ {IDS_ATTACH_STARDOS_IMAGE_FR, ""},  /* fuzzy */
 /* hu */ {IDS_ATTACH_STARDOS_IMAGE_HU, ""},  /* fuzzy */
 /* it */ {IDS_ATTACH_STARDOS_IMAGE_IT, ""},  /* fuzzy */
@@ -4266,7 +4266,7 @@
 /* sv */ {IDS_PAL_EMULATION_SV, "PAL-emulering"},
 
 /* en */ {IDS_NEW_PAL_EMULATION,    "New PAL Emulation"},
-/* de */ {IDS_NEW_PAL_EMULATION_DE, ""},  /* fuzzy */
+/* de */ {IDS_NEW_PAL_EMULATION_DE, "PAL Emulation"},
 /* fr */ {IDS_NEW_PAL_EMULATION_FR, ""},  /* fuzzy */
 /* hu */ {IDS_NEW_PAL_EMULATION_HU, ""},  /* fuzzy */
 /* it */ {IDS_NEW_PAL_EMULATION_IT, ""},  /* fuzzy */
@@ -4311,7 +4311,7 @@
 /* sv */ {IDS_PAL_BLUR_0_1_SV, "PAL-suddighet (0..1)"},
 
 /* en */ {IDS_NEW_PAL_TINT_0_2,    "Tint (0..2)"},
-/* de */ {IDS_NEW_PAL_TINT_0_2_DE, ""},  /* fuzzy */
+/* de */ {IDS_NEW_PAL_TINT_0_2_DE, "Farbton (0..2)"},
 /* fr */ {IDS_NEW_PAL_TINT_0_2_FR, ""},  /* fuzzy */
 /* hu */ {IDS_NEW_PAL_TINT_0_2_HU, ""},  /* fuzzy */
 /* it */ {IDS_NEW_PAL_TINT_0_2_IT, ""},  /* fuzzy */
@@ -4320,7 +4320,7 @@
 /* sv */ {IDS_NEW_PAL_TINT_0_2_SV, ""},  /* fuzzy */
 
 /* en */ {IDS_NEW_PAL_PHASE_0_2,    "Odd Lines Phase (0..2)"},
-/* de */ {IDS_NEW_PAL_PHASE_0_2_DE, ""},  /* fuzzy */
+/* de */ {IDS_NEW_PAL_PHASE_0_2_DE, "Ungerade Zeilenphase (0..2)"},
 /* fr */ {IDS_NEW_PAL_PHASE_0_2_FR, ""},  /* fuzzy */
 /* hu */ {IDS_NEW_PAL_PHASE_0_2_HU, ""},  /* fuzzy */
 /* it */ {IDS_NEW_PAL_PHASE_0_2_IT, ""},  /* fuzzy */
@@ -4329,7 +4329,7 @@
 /* sv */ {IDS_NEW_PAL_PHASE_0_2_SV, ""},  /* fuzzy */
 
 /* en */ {IDS_NEW_PAL_OFFSET_0_2,    "Odd Lines Offset (0..2)"},
-/* de */ {IDS_NEW_PAL_OFFSET_0_2_DE, ""},  /* fuzzy */
+/* de */ {IDS_NEW_PAL_OFFSET_0_2_DE, "Ungerader Zeilenoffset (0..2)"},
 /* fr */ {IDS_NEW_PAL_OFFSET_0_2_FR, ""},  /* fuzzy */
 /* hu */ {IDS_NEW_PAL_OFFSET_0_2_HU, ""},  /* fuzzy */
 /* it */ {IDS_NEW_PAL_OFFSET_0_2_IT, ""},  /* fuzzy */

Modified: trunk/vice/src/arch/win32/res.rc
===================================================================
--- trunk/vice/src/arch/win32/res.rc	2008-07-18 16:26:06 UTC (rev 19039)
+++ trunk/vice/src/arch/win32/res.rc	2008-07-18 16:58:14 UTC (rev 19040)
@@ -3207,13 +3207,13 @@
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Sans Serif"
 BEGIN
-    LTEXT           "Tint",IDC_STATIC,12,12,60,8
+    LTEXT           "Farbton",IDC_STATIC,12,12,60,8
     LTEXT           "(0..2)",IDC_STATIC,72,12,28,8
     EDITTEXT        IDC_VIDEO_NEW_PAL_TINT, 105,10,32,12,WS_TABSTOP
-    LTEXT           "Odd lines phase",IDC_STATIC,12,24,60,8
+    LTEXT           "Ungerade Zeilenphase",IDC_STATIC,12,24,60,8
     LTEXT           "(0..2)",IDC_STATIC,72,24,28,8
     EDITTEXT        IDC_VIDEO_NEW_PAL_PHASE, 105,22,32,12,WS_TABSTOP
-    LTEXT           "Odd lines offset",IDC_STATIC,12,36,60,8
+    LTEXT           "Ungerader Zeilenoffset",IDC_STATIC,12,36,60,8
     LTEXT           "(0..2)",IDC_STATIC,72,36,28,8
     EDITTEXT        IDC_VIDEO_NEW_PAL_OFFSET, 105,34,32,12,WS_TABSTOP
 END
@@ -5684,7 +5684,7 @@
   IDS_LOAD_VICE_PALETTE_FILE      "VICE Paletten Datei laden"
   IDS_FULLSCREEN                  "Vollbild"
   IDS_COLORS                      "Farben"
-  IDS_NEW_PAL                     "New PAL emulation"
+  IDS_NEW_PAL                     "PAL Emulation"
   IDS_VIDEO_SETTINGS              "Video Einstellungen"
   IDS_FILE_SYSTEM                 "Dateisystem"
 #ifdef HAVE_OPENCBM
@@ -5697,7 +5697,7 @@
   IDS_ATTACH_AR_CART_IMAGE        "Action Replay Erweiterungsmodul Image einlegen"
   IDS_ATTACH_AR3_CART_IMAGE       "Action Replay III Erweiterungsmodul Image einlegen"
   IDS_ATTACH_AR4_CART_IMAGE       "Action Replay 4 Erweiterungsmodul Image einlegen"
-  IDS_ATTACH_STARDOS_CART_IMAGE   "StarDOS Erweiterungsmodul Image einlegen"
+  IDS_ATTACH_STARDOS_CART_IMAGE   "Erweiterungsmodul StarDOS Image einlegen"
   IDS_ATTACH_ATOMIC_P_CART_IMG    "Atomic Power Erweiterungsmodul Image einlegen"
   IDS_ATTACH_EPYX_FL_CART_IMG     "Epyx Fastload Erweiterungsmodul Image einlegen"
   IDS_ATTACH_IEEE488_CART_IMG     "IEEE Schnittstellen Erweiterungsmodul Image einlegen"

Modified: trunk/vice/src/arch/win32/resc128.rc
===================================================================
--- trunk/vice/src/arch/win32/resc128.rc	2008-07-18 16:26:06 UTC (rev 19039)
+++ trunk/vice/src/arch/win32/resc128.rc	2008-07-18 16:58:14 UTC (rev 19040)
@@ -400,10 +400,10 @@
         MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
-    POPUP "&Edit"
+    POPUP "B&earbeiten"
     BEGIN
-        MENUITEM "&Copy", IDM_EDIT_COPY
-        MENUITEM "&Paste", IDM_EDIT_PASTE
+        MENUITEM "&Kopieren", IDM_EDIT_COPY
+        MENUITEM "&Einf\xFAgen", IDM_EDIT_PASTE
     END
     POPUP "Sna&pshot"
     BEGIN

Modified: trunk/vice/src/arch/win32/resc64.rc
===================================================================
--- trunk/vice/src/arch/win32/resc64.rc	2008-07-18 16:26:06 UTC (rev 19039)
+++ trunk/vice/src/arch/win32/resc64.rc	2008-07-18 16:58:14 UTC (rev 19040)
@@ -397,10 +397,10 @@
         MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
-    POPUP "&Edit"
+    POPUP "B&earbeiten"
     BEGIN
-        MENUITEM "&Copy", IDM_EDIT_COPY
-        MENUITEM "&Paste", IDM_EDIT_PASTE
+        MENUITEM "&Kopieren", IDM_EDIT_COPY
+        MENUITEM "&Einf\xFAgen", IDM_EDIT_PASTE
     END
     POPUP "Sna&pshot"
     BEGIN

Modified: trunk/vice/src/arch/win32/rescbm2.rc
===================================================================
--- trunk/vice/src/arch/win32/rescbm2.rc	2008-07-18 16:26:06 UTC (rev 19039)
+++ trunk/vice/src/arch/win32/rescbm2.rc	2008-07-18 16:58:14 UTC (rev 19040)
@@ -317,10 +317,10 @@
         MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
-    POPUP "&Edit"
+    POPUP "B&earbeiten"
     BEGIN
-        MENUITEM "&Copy", IDM_EDIT_COPY
-        MENUITEM "&Paste", IDM_EDIT_PASTE
+        MENUITEM "&Kopieren", IDM_EDIT_COPY
+        MENUITEM "&Einf\xFAgen", IDM_EDIT_PASTE
     END
     POPUP "Sna&pshot"
     BEGIN

Modified: trunk/vice/src/arch/win32/respet.rc
===================================================================
--- trunk/vice/src/arch/win32/respet.rc	2008-07-18 16:26:06 UTC (rev 19039)
+++ trunk/vice/src/arch/win32/respet.rc	2008-07-18 16:58:14 UTC (rev 19040)
@@ -313,10 +313,10 @@
        MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
-    POPUP "&Edit"
+    POPUP "B&earbeiten"
     BEGIN
-        MENUITEM "&Copy", IDM_EDIT_COPY
-        MENUITEM "&Paste", IDM_EDIT_PASTE
+        MENUITEM "&Kopieren", IDM_EDIT_COPY
+        MENUITEM "&Einf\xFAgen", IDM_EDIT_PASTE
     END
     POPUP "Sna&pshot"
     BEGIN

Modified: trunk/vice/src/arch/win32/resplus4.rc
===================================================================
--- trunk/vice/src/arch/win32/resplus4.rc	2008-07-18 16:26:06 UTC (rev 19039)
+++ trunk/vice/src/arch/win32/resplus4.rc	2008-07-18 16:58:14 UTC (rev 19040)
@@ -343,10 +343,10 @@
        MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
-    POPUP "&Edit"
+    POPUP "B&earbeiten"
     BEGIN
-        MENUITEM "&Copy", IDM_EDIT_COPY
-        MENUITEM "&Paste", IDM_EDIT_PASTE
+        MENUITEM "&Kopieren", IDM_EDIT_COPY
+        MENUITEM "&Einf\xFAgen", IDM_EDIT_PASTE
     END
     POPUP "Sna&pshot"
     BEGIN

Modified: trunk/vice/src/arch/win32/resvic20.rc
===================================================================
--- trunk/vice/src/arch/win32/resvic20.rc	2008-07-18 16:26:06 UTC (rev 19039)
+++ trunk/vice/src/arch/win32/resvic20.rc	2008-07-18 16:58:14 UTC (rev 19040)
@@ -341,10 +341,10 @@
         MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
-    POPUP "&Edit"
+    POPUP "B&earbeiten"
     BEGIN
-        MENUITEM "&Copy", IDM_EDIT_COPY
-        MENUITEM "&Paste", IDM_EDIT_PASTE
+        MENUITEM "&Kopieren", IDM_EDIT_COPY
+        MENUITEM "&Einf\xFAgen", IDM_EDIT_PASTE
     END
     POPUP "Sna&pshot"
     BEGIN

Modified: trunk/vice/src/translate.c
===================================================================
--- trunk/vice/src/translate.c	2008-07-18 16:26:06 UTC (rev 19039)
+++ trunk/vice/src/translate.c	2008-07-18 16:58:14 UTC (rev 19040)
@@ -1548,7 +1548,7 @@
 
 /* c64/cart/c64cart.c */
 /* en */ {IDCLS_ATTACH_RAW_STARDOS_CART,    "Attach raw 16KB StarDOS cartridge image"},
-/* de */ {IDCLS_ATTACH_RAW_STARDOS_CART_DE, "16KB StarDOS (raw) einlegen"},
+/* de */ {IDCLS_ATTACH_RAW_STARDOS_CART_DE, "16KB StarDOS Erweiterungsmodul Image einlegen"},
 /* fr */ {IDCLS_ATTACH_RAW_STARDOS_CART_FR, ""},  /* fuzzy */
 /* hu */ {IDCLS_ATTACH_RAW_STARDOS_CART_HU, "16KB-os StarDOS cartridge kpms csatolsa"},
 /* it */ {IDCLS_ATTACH_RAW_STARDOS_CART_IT, "Seleziona l'immagine di una cartuccia StarDOS di 16KB"},
@@ -1558,7 +1558,7 @@
 
 /* c64/cart/c64cart.c */
 /* en */ {IDCLS_ATTACH_RAW_ACTION_REPLAY4_CART,    "Attach raw 32KB Action Replay IV cartridge image"},
-/* de */ {IDCLS_ATTACH_RAW_ACTION_REPLAY4_CART_DE, "32KB Action Replay Image IV (raw) einlegen"},
+/* de */ {IDCLS_ATTACH_RAW_ACTION_REPLAY4_CART_DE, "32K Action Replay Image IV einlegen"},
 /* fr */ {IDCLS_ATTACH_RAW_ACTION_REPLAY4_CART_FR, ""},  /* fuzzy */
 /* hu */ {IDCLS_ATTACH_RAW_ACTION_REPLAY4_CART_HU, "32KB-os Action Replay IV cartridge kpms csatolsa"},
 /* it */ {IDCLS_ATTACH_RAW_ACTION_REPLAY4_CART_IT, "Seleziona l'immagine di una cartuccia Action Replay IV di 32KB"},
@@ -2775,7 +2775,7 @@
 
 /* vicii/vicii-cmdline-options.c */
 /* en */ {IDCLS_SET_TINT,    "Set tint of internal calculated palette [1000]"},
-/* de */ {IDCLS_SET_TINT_DE, ""},  /* fuzzy */
+/* de */ {IDCLS_SET_TINT_DE, "Farbton f\xFCr intern berechneten Palette setzen [1000]"},
 /* fr */ {IDCLS_SET_TINT_FR, ""},  /* fuzzy */
 /* hu */ {IDCLS_SET_TINT_HU, ""},  /* fuzzy */
 /* it */ {IDCLS_SET_TINT_IT, ""},  /* fuzzy */
@@ -2785,7 +2785,7 @@
 
 /* vicii/vicii-cmdline-options.c */
 /* en */ {IDCLS_SET_ODDLINES_PHASE,    "Set phase for color carrier in odd lines [1250]"},
-/* de */ {IDCLS_SET_ODDLINES_PHASE_DE, ""},  /* fuzzy */
+/* de */ {IDCLS_SET_ODDLINES_PHASE_DE, "Phase f\xFCr Farbtr\xE4ger in ungeraden Zeilen setzen [1250]"},
 /* fr */ {IDCLS_SET_ODDLINES_PHASE_FR, ""},  /* fuzzy */
 /* hu */ {IDCLS_SET_ODDLINES_PHASE_HU, ""},  /* fuzzy */
 /* it */ {IDCLS_SET_ODDLINES_PHASE_IT, ""},  /* fuzzy */
@@ -2795,7 +2795,7 @@
 
 /* vicii/vicii-cmdline-options.c */
 /* en */ {IDCLS_SET_ODDLINES_OFFSET,    "Set phase offset for color carrier in odd lines [750]"},
-/* de */ {IDCLS_SET_ODDLINES_OFFSET_DE, ""},  /* fuzzy */
+/* de */ {IDCLS_SET_ODDLINES_OFFSET_DE, "Phasenoffset f\xFCr Farbtr\xE4ger in ungeraden Zeilen setzen [750]"},
 /* fr */ {IDCLS_SET_ODDLINES_OFFSET_FR, ""},  /* fuzzy */
 /* hu */ {IDCLS_SET_ODDLINES_OFFSET_HU, ""},  /* fuzzy */
 /* it */ {IDCLS_SET_ODDLINES_OFFSET_IT, ""},  /* fuzzy */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19039
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19039&view=rev
Author:   strik
Date:     2008-07-18 16:26:06 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
2008-07-18  pottendo  <pot...@ao...>

	* arch/unix/x11/gnome/uipalcontrol.c (all): #ifdefed UI elements
	for old PAL emulation as it is replaced by the new PAL Emulation.

	* arch/unix/gui/uipalemu.c: Removed UI for `Old PAL Emu' in case
	of `USE_GNOMEUI.

Modified Paths:
--------------
    trunk/vice/src/ChangeLog
    trunk/vice/src/arch/unix/gui/uipalemu.c
    trunk/vice/src/arch/unix/x11/gnome/uipalcontrol.c

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-07-18 16:24:38 UTC (rev 19038)
+++ trunk/vice/src/ChangeLog	2008-07-18 16:26:06 UTC (rev 19039)
@@ -1,3 +1,11 @@
+2008-07-18  pottendo  <pot...@ao...>
+
+	* arch/unix/x11/gnome/uipalcontrol.c (all): #ifdefed UI elements
+	for old PAL emulation as it is replaced by the new PAL Emulation.
+
+	* arch/unix/gui/uipalemu.c: Removed UI for `Old PAL Emu' in case
+	of `USE_GNOMEUI.
+
 2008-07-16  Spiro Trikaliotis  <spi...@gm...>
 
 	* Version 1.22.27

Modified: trunk/vice/src/arch/unix/gui/uipalemu.c
===================================================================
--- trunk/vice/src/arch/unix/gui/uipalemu.c	2008-07-18 16:24:38 UTC (rev 19038)
+++ trunk/vice/src/arch/unix/gui/uipalemu.c	2008-07-18 16:26:06 UTC (rev 19039)
@@ -135,8 +135,10 @@
     { "--" },
     { N_("*Fast PAL Emulation"),
       (ui_callback_t)radio_PALMode, (ui_callback_data_t)0, NULL },
+#ifndef USE_GNOMEUI
     { N_("*Old Exact PAL Emulation"),
       (ui_callback_t)radio_PALMode, (ui_callback_data_t)1, NULL },
+#endif
     { N_("*New Exact PAL Emulation"),
       (ui_callback_t)radio_PALMode, (ui_callback_data_t)2, NULL },
 #ifndef USE_GNOMEUI

Modified: trunk/vice/src/arch/unix/x11/gnome/uipalcontrol.c
===================================================================
--- trunk/vice/src/arch/unix/x11/gnome/uipalcontrol.c	2008-07-18 16:24:38 UTC (rev 19038)
+++ trunk/vice/src/arch/unix/x11/gnome/uipalcontrol.c	2008-07-18 16:26:06 UTC (rev 19039)
@@ -33,7 +33,10 @@
 #include "resources.h"
 #include "videoarch.h"
 
-static GtkWidget *fake_palemu, *true_palemu, *new_true_palemu;
+static GtkWidget *fake_palemu, *new_true_palemu;
+#ifdef OLD_PAL_EMU_IS_FIXED
+static GtkWidget *true_palemu;
+#endif
 static video_canvas_t *cached_canvas;
 
 typedef struct pal_res_s {
@@ -106,12 +109,10 @@
     if (data == (gpointer) 0)
     {
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[0].w), FALSE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ctrls[1].w), FALSE);
     }
     else
     {
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[0].w), TRUE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ctrls[1].w), TRUE);
     }
     
     if (data == (gpointer) 2)
@@ -200,11 +201,13 @@
     gtk_box_pack_start(GTK_BOX(box), fake_palemu, FALSE, FALSE, 5);
     gtk_widget_show(fake_palemu);
 
+#ifdef OLD_PAL_EMU_IS_FIXED
     true_palemu = gtk_radio_button_new_with_label(
 	gtk_radio_button_get_group(GTK_RADIO_BUTTON(fake_palemu)),
         _("Exact"));
     gtk_box_pack_start(GTK_BOX(box), true_palemu, FALSE, FALSE, 5);
     gtk_widget_show(true_palemu);
+#endif
 
     new_true_palemu = gtk_radio_button_new_with_label(
 	gtk_radio_button_get_group(GTK_RADIO_BUTTON(fake_palemu)),
@@ -220,23 +223,22 @@
     if (v == 0)
     {
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[0].w), FALSE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ctrls[1].w), FALSE);
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[7].w), FALSE);
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[8].w), FALSE);
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fake_palemu), TRUE);
     }
+#ifdef OLD_PAL_EMU_IS_FIXED
     else if (v == 1)
     {
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[0].w), TRUE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ctrls[1].w), TRUE);
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[7].w), FALSE);
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[8].w), FALSE);
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(true_palemu), TRUE);
     }
+#endif
     else
     {
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[0].w), TRUE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ctrls[1].w), TRUE);
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[7].w), TRUE);
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[8].w), TRUE);
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(new_true_palemu), TRUE);
@@ -247,8 +249,10 @@
     g_signal_connect(G_OBJECT(fake_palemu), "clicked",
                      G_CALLBACK(upd_palmode), (gpointer) 0);
     
+#ifdef OLD_PAL_EMU_IS_FIXED
     g_signal_connect(G_OBJECT(true_palemu), "clicked",
                      G_CALLBACK(upd_palmode), (gpointer) 1);
+#endif
     
     g_signal_connect(G_OBJECT(new_true_palemu), "clicked",
                      G_CALLBACK(upd_palmode), (gpointer) 2);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19038
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19038&view=rev
Author:   strik
Date:     2008-07-18 16:24:38 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
Updated.

Modified Paths:
--------------
    trunk/vice/po/ChangeLog
    trunk/vice/po/de.po

Modified: trunk/vice/po/ChangeLog
===================================================================
--- trunk/vice/po/ChangeLog	2008-07-18 16:14:17 UTC (rev 19037)
+++ trunk/vice/po/ChangeLog	2008-07-18 16:24:38 UTC (rev 19038)
@@ -1,3 +1,7 @@
+2008-07-18  pottendo  <pot...@ao...>
+
+	* de.po: Updated.
+
 2008-07-16  Spiro Trikaliotis  <spi...@gm...>
 
 	* de.po: Updated

Modified: trunk/vice/po/de.po
===================================================================
--- trunk/vice/po/de.po	2008-07-18 16:14:17 UTC (rev 19037)
+++ trunk/vice/po/de.po	2008-07-18 16:24:38 UTC (rev 19038)
@@ -6,9 +6,9 @@
 msgstr ""
 "Project-Id-Version: VICE 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-16 06:53+0200\n"
-"PO-Revision-Date: 2008-01-02 16:46+0100\n"
-"Last-Translator: Martin Pottendorfer (pot...@ut...)\n"
+"POT-Creation-Date: 2008-07-18 17:16+0200\n"
+"PO-Revision-Date: 2008-07-18 16:38+0200\n"
+"Last-Translator: pottendo (pot...@gm...)\n"
 "Language-Team: de <de...@li...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -764,9 +764,8 @@
 msgstr "16KB Action Replay Image III (raw) einlegen"
 
 #: src/c64/cart/c64cart.c:261 src/translate.c.po.c:1502
-#, fuzzy
 msgid "Attach raw 32KB Action Replay IV cartridge image"
-msgstr "32K Action Replay Image einlegen"
+msgstr "32K Action Replay Image IV einlegen"
 
 #: src/c64/cart/c64cart.c:264 src/translate.c.po.c:1532
 msgid "Attach raw 64KB Retro Replay cartridge image"
@@ -805,9 +804,8 @@
 msgstr "Erweiterungsmodul Structured Basic (raw) Image einlegen"
 
 #: src/c64/cart/c64cart.c:291 src/translate.c.po.c:1492
-#, fuzzy
 msgid "Attach raw 16KB StarDOS cartridge image"
-msgstr "16KB Erweiterungsmodul (raw) Image einlegen"
+msgstr "16KB StarDOS Erweiterungsmodul Image einlegen"
 
 #: src/c64/cart/c64cart.c:294 src/translate.c.po.c:1612
 msgid "Enable expert cartridge"
@@ -1983,17 +1981,16 @@
 msgstr "Alte Helligkeitsemulation"
 
 #: src/vicii/vicii-cmdline-options.c:126 src/translate.c.po.c:2716
-#, fuzzy
 msgid "Set tint of internal calculated palette [1000]"
-msgstr "S\xE4ttigung f\xFCr intern berechneten Palette setzen [1000]"
+msgstr "Farbton f\xFCr intern berechneten Palette setzen [1000]"
 
 #: src/vicii/vicii-cmdline-options.c:128 src/translate.c.po.c:2726
 msgid "Set phase for color carrier in odd lines [1250]"
-msgstr ""
+msgstr "Phase f\xFCr Farbtr\xE4ger in ungeraden Zeilen setzen [1250]"
 
 #: src/vicii/vicii-cmdline-options.c:130 src/translate.c.po.c:2736
 msgid "Set phase offset for color carrier in odd lines [750]"
-msgstr ""
+msgstr "Phasenoffset f\xFCr Farbtr\xE4ger in ungeraden Zeilen setzen [750]"
 
 #: src/video/video-cmdline-options.c:60 src/translate.c.po.c:3748
 msgid "Enable double size"
@@ -3028,14 +3025,12 @@
 msgstr "Action Replay Image III einlegen..."
 
 #: src/arch/unix/gui/uic64cart.c:159
-#, fuzzy
 msgid "Attach Action Replay IV image..."
-msgstr "Action Replay Image III einlegen..."
+msgstr "Action Replay Image IV einlegen..."
 
 #: src/arch/unix/gui/uic64cart.c:162
-#, fuzzy
 msgid "Attach StarDOS image..."
-msgstr "Band Image einlegen..."
+msgstr "StarDOS Image einlegen..."
 
 #: src/arch/unix/gui/uic64cart.c:165
 msgid "Attach Atomic Power image..."
@@ -3315,7 +3310,7 @@
 msgstr "\xDCber VICE..."
 
 #: src/arch/unix/gui/uicommands.c:569 src/arch/unix/gui/uidatasette.c:98
-#: src/arch/unix/x11/gnome/uipalcontrol.c:189
+#: src/arch/unix/x11/gnome/uipalcontrol.c:190
 #: src/arch/unix/x11/gnome/x11ui.c:1822 src/arch/amigaos/intl.c.po.c:312
 msgid "Reset"
 msgstr "Reset"
@@ -4127,34 +4122,31 @@
 msgid "Scanline Shade in percent"
 msgstr "Scanline Schatten in Prozent"
 
-#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:148
+#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:150
 msgid "New PAL Tint"
-msgstr ""
+msgstr "PAL Farbton"
 
 #: src/arch/unix/gui/uipalemu.c:88
-#, fuzzy
 msgid "Tint in percent"
-msgstr "Scanline Schatten in Prozent"
+msgstr "Farbton in Prozent"
 
 #: src/arch/unix/gui/uipalemu.c:95
 msgid "New PAL Odd Line Phase"
-msgstr ""
+msgstr "PAL ungerade Zeilenphase"
 
 #: src/arch/unix/gui/uipalemu.c:95
-#, fuzzy
 msgid "Phase in percent"
-msgstr "Passband Prozent"
+msgstr "Phase in Prozent"
 
 #: src/arch/unix/gui/uipalemu.c:102
 msgid "New PAL Odd Line Offset"
-msgstr ""
+msgstr "PAL ungerader Zeilenoffset"
 
 #: src/arch/unix/gui/uipalemu.c:102
-#, fuzzy
 msgid "Offset in percent"
-msgstr "Unsch\xE4rfe in Prozent"
+msgstr "Offset in Prozent"
 
-#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:146
+#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:148
 msgid "PAL Blurredness"
 msgstr "PAL Unsch\xE4rfe"
 
@@ -4170,27 +4162,25 @@
 msgid "*Fast PAL Emulation"
 msgstr "*Schnelle PAL Emulation"
 
-#: src/arch/unix/gui/uipalemu.c:138
-#, fuzzy
+#: src/arch/unix/gui/uipalemu.c:139
 msgid "*Old Exact PAL Emulation"
-msgstr "*Exakte PAL Emulation"
+msgstr "*Exakte PAL Emulation (erste Version)"
 
-#: src/arch/unix/gui/uipalemu.c:140
-#, fuzzy
+#: src/arch/unix/gui/uipalemu.c:142
 msgid "*New Exact PAL Emulation"
 msgstr "*Exakte PAL Emulation"
 
-#: src/arch/unix/gui/uipalemu.c:144
+#: src/arch/unix/gui/uipalemu.c:146
 msgid "PAL Scanline Shade"
 msgstr "PAL Scanline Schatten"
 
-#: src/arch/unix/gui/uipalemu.c:150
+#: src/arch/unix/gui/uipalemu.c:152
 msgid "New PAL Odd Lines Phase"
-msgstr ""
+msgstr "PAL ungerade Zeilenphase"
 
-#: src/arch/unix/gui/uipalemu.c:152
+#: src/arch/unix/gui/uipalemu.c:154
 msgid "New PAL Odd Lines Offset"
-msgstr ""
+msgstr "PAL ungerade Zeilenphase"
 
 #: src/arch/unix/gui/uipalette.c:47
 msgid "Load custom palette"
@@ -5424,59 +5414,58 @@
 msgid "Can't create image `%s'."
 msgstr "Kann Image `%s' nicht erzeugen."
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:49
+#: src/arch/unix/x11/gnome/uipalcontrol.c:52
 msgid "Blurredness"
 msgstr "Unsch\xE4rfe"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:50
+#: src/arch/unix/x11/gnome/uipalcontrol.c:53
 msgid "Scanline Shade"
 msgstr "Scanline Schatten"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:51 src/arch/win32/res.rc.po.c:2817
+#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:2817
 msgid "Saturation"
 msgstr "S\xE4ttigung"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:52 src/arch/win32/res.rc.po.c:2820
+#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2820
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:53 src/arch/win32/res.rc.po.c:2823
+#: src/arch/unix/x11/gnome/uipalcontrol.c:56 src/arch/win32/res.rc.po.c:2823
 msgid "Brightness"
 msgstr "Helligkeit"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:3093
+#: src/arch/unix/x11/gnome/uipalcontrol.c:57 src/arch/win32/res.rc.po.c:3093
 msgid "Gamma"
 msgstr "Gamma"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2955
-#, fuzzy
+#: src/arch/unix/x11/gnome/uipalcontrol.c:58 src/arch/win32/res.rc.po.c:2955
 msgid "Tint"
-msgstr "Client"
+msgstr "Farbton"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:56
+#: src/arch/unix/x11/gnome/uipalcontrol.c:59
 msgid "Odd Line Phase"
-msgstr ""
+msgstr "Ungerade Zeilenphase"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:57
+#: src/arch/unix/x11/gnome/uipalcontrol.c:60
 msgid "Odd Line Offset"
-msgstr ""
+msgstr "Ungerader Zeilenoffset"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:145
+#: src/arch/unix/x11/gnome/uipalcontrol.c:146
 msgid "PAL Settings"
 msgstr "PAL Einstellungen"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:198
+#: src/arch/unix/x11/gnome/uipalcontrol.c:199
 msgid "Fast"
 msgstr "Schnell"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:205 src/arch/win32/res.rc.po.c:5197
+#: src/arch/unix/x11/gnome/uipalcontrol.c:207 src/arch/win32/res.rc.po.c:5197
 #: src/arch/amigaos/intl.c.po.c:3755
 msgid "Exact"
 msgstr "Exakt"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:211
+#: src/arch/unix/x11/gnome/uipalcontrol.c:214
 msgid "New Exact"
-msgstr "Neu Exakt"
+msgstr "Exakt"
 
 #: src/arch/unix/x11/gnome/uinetplay.c:54 src/arch/win32/res.rc.po.c:4553
 #: src/arch/amigaos/intl.c.po.c:4493
@@ -5763,9 +5752,8 @@
 msgstr "Monitor"
 
 #: src/arch/unix/x11/gnome/x11ui.c:1825
-#, fuzzy
 msgid "Continue"
-msgstr "Verzeichnis"
+msgstr "Fortsetzen"
 
 #: src/arch/unix/x11/gnome/x11ui.c:1871 src/arch/unix/x11/xaw/x11ui.c:1788
 msgid "Extend disk image"
@@ -6374,9 +6362,8 @@
 msgstr "Copyright (c) 2006-2008 Christian Vogelgsang"
 
 #: src/arch/win32/res.rc.po.c:568
-#, fuzzy
 msgid "Copyright (c) 2007-2008 Fabrizio Gennari"
-msgstr "Copyright (c) 2000-2004 Markus Brenner"
+msgstr "Copyright (c) 2007-2008 Fabrizio Gennari"
 
 #: src/arch/win32/res.rc.po.c:569
 msgid "Copyright (c) 1999-2007 Andreas Dehmel"
@@ -6682,11 +6669,11 @@
 
 #: src/arch/win32/res.rc.po.c:2958
 msgid "Odd lines phase"
-msgstr ""
+msgstr "Ungerade Zeilenphase"
 
 #: src/arch/win32/res.rc.po.c:2961
 msgid "Odd lines offset"
-msgstr ""
+msgstr "Ungerader Zeilenoffset"
 
 #: src/arch/win32/res.rc.po.c:3096
 msgid "Phase"
@@ -7207,9 +7194,8 @@
 msgstr "Farben"
 
 #: src/arch/win32/res.rc.po.c:5131
-#, fuzzy
 msgid "New PAL emulation"
-msgstr "*PAL Emulation"
+msgstr "PAL Emulation"
 
 #: src/arch/win32/res.rc.po.c:5132 src/arch/amigaos/intl.c.po.c:4367
 msgid "Video settings"
@@ -7245,14 +7231,12 @@
 msgstr "Action Replay III Erweiterungsmodul Image einlegen"
 
 #: src/arch/win32/res.rc.po.c:5143 src/arch/amigaos/intl.c.po.c:2432
-#, fuzzy
 msgid "Attach Action Replay 4 cartridge image"
-msgstr "Action Replay Erweiterungsmodul Image einlegen"
+msgstr "Action Replay 4 Erweiterungsmodul Image einlegen"
 
 #: src/arch/win32/res.rc.po.c:5144 src/arch/amigaos/intl.c.po.c:2441
-#, fuzzy
 msgid "Attach StarDOS cartridge image"
-msgstr "Erweiterungsmodul Image einlegen"
+msgstr "Erweiterungsmodul StarDOS Image einlegen"
 
 #: src/arch/win32/res.rc.po.c:5145 src/arch/amigaos/intl.c.po.c:2450
 msgid "Attach Atomic Power cartridge image"
@@ -7771,19 +7755,16 @@
 msgstr "&Action Replay Image..."
 
 #: src/arch/win32/resc128.rc.po.c:67
-#, fuzzy
 msgid "&Action Replay 3 image..."
-msgstr "&Action Replay Image..."
+msgstr "&Action Replay 3 Image..."
 
 #: src/arch/win32/resc128.rc.po.c:68
-#, fuzzy
 msgid "&Action Replay 4 image..."
-msgstr "&Action Replay Image..."
+msgstr "&Action Replay 4 Image..."
 
 #: src/arch/win32/resc128.rc.po.c:69
-#, fuzzy
 msgid "&StarDOS image..."
-msgstr "&CRT Image..."
+msgstr "&StarDIS Image..."
 
 #: src/arch/win32/resc128.rc.po.c:70 src/arch/win32/resc64.rc.po.c:70
 msgid "Atomic &Power image..."
@@ -7961,23 +7942,20 @@
 #: src/arch/win32/resc128.rc.po.c:123 src/arch/win32/resc64.rc.po.c:123
 #: src/arch/win32/rescbm2.rc.po.c:92 src/arch/win32/respet.rc.po.c:90
 #: src/arch/win32/resplus4.rc.po.c:102 src/arch/win32/resvic20.rc.po.c:100
-#, fuzzy
 msgid "&Edit"
-msgstr "Editor"
+msgstr "B&earbeiten"
 
 #: src/arch/win32/resc128.rc.po.c:125 src/arch/win32/resc64.rc.po.c:125
 #: src/arch/win32/rescbm2.rc.po.c:94 src/arch/win32/respet.rc.po.c:92
 #: src/arch/win32/resplus4.rc.po.c:104 src/arch/win32/resvic20.rc.po.c:102
-#, fuzzy
 msgid "&Copy"
-msgstr "S&top"
+msgstr "&Kopieren"
 
 #: src/arch/win32/resc128.rc.po.c:126 src/arch/win32/resc64.rc.po.c:126
 #: src/arch/win32/rescbm2.rc.po.c:95 src/arch/win32/respet.rc.po.c:93
 #: src/arch/win32/resplus4.rc.po.c:105 src/arch/win32/resvic20.rc.po.c:103
-#, fuzzy
 msgid "&Paste"
-msgstr "Pause"
+msgstr "&Einf\xFCgen"
 
 #: src/arch/win32/resc128.rc.po.c:128 src/arch/win32/resc64.rc.po.c:128
 #: src/arch/win32/rescbm2.rc.po.c:97 src/arch/win32/respet.rc.po.c:95
@@ -8826,14 +8804,12 @@
 msgstr "Action Replay &III Imagedatei..."
 
 #: src/arch/win32/resc64.rc.po.c:68
-#, fuzzy
 msgid "Action Replay &4 image..."
-msgstr "Action Replay Image..."
+msgstr "Action Replay &4 Image..."
 
 #: src/arch/win32/resc64.rc.po.c:69
-#, fuzzy
 msgid "Star&DOS image..."
-msgstr "&CRT Image..."
+msgstr "Star&DOS Image..."
 
 #: src/arch/win32/resc64.rc.po.c:153 src/arch/amigaos/intl.c.po.c:870
 msgid "Netplay (experimental)..."
@@ -10147,19 +10123,16 @@
 msgstr "Action Replay Image..."
 
 #: src/arch/amigaos/intl.c.po.c:483
-#, fuzzy
 msgid "Action Replay 3 image..."
-msgstr "Action Replay Image..."
+msgstr "Action Replay 3 Image..."
 
 #: src/arch/amigaos/intl.c.po.c:492
-#, fuzzy
 msgid "Action Replay 4 image..."
-msgstr "Action Replay Image..."
+msgstr "Action Replay 4 Image..."
 
 #: src/arch/amigaos/intl.c.po.c:501
-#, fuzzy
 msgid "StarDOS image..."
-msgstr "CRT Image..."
+msgstr "StarDOS Image..."
 
 #: src/arch/amigaos/intl.c.po.c:510
 msgid "Atomic Power image..."
@@ -10206,18 +10179,16 @@
 msgstr "Exit"
 
 #: src/arch/amigaos/intl.c.po.c:699
-#, fuzzy
 msgid "Edit"
-msgstr "Editor"
+msgstr "Bearbeiten"
 
 #: src/arch/amigaos/intl.c.po.c:708
 msgid "Copy"
-msgstr ""
+msgstr "Kopie"
 
 #: src/arch/amigaos/intl.c.po.c:717
-#, fuzzy
 msgid "Paste"
-msgstr "Phase"
+msgstr "Einf\xFCgen"
 
 #: src/arch/amigaos/intl.c.po.c:735
 msgid "Load snapshot image..."
@@ -10722,9 +10693,8 @@
 msgstr "Ja|Nein"
 
 #: src/arch/amigaos/intl.c.po.c:2423
-#, fuzzy
 msgid "Attach Action Replay 3 cartridge image"
-msgstr "Action Replay Erweiterungsmodul Image einlegen"
+msgstr "Action Replay 3 Erweiterungsmodul Image einlegen"
 
 #: src/arch/amigaos/intl.c.po.c:2585
 msgid "Attach"
@@ -11116,7 +11086,6 @@
 msgstr "Schnelle PAL"
 
 #: src/arch/amigaos/intl.c.po.c:4241
-#, fuzzy
 msgid "New PAL Emulation"
 msgstr "PAL Emulation"
 
@@ -11137,19 +11106,16 @@
 msgstr "PAL Unsch\xE4rfe (0..1)"
 
 #: src/arch/amigaos/intl.c.po.c:4286
-#, fuzzy
 msgid "Tint (0..2)"
-msgstr "(0..2)"
+msgstr "Farbton (0..2)"
 
 #: src/arch/amigaos/intl.c.po.c:4295
-#, fuzzy
 msgid "Odd Lines Phase (0..2)"
-msgstr "Helligkeit (0..2)"
+msgstr "Ungerade Zeilenphase (0..2)"
 
 #: src/arch/amigaos/intl.c.po.c:4304
-#, fuzzy
 msgid "Odd Lines Offset (0..2)"
-msgstr "Helligkeit (0..2)"
+msgstr "Ungerader Zeilenoffset (0..2)"
 
 #: src/arch/amigaos/intl.c.po.c:4322
 msgid "External Palette"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19037
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19037&view=rev
Author:   strik
Date:     2008-07-18 16:14:17 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
Fixed format of some entries.

Modified Paths:
--------------
    trunk/vice/src/ChangeLog

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-07-18 15:20:17 UTC (rev 19036)
+++ trunk/vice/src/ChangeLog	2008-07-18 16:14:17 UTC (rev 19037)
@@ -4,9 +4,9 @@
 
 2008-07-16  Marco van den Heuvel  <bla...@ya...>
 
-        * arch/beos/ui.cc, arch/beos/ui_file.cc,
-        arch/beos/vicemenu.cc: Added fixes as provided by
-        Marcus Sutton <log...@gm...>
+	* arch/beos/ui.cc, arch/beos/ui_file.cc,
+	arch/beos/vicemenu.cc: Added fixes as provided by
+	Marcus Sutton <log...@gm...>
 
 2008-07-15  Spiro Trikaliotis  <spi...@gm...>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19035
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19035&view=rev
Author:   pottendo
Date:     2008-07-18 15:19:43 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
Updated.

Modified Paths:
--------------
    branches/pottendo/v1.22.27-intlupd/vice/src/ChangeLog

Modified: branches/pottendo/v1.22.27-intlupd/vice/src/ChangeLog
===================================================================
--- branches/pottendo/v1.22.27-intlupd/vice/src/ChangeLog	2008-07-18 15:17:24 UTC (rev 19034)
+++ branches/pottendo/v1.22.27-intlupd/vice/src/ChangeLog	2008-07-18 15:19:43 UTC (rev 19035)
@@ -1,3 +1,11 @@
+2008-07-18  pottendo  <pot...@ao...>
+
+	* arch/unix/x11/gnome/uipalcontrol.c (all): #ifdefed UI elements
+	for old PAL emulation as it is replaced by the new PAL Emulation.
+
+	* arch/unix/gui/uipalemu.c: Removed UI for `Old PAL Emu' in case
+	of `USE_GNOMEUI.
+
 2008-07-16  Spiro Trikaliotis  <spi...@gm...>
 
 	* Version 1.22.27


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19036
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19036&view=rev
Author:   pottendo
Date:     2008-07-18 15:20:17 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
Updated.

Modified Paths:
--------------
    branches/pottendo/v1.22.27-intlupd/vice/po/ChangeLog

Modified: branches/pottendo/v1.22.27-intlupd/vice/po/ChangeLog
===================================================================
--- branches/pottendo/v1.22.27-intlupd/vice/po/ChangeLog	2008-07-18 15:19:43 UTC (rev 19035)
+++ branches/pottendo/v1.22.27-intlupd/vice/po/ChangeLog	2008-07-18 15:20:17 UTC (rev 19036)
@@ -1,3 +1,7 @@
+2008-07-18  pottendo  <pot...@ao...>
+
+	* de.po: Updated.
+
 2008-07-08  Marco van den Heuvel  <bla...@ya...>
 
 	* de.po, fr.po, hu.po, it.po, nl.po, pl.po, sv.po: Removed the


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19034
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19034&view=rev
Author:   pottendo
Date:     2008-07-18 15:17:24 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
Updated.

Modified Paths:
--------------
    branches/pottendo/v1.22.27-intlupd/vice/po/de.po

Modified: branches/pottendo/v1.22.27-intlupd/vice/po/de.po
===================================================================
--- branches/pottendo/v1.22.27-intlupd/vice/po/de.po	2008-07-18 15:15:59 UTC (rev 19033)
+++ branches/pottendo/v1.22.27-intlupd/vice/po/de.po	2008-07-18 15:17:24 UTC (rev 19034)
@@ -6,9 +6,9 @@
 msgstr ""
 "Project-Id-Version: VICE 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-13 20:27+0200\n"
-"PO-Revision-Date: 2008-01-02 16:46+0100\n"
-"Last-Translator: Martin Pottendorfer (pot...@ut...)\n"
+"POT-Creation-Date: 2008-07-18 17:16+0200\n"
+"PO-Revision-Date: 2008-07-18 16:38+0200\n"
+"Last-Translator: pottendo (pot...@gm...)\n"
 "Language-Team: de <de...@li...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -764,9 +764,8 @@
 msgstr "16KB Action Replay Image III (raw) einlegen"
 
 #: src/c64/cart/c64cart.c:261 src/translate.c.po.c:1502
-#, fuzzy
 msgid "Attach raw 32KB Action Replay IV cartridge image"
-msgstr "32K Action Replay Image einlegen"
+msgstr "32K Action Replay Image IV einlegen"
 
 #: src/c64/cart/c64cart.c:264 src/translate.c.po.c:1532
 msgid "Attach raw 64KB Retro Replay cartridge image"
@@ -805,9 +804,8 @@
 msgstr "Erweiterungsmodul Structured Basic (raw) Image einlegen"
 
 #: src/c64/cart/c64cart.c:291 src/translate.c.po.c:1492
-#, fuzzy
 msgid "Attach raw 16KB StarDOS cartridge image"
-msgstr "16KB Erweiterungsmodul (raw) Image einlegen"
+msgstr "16KB StarDOS Erweiterungsmodul Image einlegen"
 
 #: src/c64/cart/c64cart.c:294 src/translate.c.po.c:1612
 msgid "Enable expert cartridge"
@@ -1983,17 +1981,16 @@
 msgstr "Alte Helligkeitsemulation"
 
 #: src/vicii/vicii-cmdline-options.c:126 src/translate.c.po.c:2716
-#, fuzzy
 msgid "Set tint of internal calculated palette [1000]"
-msgstr "S\xE4ttigung f\xFCr intern berechneten Palette setzen [1000]"
+msgstr "Farbton f\xFCr intern berechneten Palette setzen [1000]"
 
 #: src/vicii/vicii-cmdline-options.c:128 src/translate.c.po.c:2726
 msgid "Set phase for color carrier in odd lines [1250]"
-msgstr ""
+msgstr "Phase f\xFCr Farbtr\xE4ger in ungeraden Zeilen setzen [1250]"
 
 #: src/vicii/vicii-cmdline-options.c:130 src/translate.c.po.c:2736
 msgid "Set phase offset for color carrier in odd lines [750]"
-msgstr ""
+msgstr "Phasenoffset f\xFCr Farbtr\xE4ger in ungeraden Zeilen setzen [750]"
 
 #: src/video/video-cmdline-options.c:60 src/translate.c.po.c:3748
 msgid "Enable double size"
@@ -3028,14 +3025,12 @@
 msgstr "Action Replay Image III einlegen..."
 
 #: src/arch/unix/gui/uic64cart.c:159
-#, fuzzy
 msgid "Attach Action Replay IV image..."
-msgstr "Action Replay Image III einlegen..."
+msgstr "Action Replay Image IV einlegen..."
 
 #: src/arch/unix/gui/uic64cart.c:162
-#, fuzzy
 msgid "Attach StarDOS image..."
-msgstr "Band Image einlegen..."
+msgstr "StarDOS Image einlegen..."
 
 #: src/arch/unix/gui/uic64cart.c:165
 msgid "Attach Atomic Power image..."
@@ -3315,7 +3310,7 @@
 msgstr "\xDCber VICE..."
 
 #: src/arch/unix/gui/uicommands.c:569 src/arch/unix/gui/uidatasette.c:98
-#: src/arch/unix/x11/gnome/uipalcontrol.c:189
+#: src/arch/unix/x11/gnome/uipalcontrol.c:190
 #: src/arch/unix/x11/gnome/x11ui.c:1822 src/arch/amigaos/intl.c.po.c:312
 msgid "Reset"
 msgstr "Reset"
@@ -4127,34 +4122,31 @@
 msgid "Scanline Shade in percent"
 msgstr "Scanline Schatten in Prozent"
 
-#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:148
+#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:150
 msgid "New PAL Tint"
-msgstr ""
+msgstr "PAL Farbton"
 
 #: src/arch/unix/gui/uipalemu.c:88
-#, fuzzy
 msgid "Tint in percent"
-msgstr "Scanline Schatten in Prozent"
+msgstr "Farbton in Prozent"
 
 #: src/arch/unix/gui/uipalemu.c:95
 msgid "New PAL Odd Line Phase"
-msgstr ""
+msgstr "PAL ungerade Zeilenphase"
 
 #: src/arch/unix/gui/uipalemu.c:95
-#, fuzzy
 msgid "Phase in percent"
-msgstr "Passband Prozent"
+msgstr "Phase in Prozent"
 
 #: src/arch/unix/gui/uipalemu.c:102
 msgid "New PAL Odd Line Offset"
-msgstr ""
+msgstr "PAL ungerader Zeilenoffset"
 
 #: src/arch/unix/gui/uipalemu.c:102
-#, fuzzy
 msgid "Offset in percent"
-msgstr "Unsch\xE4rfe in Prozent"
+msgstr "Offset in Prozent"
 
-#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:146
+#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:148
 msgid "PAL Blurredness"
 msgstr "PAL Unsch\xE4rfe"
 
@@ -4170,27 +4162,25 @@
 msgid "*Fast PAL Emulation"
 msgstr "*Schnelle PAL Emulation"
 
-#: src/arch/unix/gui/uipalemu.c:138
-#, fuzzy
+#: src/arch/unix/gui/uipalemu.c:139
 msgid "*Old Exact PAL Emulation"
-msgstr "*Exakte PAL Emulation"
+msgstr "*Exakte PAL Emulation (erste Version)"
 
-#: src/arch/unix/gui/uipalemu.c:140
-#, fuzzy
+#: src/arch/unix/gui/uipalemu.c:142
 msgid "*New Exact PAL Emulation"
 msgstr "*Exakte PAL Emulation"
 
-#: src/arch/unix/gui/uipalemu.c:144
+#: src/arch/unix/gui/uipalemu.c:146
 msgid "PAL Scanline Shade"
 msgstr "PAL Scanline Schatten"
 
-#: src/arch/unix/gui/uipalemu.c:150
+#: src/arch/unix/gui/uipalemu.c:152
 msgid "New PAL Odd Lines Phase"
-msgstr ""
+msgstr "PAL ungerade Zeilenphase"
 
-#: src/arch/unix/gui/uipalemu.c:152
+#: src/arch/unix/gui/uipalemu.c:154
 msgid "New PAL Odd Lines Offset"
-msgstr ""
+msgstr "PAL ungerade Zeilenphase"
 
 #: src/arch/unix/gui/uipalette.c:47
 msgid "Load custom palette"
@@ -5424,59 +5414,58 @@
 msgid "Can't create image `%s'."
 msgstr "Kann Image `%s' nicht erzeugen."
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:49
+#: src/arch/unix/x11/gnome/uipalcontrol.c:52
 msgid "Blurredness"
 msgstr "Unsch\xE4rfe"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:50
+#: src/arch/unix/x11/gnome/uipalcontrol.c:53
 msgid "Scanline Shade"
 msgstr "Scanline Schatten"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:51 src/arch/win32/res.rc.po.c:2817
+#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:2817
 msgid "Saturation"
 msgstr "S\xE4ttigung"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:52 src/arch/win32/res.rc.po.c:2820
+#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2820
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:53 src/arch/win32/res.rc.po.c:2823
+#: src/arch/unix/x11/gnome/uipalcontrol.c:56 src/arch/win32/res.rc.po.c:2823
 msgid "Brightness"
 msgstr "Helligkeit"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:3093
+#: src/arch/unix/x11/gnome/uipalcontrol.c:57 src/arch/win32/res.rc.po.c:3093
 msgid "Gamma"
 msgstr "Gamma"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2955
-#, fuzzy
+#: src/arch/unix/x11/gnome/uipalcontrol.c:58 src/arch/win32/res.rc.po.c:2955
 msgid "Tint"
-msgstr "Client"
+msgstr "Farbton"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:56
+#: src/arch/unix/x11/gnome/uipalcontrol.c:59
 msgid "Odd Line Phase"
-msgstr ""
+msgstr "Ungerade Zeilenphase"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:57
+#: src/arch/unix/x11/gnome/uipalcontrol.c:60
 msgid "Odd Line Offset"
-msgstr ""
+msgstr "Ungerader Zeilenoffset"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:145
+#: src/arch/unix/x11/gnome/uipalcontrol.c:146
 msgid "PAL Settings"
 msgstr "PAL Einstellungen"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:198
-msgid "Fast Emulation"
-msgstr "Schnelle Emulation"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:199
+msgid "Fast"
+msgstr "Schnell"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:205
-msgid "Exact Emulation"
-msgstr "Exakte Emulation"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:207 src/arch/win32/res.rc.po.c:5197
+#: src/arch/amigaos/intl.c.po.c:3755
+msgid "Exact"
+msgstr "Exakt"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:211
-#, fuzzy
-msgid "New Exact Emulation"
-msgstr "Exakte Emulation"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:214
+msgid "New Exact"
+msgstr "Exakt"
 
 #: src/arch/unix/x11/gnome/uinetplay.c:54 src/arch/win32/res.rc.po.c:4553
 #: src/arch/amigaos/intl.c.po.c:4493
@@ -5763,9 +5752,8 @@
 msgstr "Monitor"
 
 #: src/arch/unix/x11/gnome/x11ui.c:1825
-#, fuzzy
 msgid "Continue"
-msgstr "Verzeichnis"
+msgstr "Fortsetzen"
 
 #: src/arch/unix/x11/gnome/x11ui.c:1871 src/arch/unix/x11/xaw/x11ui.c:1788
 msgid "Extend disk image"
@@ -6374,9 +6362,8 @@
 msgstr "Copyright (c) 2006-2008 Christian Vogelgsang"
 
 #: src/arch/win32/res.rc.po.c:568
-#, fuzzy
 msgid "Copyright (c) 2007-2008 Fabrizio Gennari"
-msgstr "Copyright (c) 2000-2004 Markus Brenner"
+msgstr "Copyright (c) 2007-2008 Fabrizio Gennari"
 
 #: src/arch/win32/res.rc.po.c:569
 msgid "Copyright (c) 1999-2007 Andreas Dehmel"
@@ -6682,11 +6669,11 @@
 
 #: src/arch/win32/res.rc.po.c:2958
 msgid "Odd lines phase"
-msgstr ""
+msgstr "Ungerade Zeilenphase"
 
 #: src/arch/win32/res.rc.po.c:2961
 msgid "Odd lines offset"
-msgstr ""
+msgstr "Ungerader Zeilenoffset"
 
 #: src/arch/win32/res.rc.po.c:3096
 msgid "Phase"
@@ -7207,9 +7194,8 @@
 msgstr "Farben"
 
 #: src/arch/win32/res.rc.po.c:5131
-#, fuzzy
 msgid "New PAL emulation"
-msgstr "*PAL Emulation"
+msgstr "PAL Emulation"
 
 #: src/arch/win32/res.rc.po.c:5132 src/arch/amigaos/intl.c.po.c:4367
 msgid "Video settings"
@@ -7245,14 +7231,12 @@
 msgstr "Action Replay III Erweiterungsmodul Image einlegen"
 
 #: src/arch/win32/res.rc.po.c:5143 src/arch/amigaos/intl.c.po.c:2432
-#, fuzzy
 msgid "Attach Action Replay 4 cartridge image"
-msgstr "Action Replay Erweiterungsmodul Image einlegen"
+msgstr "Action Replay 4 Erweiterungsmodul Image einlegen"
 
 #: src/arch/win32/res.rc.po.c:5144 src/arch/amigaos/intl.c.po.c:2441
-#, fuzzy
 msgid "Attach StarDOS cartridge image"
-msgstr "Erweiterungsmodul Image einlegen"
+msgstr "Erweiterungsmodul StarDOS Image einlegen"
 
 #: src/arch/win32/res.rc.po.c:5145 src/arch/amigaos/intl.c.po.c:2450
 msgid "Attach Atomic Power cartridge image"
@@ -7445,10 +7429,6 @@
 msgid "Adjusting"
 msgstr "Anpassend"
 
-#: src/arch/win32/res.rc.po.c:5197 src/arch/amigaos/intl.c.po.c:3755
-msgid "Exact"
-msgstr "Exakt"
-
 #: src/arch/win32/res.rc.po.c:5198
 msgid "Sound driver: DirectX"
 msgstr "Sound Treiber: DirectX"
@@ -7775,19 +7755,16 @@
 msgstr "&Action Replay Image..."
 
 #: src/arch/win32/resc128.rc.po.c:67
-#, fuzzy
 msgid "&Action Replay 3 image..."
-msgstr "&Action Replay Image..."
+msgstr "&Action Replay 3 Image..."
 
 #: src/arch/win32/resc128.rc.po.c:68
-#, fuzzy
 msgid "&Action Replay 4 image..."
-msgstr "&Action Replay Image..."
+msgstr "&Action Replay 4 Image..."
 
 #: src/arch/win32/resc128.rc.po.c:69
-#, fuzzy
 msgid "&StarDOS image..."
-msgstr "&CRT Image..."
+msgstr "&StarDIS Image..."
 
 #: src/arch/win32/resc128.rc.po.c:70 src/arch/win32/resc64.rc.po.c:70
 msgid "Atomic &Power image..."
@@ -7965,23 +7942,20 @@
 #: src/arch/win32/resc128.rc.po.c:123 src/arch/win32/resc64.rc.po.c:123
 #: src/arch/win32/rescbm2.rc.po.c:92 src/arch/win32/respet.rc.po.c:90
 #: src/arch/win32/resplus4.rc.po.c:102 src/arch/win32/resvic20.rc.po.c:100
-#, fuzzy
 msgid "&Edit"
-msgstr "Editor"
+msgstr "B&earbeiten"
 
 #: src/arch/win32/resc128.rc.po.c:125 src/arch/win32/resc64.rc.po.c:125
 #: src/arch/win32/rescbm2.rc.po.c:94 src/arch/win32/respet.rc.po.c:92
 #: src/arch/win32/resplus4.rc.po.c:104 src/arch/win32/resvic20.rc.po.c:102
-#, fuzzy
 msgid "&Copy"
-msgstr "S&top"
+msgstr "&Kopieren"
 
 #: src/arch/win32/resc128.rc.po.c:126 src/arch/win32/resc64.rc.po.c:126
 #: src/arch/win32/rescbm2.rc.po.c:95 src/arch/win32/respet.rc.po.c:93
 #: src/arch/win32/resplus4.rc.po.c:105 src/arch/win32/resvic20.rc.po.c:103
-#, fuzzy
 msgid "&Paste"
-msgstr "Pause"
+msgstr "&Einf\xFCgen"
 
 #: src/arch/win32/resc128.rc.po.c:128 src/arch/win32/resc64.rc.po.c:128
 #: src/arch/win32/rescbm2.rc.po.c:97 src/arch/win32/respet.rc.po.c:95
@@ -8830,14 +8804,12 @@
 msgstr "Action Replay &III Imagedatei..."
 
 #: src/arch/win32/resc64.rc.po.c:68
-#, fuzzy
 msgid "Action Replay &4 image..."
-msgstr "Action Replay Image..."
+msgstr "Action Replay &4 Image..."
 
 #: src/arch/win32/resc64.rc.po.c:69
-#, fuzzy
 msgid "Star&DOS image..."
-msgstr "&CRT Image..."
+msgstr "Star&DOS Image..."
 
 #: src/arch/win32/resc64.rc.po.c:153 src/arch/amigaos/intl.c.po.c:870
 msgid "Netplay (experimental)..."
@@ -10151,19 +10123,16 @@
 msgstr "Action Replay Image..."
 
 #: src/arch/amigaos/intl.c.po.c:483
-#, fuzzy
 msgid "Action Replay 3 image..."
-msgstr "Action Replay Image..."
+msgstr "Action Replay 3 Image..."
 
 #: src/arch/amigaos/intl.c.po.c:492
-#, fuzzy
 msgid "Action Replay 4 image..."
-msgstr "Action Replay Image..."
+msgstr "Action Replay 4 Image..."
 
 #: src/arch/amigaos/intl.c.po.c:501
-#, fuzzy
 msgid "StarDOS image..."
-msgstr "CRT Image..."
+msgstr "StarDOS Image..."
 
 #: src/arch/amigaos/intl.c.po.c:510
 msgid "Atomic Power image..."
@@ -10210,18 +10179,16 @@
 msgstr "Exit"
 
 #: src/arch/amigaos/intl.c.po.c:699
-#, fuzzy
 msgid "Edit"
-msgstr "Editor"
+msgstr "Bearbeiten"
 
 #: src/arch/amigaos/intl.c.po.c:708
 msgid "Copy"
-msgstr ""
+msgstr "Kopie"
 
 #: src/arch/amigaos/intl.c.po.c:717
-#, fuzzy
 msgid "Paste"
-msgstr "Phase"
+msgstr "Einf\xFCgen"
 
 #: src/arch/amigaos/intl.c.po.c:735
 msgid "Load snapshot image..."
@@ -10726,9 +10693,8 @@
 msgstr "Ja|Nein"
 
 #: src/arch/amigaos/intl.c.po.c:2423
-#, fuzzy
 msgid "Attach Action Replay 3 cartridge image"
-msgstr "Action Replay Erweiterungsmodul Image einlegen"
+msgstr "Action Replay 3 Erweiterungsmodul Image einlegen"
 
 #: src/arch/amigaos/intl.c.po.c:2585
 msgid "Attach"
@@ -11120,7 +11086,6 @@
 msgstr "Schnelle PAL"
 
 #: src/arch/amigaos/intl.c.po.c:4241
-#, fuzzy
 msgid "New PAL Emulation"
 msgstr "PAL Emulation"
 
@@ -11141,19 +11106,16 @@
 msgstr "PAL Unsch\xE4rfe (0..1)"
 
 #: src/arch/amigaos/intl.c.po.c:4286
-#, fuzzy
 msgid "Tint (0..2)"
-msgstr "(0..2)"
+msgstr "Farbton (0..2)"
 
 #: src/arch/amigaos/intl.c.po.c:4295
-#, fuzzy
 msgid "Odd Lines Phase (0..2)"
-msgstr "Helligkeit (0..2)"
+msgstr "Ungerade Zeilenphase (0..2)"
 
 #: src/arch/amigaos/intl.c.po.c:4304
-#, fuzzy
 msgid "Odd Lines Offset (0..2)"
-msgstr "Helligkeit (0..2)"
+msgstr "Ungerader Zeilenoffset (0..2)"
 
 #: src/arch/amigaos/intl.c.po.c:4322
 msgid "External Palette"
@@ -11322,3 +11284,13 @@
 #: src/arch/amigaos/intl.c.po.c:4844
 msgid "Amiga mouse"
 msgstr "Amiga Maus"
+
+#~ msgid "Fast Emulation"
+#~ msgstr "Schnelle Emulation"
+
+#~ msgid "Exact Emulation"
+#~ msgstr "Exakte Emulation"
+
+#, fuzzy
+#~ msgid "New Exact Emulation"
+#~ msgstr "Exakte Emulation"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19033
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19033&view=rev
Author:   pottendo
Date:     2008-07-18 15:15:59 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
	* arch/unix/x11/gnome/uipalcontrol.c (all): #ifdefed UI elements
	for old PAL emulation as it is replaced by the new PAL Emulation.

Modified Paths:
--------------
    branches/pottendo/v1.22.27-intlupd/vice/src/arch/unix/x11/gnome/uipalcontrol.c

Modified: branches/pottendo/v1.22.27-intlupd/vice/src/arch/unix/x11/gnome/uipalcontrol.c
===================================================================
--- branches/pottendo/v1.22.27-intlupd/vice/src/arch/unix/x11/gnome/uipalcontrol.c	2008-07-18 15:15:03 UTC (rev 19032)
+++ branches/pottendo/v1.22.27-intlupd/vice/src/arch/unix/x11/gnome/uipalcontrol.c	2008-07-18 15:15:59 UTC (rev 19033)
@@ -33,7 +33,10 @@
 #include "resources.h"
 #include "videoarch.h"
 
-static GtkWidget *fake_palemu, *true_palemu, *new_true_palemu;
+static GtkWidget *fake_palemu, *new_true_palemu;
+#ifdef OLD_PAL_EMU_IS_FIXED
+static GtkWidget *true_palemu;
+#endif
 static video_canvas_t *cached_canvas;
 
 typedef struct pal_res_s {
@@ -106,12 +109,10 @@
     if (data == (gpointer) 0)
     {
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[0].w), FALSE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ctrls[1].w), FALSE);
     }
     else
     {
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[0].w), TRUE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ctrls[1].w), TRUE);
     }
     
     if (data == (gpointer) 2)
@@ -200,11 +201,13 @@
     gtk_box_pack_start(GTK_BOX(box), fake_palemu, FALSE, FALSE, 5);
     gtk_widget_show(fake_palemu);
 
+#ifdef OLD_PAL_EMU_IS_FIXED
     true_palemu = gtk_radio_button_new_with_label(
 	gtk_radio_button_get_group(GTK_RADIO_BUTTON(fake_palemu)),
         _("Exact"));
     gtk_box_pack_start(GTK_BOX(box), true_palemu, FALSE, FALSE, 5);
     gtk_widget_show(true_palemu);
+#endif
 
     new_true_palemu = gtk_radio_button_new_with_label(
 	gtk_radio_button_get_group(GTK_RADIO_BUTTON(fake_palemu)),
@@ -220,23 +223,22 @@
     if (v == 0)
     {
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[0].w), FALSE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ctrls[1].w), FALSE);
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[7].w), FALSE);
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[8].w), FALSE);
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fake_palemu), TRUE);
     }
+#ifdef OLD_PAL_EMU_IS_FIXED
     else if (v == 1)
     {
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[0].w), TRUE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ctrls[1].w), TRUE);
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[7].w), FALSE);
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[8].w), FALSE);
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(true_palemu), TRUE);
     }
+#endif
     else
     {
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[0].w), TRUE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ctrls[1].w), TRUE);
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[7].w), TRUE);
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[8].w), TRUE);
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(new_true_palemu), TRUE);
@@ -247,8 +249,10 @@
     g_signal_connect(G_OBJECT(fake_palemu), "clicked",
                      G_CALLBACK(upd_palmode), (gpointer) 0);
     
+#ifdef OLD_PAL_EMU_IS_FIXED
     g_signal_connect(G_OBJECT(true_palemu), "clicked",
                      G_CALLBACK(upd_palmode), (gpointer) 1);
+#endif
     
     g_signal_connect(G_OBJECT(new_true_palemu), "clicked",
                      G_CALLBACK(upd_palmode), (gpointer) 2);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19032
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19032&view=rev
Author:   pottendo
Date:     2008-07-18 15:15:03 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
	* arch/unix/gui/uipalemu.c: Removed UI for `Old PAL Emu' in case
	of `USE_GNOMEUI.

Modified Paths:
--------------
    branches/pottendo/v1.22.27-intlupd/vice/src/arch/unix/gui/uipalemu.c

Modified: branches/pottendo/v1.22.27-intlupd/vice/src/arch/unix/gui/uipalemu.c
===================================================================
--- branches/pottendo/v1.22.27-intlupd/vice/src/arch/unix/gui/uipalemu.c	2008-07-18 14:03:47 UTC (rev 19031)
+++ branches/pottendo/v1.22.27-intlupd/vice/src/arch/unix/gui/uipalemu.c	2008-07-18 15:15:03 UTC (rev 19032)
@@ -135,8 +135,10 @@
     { "--" },
     { N_("*Fast PAL Emulation"),
       (ui_callback_t)radio_PALMode, (ui_callback_data_t)0, NULL },
+#ifndef USE_GNOMEUI
     { N_("*Old Exact PAL Emulation"),
       (ui_callback_t)radio_PALMode, (ui_callback_data_t)1, NULL },
+#endif
     { N_("*New Exact PAL Emulation"),
       (ui_callback_t)radio_PALMode, (ui_callback_data_t)2, NULL },
 #ifndef USE_GNOMEUI


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19031
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19031&view=rev
Author:   pottendo
Date:     2008-07-18 14:03:47 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
pottendos update branch for 2.0.

Added Paths:
-----------
    branches/pottendo/v1.22.27-intlupd/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19030
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19030&view=rev
Author:   strik
Date:     2008-07-17 19:25:46 +0000 (Thu, 17 Jul 2008)

Log Message:
-----------
	doc/Win32-Cygwin-HOWTO.txt: Prepared for upcoming 2.0 release.

Modified Paths:
--------------
    trunk/vice/ChangeLog
    trunk/vice/doc/Win32-Cygwin-HOWTO.txt
    trunk/vice/doc/html/index.html
    trunk/vice/doc/html/plain/NEWS
    trunk/vice/doc/vice.texi

Modified: trunk/vice/ChangeLog
===================================================================
--- trunk/vice/ChangeLog	2008-07-17 19:12:19 UTC (rev 19029)
+++ trunk/vice/ChangeLog	2008-07-17 19:25:46 UTC (rev 19030)
@@ -1,3 +1,8 @@
+2008-07-17  Spiro Trikaliotis  <spi...@gm...>
+
+	* doc/vice.texi, doc/html/plain/NEWS, doc/html/index.html,
+	doc/Win32-Cygwin-HOWTO.txt: Prepared for upcoming 2.0 release.
+
 2008-07-16  Spiro Trikaliotis  <spi...@gm...>
 
 	* Version 1.22.27

Modified: trunk/vice/doc/Win32-Cygwin-HOWTO.txt
===================================================================
--- trunk/vice/doc/Win32-Cygwin-HOWTO.txt	2008-07-17 19:12:19 UTC (rev 19029)
+++ trunk/vice/doc/Win32-Cygwin-HOWTO.txt	2008-07-17 19:25:46 UTC (rev 19030)
@@ -13,7 +13,7 @@
    dependencies.
 
 2. Obtain a copy of the VICE sources.  Extract the vice-x.xx directory into
-   your Cygwin user's home directory (e.g. /home/Owner/vice-1.22).
+   your Cygwin user's home directory (e.g. /home/Owner/vice-2.0).
 
 3. Obtain DirectX 7 header files and libraries.  It doesn't look like
    Microsoft still makes this distribution available for download from its
@@ -46,7 +46,7 @@
      make bindist
 
    to make an executable distribution, which will appear in a directory
-   called e.g. /home/Owner/vice-1.22/src/WinVICE-1.22.  For development
+   called e.g. /home/Owner/vice-2.0/src/WinVICE-2.0.  For development
    purposes, no further installation is necessary; you can run the
    executables directly from this directory.
 

Modified: trunk/vice/doc/html/index.html
===================================================================
--- trunk/vice/doc/html/index.html	2008-07-17 19:12:19 UTC (rev 19029)
+++ trunk/vice/doc/html/index.html	2008-07-17 19:25:46 UTC (rev 19030)
@@ -461,6 +461,11 @@
 <a NAME="contact">Contacts
 </h1>
 
+<p>VICE has moved its source repository to public services provided by
+<a href="http://sf.net/">SourceForge</a>. You can find it at <a
+href="http://sf.net/projects/vice-emu">http://sf.net/projects/vice-emu</a>.
+We like to thank the SourceForge staff for that help.</p>
+
 <p>Before contacting us, have a look at the
 <a href="http://vicekb.trikaliotis.net/">VICE knowledge base</a> if your
 question is answered there. Keep in mind
@@ -473,8 +478,13 @@
 <ul>
 
 <li>
-Generic questions, bug reports, suggestions etc.: The Vice team
-(<a href="mailto:vic...@fi...">vic...@fi...</a>)
+Bug reports, suggestions, support requests should be directed to the
+SourceForge trackers at <a
+	href="http://sourceforge.net/tracker/?group_id=223021">http://sourceforge.net/tracker/?group_id=223021</a>.
+This way, you, the users, and we, the developers, can track what has
+been reported and what has been already fixed. Ideally, also sent the
+report to the mailing address of the Vice team at (<a
+	href="mailto:vic...@fi...">vic...@fi...</a>).
 </li>
 
 </ul>

Modified: trunk/vice/doc/html/plain/NEWS
===================================================================
--- trunk/vice/doc/html/plain/NEWS	2008-07-17 19:12:19 UTC (rev 19029)
+++ trunk/vice/doc/html/plain/NEWS	2008-07-17 19:25:46 UTC (rev 19030)
@@ -11,6 +11,12 @@
 ** General
 ----------
 
+- VICE development has moved to public services:
+  http://sf.net/projects/vice-emu
+  You can read the latest development in the Subversion
+  repository, file bug reports, and similar things.
+  Check it out!
+
 - New Openserver 5.x, Openserver 6.x and Unixware ports.
 
 - New AROS64 port.
@@ -51,6 +57,9 @@
   NTSC sprites and sprites in full/debugging border mode (list
   of fixed demos/games too long to mention here).
 
+- RESTORE key is handled differently now, fixing an NMI bug
+  because the NMI was asserted too long before.
+
 ** VIC20 changes
 ----------------
 
@@ -111,6 +120,9 @@
 
 - Fixed volume slider behaviour when switching fullscreen mode.
 
+- Key repeat is eliminated OS-wise. This way, the RESTORE key is
+  not used with autorepeat.
+
 ** BeOS changes
 ---------------
 

Modified: trunk/vice/doc/vice.texi
===================================================================
--- trunk/vice/doc/vice.texi	2008-07-17 19:12:19 UTC (rev 19029)
+++ trunk/vice/doc/vice.texi	2008-07-17 19:25:46 UTC (rev 19030)
@@ -99,7 +99,7 @@
 
 @ifinfo
 
-This is the documentation for version 1.20 of VICE, the Versatile
+This is the documentation for version 2.0 of VICE, the Versatile
 Commodore Emulator.
 
 @end ifinfo


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19029
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19029&view=rev
Author:   cnvogelg
Date:     2008-07-17 19:12:19 +0000 (Thu, 17 Jul 2008)

Log Message:
-----------
updated macosx.html for 2.0 release

Modified Paths:
--------------
    branches/chris/cocoa-port/vice/doc/html/macosx.html

Modified: branches/chris/cocoa-port/vice/doc/html/macosx.html
===================================================================
--- branches/chris/cocoa-port/vice/doc/html/macosx.html	2008-07-17 18:55:51 UTC (rev 19028)
+++ branches/chris/cocoa-port/vice/doc/html/macosx.html	2008-07-17 19:12:19 UTC (rev 19029)
@@ -43,7 +43,7 @@
 On Intel Macs: Requires at least Mac OS X <b>10.4</b>
 </li>
 <li>
-<b>X11.app</b> Version 1.0 from Extra Installs on Mac OS X DVD
+<b>X11.app</b> Version 1.0 from Extra Installs on Mac OS X DVD for X11 and Gtk+ port.
 </li>
 </ul>
     
@@ -56,7 +56,7 @@
 <ul>
 <li>
 Tarball:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-1.22.tar.gz">vice-1.22.tar.gz</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0.tar.gz">vice-2.0.tar.gz</a>
 </li>
 </ul>
 
@@ -70,12 +70,12 @@
 
 <li>
 Universal Binary for <b>X11 Athena Widgets UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-x11-ub-1.22.dmg">vice-macosx-x11-ub-1.22.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-x11-ub-2.0.dmg">vice-macosx-x11-ub-2.0.dmg</a>
 </li>
 
 <li>
 Universal Binary for <b>X11 Gtk+ UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-gtk-ub-1.22.dmg">vice-macosx-gtk-ub-1.22.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-gtk-ub-2.0.dmg">vice-macosx-gtk-ub-2.0.dmg</a>
 </li>
 
 </ul>
@@ -87,7 +87,7 @@
 <ul>
 <li>
 Universal Binary for <b>native Cocoa UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-cocoa-ub-1.22.dmg">vice-macosx-cocoa-ub-1.22.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-cocoa-ub-2.0.dmg">vice-macosx-cocoa-ub-2.0.dmg</a>
 <p><b>Note:</b> The Cocoa Port is not complete yet. The archive contains a runnable x64 with a subset of the upcoming features.
 This binary is a technical preview of the new port and no full featured release of VICE. Please choose the X11/Athena or X11/Gtk+ port
 for a complete Mac release.</p>
@@ -102,14 +102,20 @@
 
 <li>
 Universal Binary for <b>X11 Athena Widgets UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-x11-ub-1.21.dmg">vice-macosx-x11-ub-1.21.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-x11-ub-1.22.dmg">vice-macosx-x11-ub-1.22.dmg</a>
 </li>
 
 <li>
 Universal Binary for <b>X11 Gtk+ UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-gtk-ub-1.21.dmg">vice-macosx-gtk-ub-1.21.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-gtk-ub-1.22.dmg">vice-macosx-gtk-ub-1.22.dmg</a>
 </li>
 
+<li>
+Universal Binary for <b>native Cocoa UI</b>:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-cocoa-ub-1.22.dmg">vice-macosx-gtk-ub-1.22.dmg</a>
+
+</li>
+
 </ul>
 
 The files are taken from


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19028
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19028&view=rev
Author:   cnvogelg
Date:     2008-07-17 18:55:51 +0000 (Thu, 17 Jul 2008)

Log Message:
-----------
merged trunk 1.22.27 [19009]-[19021]

Modified Paths:
--------------
    branches/chris/cocoa-port/vice/ChangeLog
    branches/chris/cocoa-port/vice/Makefile.am
    branches/chris/cocoa-port/vice/README
    branches/chris/cocoa-port/vice/configure.in
    branches/chris/cocoa-port/vice/src/ChangeLog
    branches/chris/cocoa-port/vice/src/arch/beos/ui.cc
    branches/chris/cocoa-port/vice/src/arch/beos/ui_file.cc
    branches/chris/cocoa-port/vice/src/arch/beos/vicemenu.cc
    branches/chris/cocoa-port/vice/src/arch/unix/skyos/make-bindist.sh
    branches/chris/cocoa-port/vice/src/arch/unix/x11/gnome/uipalcontrol.c
    branches/chris/cocoa-port/vice/src/arch/win32/kbd.c
    branches/chris/cocoa-port/vice/src/c64/c64keyboard.c
    branches/chris/cocoa-port/vice/src/version.h

Modified: branches/chris/cocoa-port/vice/ChangeLog
===================================================================
--- branches/chris/cocoa-port/vice/ChangeLog	2008-07-17 18:43:17 UTC (rev 19027)
+++ branches/chris/cocoa-port/vice/ChangeLog	2008-07-17 18:55:51 UTC (rev 19028)
@@ -1,3 +1,16 @@
+2008-07-16  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.27
+
+2008-07-15  Marco van den Heuvel  <bla...@ya...>
+
+	* Makefile.am: Reverted the skyos make bindist(zip) part back to
+	what is used to be.
+
+2008-07-14  Marco van den Heuvel  <bla...@ya...>
+
+	* README: Updated for the 2.0 release.
+
 2008-07-13  Spiro Trikaliotis  <spi...@gm...>
 
 	* Version 1.22.26

Modified: branches/chris/cocoa-port/vice/Makefile.am
===================================================================
--- branches/chris/cocoa-port/vice/Makefile.am	2008-07-17 18:43:17 UTC (rev 19027)
+++ branches/chris/cocoa-port/vice/Makefile.am	2008-07-17 18:55:51 UTC (rev 19028)
@@ -75,10 +75,10 @@
 
 if UNIX_SKYOS_COMPILE
 bindist:
-	$(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) nozip $(top_srcdir) $(MAKE)
+	$(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) nozip $(top_srcdir)
 
 bindistzip:
-	$(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) zip $(top_srcdir) $(MAKE)
+	$(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) zip $(top_srcdir)
 endif
 
 if UNIX_QNX6_COMPILE

Modified: branches/chris/cocoa-port/vice/README
===================================================================
--- branches/chris/cocoa-port/vice/README	2008-07-17 18:43:17 UTC (rev 19027)
+++ branches/chris/cocoa-port/vice/README	2008-07-17 18:55:51 UTC (rev 19028)
@@ -1,5 +1,5 @@
 
-  VICE  1.22							Aug 2007
+  VICE  2.0							Jul 2008
 
 
 		 _______________

Modified: branches/chris/cocoa-port/vice/configure.in
===================================================================
--- branches/chris/cocoa-port/vice/configure.in	2008-07-17 18:43:17 UTC (rev 19027)
+++ branches/chris/cocoa-port/vice/configure.in	2008-07-17 18:55:51 UTC (rev 19028)
@@ -9,7 +9,7 @@
 
 VICE_VERSION_MAJOR=1
 VICE_VERSION_MINOR=22
-VICE_VERSION_BUILD=26
+VICE_VERSION_BUILD=27
 
 AC_SUBST(VICE_VERSION_MAJOR)
 AC_SUBST(VICE_VERSION_MINOR)

Modified: branches/chris/cocoa-port/vice/src/ChangeLog
===================================================================
--- branches/chris/cocoa-port/vice/src/ChangeLog	2008-07-17 18:43:17 UTC (rev 19027)
+++ branches/chris/cocoa-port/vice/src/ChangeLog	2008-07-17 18:55:51 UTC (rev 19028)
@@ -1,3 +1,34 @@
+2008-07-16  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.27
+
+2008-07-16  Marco van den Heuvel  <bla...@ya...>
+
+        * arch/beos/ui.cc, arch/beos/ui_file.cc,
+        arch/beos/vicemenu.cc: Added fixes as provided by
+        Marcus Sutton <log...@gm...>
+
+2008-07-15  Spiro Trikaliotis  <spi...@gm...>
+
+	* arch/win32/kbd.c: In kbd_handle_keydown() and
+	kbd_handle_keyup(), filter out keystrokes if the happen because
+	of key autorepeat of Windows.
+
+2008-07-15  Hannu Nuotio  <han...@tu...>
+
+	* arch/unix/x11/gnome/uipalcontrol.c: Removed "Emulation" from
+	radio button texts. Fixes single size window stretching.
+
+2008-07-15  Hannu Nuotio  <han...@tu...>
+
+	* c64/c64keyboard.c: Changed Restore to ignore key release and
+	automatically clear the NMI. Fixes "nmitest" (bug 2016657).
+
+2008-07-15  Marco van den Heuvel  <bla...@ya...>
+
+	* arch/unix/skyos/make-bindist.sh: Reverted back to what worked
+	before.
+
 2008-07-13  Spiro Trikaliotis  <spi...@gm...>
 
 	* Version 1.22.26

Modified: branches/chris/cocoa-port/vice/src/arch/beos/ui.cc
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/beos/ui.cc	2008-07-17 18:43:17 UTC (rev 19027)
+++ branches/chris/cocoa-port/vice/src/arch/beos/ui.cc	2008-07-17 18:55:51 UTC (rev 19028)
@@ -263,17 +263,6 @@
 }
 
 
-static void save_snapshot_trap(WORD unused_addr, void *unused_data)
-{
-	ui_select_file(windowlist[0]->savepanel,SNAPSHOTSAVE_FILE,(void*)0);
-}
-
-static void load_snapshot_trap(WORD unused_addr, void *unused_data)
-{
-	ui_select_file(windowlist[0]->filepanel,SNAPSHOTLOAD_FILE,(void*)0);
-}
-
-
 /* this check is needed for haiku, since it always returns 1 on
    SupportsWindowMode() */
 int CheckForHaiku(void)
@@ -286,6 +275,8 @@
 	return 0;
 }
 
+/* ------------------------------------------------------------------------ */
+
 typedef struct {
     char    name[256];
     int     valid;
@@ -629,12 +620,11 @@
 		        datasette_control(DATASETTE_CONTROL_RESET_COUNTER);
 				break;
 			case MENU_SNAPSHOT_LOAD:
-				interrupt_maincpu_trigger_trap(
-					load_snapshot_trap,	(void*) 0);
+				ui_select_file(filepanel, SNAPSHOTLOAD_FILE, (void*)0);
 				break;
 			case MENU_SNAPSHOT_SAVE:
-				interrupt_maincpu_trigger_trap(
-					save_snapshot_trap, (void*) 0);
+				ui_select_file(windowlist[0]->savepanel,
+								SNAPSHOTSAVE_FILE, (void*)0);
 				break;
 			case MENU_LOADQUICK:
 				scan_files();
@@ -698,41 +688,31 @@
 			ui_paste_clipboard_text();
 			break;
         	case MENU_SOUND_RECORD_AIFF:
-                  ui_select_file(windowlist[0]->savepanel,AIFF_FILE,(void*)0);
-                  resources_set_string("SoundRecordDeviceName", "");
-                  resources_set_string("SoundRecordDeviceName", "aiff");
-                  ui_display_statustext("Sound Recording Started...", 1);
-        		break;	
+				resources_set_string("SoundRecordDeviceName", "");
+				ui_select_file(windowlist[0]->savepanel,AIFF_FILE,(void*)0);
+				break;
         	case MENU_SOUND_RECORD_IFF:
-                  ui_select_file(windowlist[0]->savepanel,IFF_FILE,(void*)0);
-                  resources_set_string("SoundRecordDeviceName", "");
-                  resources_set_string("SoundRecordDeviceName", "iff");
-                  ui_display_statustext("Sound Recording Started...", 1);
-        		break;	
+				resources_set_string("SoundRecordDeviceName", "");
+				ui_select_file(windowlist[0]->savepanel,IFF_FILE,(void*)0);
+				break;
 #ifdef USE_LAMEMP3
         	case MENU_SOUND_RECORD_MP3:
-                  ui_select_file(windowlist[0]->savepanel,MP3_FILE,(void*)0);
-                  resources_set_string("SoundRecordDeviceName", "");
-                  resources_set_string("SoundRecordDeviceName", "mp3");
-                  ui_display_statustext("Sound Recording Started...", 1);
-        		break;	
+				resources_set_string("SoundRecordDeviceName", "");
+				ui_select_file(windowlist[0]->savepanel,MP3_FILE,(void*)0);
+				break;
 #endif
         	case MENU_SOUND_RECORD_VOC:
-                  ui_select_file(windowlist[0]->savepanel,VOC_FILE,(void*)0);
-                  resources_set_string("SoundRecordDeviceName", "");
-                  resources_set_string("SoundRecordDeviceName", "voc");
-                  ui_display_statustext("Sound Recording Started...", 1);
-        		break;	
+				resources_set_string("SoundRecordDeviceName", "");
+				ui_select_file(windowlist[0]->savepanel,VOC_FILE,(void*)0);
+				break;
         	case MENU_SOUND_RECORD_WAV:
-                  ui_select_file(windowlist[0]->savepanel,WAV_FILE,(void*)0);
-                  resources_set_string("SoundRecordDeviceName", "");
-                  resources_set_string("SoundRecordDeviceName", "wav");
-                  ui_display_statustext("Sound Recording Started...", 1);
-        		break;	
+				resources_set_string("SoundRecordDeviceName", "");
+				ui_select_file(windowlist[0]->savepanel,WAV_FILE,(void*)0);
+				break;
         	case MENU_SOUND_RECORD_STOP:
-                  resources_set_string("SoundRecordDeviceName", "");
-                  ui_display_statustext("Sound Recording Stopped...", 1);
-       		break;	
+				resources_set_string("SoundRecordDeviceName", "");
+				ui_display_statustext("Sound Recording Stopped...", 1);
+				break;
         	case MENU_DRIVE_SETTINGS:
         		ui_drive();
         		break;	
@@ -984,23 +964,24 @@
 /* Report an error to the user (`printf()' style).  */
 void ui_error(const char *format, ...)
 {
-	BAlert *messagebox;
     char tmp[1024];
     va_list args;
 
     va_start(args, format);
     vsprintf(tmp, format, args);
     va_end(args);
-    messagebox = new BAlert("error", tmp, "OK", NULL, NULL, 
-    	B_WIDTH_AS_USUAL, B_STOP_ALERT);
-	vsync_suspend_speed_eval();
-	messagebox->Go();
+
+    ui_error_string(tmp);
 }
 
 /* Report an error to the user (one string).  */
 void ui_error_string(const char *text)
 {
-	ui_error(text);
+    BAlert *messagebox;
+
+    messagebox = new BAlert("error", text, "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+    vsync_suspend_speed_eval();
+    messagebox->Go();
 }
 
 /* Report a message to the user (`printf()' style).  */

Modified: branches/chris/cocoa-port/vice/src/arch/beos/ui_file.cc
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/beos/ui_file.cc	2008-07-17 18:43:17 UTC (rev 19027)
+++ branches/chris/cocoa-port/vice/src/arch/beos/ui_file.cc	2008-07-17 18:55:51 UTC (rev 19028)
@@ -44,6 +44,8 @@
 #include "c64ui.h"
 #include "constants.h"
 #include "imagecontents.h"
+#include "interrupt.h"
+#include "lib.h"
 #include "machine.h"
 #include "resources.h"
 #include "tape.h"
@@ -53,6 +55,7 @@
 #include "util.h"
 #include "vic20ui.h"
 #include "vicemenu.h"
+#include "vsync.h"
 }
 
 static int last_fileparam[2]; /* 0=filepanel, 1=savepanel */
@@ -336,10 +339,41 @@
 	filepanel->Show();
 
 	/* remember for later action */
+	last_filetype[panelnr] = filetype;
 
-	last_filetype[panelnr] = filetype;
+	/* wait for save panel to disappear */
+	if (filepanel->PanelMode() == B_SAVE_PANEL) {
+		vsync_suspend_speed_eval();
+		while (filepanel->IsShowing()) {
+		    snooze(1000);
+		    //ui_dispatch_events();
+		}
+	}
 }
+
+static void load_snapshot_trap(WORD unused_addr, void *path)
+{
+	if (machine_read_snapshot((char *)path, 0) < 0)
+        ui_error("Cannot read snapshot image.");
+    delete path;
+}
+
+static void save_snapshot_trap(WORD unused_addr, void *path)
+{
+	if (machine_write_snapshot((char *)path, 1, 1, 0) < 0)
+        ui_error("Cannot write snapshot file.");
+    delete path;
+}
 	
+static void ui_sound_record_action(const char *name, const char *ext)
+{
+	char *ext_name = util_add_extension_const(name, ext);
+	resources_set_string("SoundRecordDeviceArg", ext_name);
+	resources_set_string("SoundRecordDeviceName", ext);
+	ui_display_statustext("Sound Recording Started...", 1);
+    delete ext_name;
+}
+	
 void ui_select_file_action(BMessage *msg) {
 		entry_ref 	ref;
 		status_t 	err;
@@ -367,9 +401,9 @@
 			if (autostart_autodetect(path->Path(), NULL, 0, AUTOSTART_MODE_RUN) < 0)
   				ui_error("Cannot autostart specified file.");
 		} else if (last_filetype[0] == SNAPSHOTLOAD_FILE) {
-	    	if (machine_read_snapshot(path->Path(),0)<0) {
-        		ui_error("Cannot read snapshot image");
-        	}
+			/* we need a copy of the path that won't be deleted here */
+			char *pathname = lib_stralloc(path->Path());
+			interrupt_maincpu_trigger_trap(load_snapshot_trap, (void*) pathname);
     	} else if (last_filetype[0] == C64_CARTRIDGE_FILE) {
     		BMessage *msg = new BMessage(ATTACH_C64_CART);
     		msg->AddInt32("type", last_fileparam[0]);
@@ -411,45 +445,41 @@
 		
 		/* now the action */
 		if (last_filetype[1] == SNAPSHOTSAVE_FILE) {
-			if (machine_write_snapshot(fullpath, 1, 1, 0) < 0)
-            	ui_error("Cannot write snapshot file.");
-    	} else if (last_filetype[1] == SNAPSHOT_HISTORY_START) {
+			/* we need a copy of the path that won't be deleted here */
+			char *pathname = lib_stralloc(fullpath);
+			interrupt_maincpu_trigger_trap(save_snapshot_trap, (void*) fullpath);
+      } else if (last_filetype[1] == SNAPSHOT_HISTORY_START) {
     		resources_set_string("EventStartSnapshot", name);
-    	} else if (last_filetype[1] == SNAPSHOT_HISTORY_END) {
+      } else if (last_filetype[1] == SNAPSHOT_HISTORY_END) {
     		resources_set_string("EventEndSnapshot", name);
     		resources_set_string("EventSnapshotDir", path->Path());
       } else if (last_filetype[1] == REU_FILE) {
-            resources_set_string("REUfilename", name);
+			resources_set_string("REUfilename", fullpath);
       } else if (last_filetype[1] == GEORAM_FILE) {
-            resources_set_string("GEORAMfilename", name);
+			resources_set_string("GEORAMfilename", fullpath);
       } else if (last_filetype[1] == RAMCART_FILE) {
-            resources_set_string("RAMCARTfilename", name);
+			resources_set_string("RAMCARTfilename", fullpath);
       } else if (last_filetype[1] == PLUS60K_FILE) {
-            resources_set_string("PLUS60Kfilename", name);
+			resources_set_string("PLUS60Kfilename", fullpath);
       } else if (last_filetype[1] == PLUS256K_FILE) {
-            resources_set_string("PLUS256Kfilename", name);
+			resources_set_string("PLUS256Kfilename", fullpath);
       } else if (last_filetype[1] == C64_256K_FILE) {
-            resources_set_string("C64_256Kfilename", name);
+			resources_set_string("C64_256Kfilename", fullpath);
       } else if (last_filetype[1] == PETREU_FILE) {
-            resources_set_string("PETREUfilename", name);
+			resources_set_string("PETREUfilename", fullpath);
       } else if (last_filetype[1] == AIFF_FILE) {
-            util_add_extension_const(name, "aiff");
-            resources_set_string("SoundRecordDeviceArg", name);
+			ui_sound_record_action(fullpath, "aiff");
       } else if (last_filetype[1] == IFF_FILE) {
-            util_add_extension_const(name, "iff");
-            resources_set_string("SoundRecordDeviceArg", name);
+			ui_sound_record_action(fullpath, "iff");
 #ifdef USE_LAMEMP3
       } else if (last_filetype[1] == MP3_FILE) {
-            util_add_extension_const(name, "mp3");
-            resources_set_string("SoundRecordDeviceArg", name);
+			ui_sound_record_action(fullpath, "mp3");
 #endif
       } else if (last_filetype[1] == VOC_FILE) {
-            util_add_extension_const(name, "voc");
-            resources_set_string("SoundRecordDeviceArg", name);
+			ui_sound_record_action(fullpath, "voc");
       } else if (last_filetype[1] == WAV_FILE) {
-            util_add_extension_const(name, "wav");
-            resources_set_string("SoundRecordDeviceArg", name);
-            }
+			ui_sound_record_action(fullpath, "wav");
+      }
 		delete path;
 		delete fullpath;
 	}

Modified: branches/chris/cocoa-port/vice/src/arch/beos/vicemenu.cc
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/beos/vicemenu.cc	2008-07-17 18:43:17 UTC (rev 19027)
+++ branches/chris/cocoa-port/vice/src/arch/beos/vicemenu.cc	2008-07-17 18:55:51 UTC (rev 19028)
@@ -368,7 +368,7 @@
 	submenu->AddItem(new BMenuItem("Sound Record AIFF",
 		new BMessage(MENU_SOUND_RECORD_AIFF)));
 	submenu->AddItem(new BMenuItem("Sound Record IFF",
-		new BMessage(MENU_SOUND_RECORD_AIFF)));
+		new BMessage(MENU_SOUND_RECORD_IFF)));
 #ifdef USE_LAMEMP3
 	submenu->AddItem(new BMenuItem("Sound Record MP3",
 		new BMessage(MENU_SOUND_RECORD_MP3)));

Modified: branches/chris/cocoa-port/vice/src/arch/unix/skyos/make-bindist.sh
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/skyos/make-bindist.sh	2008-07-17 18:43:17 UTC (rev 19027)
+++ branches/chris/cocoa-port/vice/src/arch/unix/skyos/make-bindist.sh	2008-07-17 18:55:51 UTC (rev 19028)
@@ -3,49 +3,64 @@
 #
 # written by Marco van den Heuvel <bla...@ya...>
 #
-# make-bindist.sh <strip> <vice-version> <prefix> <zip|nozip> <topsrcdir> <make-command>
-#                 $1      $2             $3       $4          $5          $6
+# make-bindist.sh <strip> <vice-version> <prefix> <zip|nozip> <topsrcdir>
+#                 $1      $2             $3       $4          $5
 
 STRIP=$1
 VERSION=$2
 PREFIX=$3
 ZIPKIND=$4
 TOPSRCDIR=$5
-MAKECOMMAND=$6
 
 if test x"$PREFIX" != "x/boot/programs/VICE"; then
   echo Error: installation path is not /boot/programs/VICE
   exit 1
 fi
 
-if [ ! -e src/x64 -o ! -e src/x128 -o ! -e src/xvic -o ! -e src/xpet -o ! -e src/xplus4 -o ! -e src/xcbm2 -o ! -e src/c1541 -o ! -e src/petcat -o ! -e src/cartconv ]
+if [ ! -e /boot/programs/VICE/bin/x64 -o ! -e /boot/programs/VICE/bin/x128 -o ! -e /boot/programs/VICE/bin/xvic -o ! -e /boot/programs/VICE/bin/xpet -o ! -e /boot/programs/VICE/bin/xplus4 -o ! -e /boot/programs/VICE/bin/xcbm2 -o ! -e /boot/programs/VICE/bin/c1541 -o ! -e /boot/programs/VICE/bin/petcat -o ! -e /boot/programs/VICE/bin/cartconv ]
 then
-  echo Error: \"make\" needs to be done first
+  echo Error: \"make install\" needs to be done first
   exit 1
 fi
 
 echo Generating SkyOS port binary distribution.
 rm -f -r VICE-$VERSION
-curdir=`pwd`
-$MAKECOMMAND -e prefix=$curdir/VICE-$VERSION/programs/VICE VICEDIR=$curdir/VICE-$VERSION/programs/VICE/lib/vice install
-mv VICE-$VERSION/programs/VICE/bin/x64 VICE-$VERSION/programs/VICE/bin/x64.app
+mkdir -p VICE-$VERSION/programs/VICE
+mkdir -p VICE-$VERSION/programs/VICE/lib/locale/de/LC_MESSAGES
+mv /boot/programs/VICE/lib/locale/de/LC_MESSAGES/vice.* VICE-$VERSION/programs/VICE/lib/locale/de/LC_MESSAGES
+mkdir -p VICE-$VERSION/programs/VICE/lib/locale/fr/LC_MESSAGES
+mv /boot/programs/VICE/lib/locale/fr/LC_MESSAGES/vice.* VICE-$VERSION/programs/VICE/lib/locale/fr/LC_MESSAGES
+mkdir -p VICE-$VERSION/programs/VICE/lib/locale/it/LC_MESSAGES
+mv /boot/programs/VICE/lib/locale/it/LC_MESSAGES/vice.* VICE-$VERSION/programs/VICE/lib/locale/it/LC_MESSAGES
+mkdir -p VICE-$VERSION/programs/VICE/lib/locale/sv/LC_MESSAGES
+mv /boot/programs/VICE/lib/locale/sv/LC_MESSAGES/vice.* VICE-$VERSION/programs/VICE/lib/locale/sv/LC_MESSAGES
+mkdir -p VICE-$VERSION/programs/VICE/lib/locale/pl/LC_MESSAGES
+mv /boot/programs/VICE/lib/locale/pl/LC_MESSAGES/vice.* VICE-$VERSION/programs/VICE/lib/locale/pl/LC_MESSAGES
+mkdir -p VICE-$VERSION/programs/VICE/lib/locale/nl/LC_MESSAGES
+mv /boot/programs/VICE/lib/locale/nl/LC_MESSAGES/vice.* VICE-$VERSION/programs/VICE/lib/locale/nl/LC_MESSAGES
+mkdir -p VICE-$VERSION/programs/VICE/lib/locale/hu/LC_MESSAGES
+mv /boot/programs/VICE/lib/locale/hu/LC_MESSAGES/vice.* VICE-$VERSION/programs/VICE/lib/locale/hu/LC_MESSAGES
+mkdir VICE-$VERSION/programs/VICE/bin
+mv /boot/programs/VICE/bin/vsid VICE-$VERSION/programs/VICE/bin
+mv /boot/programs/VICE/bin/x64 VICE-$VERSION/programs/VICE/bin/x64.app
 $STRIP VICE-$VERSION/programs/VICE/bin/x64.app
-mv VICE-$VERSION/programs/VICE/bin/x128 VICE-$VERSION/programs/VICE/bin/x128.app
+mv /boot/programs/VICE/bin/x128 VICE-$VERSION/programs/VICE/bin/x128.app
 $STRIP VICE-$VERSION/programs/VICE/bin/x128.app
-mv VICE-$VERSION/programs/VICE/bin/xvic VICE-$VERSION/programs/VICE/bin/xvic.app
+mv /boot/programs/VICE/bin/xvic VICE-$VERSION/programs/VICE/bin/xvic.app
 $STRIP VICE-$VERSION/programs/VICE/bin/xvic.app
-mv VICE-$VERSION/programs/VICE/bin/xpet VICE-$VERSION/programs/VICE/bin/xpet.app
+mv /boot/programs/VICE/bin/xpet VICE-$VERSION/programs/VICE/bin/xpet.app
 $STRIP VICE-$VERSION/programs/VICE/bin/xpet.app
-mv VICE-$VERSION/programs/VICE/bin/xplus4 VICE-$VERSION/programs/VICE/bin/xplus4.app
+mv /boot/programs/VICE/bin/xplus4 VICE-$VERSION/programs/VICE/bin/xplus4.app
 $STRIP VICE-$VERSION/programs/VICE/bin/xplus4.app
-mv VICE-$VERSION/programs/VICE/bin/xcbm2 VICE-$VERSION/programs/VICE/bin/xcbm2.app
+mv /boot/programs/VICE/bin/xcbm2 VICE-$VERSION/programs/VICE/bin/xcbm2.app
 $STRIP VICE-$VERSION/programs/VICE/bin/xcbm2.app
-mv VICE-$VERSION/programs/VICE/bin/c1541 VICE-$VERSION/programs/VICE/bin/c1541.app
+mv /boot/programs/VICE/bin/c1541 VICE-$VERSION/programs/VICE/bin/c1541.app
 $STRIP VICE-$VERSION/programs/VICE/bin/c1541.app
-mv VICE-$VERSION/programs/VICE/bin/petcat VICE-$VERSION/programs/VICE/bin/petcat.app
+mv /boot/programs/VICE/bin/petcat VICE-$VERSION/programs/VICE/bin/petcat.app
 $STRIP VICE-$VERSION/programs/VICE/bin/petcat.app
-mv VICE-$VERSION/programs/VICE/bin/cartconv VICE-$VERSION/programs/VICE/bin/cartconv.app
+mv /boot/programs/VICE/bin/cartconv VICE-$VERSION/programs/VICE/bin/cartconv.app
 $STRIP VICE-$VERSION/programs/VICE/bin/cartconv.app
+mv /boot/programs/VICE/lib/vice VICE-$VERSION/programs/VICE/lib
 rm `find VICE-$VERSION -name "amiga_*.vkm"`
 rm `find VICE-$VERSION -name "beos_*.vkm"`
 rm `find VICE-$VERSION -name "dos_*.vkm"`
@@ -53,7 +68,12 @@
 rm `find VICE-$VERSION -name "osx*.vkm"`
 rm `find VICE-$VERSION -name "win_*.vkm"`
 rm `find VICE-$VERSION -name "RO*.vkm"`
+mkdir -p VICE-$VERSION/programs/VICE/share/man/man1
+mv /boot/programs/VICE/share/man/man1/* VICE-$VERSION/programs/VICE/share/man/man1/
+mkdir -p VICE-$VERSION/programs/VICE/info
+mv /boot/programs/VICE/share/info/vice.info* VICE-$VERSION/programs/VICE/share/info
 cp -r $TOPSRCDIR/src/arch/unix/skyos/icons VICE-$VERSION/programs/VICE/
+rm -f -r /boot/programs/VICE
 if test x"$ZIPKIND" = "xzip"; then
   THEDATE=`date +%d-%b-%Y`
   cat >VICE-$VERSION/install.sif <<_END

Modified: branches/chris/cocoa-port/vice/src/arch/unix/x11/gnome/uipalcontrol.c
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/x11/gnome/uipalcontrol.c	2008-07-17 18:43:17 UTC (rev 19027)
+++ branches/chris/cocoa-port/vice/src/arch/unix/x11/gnome/uipalcontrol.c	2008-07-17 18:55:51 UTC (rev 19028)
@@ -195,20 +195,20 @@
     gtk_widget_show(rb);
 
     fake_palemu = gtk_radio_button_new_with_label(NULL, 
-        _("Fast Emulation"));
+        _("Fast"));
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fake_palemu), TRUE);
     gtk_box_pack_start(GTK_BOX(box), fake_palemu, FALSE, FALSE, 5);
     gtk_widget_show(fake_palemu);
 
     true_palemu = gtk_radio_button_new_with_label(
 	gtk_radio_button_get_group(GTK_RADIO_BUTTON(fake_palemu)),
-        _("Exact Emulation"));
+        _("Exact"));
     gtk_box_pack_start(GTK_BOX(box), true_palemu, FALSE, FALSE, 5);
     gtk_widget_show(true_palemu);
 
     new_true_palemu = gtk_radio_button_new_with_label(
 	gtk_radio_button_get_group(GTK_RADIO_BUTTON(fake_palemu)),
-        _("New Exact Emulation"));
+        _("New Exact"));
     gtk_box_pack_start(GTK_BOX(box), new_true_palemu, FALSE, FALSE, 5);
     gtk_widget_show(new_true_palemu);
 

Modified: branches/chris/cocoa-port/vice/src/arch/win32/kbd.c
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/win32/kbd.c	2008-07-17 18:43:17 UTC (rev 19027)
+++ branches/chris/cocoa-port/vice/src/arch/win32/kbd.c	2008-07-17 18:55:51 UTC (rev 19028)
@@ -58,6 +58,7 @@
 int kbd_handle_keydown(DWORD virtual_key, DWORD key_data)
 {
     int kcode = (key_data >> 16) & 0xff;
+    int repeated = key_data & 0x40000000 ? 1 : 0;
 
     if (virtual_key == 0xff)
         return 0;
@@ -67,7 +68,9 @@
         kcode = _kbd_extended_key_tab[kcode];
     }
 
-    keyboard_key_pressed((signed long)kcode);
+    if ( ! repeated ) {
+        keyboard_key_pressed((signed long)kcode);
+    }
 
     return 0;
 }
@@ -75,6 +78,7 @@
 int kbd_handle_keyup(DWORD virtual_key, DWORD key_data)
 {
     int kcode = (key_data >> 16) & 0xff;
+    int repeated = key_data & 0x40000000 ? 0 : 1;
 
     if (virtual_key == 0xff)
         return 0;
@@ -84,7 +88,9 @@
         kcode = _kbd_extended_key_tab[kcode];
     }
 
-    keyboard_key_released((signed long)kcode);
+    if ( ! repeated ) {
+        keyboard_key_released((signed long)kcode);
+    }
 
     return 0;
 }

Modified: branches/chris/cocoa-port/vice/src/c64/c64keyboard.c
===================================================================
--- branches/chris/cocoa-port/vice/src/c64/c64keyboard.c	2008-07-17 18:43:17 UTC (rev 19027)
+++ branches/chris/cocoa-port/vice/src/c64/c64keyboard.c	2008-07-17 18:55:51 UTC (rev 19028)
@@ -56,7 +56,13 @@
 
 void c64keyboard_restore_key(int v)
 {
-    maincpu_set_nmi(c64keyboard_int_num, v ? 1 : 0);
+    /* ignore key release */
+    if (v) {
+        /* trigger the NMI */
+        maincpu_set_nmi(c64keyboard_int_num, 1);
+        /* ack the restore NMI, leaving global_pending_int active */
+        maincpu_set_nmi(c64keyboard_int_num, 0);
+    }
 }
 
 void c64keyboard_init(void)

Modified: branches/chris/cocoa-port/vice/src/version.h
===================================================================
--- branches/chris/cocoa-port/vice/src/version.h	2008-07-17 18:43:17 UTC (rev 19027)
+++ branches/chris/cocoa-port/vice/src/version.h	2008-07-17 18:55:51 UTC (rev 19028)
@@ -28,11 +28,11 @@
 #define __VERSION_H__
 
 #ifndef VERSION
-#define VERSION "1.22.26"
+#define VERSION "1.22.27"
 #endif
 
 #ifndef VERSION_RC_NUMBER
-#define VERSION_RC_NUMBER 1,22,26,0
+#define VERSION_RC_NUMBER 1,22,27,0
 #endif
 
 #ifndef PACKAGE


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19027
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19027&view=rev
Author:   cnvogelg
Date:     2008-07-17 18:43:17 +0000 (Thu, 17 Jul 2008)

Log Message:
-----------
updated OSX docs

Modified Paths:
--------------
    branches/chris/cocoa-port/vice/doc/ReadmeMacOSX.txt

Modified: branches/chris/cocoa-port/vice/doc/ReadmeMacOSX.txt
===================================================================
--- branches/chris/cocoa-port/vice/doc/ReadmeMacOSX.txt	2008-07-17 07:01:28 UTC (rev 19026)
+++ branches/chris/cocoa-port/vice/doc/ReadmeMacOSX.txt	2008-07-17 18:43:17 UTC (rev 19027)
@@ -1,9 +1,9 @@
-MacOS X Port of VICE
+Mac OS X Port of VICE
 ====================
 
 This document contains information relevant for the Mac OS X Port of VICE.
 
-This official MacOS X Port is maintained by 
+This official Mac OS X Port is maintained by 
   Christian Vogelgsang <ch...@vo...>
 
 
@@ -11,35 +11,48 @@
   --------
 
   1. Installation
-  2. Usage
-  3. Building VICE
-  4. Feedback
+  2. Usage of Gtk+/X11 Port
+  3. Usage of Cocoa Port
+  4. Joystick Support
+  5. Building VICE
+  6. Feedback
 
 
 1. Installation
 ---------------
 
-1.1 Install X11
 
-Make sure to have X11.app installed on your Mac. It is provided on your Mac
+1.1 Choose Port
+
+The VICE Emulators for Macs are distributed in three versions that use
+different UI front ends: native Cocoa, X11/Xaw, and, Gtk+. The first one
+directly uses the well known Mac user interface. The other ones are based on
+the X11 Window System that is available additionally for Mac OS X.
+
+X11/Xaw is based on the original X11 interface of VICE and is very light but
+with limited UI interface. The second one is based on the Gtk+ widget library
+and has a feature rich UI with pull-down menus. Xaw is a slim port that needs
+no non-system extra libraries, Gtk+ requires a large set of external libs and
+thus is quite large.
+
+The ports are named with *-cocoa-*, *-x11-*, or *-gtk-* in the distribution
+archive name.
+
+The X11/Xaw and Gtk+ are complete ports, i.e. all features available on other
+systems are available and all emulators are included. The Cocoa port is still
+under construction and thus considered "experimental". It does not include all
+features available and some emulators are not complete.
+
+
+1.2 Install X11 (Only for X11/Xaw and Gtk+ Port)
+
+Make sure you have X11.app installed on your Mac. It is provided on your Mac
 OSX install CD/DVD (at least on Mac OS X 10.4 or later) and often not
 installed by default. Click on the corresponding "X11.pkg" to install it. On
 newer systems there is an "Optional Installs.pkg" installer that allows to
 install X11 in the "Custom Installation" section.
 
-1.2 Choose Version
 
-The VICE Emulators for Macs are distributed in two versions that use different
-UI front ends: X11 or Gtk+. The first one is based on the original X11
-interface of VICE and is very light. The second one is based on the Gtk+
-widget library and has a feature rich UI with pull-down menus.
-
-X11 is a slim port that needs no non-system extra libraries, Gtk+ requires a
-large set of external libs and thus is quite large.
-
-The two ports are named with *-x11-* or *-gtk-* in the distribution archive
-name.
-
 1.3 Install Application
 
 The Mac OS X port is distributed as a disk image *.dmg. Just click on the
@@ -47,8 +60,11 @@
 disk image to your hard disk. Just create a new VICE directory in your
 applications folder (/Applications) and copy all files there.
 
-1.4 Create Bundles for each Emulator
+If you like, you can move the Application binaries anywhere you want.
 
+
+1.4 Create Bundles for each Emulator (Optional; Only for X11/Xaw and Gtk+ Port)
+
 The VICE distribution contains a single application bundle called VICE. If you
 run this one by double clicking on it then it will ask which emulator to run.
 
@@ -61,6 +77,7 @@
 The separate emulator application bundles are not distributed in the release
 dmg to save download time and server space.
 
+
 1.5 Setup Command Line Tools
 
 You can use the emulators and some additional tools (e.g. c1541, cardconv,
@@ -73,8 +90,10 @@
 The command line emulators are launched with a helper script that calls the
 binary embedded in the VICE.app application bundle. It is important to keep
 the VICE.app bundle in the directory directly next to the "tools" directory
-otherwise the command line emulators will not run.
+otherwise the command line emulators will not run. Similarly, the Cocoa port
+needs the emulator App bundle in the same directory.
 
+
 1.6 Network Setup
 
 This port of VICE supports the ethernet emulation available in some emulators
@@ -98,10 +117,15 @@
 libpcap-source distribution. Download from http://www.tcpdump.org and have a
 look at libpcap/README.macosx.
 
+Unfortunately, the WLAN adapter (usually device en1) on portable Macs does not
+support libpcap packet capturing (as of 10.4 and 10.5). So TFE emulation on a
+wireless network adapter may not work. Use the ethernet port instead.
 
-2. Usage
---------
 
+
+2. Usage of Gtk+ and X11/Xaw Ports
+----------------------------------
+
 2.1 Run VICE Bundle
 
 Simply run the emulator suite by clicking on the VICE.app icon. A chooser
@@ -109,15 +133,19 @@
 to launch an emulator directly then see section 1.4 for creating separate
 bundles for each emulator.
 
-The VICE Bundle supports a simple style of drag and drop: You can launch the
+On start up the bundle will first open a terminal window (xterm) for the VICE
+log messages and then the screen windows for the virtual displays.
+
+The VICE bundles support a simple style of drag and drop: You can launch the
 emulator by dragging a disk image (*.d64 *.d71 *.d81) or a program file (*.prg
 *.p00) on the bundle icon. This will smart-attach the given binary and launch
 the emulator. If the emulator is already running then drag and drop does not
 work.
 
-On start up the bundle will first open a terminal window (xterm) for the VICE
-log messages and then the screen windows for the virtual displays.
+Also, an emulator bundle will register the typical file types (see above) and
+then you can simply click on a disk image directly to launch it in VICE.
 
+
 2.2 Run from Command Line
 
 First add the "tools" directory to your PATH (see section 1.5) in your
@@ -125,10 +153,11 @@
 script in "tools" (e.g. x64, x128...). Any arguments passed to the launcher
 are directly forwarded to the emulator binary.
 
-On start up the launcher ensures that the X11 environment is available and
-redirects all console output directly to the console. An additional xterm
-window for log messages is not opened.
+For the Gtk+ and X11/Xaw ports on start up the launcher ensures that the X11
+environment is available and redirects all console output directly to the
+console. An additional xterm window for log messages is not opened.
 
+
 2.3 Use the X11 UI
 
 The X11 UI is very light and only presents the virtual display in a window
@@ -151,6 +180,7 @@
 Have a look at the official VICE manuals for an in-depth description of the
 available commands and options.
 
+
 2.4 Use the Gtk+ UI
 
 The Gtk+ UI is much more user-friendly. An emulator window with a pull-down
@@ -164,8 +194,9 @@
 Have a look at the official VICE manuals for an in-depth description of the
 available commands and options.
 
-2.5 Keyboard Mapping
 
+2.5 Keyboard Mapping in Gtk+/X11
+
 The keyboard mapping on X11 (and on your Mac) is done as follows:
  
  1. Map raw key code of your keyboard to X11 key code with Xmodmap
@@ -183,7 +214,7 @@
 choosing a file or by selecting a predefined one. Predefined symbolic and
 positional mappings are available.
 
-The symbolic mapping assigns the pressed Mac key to the same labeled key on
+The 'symbolic mapping' assigns the pressed Mac key to the same labeled key on
 the virtual cbm keyboard. So pressing F1 on the Mac presses F1 on the emulated
 machine. It also does automatic shifting/unshifting, e.g. pressing F2 on the
 Mac results in a virtual shift press and a virtual key F1 press (i.e. F2 is
@@ -205,12 +236,12 @@
    Left Arrow                Underscore (_)               
    Up Arrow                  Tilde (~) Backtick (`) Grave (^)
 
-The positional mappings try to map the physical location of a key on the Mac
+The 'positional mappings' try to map the physical location of a key on the Mac
 keyboard to a virtual key at a similar position. E.g. your top and leftmost
 key will be the top and leftmost key on your virtual machine. Unfortunately,
 this mapping does not work always as expected: It relies heavily on the
 national layout of your keymap. Furthermore, the physical layout of Mac and
-VICE machine do not match exactly so positional mapping will always be an
+VICE machine do not match exactly, so positional mapping will always be an
 approximation. This can be even more complicate if you use different key
 mappings on your Mac.
 
@@ -220,8 +251,56 @@
 keys to control software features". The hardware controls are then accessed by
 pressing F1-F12 + Fn key.
 
-2.6 Joystick Support
 
+
+3. Usage of Cocoa Port
+----------------------
+
+Note: The Cocoa port is still "experimental", i.e. it is not full featured and
+some things may be missing. This holds for the documentation as well ;)
+
+3.1 Features
+
+ * native Mac OS X user interface with modeless dialogs
+ * any-size/fullscreen OpenGL accelerated rendering
+ * multi-threaded emulation core
+
+
+3.2 Current State
+
+ * x64 90% complete, runs with UI and most menus and dialogs.
+ 
+ * All other emus: binaries are available, no menus and dialogs.
+   Use CMD+Q to quit such an emulator and drag&drop to attach disk images.
+   Some keyboard mappings already work, others not.
+
+
+3.3 Known Issues
+
+ * The Resource Inspector lacks correct input cells. All values have to
+   be entered as strings.
+ * Some Menu entries are not greyed out but still do nothing.
+
+
+3.4 Key Mapping
+
+The key mapping show the Mac key on a US extended mapping and the right one is
+the emulated Commodore key. Special keys are marked with <Symbol>.
+
+  § (Paragraph)                 <LEFT ARROW>
+  <Tab>                         <CONTROL>
+  ` (Backtick), Left Alt/Ctrl   <CBM>
+  <ESC>                         <RUN/STOP>
+  <Backspace>                   <DEL>
+  <F9>, <PgDown>                <POUND>
+  <F10>, <PgUp>                 <UP ARROW>
+  <F11>, <Home>                 <CLR/HOME>
+  <F12>                         <RESTORE>
+
+
+4. Joystick Support
+-------------------
+
 The Mac ports has support for USB joysticks. It requires a generic USB HID
 joystick device which is supported by most joystick models. Every button of
 the joystick is mapped to the single virtual fire button in the emulator. The
@@ -242,14 +321,15 @@
 should work with other models as well.
 
 
-3. Building VICE
+5. Building VICE
 ----------------
 
 This section is only relevant if you want to compile an own distribution of
 VICE from the source code.
 
-3.1 XCode
 
+5.1 XCode
+
 If you wan to compile VICE yourself then you first need to install Apple's
 XCode Development kit. It is available on your Mac OS X Installation DVD or
 can be downloaded for free (after registration) from the Apple Developer
@@ -260,10 +340,11 @@
 XCode itself is not required but the command line tools (compiler, linker...)
 and other development files (SDKs).
 
-3.2 Required Tools
 
-The following tools are required or optional for a successfull VICE build:
+5.2 Required Tools
 
+The following tools are required or optional for a successful VICE build:
+
  - Platypus  (Optional)
    
      http://www.sveinbjorn.org/platypus
@@ -276,8 +357,9 @@
    script does not support drag and drop and quits immediately afert start up
    (i.e. the VICE application icon disappears after the launch)!
 
-3.3 Required Library Sources
 
+5.3 Required Library Sources
+
 VICE for Macs relies on a number of external libraries. You have to get their
 source code as they are missing on a default Mac system. Some libs are
 optional, i.e. if they are available then some extra features of VICE are
@@ -317,8 +399,9 @@
     lame-3.97.tar.gz            http://lame.sourceforge.net/
     svn tree at                 svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-svn
 
-3.4 Building Required Libraries
 
+5.4 Building Required Libraries
+
 First, build all external libraries. The VICE source distribution contains
 build scripts to automatically perform this step.
 
@@ -342,8 +425,9 @@
 If all went well then the libraries are compiled and installed in the "extlib"
 directory. The libraries are now ready for the VICE build.
 
-3.5 Building VICE
 
+5.5 Building VICE
+
 The build process of VICE contains the following steps: Call "configure" in
 the source tree to determine the required "make" system setup and find
 available libs. Then compile the source tree to get binaries of all emulators
@@ -399,7 +483,7 @@
 disk image found in the "TEMP/x11/ub/" directory.
 
 
-4. Feedback
+6. Feedback
 -----------
 
 If you discover problems not listed above or just want to tell us your


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19026
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19026&view=rev
Author:   strik
Date:     2008-07-17 07:01:28 +0000 (Thu, 17 Jul 2008)

Log Message:
-----------
Updated.

Modified Paths:
--------------
    trunk/vice/po/ChangeLog
    trunk/vice/po/de.po

Modified: trunk/vice/po/ChangeLog
===================================================================
--- trunk/vice/po/ChangeLog	2008-07-16 21:40:23 UTC (rev 19025)
+++ trunk/vice/po/ChangeLog	2008-07-17 07:01:28 UTC (rev 19026)
@@ -1,3 +1,7 @@
+2008-07-16  Spiro Trikaliotis  <spi...@gm...>
+
+	* de.po: Updated
+
 2008-07-16  Marco van den Heuvel  <bla...@ya...>
 
 	* de.po, fr.po, hu.po, it.po, pl.po, sv.po: Removed the '#~' items.

Modified: trunk/vice/po/de.po
===================================================================
--- trunk/vice/po/de.po	2008-07-16 21:40:23 UTC (rev 19025)
+++ trunk/vice/po/de.po	2008-07-17 07:01:28 UTC (rev 19026)
@@ -5466,9 +5466,8 @@
 msgstr "PAL Einstellungen"
 
 #: src/arch/unix/x11/gnome/uipalcontrol.c:198
-#, fuzzy
 msgid "Fast"
-msgstr "*Schnell"
+msgstr "Schnell"
 
 #: src/arch/unix/x11/gnome/uipalcontrol.c:205 src/arch/win32/res.rc.po.c:5197
 #: src/arch/amigaos/intl.c.po.c:3755
@@ -5476,9 +5475,8 @@
 msgstr "Exakt"
 
 #: src/arch/unix/x11/gnome/uipalcontrol.c:211
-#, fuzzy
 msgid "New Exact"
-msgstr "Exakt"
+msgstr "Neu Exakt"
 
 #: src/arch/unix/x11/gnome/uinetplay.c:54 src/arch/win32/res.rc.po.c:4553
 #: src/arch/amigaos/intl.c.po.c:4493


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19023
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19023&view=rev
Author:   strik
Date:     2008-07-16 00:17:34 -0700 (Wed, 16 Jul 2008)

Log Message:
-----------
Checked in missing .po files from build of 1.22.27.

Modified Paths:
--------------
    trunk/vice/po/de.po
    trunk/vice/po/fr.po
    trunk/vice/po/hu.po
    trunk/vice/po/it.po
    trunk/vice/po/nl.po
    trunk/vice/po/pl.po
    trunk/vice/po/sv.po

Modified: trunk/vice/po/de.po
===================================================================
--- trunk/vice/po/de.po	2008-07-16 04:57:57 UTC (rev 19022)
+++ trunk/vice/po/de.po	2008-07-16 07:17:34 UTC (rev 19023)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: VICE 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-13 20:27+0200\n"
+"POT-Creation-Date: 2008-07-16 06:53+0200\n"
 "PO-Revision-Date: 2008-01-02 16:46+0100\n"
 "Last-Translator: Martin Pottendorfer (pot...@ut...)\n"
 "Language-Team: de <de...@li...>\n"
@@ -5466,17 +5466,19 @@
 msgstr "PAL Einstellungen"
 
 #: src/arch/unix/x11/gnome/uipalcontrol.c:198
-msgid "Fast Emulation"
-msgstr "Schnelle Emulation"
+#, fuzzy
+msgid "Fast"
+msgstr "*Schnell"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:205
-msgid "Exact Emulation"
-msgstr "Exakte Emulation"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:205 src/arch/win32/res.rc.po.c:5197
+#: src/arch/amigaos/intl.c.po.c:3755
+msgid "Exact"
+msgstr "Exakt"
 
 #: src/arch/unix/x11/gnome/uipalcontrol.c:211
 #, fuzzy
-msgid "New Exact Emulation"
-msgstr "Exakte Emulation"
+msgid "New Exact"
+msgstr "Exakt"
 
 #: src/arch/unix/x11/gnome/uinetplay.c:54 src/arch/win32/res.rc.po.c:4553
 #: src/arch/amigaos/intl.c.po.c:4493
@@ -7445,10 +7447,6 @@
 msgid "Adjusting"
 msgstr "Anpassend"
 
-#: src/arch/win32/res.rc.po.c:5197 src/arch/amigaos/intl.c.po.c:3755
-msgid "Exact"
-msgstr "Exakt"
-
 #: src/arch/win32/res.rc.po.c:5198
 msgid "Sound driver: DirectX"
 msgstr "Sound Treiber: DirectX"
@@ -11322,3 +11320,13 @@
 #: src/arch/amigaos/intl.c.po.c:4844
 msgid "Amiga mouse"
 msgstr "Amiga Maus"
+
+#~ msgid "Fast Emulation"
+#~ msgstr "Schnelle Emulation"
+
+#~ msgid "Exact Emulation"
+#~ msgstr "Exakte Emulation"
+
+#, fuzzy
+#~ msgid "New Exact Emulation"
+#~ msgstr "Exakte Emulation"

Modified: trunk/vice/po/fr.po
===================================================================
--- trunk/vice/po/fr.po	2008-07-16 04:57:57 UTC (rev 19022)
+++ trunk/vice/po/fr.po	2008-07-16 07:17:34 UTC (rev 19023)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: VICE 1.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-13 20:27+0200\n"
+"POT-Creation-Date: 2008-07-16 06:53+0200\n"
 "PO-Revision-Date: 2007-07-26 11:57+0200\n"
 "Last-Translator: Paul Dub\xE9 <dub...@gm...>\n"
 "Language-Team: fr <fr...@li...>\n"
@@ -5637,17 +5637,19 @@
 msgstr "Param\xE8tres PAL"
 
 #: src/arch/unix/x11/gnome/uipalcontrol.c:198
-msgid "Fast Emulation"
-msgstr "\xC9mulation rapide"
+#, fuzzy
+msgid "Fast"
+msgstr "*Rapide"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:205
-msgid "Exact Emulation"
-msgstr "\xC9mulation exacte"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:205 src/arch/win32/res.rc.po.c:5197
+#: src/arch/amigaos/intl.c.po.c:3755
+msgid "Exact"
+msgstr "Exact"
 
 #: src/arch/unix/x11/gnome/uipalcontrol.c:211
 #, fuzzy
-msgid "New Exact Emulation"
-msgstr "\xC9mulation exacte"
+msgid "New Exact"
+msgstr "Exact"
 
 #: src/arch/unix/x11/gnome/uinetplay.c:54 src/arch/win32/res.rc.po.c:4553
 #: src/arch/amigaos/intl.c.po.c:4493
@@ -7660,10 +7662,6 @@
 msgid "Adjusting"
 msgstr "Ajust\xE9"
 
-#: src/arch/win32/res.rc.po.c:5197 src/arch/amigaos/intl.c.po.c:3755
-msgid "Exact"
-msgstr "Exact"
-
 #: src/arch/win32/res.rc.po.c:5198
 #, fuzzy
 msgid "Sound driver: DirectX"
@@ -11866,3 +11864,13 @@
 #: src/arch/amigaos/intl.c.po.c:4844
 msgid "Amiga mouse"
 msgstr ""
+
+#~ msgid "Fast Emulation"
+#~ msgstr "\xC9mulation rapide"
+
+#~ msgid "Exact Emulation"
+#~ msgstr "\xC9mulation exacte"
+
+#, fuzzy
+#~ msgid "New Exact Emulation"
+#~ msgstr "\xC9mulation exacte"

Modified: trunk/vice/po/hu.po
===================================================================
--- trunk/vice/po/hu.po	2008-07-16 04:57:57 UTC (rev 19022)
+++ trunk/vice/po/hu.po	2008-07-16 07:17:34 UTC (rev 19023)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: VICE 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-13 20:27+0200\n"
+"POT-Creation-Date: 2008-07-16 06:53+0200\n"
 "PO-Revision-Date: 2007-07-27 15:58+0200\n"
 "Last-Translator: Karai Csaba <cs...@fr...>\n"
 "Language-Team: Hungarian <hu...@li...>\n"
@@ -5504,17 +5504,19 @@
 msgstr "PAL Be\xE1ll\xEDt\xE1sai"
 
 #: src/arch/unix/x11/gnome/uipalcontrol.c:198
-msgid "Fast Emulation"
-msgstr "Gyors emul\xE1ci\xF3"
+#, fuzzy
+msgid "Fast"
+msgstr "*Gyors"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:205
-msgid "Exact Emulation"
-msgstr "Pontos emul\xE1ci\xF3"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:205 src/arch/win32/res.rc.po.c:5197
+#: src/arch/amigaos/intl.c.po.c:3755
+msgid "Exact"
+msgstr "Pontos"
 
 #: src/arch/unix/x11/gnome/uipalcontrol.c:211
 #, fuzzy
-msgid "New Exact Emulation"
-msgstr "Pontos emul\xE1ci\xF3"
+msgid "New Exact"
+msgstr "Pontos"
 
 #: src/arch/unix/x11/gnome/uinetplay.c:54 src/arch/win32/res.rc.po.c:4553
 #: src/arch/amigaos/intl.c.po.c:4493
@@ -7483,10 +7485,6 @@
 msgid "Adjusting"
 msgstr "Igazod\xF3"
 
-#: src/arch/win32/res.rc.po.c:5197 src/arch/amigaos/intl.c.po.c:3755
-msgid "Exact"
-msgstr "Pontos"
-
 #: src/arch/win32/res.rc.po.c:5198
 msgid "Sound driver: DirectX"
 msgstr "Hang meghajt\xF3: DirectX"
@@ -11366,3 +11364,13 @@
 #: src/arch/amigaos/intl.c.po.c:4844
 msgid "Amiga mouse"
 msgstr "Amiga eg\xE9r"
+
+#~ msgid "Fast Emulation"
+#~ msgstr "Gyors emul\xE1ci\xF3"
+
+#~ msgid "Exact Emulation"
+#~ msgstr "Pontos emul\xE1ci\xF3"
+
+#, fuzzy
+#~ msgid "New Exact Emulation"
+#~ msgstr "Pontos emul\xE1ci\xF3"

Modified: trunk/vice/po/it.po
===================================================================
--- trunk/vice/po/it.po	2008-07-16 04:57:57 UTC (rev 19022)
+++ trunk/vice/po/it.po	2008-07-16 07:17:34 UTC (rev 19023)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: VICE 1.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-13 20:27+0200\n"
+"POT-Creation-Date: 2008-07-16 06:53+0200\n"
 "PO-Revision-Date: 2007-07-28 14:26+0100\n"
 "Last-Translator: Andrea Musuruane <mus...@gm...>\n"
 "Language-Team: it <it...@li...>\n"
@@ -5547,17 +5547,19 @@
 msgstr "Impostazioni PAL"
 
 #: src/arch/unix/x11/gnome/uipalcontrol.c:198
-msgid "Fast Emulation"
-msgstr "Emulazione veloce"
+#, fuzzy
+msgid "Fast"
+msgstr "*Veloce"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:205
-msgid "Exact Emulation"
-msgstr "Emulazione esatta"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:205 src/arch/win32/res.rc.po.c:5197
+#: src/arch/amigaos/intl.c.po.c:3755
+msgid "Exact"
+msgstr "Esatta"
 
 #: src/arch/unix/x11/gnome/uipalcontrol.c:211
 #, fuzzy
-msgid "New Exact Emulation"
-msgstr "Emulazione esatta"
+msgid "New Exact"
+msgstr "Esatta"
 
 #: src/arch/unix/x11/gnome/uinetplay.c:54 src/arch/win32/res.rc.po.c:4553
 #: src/arch/amigaos/intl.c.po.c:4493
@@ -7539,10 +7541,6 @@
 msgid "Adjusting"
 msgstr "Adattabile"
 
-#: src/arch/win32/res.rc.po.c:5197 src/arch/amigaos/intl.c.po.c:3755
-msgid "Exact"
-msgstr "Esatta"
-
 #: src/arch/win32/res.rc.po.c:5198
 msgid "Sound driver: DirectX"
 msgstr "Driver audio: DirectX"
@@ -11448,3 +11446,13 @@
 #: src/arch/amigaos/intl.c.po.c:4844
 msgid "Amiga mouse"
 msgstr ""
+
+#~ msgid "Fast Emulation"
+#~ msgstr "Emulazione veloce"
+
+#~ msgid "Exact Emulation"
+#~ msgstr "Emulazione esatta"
+
+#, fuzzy
+#~ msgid "New Exact Emulation"
+#~ msgstr "Emulazione esatta"

Modified: trunk/vice/po/nl.po
===================================================================
--- trunk/vice/po/nl.po	2008-07-16 04:57:57 UTC (rev 19022)
+++ trunk/vice/po/nl.po	2008-07-16 07:17:34 UTC (rev 19023)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: VICE 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-13 20:27+0200\n"
+"POT-Creation-Date: 2008-07-16 06:53+0200\n"
 "PO-Revision-Date: 2008-06-11 11:57+0200\n"
 "Last-Translator: Marco van den Heuvel <bla...@ya...>\n"
 "Language-Team: nl <nl...@li...>\n"
@@ -5506,16 +5506,19 @@
 msgstr "PAL-instellingen"
 
 #: src/arch/unix/x11/gnome/uipalcontrol.c:198
-msgid "Fast Emulation"
-msgstr "Snelle emulatie"
+#, fuzzy
+msgid "Fast"
+msgstr "*Snel"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:205
-msgid "Exact Emulation"
-msgstr "Exacte emulatie"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:205 src/arch/win32/res.rc.po.c:5197
+#: src/arch/amigaos/intl.c.po.c:3755
+msgid "Exact"
+msgstr "Exact"
 
 #: src/arch/unix/x11/gnome/uipalcontrol.c:211
-msgid "New Exact Emulation"
-msgstr "Nieuwe Exacte emulatie"
+#, fuzzy
+msgid "New Exact"
+msgstr "Exact"
 
 #: src/arch/unix/x11/gnome/uinetplay.c:54 src/arch/win32/res.rc.po.c:4553
 #: src/arch/amigaos/intl.c.po.c:4493
@@ -7487,10 +7490,6 @@
 msgid "Adjusting"
 msgstr "Aanpassend"
 
-#: src/arch/win32/res.rc.po.c:5197 src/arch/amigaos/intl.c.po.c:3755
-msgid "Exact"
-msgstr "Exact"
-
 #: src/arch/win32/res.rc.po.c:5198
 msgid "Sound driver: DirectX"
 msgstr "Geluid stuurprogramma: DirectX"
@@ -11351,3 +11350,12 @@
 #: src/arch/amigaos/intl.c.po.c:4844
 msgid "Amiga mouse"
 msgstr "Amiga muis"
+
+#~ msgid "Fast Emulation"
+#~ msgstr "Snelle emulatie"
+
+#~ msgid "Exact Emulation"
+#~ msgstr "Exacte emulatie"
+
+#~ msgid "New Exact Emulation"
+#~ msgstr "Nieuwe Exacte emulatie"

Modified: trunk/vice/po/pl.po
===================================================================
--- trunk/vice/po/pl.po	2008-07-16 04:57:57 UTC (rev 19022)
+++ trunk/vice/po/pl.po	2008-07-16 07:17:34 UTC (rev 19023)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: VICE 1.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-13 20:27+0200\n"
+"POT-Creation-Date: 2008-07-16 06:53+0200\n"
 "PO-Revision-Date: 2007-07-26 11:55+0200\n"
 "Last-Translator: Mariusz M\xB3ynek <fl...@go...>\n"
 "Language-Team: pl <pl...@li...>\n"
@@ -5855,18 +5855,19 @@
 
 #: src/arch/unix/x11/gnome/uipalcontrol.c:198
 #, fuzzy
-msgid "Fast Emulation"
-msgstr "*Szybka emulacja PAL"
+msgid "Fast"
+msgstr "*Szybko"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:205
+#: src/arch/unix/x11/gnome/uipalcontrol.c:205 src/arch/win32/res.rc.po.c:5197
+#: src/arch/amigaos/intl.c.po.c:3755
 #, fuzzy
-msgid "Exact Emulation"
-msgstr "Emulacja PAL"
+msgid "Exact"
+msgstr "*Wymu\xB6"
 
 #: src/arch/unix/x11/gnome/uipalcontrol.c:211
 #, fuzzy
-msgid "New Exact Emulation"
-msgstr "Emulacja PAL"
+msgid "New Exact"
+msgstr "*Wymu\xB6"
 
 #: src/arch/unix/x11/gnome/uinetplay.c:54 src/arch/win32/res.rc.po.c:4553
 #: src/arch/amigaos/intl.c.po.c:4493
@@ -8073,11 +8074,6 @@
 msgid "Adjusting"
 msgstr "*Dodawanie"
 
-#: src/arch/win32/res.rc.po.c:5197 src/arch/amigaos/intl.c.po.c:3755
-#, fuzzy
-msgid "Exact"
-msgstr "*Wymu\xB6"
-
 #: src/arch/win32/res.rc.po.c:5198
 msgid "Sound driver: DirectX"
 msgstr ""
@@ -12577,3 +12573,15 @@
 #: src/arch/amigaos/intl.c.po.c:4844
 msgid "Amiga mouse"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Fast Emulation"
+#~ msgstr "*Szybka emulacja PAL"
+
+#, fuzzy
+#~ msgid "Exact Emulation"
+#~ msgstr "Emulacja PAL"
+
+#, fuzzy
+#~ msgid "New Exact Emulation"
+#~ msgstr "Emulacja PAL"

Modified: trunk/vice/po/sv.po
===================================================================
--- trunk/vice/po/sv.po	2008-07-16 04:57:57 UTC (rev 19022)
+++ trunk/vice/po/sv.po	2008-07-16 07:17:34 UTC (rev 19023)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: VICE 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-13 20:27+0200\n"
+"POT-Creation-Date: 2008-07-16 06:53+0200\n"
 "PO-Revision-Date: 2007-07-30 20:49+0100\n"
 "Last-Translator: Peter Karlsson <pe...@so...>\n"
 "Language-Team: Swedish <tp...@li...>\n"
@@ -5489,17 +5489,19 @@
 msgstr "PAL-inst\xE4llningar"
 
 #: src/arch/unix/x11/gnome/uipalcontrol.c:198
-msgid "Fast Emulation"
-msgstr "Snabb emulering"
+#, fuzzy
+msgid "Fast"
+msgstr "*Snabbt"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:205
-msgid "Exact Emulation"
-msgstr "Exakt emulering"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:205 src/arch/win32/res.rc.po.c:5197
+#: src/arch/amigaos/intl.c.po.c:3755
+msgid "Exact"
+msgstr "Exakt"
 
 #: src/arch/unix/x11/gnome/uipalcontrol.c:211
 #, fuzzy
-msgid "New Exact Emulation"
-msgstr "Exakt emulering"
+msgid "New Exact"
+msgstr "Exakt"
 
 #: src/arch/unix/x11/gnome/uinetplay.c:54 src/arch/win32/res.rc.po.c:4553
 #: src/arch/amigaos/intl.c.po.c:4493
@@ -7464,10 +7466,6 @@
 msgid "Adjusting"
 msgstr "Anpassande"
 
-#: src/arch/win32/res.rc.po.c:5197 src/arch/amigaos/intl.c.po.c:3755
-msgid "Exact"
-msgstr "Exakt"
-
 #: src/arch/win32/res.rc.po.c:5198
 msgid "Sound driver: DirectX"
 msgstr "Ljuddrivrutin: DirectX"
@@ -11344,3 +11342,13 @@
 #: src/arch/amigaos/intl.c.po.c:4844
 msgid "Amiga mouse"
 msgstr "Amigamus"
+
+#~ msgid "Fast Emulation"
+#~ msgstr "Snabb emulering"
+
+#~ msgid "Exact Emulation"
+#~ msgstr "Exakt emulering"
+
+#, fuzzy
+#~ msgid "New Exact Emulation"
+#~ msgstr "Exakt emulering"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19022
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19022&view=rev
Author:   strik
Date:     2008-07-15 21:57:57 -0700 (Tue, 15 Jul 2008)

Log Message:
-----------
Tagged version 1.22.27.

Added Paths:
-----------
    tags/v1.22/v1.22.27/

Copied: tags/v1.22/v1.22.27 (from rev 19021, trunk)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19021
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19021&view=rev
Author:   strik
Date:     2008-07-15 21:57:45 -0700 (Tue, 15 Jul 2008)

Log Message:
-----------
2008-07-16  Spiro Trikaliotis  <spi...@gm...>

	* Version 1.22.27

Modified Paths:
--------------
    trunk/vice/ChangeLog
    trunk/vice/configure.in
    trunk/vice/src/ChangeLog
    trunk/vice/src/version.h

Modified: trunk/vice/ChangeLog
===================================================================
--- trunk/vice/ChangeLog	2008-07-16 02:33:00 UTC (rev 19020)
+++ trunk/vice/ChangeLog	2008-07-16 04:57:45 UTC (rev 19021)
@@ -1,3 +1,7 @@
+2008-07-16  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.27
+
 2008-07-15  Marco van den Heuvel  <bla...@ya...>
 
 	* Makefile.am: Reverted the skyos make bindist(zip) part back to

Modified: trunk/vice/configure.in
===================================================================
--- trunk/vice/configure.in	2008-07-16 02:33:00 UTC (rev 19020)
+++ trunk/vice/configure.in	2008-07-16 04:57:45 UTC (rev 19021)
@@ -9,7 +9,7 @@
 
 VICE_VERSION_MAJOR=1
 VICE_VERSION_MINOR=22
-VICE_VERSION_BUILD=26
+VICE_VERSION_BUILD=27
 
 AC_SUBST(VICE_VERSION_MAJOR)
 AC_SUBST(VICE_VERSION_MINOR)

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-07-16 02:33:00 UTC (rev 19020)
+++ trunk/vice/src/ChangeLog	2008-07-16 04:57:45 UTC (rev 19021)
@@ -1,3 +1,7 @@
+2008-07-16  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.27
+
 2008-07-16  Marco van den Heuvel  <bla...@ya...>
 
         * arch/beos/ui.cc, arch/beos/ui_file.cc,

Modified: trunk/vice/src/version.h
===================================================================
--- trunk/vice/src/version.h	2008-07-16 02:33:00 UTC (rev 19020)
+++ trunk/vice/src/version.h	2008-07-16 04:57:45 UTC (rev 19021)
@@ -28,11 +28,11 @@
 #define __VERSION_H__
 
 #ifndef VERSION
-#define VERSION "1.22.26"
+#define VERSION "1.22.27"
 #endif
 
 #ifndef VERSION_RC_NUMBER
-#define VERSION_RC_NUMBER 1,22,26,0
+#define VERSION_RC_NUMBER 1,22,27,0
 #endif
 
 #ifndef PACKAGE


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19020
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19020&view=rev
Author:   blackystardust
Date:     2008-07-15 19:33:00 -0700 (Tue, 15 Jul 2008)

Log Message:
-----------
Added BeOS fixes.

Modified Paths:
--------------
    trunk/vice/src/ChangeLog
    trunk/vice/src/arch/beos/ui.cc
    trunk/vice/src/arch/beos/ui_file.cc
    trunk/vice/src/arch/beos/vicemenu.cc

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-07-15 16:53:59 UTC (rev 19019)
+++ trunk/vice/src/ChangeLog	2008-07-16 02:33:00 UTC (rev 19020)
@@ -1,5 +1,11 @@
-008-07-15  Spiro Trikaliotis  <spi...@gm...>
+2008-07-16  Marco van den Heuvel  <bla...@ya...>
 
+        * arch/beos/ui.cc, arch/beos/ui_file.cc,
+        arch/beos/vicemenu.cc: Added fixes as provided by
+        Marcus Sutton <log...@gm...>
+
+2008-07-15  Spiro Trikaliotis  <spi...@gm...>
+
 	* arch/win32/kbd.c: In kbd_handle_keydown() and
 	kbd_handle_keyup(), filter out keystrokes if the happen because
 	of key autorepeat of Windows.

Modified: trunk/vice/src/arch/beos/ui.cc
===================================================================
--- trunk/vice/src/arch/beos/ui.cc	2008-07-15 16:53:59 UTC (rev 19019)
+++ trunk/vice/src/arch/beos/ui.cc	2008-07-16 02:33:00 UTC (rev 19020)
@@ -263,17 +263,6 @@
 }
 
 
-static void save_snapshot_trap(WORD unused_addr, void *unused_data)
-{
-	ui_select_file(windowlist[0]->savepanel,SNAPSHOTSAVE_FILE,(void*)0);
-}
-
-static void load_snapshot_trap(WORD unused_addr, void *unused_data)
-{
-	ui_select_file(windowlist[0]->filepanel,SNAPSHOTLOAD_FILE,(void*)0);
-}
-
-
 /* this check is needed for haiku, since it always returns 1 on
    SupportsWindowMode() */
 int CheckForHaiku(void)
@@ -286,6 +275,8 @@
 	return 0;
 }
 
+/* ------------------------------------------------------------------------ */
+
 typedef struct {
     char    name[256];
     int     valid;
@@ -629,12 +620,11 @@
 		        datasette_control(DATASETTE_CONTROL_RESET_COUNTER);
 				break;
 			case MENU_SNAPSHOT_LOAD:
-				interrupt_maincpu_trigger_trap(
-					load_snapshot_trap,	(void*) 0);
+				ui_select_file(filepanel, SNAPSHOTLOAD_FILE, (void*)0);
 				break;
 			case MENU_SNAPSHOT_SAVE:
-				interrupt_maincpu_trigger_trap(
-					save_snapshot_trap, (void*) 0);
+				ui_select_file(windowlist[0]->savepanel,
+								SNAPSHOTSAVE_FILE, (void*)0);
 				break;
 			case MENU_LOADQUICK:
 				scan_files();
@@ -698,41 +688,31 @@
 			ui_paste_clipboard_text();
 			break;
         	case MENU_SOUND_RECORD_AIFF:
-                  ui_select_file(windowlist[0]->savepanel,AIFF_FILE,(void*)0);
-                  resources_set_string("SoundRecordDeviceName", "");
-                  resources_set_string("SoundRecordDeviceName", "aiff");
-                  ui_display_statustext("Sound Recording Started...", 1);
-        		break;	
+				resources_set_string("SoundRecordDeviceName", "");
+				ui_select_file(windowlist[0]->savepanel,AIFF_FILE,(void*)0);
+				break;
         	case MENU_SOUND_RECORD_IFF:
-                  ui_select_file(windowlist[0]->savepanel,IFF_FILE,(void*)0);
-                  resources_set_string("SoundRecordDeviceName", "");
-                  resources_set_string("SoundRecordDeviceName", "iff");
-                  ui_display_statustext("Sound Recording Started...", 1);
-        		break;	
+				resources_set_string("SoundRecordDeviceName", "");
+				ui_select_file(windowlist[0]->savepanel,IFF_FILE,(void*)0);
+				break;
 #ifdef USE_LAMEMP3
         	case MENU_SOUND_RECORD_MP3:
-                  ui_select_file(windowlist[0]->savepanel,MP3_FILE,(void*)0);
-                  resources_set_string("SoundRecordDeviceName", "");
-                  resources_set_string("SoundRecordDeviceName", "mp3");
-                  ui_display_statustext("Sound Recording Started...", 1);
-        		break;	
+				resources_set_string("SoundRecordDeviceName", "");
+				ui_select_file(windowlist[0]->savepanel,MP3_FILE,(void*)0);
+				break;
 #endif
         	case MENU_SOUND_RECORD_VOC:
-                  ui_select_file(windowlist[0]->savepanel,VOC_FILE,(void*)0);
-                  resources_set_string("SoundRecordDeviceName", "");
-                  resources_set_string("SoundRecordDeviceName", "voc");
-                  ui_display_statustext("Sound Recording Started...", 1);
-        		break;	
+				resources_set_string("SoundRecordDeviceName", "");
+				ui_select_file(windowlist[0]->savepanel,VOC_FILE,(void*)0);
+				break;
         	case MENU_SOUND_RECORD_WAV:
-                  ui_select_file(windowlist[0]->savepanel,WAV_FILE,(void*)0);
-                  resources_set_string("SoundRecordDeviceName", "");
-                  resources_set_string("SoundRecordDeviceName", "wav");
-                  ui_display_statustext("Sound Recording Started...", 1);
-        		break;	
+				resources_set_string("SoundRecordDeviceName", "");
+				ui_select_file(windowlist[0]->savepanel,WAV_FILE,(void*)0);
+				break;
         	case MENU_SOUND_RECORD_STOP:
-                  resources_set_string("SoundRecordDeviceName", "");
-                  ui_display_statustext("Sound Recording Stopped...", 1);
-       		break;	
+				resources_set_string("SoundRecordDeviceName", "");
+				ui_display_statustext("Sound Recording Stopped...", 1);
+				break;
         	case MENU_DRIVE_SETTINGS:
         		ui_drive();
         		break;	
@@ -984,23 +964,24 @@
 /* Report an error to the user (`printf()' style).  */
 void ui_error(const char *format, ...)
 {
-	BAlert *messagebox;
     char tmp[1024];
     va_list args;
 
     va_start(args, format);
     vsprintf(tmp, format, args);
     va_end(args);
-    messagebox = new BAlert("error", tmp, "OK", NULL, NULL, 
-    	B_WIDTH_AS_USUAL, B_STOP_ALERT);
-	vsync_suspend_speed_eval();
-	messagebox->Go();
+
+    ui_error_string(tmp);
 }
 
 /* Report an error to the user (one string).  */
 void ui_error_string(const char *text)
 {
-	ui_error(text);
+    BAlert *messagebox;
+
+    messagebox = new BAlert("error", text, "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+    vsync_suspend_speed_eval();
+    messagebox->Go();
 }
 
 /* Report a message to the user (`printf()' style).  */

Modified: trunk/vice/src/arch/beos/ui_file.cc
===================================================================
--- trunk/vice/src/arch/beos/ui_file.cc	2008-07-15 16:53:59 UTC (rev 19019)
+++ trunk/vice/src/arch/beos/ui_file.cc	2008-07-16 02:33:00 UTC (rev 19020)
@@ -44,6 +44,8 @@
 #include "c64ui.h"
 #include "constants.h"
 #include "imagecontents.h"
+#include "interrupt.h"
+#include "lib.h"
 #include "machine.h"
 #include "resources.h"
 #include "tape.h"
@@ -53,6 +55,7 @@
 #include "util.h"
 #include "vic20ui.h"
 #include "vicemenu.h"
+#include "vsync.h"
 }
 
 static int last_fileparam[2]; /* 0=filepanel, 1=savepanel */
@@ -336,10 +339,41 @@
 	filepanel->Show();
 
 	/* remember for later action */
+	last_filetype[panelnr] = filetype;
 
-	last_filetype[panelnr] = filetype;
+	/* wait for save panel to disappear */
+	if (filepanel->PanelMode() == B_SAVE_PANEL) {
+		vsync_suspend_speed_eval();
+		while (filepanel->IsShowing()) {
+		    snooze(1000);
+		    //ui_dispatch_events();
+		}
+	}
 }
+
+static void load_snapshot_trap(WORD unused_addr, void *path)
+{
+	if (machine_read_snapshot((char *)path, 0) < 0)
+        ui_error("Cannot read snapshot image.");
+    delete path;
+}
+
+static void save_snapshot_trap(WORD unused_addr, void *path)
+{
+	if (machine_write_snapshot((char *)path, 1, 1, 0) < 0)
+        ui_error("Cannot write snapshot file.");
+    delete path;
+}
 	
+static void ui_sound_record_action(const char *name, const char *ext)
+{
+	char *ext_name = util_add_extension_const(name, ext);
+	resources_set_string("SoundRecordDeviceArg", ext_name);
+	resources_set_string("SoundRecordDeviceName", ext);
+	ui_display_statustext("Sound Recording Started...", 1);
+    delete ext_name;
+}
+	
 void ui_select_file_action(BMessage *msg) {
 		entry_ref 	ref;
 		status_t 	err;
@@ -367,9 +401,9 @@
 			if (autostart_autodetect(path->Path(), NULL, 0, AUTOSTART_MODE_RUN) < 0)
   				ui_error("Cannot autostart specified file.");
 		} else if (last_filetype[0] == SNAPSHOTLOAD_FILE) {
-	    	if (machine_read_snapshot(path->Path(),0)<0) {
-        		ui_error("Cannot read snapshot image");
-        	}
+			/* we need a copy of the path that won't be deleted here */
+			char *pathname = lib_stralloc(path->Path());
+			interrupt_maincpu_trigger_trap(load_snapshot_trap, (void*) pathname);
     	} else if (last_filetype[0] == C64_CARTRIDGE_FILE) {
     		BMessage *msg = new BMessage(ATTACH_C64_CART);
     		msg->AddInt32("type", last_fileparam[0]);
@@ -411,45 +445,41 @@
 		
 		/* now the action */
 		if (last_filetype[1] == SNAPSHOTSAVE_FILE) {
-			if (machine_write_snapshot(fullpath, 1, 1, 0) < 0)
-            	ui_error("Cannot write snapshot file.");
-    	} else if (last_filetype[1] == SNAPSHOT_HISTORY_START) {
+			/* we need a copy of the path that won't be deleted here */
+			char *pathname = lib_stralloc(fullpath);
+			interrupt_maincpu_trigger_trap(save_snapshot_trap, (void*) fullpath);
+      } else if (last_filetype[1] == SNAPSHOT_HISTORY_START) {
     		resources_set_string("EventStartSnapshot", name);
-    	} else if (last_filetype[1] == SNAPSHOT_HISTORY_END) {
+      } else if (last_filetype[1] == SNAPSHOT_HISTORY_END) {
     		resources_set_string("EventEndSnapshot", name);
     		resources_set_string("EventSnapshotDir", path->Path());
       } else if (last_filetype[1] == REU_FILE) {
-            resources_set_string("REUfilename", name);
+			resources_set_string("REUfilename", fullpath);
       } else if (last_filetype[1] == GEORAM_FILE) {
-            resources_set_string("GEORAMfilename", name);
+			resources_set_string("GEORAMfilename", fullpath);
       } else if (last_filetype[1] == RAMCART_FILE) {
-            resources_set_string("RAMCARTfilename", name);
+			resources_set_string("RAMCARTfilename", fullpath);
       } else if (last_filetype[1] == PLUS60K_FILE) {
-            resources_set_string("PLUS60Kfilename", name);
+			resources_set_string("PLUS60Kfilename", fullpath);
       } else if (last_filetype[1] == PLUS256K_FILE) {
-            resources_set_string("PLUS256Kfilename", name);
+			resources_set_string("PLUS256Kfilename", fullpath);
       } else if (last_filetype[1] == C64_256K_FILE) {
-            resources_set_string("C64_256Kfilename", name);
+			resources_set_string("C64_256Kfilename", fullpath);
       } else if (last_filetype[1] == PETREU_FILE) {
-            resources_set_string("PETREUfilename", name);
+			resources_set_string("PETREUfilename", fullpath);
       } else if (last_filetype[1] == AIFF_FILE) {
-            util_add_extension_const(name, "aiff");
-            resources_set_string("SoundRecordDeviceArg", name);
+			ui_sound_record_action(fullpath, "aiff");
       } else if (last_filetype[1] == IFF_FILE) {
-            util_add_extension_const(name, "iff");
-            resources_set_string("SoundRecordDeviceArg", name);
+			ui_sound_record_action(fullpath, "iff");
 #ifdef USE_LAMEMP3
       } else if (last_filetype[1] == MP3_FILE) {
-            util_add_extension_const(name, "mp3");
-            resources_set_string("SoundRecordDeviceArg", name);
+			ui_sound_record_action(fullpath, "mp3");
 #endif
       } else if (last_filetype[1] == VOC_FILE) {
-            util_add_extension_const(name, "voc");
-            resources_set_string("SoundRecordDeviceArg", name);
+			ui_sound_record_action(fullpath, "voc");
       } else if (last_filetype[1] == WAV_FILE) {
-            util_add_extension_const(name, "wav");
-            resources_set_string("SoundRecordDeviceArg", name);
-            }
+			ui_sound_record_action(fullpath, "wav");
+      }
 		delete path;
 		delete fullpath;
 	}

Modified: trunk/vice/src/arch/beos/vicemenu.cc
===================================================================
--- trunk/vice/src/arch/beos/vicemenu.cc	2008-07-15 16:53:59 UTC (rev 19019)
+++ trunk/vice/src/arch/beos/vicemenu.cc	2008-07-16 02:33:00 UTC (rev 19020)
@@ -368,7 +368,7 @@
 	submenu->AddItem(new BMenuItem("Sound Record AIFF",
 		new BMessage(MENU_SOUND_RECORD_AIFF)));
 	submenu->AddItem(new BMenuItem("Sound Record IFF",
-		new BMessage(MENU_SOUND_RECORD_AIFF)));
+		new BMessage(MENU_SOUND_RECORD_IFF)));
 #ifdef USE_LAMEMP3
 	submenu->AddItem(new BMenuItem("Sound Record MP3",
 		new BMessage(MENU_SOUND_RECORD_MP3)));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19019
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19019&view=rev
Author:   strik
Date:     2008-07-15 09:53:59 -0700 (Tue, 15 Jul 2008)

Log Message:
-----------
2008-07-15  Spiro Trikaliotis  <spi...@gm...>

	* src/arch/win32/kbd.c: In kbd_handle_keydown() and
	kbd_handle_keyup(), filter out keystrokes if the happen because
	of key autorepeat of Windows.

Modified Paths:
--------------
    trunk/vice/src/ChangeLog
    trunk/vice/src/arch/win32/kbd.c

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-07-15 08:25:47 UTC (rev 19018)
+++ trunk/vice/src/ChangeLog	2008-07-15 16:53:59 UTC (rev 19019)
@@ -1,3 +1,9 @@
+008-07-15  Spiro Trikaliotis  <spi...@gm...>
+
+	* arch/win32/kbd.c: In kbd_handle_keydown() and
+	kbd_handle_keyup(), filter out keystrokes if the happen because
+	of key autorepeat of Windows.
+
 2008-07-15  Hannu Nuotio  <han...@tu...>
 
 	* arch/unix/x11/gnome/uipalcontrol.c: Removed "Emulation" from

Modified: trunk/vice/src/arch/win32/kbd.c
===================================================================
--- trunk/vice/src/arch/win32/kbd.c	2008-07-15 08:25:47 UTC (rev 19018)
+++ trunk/vice/src/arch/win32/kbd.c	2008-07-15 16:53:59 UTC (rev 19019)
@@ -58,6 +58,7 @@
 int kbd_handle_keydown(DWORD virtual_key, DWORD key_data)
 {
     int kcode = (key_data >> 16) & 0xff;
+    int repeated = key_data & 0x40000000 ? 1 : 0;
 
     if (virtual_key == 0xff)
         return 0;
@@ -67,7 +68,9 @@
         kcode = _kbd_extended_key_tab[kcode];
     }
 
-    keyboard_key_pressed((signed long)kcode);
+    if ( ! repeated ) {
+        keyboard_key_pressed((signed long)kcode);
+    }
 
     return 0;
 }
@@ -75,6 +78,7 @@
 int kbd_handle_keyup(DWORD virtual_key, DWORD key_data)
 {
     int kcode = (key_data >> 16) & 0xff;
+    int repeated = key_data & 0x40000000 ? 0 : 1;
 
     if (virtual_key == 0xff)
         return 0;
@@ -84,7 +88,9 @@
         kcode = _kbd_extended_key_tab[kcode];
     }
 
-    keyboard_key_released((signed long)kcode);
+    if ( ! repeated ) {
+        keyboard_key_released((signed long)kcode);
+    }
 
     return 0;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.