Update of /cvsroot/audacity/audacity-src/src/widgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv21137/widgets
Added Files:
FileHistory.cpp FileHistory.h
Log Message:
Add FileHistory class to correct Unicode problem with wxFileHistory on OSX
and to allow adding "Clear" item at end of menu instead of beginning.
--- NEW FILE: FileHistory.cpp ---
/**********************************************************************
Audacity: A Digital Audio Editor
FileHistory.cpp
Leland Lucius
*******************************************************************//**
\class FileHistory
\brief Similar to FileHistory, but customized to our needs.
*//*******************************************************************/
#include "../Audacity.h"
#include <wx/defs.h>
#include <wx/fileconf.h>
#include <wx/menu.h>
#include "FileHistory.h"
FileHistory::FileHistory(int maxfiles, wxWindowID base)
{
mMaxFiles = maxfiles;
mIDBase = base;
}
FileHistory::~FileHistory()
{
}
// File history management
void FileHistory::AddFileToHistory(const wxString & file, bool update)
{
// Needed to transition from wxFileHistory to FileHistory since there
// can be empty history "slots".
if (file.IsEmpty()) {
return;
}
#if defined(__WXMSW__)
int i = mHistory.Index(file, false);
#else
int i = mHistory.Index(file, true);
#endif
if (i != wxNOT_FOUND) {
mHistory.RemoveAt(i);
}
if (mMaxFiles == mHistory.GetCount()) {
mHistory.RemoveAt(mHistory.GetCount() - 1);
}
mHistory.Insert(file, 0);
if (update) {
AddFilesToMenu();
}
}
void FileHistory::RemoveFileFromHistory(size_t i, bool update)
{
wxASSERT(i < mHistory.GetCount());
if (i < mHistory.GetCount()) {
mHistory.RemoveAt(i);
if (update) {
AddFilesToMenu();
}
}
}
void FileHistory::Clear()
{
mHistory.Clear();
AddFilesToMenu();
}
wxString FileHistory::GetHistoryFile(size_t i) const
{
wxASSERT(i < mHistory.GetCount());
if (i < mHistory.GetCount()) {
return mHistory[i];
}
return wxEmptyString;
}
size_t FileHistory::GetCount()
{
return mHistory.GetCount();
}
void FileHistory::UseMenu(wxMenu *menu)
{
wxASSERT(mMenus.Index(menu) == wxNOT_FOUND);
if (mMenus.Index(menu) == wxNOT_FOUND) {
mMenus.Add(menu);
}
}
void FileHistory::RemoveMenu(wxMenu *menu)
{
wxASSERT(mMenus.Index(menu) != wxNOT_FOUND);
if (mMenus.Index(menu) != wxNOT_FOUND) {
mMenus.Remove(menu);
}
}
void FileHistory::Load(wxConfigBase & config, const wxString & group)
{
mHistory.Clear();
config.SetPath(group);
wxString file;
long ndx;
bool got = config.GetFirstEntry(file, ndx);
while (got) {
AddFileToHistory(config.Read(file), false);
got = config.GetNextEntry(file, ndx);
}
config.SetPath(wxT(".."));
AddFilesToMenu();
}
void FileHistory::Save(wxConfigBase & config, const wxString & group)
{
config.DeleteGroup(group);
config.SetPath(group);
// Stored in reverse order
int n = mHistory.GetCount() - 1;
for (size_t i = 1; i <= mHistory.GetCount(); i++) {
config.Write(wxString::Format(wxT("file%d"), i), mHistory[n--]);
}
config.SetPath(wxT(".."));
}
void FileHistory::AddFilesToMenu()
{
for (size_t i = 0; i < mMenus.GetCount(); i++) {
AddFilesToMenu((wxMenu *) mMenus[i]);
}
}
void FileHistory::AddFilesToMenu(wxMenu *menu)
{
wxMenuItemList items = menu->GetMenuItems();
wxMenuItemList::compatibility_iterator node = items.GetFirst();
while (node) {
menu->Destroy((wxMenuItem *) node->GetData());
node = node->GetNext();
}
for (size_t i = 0; i < mHistory.GetCount(); i++) {
menu->Append(mIDBase + 1 + i, mHistory[i]);
}
if (mHistory.GetCount() > 0) {
menu->AppendSeparator();
}
menu->Append(mIDBase, _("&Clear"));
menu->Enable(mIDBase, mHistory.GetCount() > 0);
}
// Indentation settings for Vim and Emacs and unique identifier for Arch, a
// version control system. Please do not modify past this point.
//
// Local Variables:
// c-basic-offset: 3
// indent-tabs-mode: nil
// End:
//
// vim: et sts=3 sw=3
// arch-tag: 94f72c32-970b-4f4e-bbf3-3880fce7b965
--- NEW FILE: FileHistory.h ---
/**********************************************************************
Audacity: A Digital Audio Editor
FileHistory.h
Leland Lucius
**********************************************************************/
#ifndef __AUDACITY_WIDGETS_FILEHISTORY__
#define __AUDACITY_WIDGETS_FILEHISTORY__
#include <wx/defs.h>
#include <wx/choice.h>
#include <wx/dynarray.h>
#include <wx/event.h>
#include <wx/grid.h>
#include <wx/string.h>
#include <wx/window.h>
class AUDACITY_DLL_API FileHistory
{
public:
FileHistory(int maxfiles = 9, wxWindowID idbase = wxID_FILE);
virtual ~FileHistory();
void AddFileToHistory(const wxString & file, bool update = true);
void RemoveFileFromHistory(size_t i, bool update = true);
void Clear();
void UseMenu(wxMenu *menu);
void RemoveMenu(wxMenu *menu);
void Load(wxConfigBase& config, const wxString & group);
void Save(wxConfigBase& config, const wxString & group);
void AddFilesToMenu();
void AddFilesToMenu(wxMenu *menu);
size_t GetCount();
wxString GetHistoryFile(size_t i) const;
private:
int mMaxFiles;
wxWindowID mIDBase;
wxArrayPtrVoid mMenus;
wxArrayString mHistory;
};
#endif
// Indentation settings for Vim and Emacs and unique identifier for Arch, a
// version control system. Please do not modify past this point.
//
// Local Variables:
// c-basic-offset: 3
// indent-tabs-mode: nil
// End:
//
// vim: et sts=3 sw=3
// arch-tag: 94f72c32-970b-4f4e-bbf3-3880fce7b965
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
