Made the 'default' button in "Config Files" dialog generate path names

with the '~' character.

Bumped release date to Jan. 19 (Monday).  I'm sure I'll find something
else wrong in the next day or so, and I really don't want to have to do
a quick 2.7.1 release because of rushing.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1636 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2009-01-16 21:46:31 +00:00
parent ab4d878e33
commit c771f6caa2
8 changed files with 26 additions and 40 deletions

View File

@ -35,10 +35,10 @@ The distributions currently available are:
* Binary installer (exe) for Windows (stella-2.7-win32.exe)
* Binary zip for 64-bit Windows (stella-2.7-win64.zip)
* Binary zip for Windows (stella-2.7-win32.zip)
* Binary zip for 64-bit Windows (stella-2.7-win64.zip)
* Source code distribution for all platforms (stella-2.7-src.tar.gz)
PLEASE DO NOT WRITE ASKING FOR ROM IMAGES TO USE WITH STELLA! ALL SUCH

View File

@ -12,7 +12,7 @@
Release History
===============================================================================
2.6.1 to 2.7: (Jan. 17, 2009)
2.6.1 to 2.7: (Jan. 19, 2009)
* Totally reworked the built-in UI to be font-sensitive and use higher-
resolution fonts. Stella now requires a minimum screen size of 640x480.
@ -56,9 +56,8 @@
currently in use.
* Various path textboxes in the UI now recognize './' (or '.\') to mean
the current directory and '~/' (or '~\') is also recognized to
mean your home directory (for Windows, home directory will be your
'My Documents' folder).
the current directory and '~/' (or '~\') to mean your home directory
(for Windows, home directory will be your 'My Documents' folder).
* Large speedup in loading directories with many files in the ROM launcher.

View File

@ -9,4 +9,4 @@ the Stella Website at:
Enjoy,
The Stella Team
January 17, 2009
January 19, 2009

View File

@ -267,9 +267,8 @@
currently in use.</li>
<li>Various path textboxes in the UI now recognize './' (or '.\') to mean
the current directory and '~/' (or '~\') is also recognized to
mean your home directory (for Windows, home directory will be your
'My Documents' folder).</li>
the current directory and '~/' (or '~\') to mean your home directory
(for Windows, home directory will be your 'My Documents' folder).</li>
<li>Large speedup in loading directories with many files in the ROM launcher.</li>
@ -2290,12 +2289,7 @@
<tr>
<td><b>Windows</b></td>
<td><i>%MY_DOCUMENTS%\Stella\atarivox_eeprom.dat<br>
%MY_DOCUMENTS%\Stella\savekey_eeprom.dat</i>&nbsp;&nbsp;&nbsp;
<b>OR</b><br>
<i>%CURRENT_DIR%\atarivox_eeprom.dat<br>
%CURRENT_DIR%\savekey_eeprom.dat<br></i>
(if a file named 'disable_profiles.txt' exists in the
application directory)</td>
%MY_DOCUMENTS%\Stella\savekey_eeprom.dat</i></td>
</tr>
</table>
@ -2409,8 +2403,7 @@
</tr>
<tr>
<td><b>Windows</b></td>
<td><i>%MY_DOCUMENTS%\Stella\stella.ini</i>&nbsp;&nbsp;&nbsp;<b>OR</b><br>
<i>%CURRENT_DIR%\stella.ini</i> (if a file named 'disable_profiles.txt' exists in the application directory)</td>
<td><i>%MY_DOCUMENTS%\Stella\stella.ini</i></td>
</tr>
</table>
@ -2507,8 +2500,7 @@ Ms Pac-Man (Stella extended codes):
</tr>
<tr>
<td><b>Windows</b></td>
<td><i>%MY_DOCUMENTS%\Stella\stella.cht</i>&nbsp;&nbsp;&nbsp;<b>OR</b><br>
<i>%CURRENT_DIR%\stella.cht</i> (if a file named 'disable_profiles.txt' exists in the application directory)</td>
<td><i>%MY_DOCUMENTS%\Stella\stella.cht</i></td>
</tr>
</table>
<p>Stella will require a restart for changes to this file to take effect.</p>
@ -2759,8 +2751,7 @@ Ms Pac-Man (Stella extended codes):
</tr>
<tr>
<td><b>Windows</b></td>
<td><i>%MY_DOCUMENTS%\Stella\stella.pro</i>&nbsp;&nbsp;&nbsp;<b>OR</b><br>
<i>%CURRENT_DIR%\stella.pro</i> (if a file named 'disable_profiles.txt' exists in the application directory)</td>
<td><i>%MY_DOCUMENTS%\Stella\stella.pro</i></td>
</tr>
</table>
<p>Stella will require a restart for changes to this file to take effect.</p>
@ -2823,8 +2814,7 @@ Ms Pac-Man (Stella extended codes):
</tr>
<tr>
<td><b>Windows</b></td>
<td><i>%MY_DOCUMENTS%\Stella\stella.pal</i>&nbsp;&nbsp;&nbsp;<b>OR</b><br>
<i>%CURRENT_DIR%\stella.pal</i> (if a file named 'disable_profiles.txt' exists in the application directory)</td>
<td><i>%MY_DOCUMENTS%\Stella\stella.pal</i></td>
</tr>
</table>
<p>Note that to actually use the external palette, the palette file must

View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: OSystem.hxx,v 1.76 2009-01-16 16:38:06 stephena Exp $
// $Id: OSystem.hxx,v 1.77 2009-01-16 21:46:30 stephena Exp $
//============================================================================
#ifndef OSYSTEM_HXX
@ -56,7 +56,7 @@ typedef Common::Array<Resolution> ResolutionList;
other objects belong.
@author Stephen Anthony
@version $Id: OSystem.hxx,v 1.76 2009-01-16 16:38:06 stephena Exp $
@version $Id: OSystem.hxx,v 1.77 2009-01-16 21:46:30 stephena Exp $
*/
class OSystem
{
@ -251,7 +251,8 @@ class OSystem
/**
Return the default full/complete directory name for storing data.
*/
const string& baseDir() const { return myBaseDirExpanded; }
const string& baseDir(bool expanded = true) const
{ return expanded ? myBaseDirExpanded : myBaseDir; }
/**
Return the full/complete directory name for storing state files.

View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: Settings.cxx,v 1.157 2009-01-13 14:45:34 stephena Exp $
// $Id: Settings.cxx,v 1.158 2009-01-16 21:46:30 stephena Exp $
//============================================================================
#include <cassert>
@ -80,7 +80,7 @@ Settings::Settings(OSystem* osystem)
setInternal("ss1x", "false");
// Config files and paths
setInternal("romdir", "");
setInternal("romdir", "~");
setInternal("statedir", "");
setInternal("cheatfile", "");
setInternal("palettefile", "");

View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: FileSnapDialog.cxx,v 1.28 2009-01-16 16:38:06 stephena Exp $
// $Id: FileSnapDialog.cxx,v 1.29 2009-01-16 21:46:31 stephena Exp $
//
// Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project
@ -185,8 +185,8 @@ void FileSnapDialog::saveConfig()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void FileSnapDialog::setDefaults()
{
const string& basedir = instance().baseDir();
const string& romdir = "roms";
const string& basedir = instance().baseDir(false); // get relative basedir
const string& romdir = "~";
const string& statedir = basedir + BSPF_PATH_SEPARATOR + "state";
const string& cheatfile = basedir + BSPF_PATH_SEPARATOR + "stella.cht";
const string& palettefile = basedir + BSPF_PATH_SEPARATOR + "stella.pal";

View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: OSystemWin32.cxx,v 1.30 2009-01-16 18:25:51 stephena Exp $
// $Id: OSystemWin32.cxx,v 1.31 2009-01-16 21:46:31 stephena Exp $
//============================================================================
#include "bspf.hxx"
@ -37,13 +37,9 @@ OSystemWin32::OSystemWin32()
{
string basedir = ".";
FilesystemNode node("disable_profiles.txt");
if(!node.exists())
{
FilesystemNode home("~\\");
if(home.isDirectory())
basedir = "~\\Stella";
}
FilesystemNode home("~\\");
if(home.isDirectory())
basedir = "~\\Stella";
setBaseDir(basedir);
setConfigFile(basedir + "\\stella.ini");