From 7fbfc2b292165e9b0c78bc4188822c99f1950413 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Mon, 25 May 2020 11:51:28 -0400 Subject: [PATCH] Finish the job of 30dbdf4, deleting abandoned source files... ... And correcting #include paths, and removing mentions in read-me files, and correcting CMakeLists.txt --- CMakeLists.txt | 3 - cmake-proxies/CMakeLists.txt | 1 - cmake-proxies/FileDialog/CMakeLists.txt | 43 - cmake-proxies/README.txt | 3 - cmake-proxies/mod-null/CMakeLists.txt | 59 - cmake-proxies/mod-nyq-bench/CMakeLists.txt | 64 - cmake-proxies/mod-script-pipe/CMakeLists.txt | 60 - lib-src/FileDialog/FileDialog.cpp | 154 -- lib-src/FileDialog/FileDialog.h | 96 - lib-src/FileDialog/gtk/FileDialogPrivate.cpp | 643 ------ lib-src/FileDialog/gtk/FileDialogPrivate.h | 91 - lib-src/FileDialog/mac/FileDialogPrivate.h | 107 - lib-src/FileDialog/mac/FileDialogPrivate.mm | 721 ------- lib-src/FileDialog/win/FileDialogPrivate.cpp | 1224 ------------ lib-src/FileDialog/win/FileDialogPrivate.h | 124 -- lib-src/audacity-patches.txt | 9 - lib-src/mod-null/ModNullCallback.cpp | 167 -- lib-src/mod-null/ModNullCallback.h | 18 - lib-src/mod-nyq-bench/NyqBench.cpp | 1759 ----------------- lib-src/mod-nyq-bench/NyqBench.h | 227 --- lib-src/mod-nyq-bench/Readme.txt | 19 - .../images/document-new-large.xpm | 214 -- .../images/document-new-small.xpm | 81 - .../images/document-open-large.xpm | 286 --- .../images/document-open-small.xpm | 91 - .../images/document-save-as-large.xpm | 121 -- .../images/document-save-as-small.xpm | 117 -- .../images/document-save-large.xpm | 122 -- .../images/document-save-small.xpm | 129 -- .../mod-nyq-bench/images/edit-clear-large.xpm | 210 -- .../mod-nyq-bench/images/edit-clear-small.xpm | 130 -- .../mod-nyq-bench/images/edit-copy-large.xpm | 102 - .../mod-nyq-bench/images/edit-copy-small.xpm | 49 - .../mod-nyq-bench/images/edit-cut-large.xpm | 258 --- .../mod-nyq-bench/images/edit-cut-small.xpm | 110 -- .../images/edit-delete-large.xpm | 138 -- .../images/edit-delete-small.xpm | 105 - .../mod-nyq-bench/images/edit-find-large.xpm | 142 -- .../mod-nyq-bench/images/edit-find-small.xpm | 99 - .../mod-nyq-bench/images/edit-paste-large.xpm | 204 -- .../mod-nyq-bench/images/edit-paste-small.xpm | 99 - .../mod-nyq-bench/images/edit-redo-large.xpm | 212 -- .../mod-nyq-bench/images/edit-redo-small.xpm | 69 - .../images/edit-select-all-large.xpm | 106 - .../images/edit-select-all-small.xpm | 59 - .../mod-nyq-bench/images/edit-undo-large.xpm | 221 --- .../mod-nyq-bench/images/edit-undo-small.xpm | 83 - .../mod-nyq-bench/images/go-next-large.xpm | 263 --- .../mod-nyq-bench/images/go-next-small.xpm | 122 -- .../images/go-previous-large.xpm | 277 --- .../images/go-previous-small.xpm | 120 -- lib-src/mod-nyq-bench/images/go-top-large.xpm | 275 --- lib-src/mod-nyq-bench/images/go-top-small.xpm | 126 -- lib-src/mod-nyq-bench/images/go-up-large.xpm | 233 --- lib-src/mod-nyq-bench/images/go-up-small.xpm | 127 -- .../images/media-playback-pause-large.xpm | 80 - .../images/media-playback-pause-small.xpm | 65 - .../images/media-playback-start-large.xpm | 143 -- .../images/media-playback-start-small.xpm | 80 - .../images/media-playback-stop-large.xpm | 116 -- .../images/media-playback-stop-small.xpm | 77 - .../images/system-search-large.xpm | 120 -- .../images/system-search-small.xpm | 149 -- lib-src/mod-script-pipe/PipeServer.cpp | 206 -- lib-src/mod-script-pipe/ScripterCallback.cpp | 197 -- lib-src/mod-script-pipe/ScripterCallback.h | 39 - .../mod-track-panel/ModTrackPanelCallback.cpp | 212 -- .../mod-track-panel/ModTrackPanelCallback.h | 38 - lib-src/mod-track-panel/Registrar.cpp | 77 - lib-src/mod-track-panel/Registrar.h | 45 - lib-src/mod-track-panel/SkewedRuler.cpp | 136 -- lib-src/mod-track-panel/SkewedRuler.h | 23 - lib-src/mod-track-panel/TrackPanel2.cpp | 133 -- lib-src/mod-track-panel/TrackPanel2.h | 44 - lib-src/mod-track-panel/mod-track-panel.sln | 22 - .../mod-track-panel/mod-track-panel.vcxproj | 113 -- .../mod-track-panel.vcxproj.filters | 37 - src/BatchProcessDialog.cpp | 2 +- src/CMakeLists.txt | 15 +- src/FileNames.cpp | 2 +- src/effects/Equalization.cpp | 2 +- src/effects/nyquist/Nyquist.cpp | 2 +- src/export/Export.cpp | 2 +- src/export/ExportFFmpegDialogs.cpp | 2 +- src/widgets/wxPanelWrapper.h | 2 +- 85 files changed, 21 insertions(+), 12852 deletions(-) delete mode 100644 cmake-proxies/FileDialog/CMakeLists.txt delete mode 100644 cmake-proxies/mod-null/CMakeLists.txt delete mode 100644 cmake-proxies/mod-nyq-bench/CMakeLists.txt delete mode 100644 cmake-proxies/mod-script-pipe/CMakeLists.txt delete mode 100644 lib-src/FileDialog/FileDialog.cpp delete mode 100644 lib-src/FileDialog/FileDialog.h delete mode 100644 lib-src/FileDialog/gtk/FileDialogPrivate.cpp delete mode 100644 lib-src/FileDialog/gtk/FileDialogPrivate.h delete mode 100644 lib-src/FileDialog/mac/FileDialogPrivate.h delete mode 100644 lib-src/FileDialog/mac/FileDialogPrivate.mm delete mode 100644 lib-src/FileDialog/win/FileDialogPrivate.cpp delete mode 100644 lib-src/FileDialog/win/FileDialogPrivate.h delete mode 100644 lib-src/mod-null/ModNullCallback.cpp delete mode 100644 lib-src/mod-null/ModNullCallback.h delete mode 100755 lib-src/mod-nyq-bench/NyqBench.cpp delete mode 100755 lib-src/mod-nyq-bench/NyqBench.h delete mode 100644 lib-src/mod-nyq-bench/Readme.txt delete mode 100644 lib-src/mod-nyq-bench/images/document-new-large.xpm delete mode 100644 lib-src/mod-nyq-bench/images/document-new-small.xpm delete mode 100644 lib-src/mod-nyq-bench/images/document-open-large.xpm delete mode 100644 lib-src/mod-nyq-bench/images/document-open-small.xpm delete mode 100644 lib-src/mod-nyq-bench/images/document-save-as-large.xpm delete mode 100644 lib-src/mod-nyq-bench/images/document-save-as-small.xpm delete mode 100644 lib-src/mod-nyq-bench/images/document-save-large.xpm delete mode 100644 lib-src/mod-nyq-bench/images/document-save-small.xpm delete mode 100644 lib-src/mod-nyq-bench/images/edit-clear-large.xpm delete mode 100644 lib-src/mod-nyq-bench/images/edit-clear-small.xpm delete mode 100644 lib-src/mod-nyq-bench/images/edit-copy-large.xpm delete mode 100644 lib-src/mod-nyq-bench/images/edit-copy-small.xpm delete mode 100644 lib-src/mod-nyq-bench/images/edit-cut-large.xpm delete mode 100644 lib-src/mod-nyq-bench/images/edit-cut-small.xpm delete mode 100644 lib-src/mod-nyq-bench/images/edit-delete-large.xpm delete mode 100644 lib-src/mod-nyq-bench/images/edit-delete-small.xpm delete mode 100644 lib-src/mod-nyq-bench/images/edit-find-large.xpm delete mode 100644 lib-src/mod-nyq-bench/images/edit-find-small.xpm delete mode 100644 lib-src/mod-nyq-bench/images/edit-paste-large.xpm delete mode 100644 lib-src/mod-nyq-bench/images/edit-paste-small.xpm delete mode 100644 lib-src/mod-nyq-bench/images/edit-redo-large.xpm delete mode 100644 lib-src/mod-nyq-bench/images/edit-redo-small.xpm delete mode 100644 lib-src/mod-nyq-bench/images/edit-select-all-large.xpm delete mode 100644 lib-src/mod-nyq-bench/images/edit-select-all-small.xpm delete mode 100644 lib-src/mod-nyq-bench/images/edit-undo-large.xpm delete mode 100644 lib-src/mod-nyq-bench/images/edit-undo-small.xpm delete mode 100644 lib-src/mod-nyq-bench/images/go-next-large.xpm delete mode 100644 lib-src/mod-nyq-bench/images/go-next-small.xpm delete mode 100644 lib-src/mod-nyq-bench/images/go-previous-large.xpm delete mode 100644 lib-src/mod-nyq-bench/images/go-previous-small.xpm delete mode 100644 lib-src/mod-nyq-bench/images/go-top-large.xpm delete mode 100644 lib-src/mod-nyq-bench/images/go-top-small.xpm delete mode 100644 lib-src/mod-nyq-bench/images/go-up-large.xpm delete mode 100644 lib-src/mod-nyq-bench/images/go-up-small.xpm delete mode 100644 lib-src/mod-nyq-bench/images/media-playback-pause-large.xpm delete mode 100644 lib-src/mod-nyq-bench/images/media-playback-pause-small.xpm delete mode 100644 lib-src/mod-nyq-bench/images/media-playback-start-large.xpm delete mode 100644 lib-src/mod-nyq-bench/images/media-playback-start-small.xpm delete mode 100644 lib-src/mod-nyq-bench/images/media-playback-stop-large.xpm delete mode 100644 lib-src/mod-nyq-bench/images/media-playback-stop-small.xpm delete mode 100644 lib-src/mod-nyq-bench/images/system-search-large.xpm delete mode 100644 lib-src/mod-nyq-bench/images/system-search-small.xpm delete mode 100644 lib-src/mod-script-pipe/PipeServer.cpp delete mode 100644 lib-src/mod-script-pipe/ScripterCallback.cpp delete mode 100644 lib-src/mod-script-pipe/ScripterCallback.h delete mode 100644 lib-src/mod-track-panel/ModTrackPanelCallback.cpp delete mode 100644 lib-src/mod-track-panel/ModTrackPanelCallback.h delete mode 100644 lib-src/mod-track-panel/Registrar.cpp delete mode 100644 lib-src/mod-track-panel/Registrar.h delete mode 100644 lib-src/mod-track-panel/SkewedRuler.cpp delete mode 100644 lib-src/mod-track-panel/SkewedRuler.h delete mode 100644 lib-src/mod-track-panel/TrackPanel2.cpp delete mode 100644 lib-src/mod-track-panel/TrackPanel2.h delete mode 100755 lib-src/mod-track-panel/mod-track-panel.sln delete mode 100755 lib-src/mod-track-panel/mod-track-panel.vcxproj delete mode 100755 lib-src/mod-track-panel/mod-track-panel.vcxproj.filters diff --git a/CMakeLists.txt b/CMakeLists.txt index df62a8f60..313d89bdd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -430,9 +430,6 @@ add_subdirectory( "locale" ) add_subdirectory( "nyquist" ) add_subdirectory( "plug-ins" ) add_subdirectory( "src" ) -add_subdirectory( "cmake-proxies/mod-null" ) -add_subdirectory( "cmake-proxies/mod-nyq-bench" ) -add_subdirectory( "cmake-proxies/mod-script-pipe" ) add_subdirectory( "scripts" ) # Uncomment what follows for symbol values. diff --git a/cmake-proxies/CMakeLists.txt b/cmake-proxies/CMakeLists.txt index 3e27f0297..991941632 100644 --- a/cmake-proxies/CMakeLists.txt +++ b/cmake-proxies/CMakeLists.txt @@ -144,7 +144,6 @@ endfunction() # # directory option symbol req chk version addlib( wxWidgets wxwidgets WX YES NO "" ) # must be first -addlib( FileDialog FileDialog FILEDIALOG YES YES "" ) addlib( expat expat EXPAT YES YES "expat >= 2.1.0" ) addlib( lame lame LAME YES YES "lame >= 3.100" ) addlib( libsndfile sndfile SNDFILE YES YES "sndfile >= 1.0.28" ) diff --git a/cmake-proxies/FileDialog/CMakeLists.txt b/cmake-proxies/FileDialog/CMakeLists.txt deleted file mode 100644 index bfb96758c..000000000 --- a/cmake-proxies/FileDialog/CMakeLists.txt +++ /dev/null @@ -1,43 +0,0 @@ - -add_library( ${TARGET} STATIC ) - -def_vars() - -list( APPEND SOURCES - PRIVATE - ${TARGET_ROOT}/FileDialog.cpp - $<$:${TARGET_ROOT}/win/FileDialogPrivate.cpp> - $<$:${TARGET_ROOT}/mac/FileDialogPrivate.mm> - $<$:${TARGET_ROOT}/gtk/FileDialogPrivate.cpp> -) - -list( APPEND INCLUDES - PUBLIC - ${TARGET_ROOT} -) - -list( APPEND DEFINES - PRIVATE - $<$:__WIN32__> -) - -list( APPEND OPTIONS - PRIVATE - $<$:/permissive-> - $<$:-Wno-deprecated-declarations> -) - -list( APPEND LIBRARIES - PRIVATE - wxWidgets - PUBLIC - $<$:PkgConfig::GTK> -) - -organize_source( "${TARGET_ROOT}" "" "${SOURCES}" ) -target_sources( ${TARGET} PRIVATE ${SOURCES} ) -target_compile_definitions( ${TARGET} PRIVATE ${DEFINES} ) -target_compile_options( ${TARGET} PRIVATE ${OPTIONS} ) -target_include_directories( ${TARGET} PRIVATE ${INCLUDES} ) -target_link_libraries( ${TARGET} PRIVATE ${LIBRARIES} ) - diff --git a/cmake-proxies/README.txt b/cmake-proxies/README.txt index 0f79157c8..8c07a35ab 100644 --- a/cmake-proxies/README.txt +++ b/cmake-proxies/README.txt @@ -7,6 +7,3 @@ the CMakeList.txt files. We did try bundling several libraries under one CMakeList.txt without using subdirectories. However, we were then fighting CMake too much - and did not have a clean separation of information between sub projects. - -We don't need the proxies for our own 'lib_src' such as mod-script-pipe and -FileDialog, where we 'own' the CMakeList.txt file. \ No newline at end of file diff --git a/cmake-proxies/mod-null/CMakeLists.txt b/cmake-proxies/mod-null/CMakeLists.txt deleted file mode 100644 index 6881e63ec..000000000 --- a/cmake-proxies/mod-null/CMakeLists.txt +++ /dev/null @@ -1,59 +0,0 @@ - -set( TARGET mod-null ) -set( TARGET_ROOT "${libsrc}/${TARGET}" ) - -message( STATUS "========== Configuring ${TARGET} ==========" ) - -def_vars() - -add_library( ${TARGET} MODULE EXCLUDE_FROM_ALL ) - -list( APPEND SOURCES - PRIVATE - ${TARGET_ROOT}/ModNullCallback.cpp - ${TARGET_ROOT}/ModNullCallback.h -) - -get_target_property( INCLUDES wxWidgets INTERFACE_INCLUDE_DIRECTORIES ) -list( APPEND INCLUDES - PUBLIC - ${TARGET_ROOT} -) - -get_target_property( DEFINES wxWidgets INTERFACE_COMPILE_DEFINITIONS ) -list( APPEND DEFINES - PRIVATE - # This is needed until the transition to cmake is complete and - # the Windows pragmas are removed from ModNullCallback.cpp. - # Without it, the wxWidgets "debug.h" will define __WXDEBUG__ - # which then causes this module to emit library pragmas for the - # debug versions of wxWidgets...even if the build is for Release. - wxDEBUG_LEVEL=0 -) - -list( APPEND LOPTS - PRIVATE - $<$:-undefined dynamic_lookup> -) - -list( APPEND LIBRARIES - PRIVATE - Audacity - $<$:wxWidgets> - $<$:FileDialog> -) - -set_target_property_all( ${TARGET} LIBRARY_OUTPUT_DIRECTORY "${_DEST}/modules" ) -set_target_properties( ${TARGET} - PROPERTIES - PREFIX "" - FOLDER "lib-src" -) - -organize_source( "${TARGET_ROOT}" "" "${SOURCES}" ) -target_sources( ${TARGET} PRIVATE ${SOURCES} ) -target_compile_definitions( ${TARGET} PRIVATE ${DEFINES} ) -target_include_directories( ${TARGET} PRIVATE ${INCLUDES} ) -target_link_options( ${TARGET} PRIVATE ${LOPTS} ) -target_link_libraries( ${TARGET} PRIVATE ${LIBRARIES} ) - diff --git a/cmake-proxies/mod-nyq-bench/CMakeLists.txt b/cmake-proxies/mod-nyq-bench/CMakeLists.txt deleted file mode 100644 index 8f69625da..000000000 --- a/cmake-proxies/mod-nyq-bench/CMakeLists.txt +++ /dev/null @@ -1,64 +0,0 @@ - -set( TARGET mod-nyq-bench ) -set( TARGET_ROOT "${libsrc}/${TARGET}" ) - -message( STATUS "========== Configuring ${TARGET} ==========" ) - -def_vars() - -add_library( ${TARGET} MODULE EXCLUDE_FROM_ALL ) - -list( APPEND SOURCES - PRIVATE - ${TARGET_ROOT}/NyqBench.cpp - ${TARGET_ROOT}/NyqBench.h -) - -get_target_property( wx_INCLUDES wxWidgets INTERFACE_INCLUDE_DIRECTORIES ) -get_target_property( pa_INCLUDES portaudio-v19 INTERFACE_INCLUDE_DIRECTORIES ) -get_target_property( ny_INCLUDES libnyquist INTERFACE_INCLUDE_DIRECTORIES ) -list( APPEND INCLUDES - PUBLIC - ${wx_INCLUDES} - ${pa_INCLUDES} - ${ny_INCLUDES} - ${TARGET_ROOT} -) - -get_target_property( DEFINES wxWidgets INTERFACE_COMPILE_DEFINITIONS ) -list( APPEND DEFINES - PRIVATE - # This is needed until the transition to cmake is complete and - # the Windows pragmas are removed from NyqBench.cpp. Without - # it, the wxWidgets "debug.h" will define __WXDEBUG__ which - # then causes this module to emit library pragmas for the debug - # versions of wxWidgets...even if the build is for Release. - wxDEBUG_LEVEL=0 -) - -list( APPEND LOPTS - PRIVATE - $<$:-undefined dynamic_lookup> -) - -list( APPEND LIBRARIES - PRIVATE - Audacity - $<$:wxWidgets> - $<$:FileDialog> -) - -set_target_property_all( ${TARGET} LIBRARY_OUTPUT_DIRECTORY "${_DEST}/modules" ) -set_target_properties( ${TARGET} - PROPERTIES - PREFIX "" - FOLDER "lib-src" -) - -organize_source( "${TARGET_ROOT}" "" "${SOURCES}" ) -target_sources( ${TARGET} PRIVATE ${SOURCES} ) -target_compile_definitions( ${TARGET} PRIVATE ${DEFINES} ) -target_include_directories( ${TARGET} PRIVATE ${INCLUDES} ) -target_link_options( ${TARGET} PRIVATE ${LOPTS} ) -target_link_libraries( ${TARGET} PRIVATE ${LIBRARIES} ) - diff --git a/cmake-proxies/mod-script-pipe/CMakeLists.txt b/cmake-proxies/mod-script-pipe/CMakeLists.txt deleted file mode 100644 index 3120ed328..000000000 --- a/cmake-proxies/mod-script-pipe/CMakeLists.txt +++ /dev/null @@ -1,60 +0,0 @@ - -set( TARGET mod-script-pipe ) -set( TARGET_ROOT "${libsrc}/${TARGET}" ) - -message( STATUS "========== Configuring ${TARGET} ==========" ) - -def_vars() - -add_library( ${TARGET} MODULE ) - -list( APPEND SOURCES - PRIVATE - ${TARGET_ROOT}/PipeServer.cpp - ${TARGET_ROOT}/ScripterCallback.cpp -) - -get_target_property( INCLUDES wxWidgets INTERFACE_INCLUDE_DIRECTORIES ) -list( APPEND INCLUDES - PUBLIC - ${TARGET_ROOT} -) - -get_target_property( DEFINES wxWidgets INTERFACE_COMPILE_DEFINITIONS ) -list( APPEND DEFINES - PRIVATE - BUILDING_SCRIPT_PIPE - - # This is needed until the transition to cmake is complete and - # the Windows pragmas are removed from ScripterCallback.cpp. - # Without it, the wxWidgets "debug.h" will define __WXDEBUG__ - # which then causes this module to emit library pragmas for the - # debug versions of wxWidgets...even if the build is for Release. - wxDEBUG_LEVEL=0 -) - -list( APPEND LOPTS - PRIVATE - $<$:-undefined dynamic_lookup> -) - -list( APPEND LIBRARIES - PRIVATE - Audacity - $<$:wxWidgets> -) - -set_target_property_all( ${TARGET} LIBRARY_OUTPUT_DIRECTORY "${_DEST}/modules" ) -set_target_properties( ${TARGET} - PROPERTIES - PREFIX "" - FOLDER "lib-src" -) - -organize_source( "${TARGET_ROOT}" "" "${SOURCES}" ) -target_sources( ${TARGET} PRIVATE ${SOURCES} ) -target_compile_definitions( ${TARGET} PRIVATE ${DEFINES} ) -target_include_directories( ${TARGET} PRIVATE ${INCLUDES} ) -target_link_options( ${TARGET} PRIVATE ${LOPTS} ) -target_link_libraries( ${TARGET} PRIVATE ${LIBRARIES} ) - diff --git a/lib-src/FileDialog/FileDialog.cpp b/lib-src/FileDialog/FileDialog.cpp deleted file mode 100644 index 663b614de..000000000 --- a/lib-src/FileDialog/FileDialog.cpp +++ /dev/null @@ -1,154 +0,0 @@ -/********************************************************************** - - Audacity: A Digital Audio Editor - - FileDialog.cpp - - Leland Lucius - -*******************************************************************//** - -\class FileDialog -\brief Dialog used to present platform specific "Save As" dialog with -custom controls. - -*//*******************************************************************/ - -#include "FileDialog.h" - -FileDialogBase::FileDialogBase() -{ - m_creator = NULL; - m_userdata = 0; -} - -bool FileDialogBase::HasUserPaneCreator() const -{ - return m_creator != NULL; -} - -void FileDialogBase::SetUserPaneCreator(UserPaneCreatorFunction creator, wxUIntPtr userdata) -{ - m_creator = creator; - m_userdata = userdata; -} - -void FileDialogBase::CreateUserPane(wxWindow *parent) -{ - if (m_creator) - { - (*m_creator)(parent, m_userdata); - } -} - -// -// Copied from wx 3.0.2 and modified to support additional features -// -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/fldlgcmn.cpp -// Purpose: wxFileDialog common functions -// Author: John Labenski -// Modified by: Leland Lucius -// Created: 14.06.03 (extracted from src/*/filedlg.cpp) -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -//---------------------------------------------------------------------------- -// FileDialog convenience functions -//---------------------------------------------------------------------------- - -wxString FileSelector(const wxString& title, - const wxString& defaultDir, - const wxString& defaultFileName, - const wxString& defaultExtension, - const wxString& filter, - int flags, - wxWindow *parent, - int x, int y) -{ - // The defaultExtension, if non-empty, is - // appended to the filename if the user fails to type an extension. The new - // implementation (taken from FileSelectorEx) appends the extension - // automatically, by looking at the filter specification. In fact this - // should be better than the native Microsoft implementation because - // Windows only allows *one* default extension, whereas here we do the - // right thing depending on the filter the user has chosen. - - // If there's a default extension specified but no filter, we create a - // suitable filter. - - wxString filter2; - if ( !defaultExtension.empty() && filter.empty() ) - filter2 = wxString(wxT("*.")) + defaultExtension; - else if ( !filter.empty() ) - filter2 = filter; - - FileDialog fileDialog(parent, title, defaultDir, - defaultFileName, filter2, - flags, wxPoint(x, y)); - - // if filter is of form "All files (*)|*|..." set correct filter index - if ( !defaultExtension.empty() && filter2.find(wxT('|')) != wxString::npos ) - { - int filterIndex = 0; - - wxArrayString descriptions, filters; - // don't care about errors, handled already by FileDialog - (void)wxParseCommonDialogsFilter(filter2, descriptions, filters); - for (size_t n=0; n 0) - fileDialog.SetFilterIndex(filterIndex); - } - - wxString filename; - if ( fileDialog.ShowModal() == wxID_OK ) - { - filename = fileDialog.GetPath(); - } - - return filename; -} - -//---------------------------------------------------------------------------- -// FileSelectorEx -//---------------------------------------------------------------------------- - -wxString FileSelectorEx(const wxString& title, - const wxString& defaultDir, - const wxString& defaultFileName, - int* defaultFilterIndex, - const wxString& filter, - int flags, - wxWindow* parent, - int x, - int y) - -{ - FileDialog fileDialog(parent, - title, - defaultDir, - defaultFileName, - filter, - flags, wxPoint(x, y)); - - wxString filename; - if ( fileDialog.ShowModal() == wxID_OK ) - { - if ( defaultFilterIndex ) - *defaultFilterIndex = fileDialog.GetFilterIndex(); - - filename = fileDialog.GetPath(); - } - - return filename; -} - diff --git a/lib-src/FileDialog/FileDialog.h b/lib-src/FileDialog/FileDialog.h deleted file mode 100644 index 0f32d3148..000000000 --- a/lib-src/FileDialog/FileDialog.h +++ /dev/null @@ -1,96 +0,0 @@ -/********************************************************************** - - Audacity: A Digital Audio Editor - - FileDialog.h - - Leland Lucius - -*******************************************************************//** - -\class FileDialog -\brief Dialog used to present platform specific "Save As" dialog with -custom controls. - -*//*******************************************************************/ - -#ifndef _FILEDIALOG_H_ -#define _FILEDIALOG_H_ - -#include // to inherit - -#ifndef AUDACITY_DLL_API -#define AUDACITY_DLL_API -#endif - -class AUDACITY_DLL_API FileDialogBase : public wxFileDialogBase -{ -public: - FileDialogBase(); - virtual ~FileDialogBase() {}; - - // FileDialogBase - - typedef void (*UserPaneCreatorFunction)(wxWindow *parent, wxUIntPtr userdata); - - virtual bool HasUserPaneCreator() const; - virtual void SetUserPaneCreator(UserPaneCreatorFunction creator, wxUIntPtr userdata); - - virtual void SetFileExtension(const wxString& extension) {}; - -protected: - void CreateUserPane(wxWindow *parent); - - UserPaneCreatorFunction m_creator; - wxUIntPtr m_userdata; -}; - -#if defined(__WXGTK__) -#include "gtk/FileDialogPrivate.h" -#elif defined(__WXMAC__) -#include "mac/FileDialogPrivate.h" -#elif defined(__WXMSW__) -#include "win/FileDialogPrivate.h" -#else -#error Unknown implementation -#endif - -// -// Copied from wx 3.0.2 and modified to support additional features -// -///////////////////////////////////////////////////////////////////////////// -// Name: wx/filedlg.h -// Purpose: wxFileDialog base header -// Author: Robert Roebling -// Modified by: Leland Lucius -// Created: 8/17/99 -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -//---------------------------------------------------------------------------- -// FileDialog convenience functions -//---------------------------------------------------------------------------- - -wxString -FileSelector(const wxString& message = wxFileSelectorPromptStr, - const wxString& default_path = wxEmptyString, - const wxString& default_filename = wxEmptyString, - const wxString& default_extension = wxEmptyString, - const wxString& wildcard = wxFileSelectorDefaultWildcardStr, - int flags = 0, - wxWindow *parent = NULL, - int x = wxDefaultCoord, int y = wxDefaultCoord); - -// An extended version of FileSelector -wxString -FileSelectorEx(const wxString& message = wxFileSelectorPromptStr, - const wxString& default_path = wxEmptyString, - const wxString& default_filename = wxEmptyString, - int *indexDefaultExtension = NULL, - const wxString& wildcard = wxFileSelectorDefaultWildcardStr, - int flags = 0, - wxWindow *parent = NULL, - int x = wxDefaultCoord, int y = wxDefaultCoord); - -#endif diff --git a/lib-src/FileDialog/gtk/FileDialogPrivate.cpp b/lib-src/FileDialog/gtk/FileDialogPrivate.cpp deleted file mode 100644 index 91346a4e0..000000000 --- a/lib-src/FileDialog/gtk/FileDialogPrivate.cpp +++ /dev/null @@ -1,643 +0,0 @@ -// -// Copied from wxWidgets 3.0.2 and modified for Audacity -// -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/filedlg.cpp -// Purpose: native implementation of wxFileDialog -// Author: Robert Roebling, Zbigniew Zagorski, Mart Raudsepp -// Copyright: (c) 1998 Robert Roebling, 2004 Zbigniew Zagorski, 2005 Mart Raudsepp -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include - -#include "../FileDialog.h" - -#include "wx/intl.h" -#include "wx/msgdlg.h" - -#ifdef __UNIX__ -#include // chdir -#endif - -#include // wxFilename -#include // wxStringTokenizer -#include // ::wxGetCwd -#include -#include - -#define wxGTK_CONV(s) (s).utf8_str() -#define wxGTK_CONV_FN(s) (s).fn_str() - -// ---------------------------------------------------------------------------- -// Convenience class for g_freeing a gchar* on scope exit automatically -// ---------------------------------------------------------------------------- - -class wxGtkString -{ -public: - explicit wxGtkString(gchar *s) : m_str(s) { } - ~wxGtkString() { g_free(m_str); } - - const gchar *c_str() const { return m_str; } - - operator gchar *() const { return m_str; } - -private: - gchar *m_str; - - wxDECLARE_NO_COPY_CLASS(wxGtkString); -}; - -//----------------------------------------------------------------------------- -// "clicked" for OK-button -//----------------------------------------------------------------------------- - -extern "C" { -static void gtk_filedialog_ok_callback(GtkWidget *widget, FileDialog *dialog) -{ - int style = dialog->GetWindowStyle(); - wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget))); - - // gtk version numbers must be identical with the one in ctor (that calls set_do_overwrite_confirmation) -#ifndef __WXGTK3__ -#if GTK_CHECK_VERSION(2,7,3) - if (gtk_check_version(2, 7, 3) != NULL) -#endif - { - if ((style & wxFD_SAVE) && (style & wxFD_OVERWRITE_PROMPT)) - { - if ( g_file_test(filename, G_FILE_TEST_EXISTS) ) - { - wxString msg; - - msg.Printf( - _("File '%s' already exists, do you really want to overwrite it?"), - wxString::FromUTF8(filename)); - - wxMessageDialog dlg(dialog, msg, _("Confirm"), - wxYES_NO | wxICON_QUESTION); - if (dlg.ShowModal() != wxID_YES) - return; - } - } - } -#endif - - if (style & wxFD_FILE_MUST_EXIST) - { - if ( !g_file_test(filename, G_FILE_TEST_EXISTS) ) - { - wxMessageDialog dlg( dialog, _("Please choose an existing file."), - _("Error"), wxOK| wxICON_ERROR); - dlg.ShowModal(); - return; - } - } - - // change to the directory where the user went if asked - if (style & wxFD_CHANGE_DIR) - { - // Use chdir to not care about filename encodings - wxGtkString folder(g_path_get_dirname(filename)); - chdir(folder); - } - - wxCommandEvent event(wxEVT_BUTTON, wxID_OK); - event.SetEventObject(dialog); - dialog->HandleWindowEvent(event); -} -} - -//----------------------------------------------------------------------------- -// "clicked" for Cancel-button -//----------------------------------------------------------------------------- - -extern "C" -{ - -static void -gtk_filedialog_cancel_callback(GtkWidget * WXUNUSED(w), FileDialog *dialog) -{ - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); - event.SetEventObject(dialog); - dialog->HandleWindowEvent(event); -} - -static void gtk_filedialog_response_callback(GtkWidget *w, - gint response, - FileDialog *dialog) -{ - if (response == GTK_RESPONSE_ACCEPT) - gtk_filedialog_ok_callback(w, dialog); - else // GTK_RESPONSE_CANCEL or GTK_RESPONSE_NONE - gtk_filedialog_cancel_callback(w, dialog); -} - -static void gtk_filedialog_selchanged_callback(GtkFileChooser *chooser, - FileDialog *dialog) -{ - wxGtkString filename(gtk_file_chooser_get_preview_filename(chooser)); - - dialog->GTKSelectionChanged(wxString::FromUTF8(filename)); -} - -static void gtk_filedialog_update_preview_callback(GtkFileChooser *chooser, - gpointer user_data) -{ - GtkWidget *preview = GTK_WIDGET(user_data); - - wxGtkString filename(gtk_file_chooser_get_preview_filename(chooser)); - - if ( !filename ) - return; - - GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file_at_size(filename, 128, 128, NULL); - gboolean have_preview = pixbuf != NULL; - - gtk_image_set_from_pixbuf(GTK_IMAGE(preview), pixbuf); - if ( pixbuf ) - g_object_unref (pixbuf); - - gtk_file_chooser_set_preview_widget_active(chooser, have_preview); -} - -static void gtk_filedialog_folderchanged_callback(GtkFileChooser *chooser, - FileDialog *dialog) -{ - dialog->GTKFolderChanged(); -} - -static void gtk_filedialog_filterchanged_callback(GtkFileChooser *chooser, - GParamSpec *pspec, - FileDialog *dialog) -{ - dialog->GTKFilterChanged(); -} - -static GtkWidget* find_widget(GtkWidget* parent, const gchar* name, int depth) -{ - // printf("%*.*c%s\n", depth, depth, ' ', gtk_widget_get_name(parent)); - - GtkWidget *widget = NULL; - if (g_strcasecmp(gtk_widget_get_name(parent), name) == 0) - { - return parent; - } - - if (GTK_IS_BIN(parent)) - { - return find_widget(gtk_bin_get_child(GTK_BIN(parent)), name, depth + 1); - } - - if (GTK_IS_CONTAINER(parent)) - { - GList *list = gtk_container_get_children(GTK_CONTAINER(parent)); - for (GList *node = list; node; node = node->next) - { - widget = find_widget(GTK_WIDGET(node->data), name, depth + 1); - if (widget) - { - break; - } - } - g_list_free(list); - } - - return widget; -} - -} // extern "C" - -void FileDialog::AddChildGTK(wxWindowGTK* child) -{ - // allow dialog to be resized smaller horizontally - gtk_widget_set_size_request( - child->m_widget, child->GetMinWidth(), child->m_height); - -// In GTK 3+, adding our container as the extra widget can cause the -// the filter combo to grow to the same height as our container. This -// makes for a very odd looking filter combo. So, we manually add our -// container below the action bar. -#if GTK_CHECK_VERSION(3,0,0) - GtkWidget *actionbar = find_widget(m_widget, "GtkActionBar", 0); - if (actionbar) - { - GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); - gtk_container_add(GTK_CONTAINER(vbox), child->m_widget); - gtk_box_set_child_packing(GTK_BOX(vbox), child->m_widget, TRUE, TRUE, 0, GTK_PACK_START); - gtk_widget_show(vbox); - - GtkWidget *abparent = gtk_widget_get_parent(actionbar); - gtk_container_add(GTK_CONTAINER(abparent), vbox); - gtk_box_set_child_packing(GTK_BOX(abparent), vbox, FALSE, FALSE, 0, GTK_PACK_END); - gtk_box_reorder_child(GTK_BOX(abparent), actionbar, -2); - } -#else - gtk_file_chooser_set_extra_widget( - GTK_FILE_CHOOSER(m_widget), child->m_widget); -#endif -} - -//----------------------------------------------------------------------------- -// FileDialog -//----------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS(FileDialog,FileDialogBase) - -BEGIN_EVENT_TABLE(FileDialog,FileDialogBase) - EVT_BUTTON(wxID_OK, FileDialog::OnFakeOk) - EVT_SIZE(FileDialog::OnSize) -END_EVENT_TABLE() - -FileDialog::FileDialog(wxWindow *parent, const wxString& message, - const wxString& defaultDir, - const wxString& defaultFileName, - const wxString& wildCard, - long style, const wxPoint& pos, - const wxSize& sz, - const wxString& name) - : FileDialogBase() -{ - Create(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name); -} - -bool FileDialog::Create(wxWindow *parent, const wxString& message, - const wxString& defaultDir, - const wxString& defaultFileName, - const wxString& wildCard, - long style, const wxPoint& pos, - const wxSize& sz, - const wxString& name) -{ - parent = GetParentForModalDialog(parent, style); - - if (!FileDialogBase::Create(parent, message, defaultDir, defaultFileName, - wildCard, style, pos, sz, name)) - { - return false; - } - - if (!PreCreation(parent, pos, wxDefaultSize) || - !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style, - wxDefaultValidator, wxT("filedialog"))) - { - wxFAIL_MSG( wxT("FileDialog creation failed") ); - return false; - } - - GtkFileChooserAction gtk_action; - GtkWindow* gtk_parent = NULL; - if (parent) - gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(parent->m_widget) ); - - const gchar* ok_btn_stock; - if ( style & wxFD_SAVE ) - { - gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE; - ok_btn_stock = GTK_STOCK_SAVE; - } - else - { - gtk_action = GTK_FILE_CHOOSER_ACTION_OPEN; - ok_btn_stock = GTK_STOCK_OPEN; - } - - m_widget = gtk_file_chooser_dialog_new( - wxGTK_CONV(m_message), - gtk_parent, - gtk_action, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - ok_btn_stock, GTK_RESPONSE_ACCEPT, - NULL); - g_object_ref(m_widget); - GtkFileChooser* file_chooser = GTK_FILE_CHOOSER(m_widget); - - m_fc.SetWidget(file_chooser); - - gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_ACCEPT); - - if ( style & wxFD_MULTIPLE ) - gtk_file_chooser_set_select_multiple(file_chooser, true); - - // local-only property could be set to false to allow non-local files to be - // loaded. In that case get/set_uri(s) should be used instead of - // get/set_filename(s) everywhere and the GtkFileChooserDialog should - // probably also be created with a backend, e.g. "gnome-vfs", "default", ... - // (gtk_file_chooser_dialog_new_with_backend). Currently local-only is kept - // as the default - true: - // gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(m_widget), true); - - g_signal_connect (m_widget, "response", - G_CALLBACK (gtk_filedialog_response_callback), this); - - g_signal_connect (m_widget, "selection-changed", - G_CALLBACK (gtk_filedialog_selchanged_callback), this); - - g_signal_connect (m_widget, "current-folder-changed", - G_CALLBACK (gtk_filedialog_folderchanged_callback), this); - - g_signal_connect (m_widget, "notify::filter", - G_CALLBACK (gtk_filedialog_filterchanged_callback), this); - - // deal with extensions/filters - SetWildcard(wildCard); - - wxString defaultFileNameWithExt = defaultFileName; - if ( !wildCard.empty() && !defaultFileName.empty() && - !wxFileName(defaultFileName).HasExt() ) - { - // append the default extension, if any, to the initial file name: GTK - // won't do it for us by default (unlike e.g. MSW) - const wxFileName fnWC(m_fc.GetCurrentWildCard()); - if ( fnWC.HasExt() ) - { - // Notice that we shouldn't append the extension if it's a wildcard - // because this is not useful: the user would need to change it to use - // some fixed extension anyhow. - const wxString& ext = fnWC.GetExt(); - if ( ext.find_first_of("?*") == wxString::npos ) - defaultFileNameWithExt << "." << ext; - } - } - - - // if defaultDir is specified it should contain the directory and - // defaultFileName should contain the default name of the file, however if - // directory is not given, defaultFileName contains both - wxFileName fn; - if ( defaultDir.empty() ) - fn.Assign(defaultFileNameWithExt); - else if ( !defaultFileNameWithExt.empty() ) - fn.Assign(defaultDir, defaultFileNameWithExt); - else - fn.AssignDir(defaultDir); - - // set the initial file name and/or directory - fn.MakeAbsolute(); // GTK+ needs absolute path - const wxString dir = fn.GetPath(); - if ( !dir.empty() ) - { - gtk_file_chooser_set_current_folder(file_chooser, wxGTK_CONV_FN(dir)); - } - - const wxString fname = fn.GetFullName(); - if ( style & wxFD_SAVE ) - { - if ( !fname.empty() ) - { - gtk_file_chooser_set_current_name(file_chooser, wxGTK_CONV_FN(fname)); - } - -#if GTK_CHECK_VERSION(2,7,3) - if ((style & wxFD_OVERWRITE_PROMPT) -#ifndef __WXGTK3__ - && gtk_check_version(2,7,3) == NULL -#endif - ) - { - gtk_file_chooser_set_do_overwrite_confirmation(file_chooser, true); - } -#endif - } - else // wxFD_OPEN - { - if ( !fname.empty() ) - { - gtk_file_chooser_set_filename(file_chooser, - wxGTK_CONV_FN(fn.GetFullPath())); - } - } - - if ( style & wxFD_PREVIEW ) - { - GtkWidget *previewImage = gtk_image_new(); - - gtk_file_chooser_set_preview_widget(file_chooser, previewImage); - g_signal_connect(m_widget, "update-preview", - G_CALLBACK(gtk_filedialog_update_preview_callback), - previewImage); - } - - return true; -} - -FileDialog::~FileDialog() -{ - if (m_extraControl) - { - // get chooser to drop its reference right now, allowing wxWindow dtor - // to verify that ref count drops to zero - gtk_file_chooser_set_extra_widget( - GTK_FILE_CHOOSER(m_widget), NULL); - } -} - -void FileDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event)) -{ - // Update the current directory from here, accessing it later may not work - // due to the strange way GtkFileChooser works. - wxGtkString - str(gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(m_widget))); - m_dir = wxString::FromUTF8(str); - - EndDialog(wxID_OK); -} - -int FileDialog::ShowModal() -{ - WX_HOOK_MODAL_DIALOG(); - - // Create the root window - wxBoxSizer *verticalSizer = new wxBoxSizer(wxVERTICAL); - wxPanel *root = new wxPanel(this, wxID_ANY); - - if (HasUserPaneCreator()) - { - wxPanel *userpane = new wxPanel(root, wxID_ANY); - CreateUserPane(userpane); - - wxBoxSizer *horizontalSizer = new wxBoxSizer(wxHORIZONTAL); - horizontalSizer->Add(userpane, 1, wxEXPAND, 0); - verticalSizer->Add(horizontalSizer, 1, wxEXPAND|wxALL, 0); - } - - root->SetSizer(verticalSizer); - root->Layout(); - verticalSizer->SetSizeHints(root); - - // Send an initial filter changed event - GTKFilterChanged(); - - return wxDialog::ShowModal(); -} - -// Change the currently displayed extension -void FileDialog::SetFileExtension(const wxString& extension) -{ - wxString filename; - -#if defined(__WXGTK3__) - filename = wxString::FromUTF8(gtk_file_chooser_get_current_name(GTK_FILE_CHOOSER(m_widget))); -#else - GtkWidget *entry = find_widget(m_widget, "GtkFileChooserEntry", 0); - if (entry) - { - filename = wxString::FromUTF8(gtk_entry_get_text(GTK_ENTRY(entry))); - } -#endif - - if (filename == wxEmptyString) - { - filename = m_fc.GetFilename(); - } - - if (filename != wxEmptyString) - { - wxFileName fn(filename); - fn.SetExt(extension); - - gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), fn.GetFullName().utf8_str()); - } -} - -void FileDialog::DoSetSize(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags)) -{ -} - -void FileDialog::OnSize(wxSizeEvent&) -{ - // avoid calling DoLayout(), which will set the (wrong) size of - // m_extraControl, its size is managed by GtkFileChooser -} - -wxString FileDialog::GetPath() const -{ - return m_fc.GetPath(); -} - -void FileDialog::GetFilenames(wxArrayString& files) const -{ - m_fc.GetFilenames( files ); -} - -void FileDialog::GetPaths(wxArrayString& paths) const -{ - m_fc.GetPaths( paths ); -} - -void FileDialog::SetMessage(const wxString& message) -{ - m_message = message; - SetTitle(message); -} - -void FileDialog::SetPath(const wxString& path) -{ - FileDialogBase::SetPath(path); - - // Don't do anything if no path is specified, in particular don't set the - // path to m_dir below as this would result in opening the dialog in the - // parent directory of this one instead of m_dir itself. - if ( path.empty() ) - return; - - // we need an absolute path for GTK native chooser so ensure that we have - // it: use the initial directory if it was set or just CWD otherwise (this - // is the default behaviour if m_dir is empty) - wxFileName fn(path); - fn.MakeAbsolute(m_dir); - m_fc.SetPath(fn.GetFullPath()); -} - -void FileDialog::SetDirectory(const wxString& dir) -{ - FileDialogBase::SetDirectory(dir); - - m_fc.SetDirectory(dir); -} - -void FileDialog::SetFilename(const wxString& name) -{ - FileDialogBase::SetFilename(name); - - if (HasFdFlag(wxFD_SAVE)) - { - gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxGTK_CONV(name)); - } - - else - { - wxString path( GetDirectory() ); - if (path.empty()) - { - // SetPath() fires an assert if fed other than filepaths - return; - } - SetPath(wxFileName(path, name).GetFullPath()); - } -} - -wxString FileDialog::GetFilename() const -{ - wxString currentFilename( m_fc.GetFilename() ); - if (currentFilename.empty()) - { - // m_fc.GetFilename() will return empty until the dialog has been shown - // in which case use any previously provided value - currentFilename = m_fileName; - } - return currentFilename; -} - -void FileDialog::SetWildcard(const wxString& wildCard) -{ - FileDialogBase::SetWildcard(wildCard); - m_fc.SetWildcard( GetWildcard() ); -} - -void FileDialog::SetFilterIndex(int filterIndex) -{ - m_fc.SetFilterIndex( filterIndex ); -} - -int FileDialog::GetFilterIndex() const -{ - return m_fc.GetFilterIndex(); -} - -void FileDialog::GTKSelectionChanged(const wxString& filename) -{ - m_currentlySelectedFilename = filename; - - wxFileCtrlEvent event(wxEVT_FILECTRL_SELECTIONCHANGED, this, GetId()); - - wxArrayString filenames; - GetFilenames(filenames); - - event.SetDirectory(GetDirectory()); - event.SetFiles(filenames); - - GetEventHandler()->ProcessEvent(event); -} - -void FileDialog::GTKFolderChanged() -{ - wxFileCtrlEvent event(wxEVT_FILECTRL_FOLDERCHANGED, this, GetId()); - - event.SetDirectory(GetDirectory()); - - GetEventHandler()->ProcessEvent(event); -} - -void FileDialog::GTKFilterChanged() -{ - wxFileCtrlEvent event(wxEVT_FILECTRL_FILTERCHANGED, this, GetId()); - - event.SetFilterIndex(GetFilterIndex()); - - GetEventHandler()->ProcessEvent(event); -} - diff --git a/lib-src/FileDialog/gtk/FileDialogPrivate.h b/lib-src/FileDialog/gtk/FileDialogPrivate.h deleted file mode 100644 index 08bd7abea..000000000 --- a/lib-src/FileDialog/gtk/FileDialogPrivate.h +++ /dev/null @@ -1,91 +0,0 @@ -// -// Copied from wxWidgets 3.0.2 and modified for Audacity -// -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/filedlg.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _GTK_FILEDIALOGPRIVATE_H_ -#define _GTK_FILEDIALOGPRIVATE_H_ - -#include // for wxGtkFileChooser -#include - -//------------------------------------------------------------------------- -// FileDialog -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE FileDialog: public FileDialogBase -{ -public: - FileDialog() { } - - FileDialog(wxWindow *parent, - const wxString& message = wxFileSelectorPromptStr, - const wxString& defaultDir = wxEmptyString, - const wxString& defaultFile = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize, - const wxString& name = wxFileDialogNameStr); - bool Create(wxWindow *parent, - const wxString& message = wxFileSelectorPromptStr, - const wxString& defaultDir = wxEmptyString, - const wxString& defaultFile = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize, - const wxString& name = wxFileDialogNameStr); - virtual ~FileDialog(); - - virtual wxString GetPath() const; - virtual void GetPaths(wxArrayString& paths) const; - virtual wxString GetFilename() const; - virtual void GetFilenames(wxArrayString& files) const; - virtual int GetFilterIndex() const; - - virtual void SetMessage(const wxString& message); - virtual void SetPath(const wxString& path); - virtual void SetDirectory(const wxString& dir); - virtual void SetFilename(const wxString& name); - virtual void SetWildcard(const wxString& wildCard); - virtual void SetFilterIndex(int filterIndex); - - virtual int ShowModal(); - - virtual bool SupportsExtraControl() const { return true; } - - virtual void SetFileExtension(const wxString& extension); - - // Implementation only. - void GTKSelectionChanged(const wxString& filename); - void GTKFolderChanged(); - void GTKFilterChanged(); - - -protected: - // override this from wxTLW since the native - // form doesn't have any m_wxwindow - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - - -private: - void OnFakeOk( wxCommandEvent &event ); - void OnSize(wxSizeEvent&); - virtual void AddChildGTK(wxWindowGTK* child); - - wxGtkFileChooser m_fc; - - DECLARE_DYNAMIC_CLASS(FileDialog) - DECLARE_EVENT_TABLE() -}; - -#endif diff --git a/lib-src/FileDialog/mac/FileDialogPrivate.h b/lib-src/FileDialog/mac/FileDialogPrivate.h deleted file mode 100644 index 7fe79111c..000000000 --- a/lib-src/FileDialog/mac/FileDialogPrivate.h +++ /dev/null @@ -1,107 +0,0 @@ -// -// Copied from wx 3.0.2 and modified to support additional features -// -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/filedlg.h -// Purpose: wxFileDialog class -// Author: Stefan Csomor -// Modified by: Leland Lucius -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _MAC_FILEDIALOG_H_ -#define _MAC_FILEDIALOG_H_ - -#include "../FileDialog.h" - -class wxChoice; - -//------------------------------------------------------------------------- -// wxFileDialog -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE FileDialog: public FileDialogBase -{ -DECLARE_DYNAMIC_CLASS(FileDialog) -protected: - wxArrayString m_fileNames; - wxArrayString m_paths; - -public: - FileDialog(); - FileDialog(wxWindow *parent, - const wxString& message = wxFileSelectorPromptStr, - const wxString& defaultDir = wxEmptyString, - const wxString& defaultFile = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize, - const wxString& name = wxFileDialogNameStr); - - void Create(wxWindow *parent, - const wxString& message = wxFileSelectorPromptStr, - const wxString& defaultDir = wxEmptyString, - const wxString& defaultFile = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize, - const wxString& name = wxFileDialogNameStr); - -#if wxOSX_USE_COCOA - ~FileDialog(); -#endif - - virtual void GetPaths(wxArrayString& paths) const { paths = m_paths; } - virtual void GetFilenames(wxArrayString& files) const { files = m_fileNames ; } - - virtual int ShowModal(); - -#if wxOSX_USE_COCOA - virtual void ModalFinishedCallback(void* panel, int resultCode); -#endif - - virtual bool SupportsExtraControl() const; - - virtual void SetFileExtension(const wxString& extension); - - // implementation only - -#if wxOSX_USE_COCOA - void DoViewResized(void* object); - void DoSendFolderChangedEvent(void* panel, const wxString& path); - void DoSendSelectionChangedEvent(void* panel); -#endif - -protected: - // not supported for file dialog, RR - virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {} - - void SetupExtraControls(WXWindow nativeWindow); - -#if wxOSX_USE_COCOA - void DoOnFilterSelected(int index); - virtual void OnFilterSelected(wxCommandEvent &event); - - wxArrayString m_filterExtensions; - wxArrayString m_filterNames; - wxChoice* m_filterChoice; - wxWindow* m_filterPanel; - bool m_useFileTypeFilter; - int m_firstFileTypeFilter; - wxArrayString m_currentExtensions; - WX_NSObject m_delegate; - WX_NSObject m_sheetDelegate; -#endif - -private: - // Common part of all ctors. - void Init(); -}; - -#endif diff --git a/lib-src/FileDialog/mac/FileDialogPrivate.mm b/lib-src/FileDialog/mac/FileDialogPrivate.mm deleted file mode 100644 index 0b6c3cdd9..000000000 --- a/lib-src/FileDialog/mac/FileDialogPrivate.mm +++ /dev/null @@ -1,721 +0,0 @@ -/// -// Copied from wxWidgets 3.0.2 and modified to support additional features -// -///////////////////////////////////////////////////////////////////////////// -// Name: src/cocoa/filedlg.mm -// Purpose: wxFileDialog for wxCocoa -// Author: Ryan Norton -// Modified by: Leland Lucius -// Created: 2004-10-02 -// Copyright: (c) Ryan Norton -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#undef WXINTL_NO_GETTEXT_MACRO - -// For compilers that support precompilation, includes "wx.h". -#include - -#include "FileDialog.h" - -#ifndef WX_PRECOMP - #include - #include - #include - #include - #include -#endif - -#include -#include -#include -#include -#include - -#include -#include -#include - -#include - -// ============================================================================ -// implementation -// ============================================================================ - -@interface OSPanelDelegate : NSObject -{ - FileDialog* _dialog; -} - -- (FileDialog*) fileDialog; -- (void) setFileDialog:(FileDialog*) dialog; - -- (void)panel:(id)sender didChangeToDirectoryURL:(NSURL *)url; -- (void)panelSelectionDidChange:(id)sender; -- (BOOL)panel:(id)sender validateURL:(NSURL *)url error:(NSError * _Nullable *)outError; - -- (void)viewResized:(NSNotification *)notification; - -@end - -@implementation OSPanelDelegate -- (void)viewResized:(NSNotification *)notification -{ - _dialog->DoViewResized([notification object]); -} - -- (id) init -{ - if ( self = [super init] ) - { - _dialog = NULL; - } - return self; -} - -- (FileDialog*) fileDialog -{ - return _dialog; -} - -- (void) setFileDialog:(FileDialog*) dialog -{ - _dialog = dialog; -} - -- (void)panel:(id)sender didChangeToDirectoryURL:(NSURL *)url AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER -{ - wxString path = wxCFStringRef::AsStringWithNormalizationFormC( [url path] ); - - _dialog->DoSendFolderChangedEvent(sender, path); -} - -- (void)panelSelectionDidChange:(id)sender AVAILABLE_MAC_OS_X_VERSION_10_3_AND_LATER -{ - _dialog->DoSendSelectionChangedEvent(sender); -} - -// Do NOT remove this method. For an explanation, refer to: -// -// http://bugzilla.audacityteam.org/show_bug.cgi?id=2371 -// -- (BOOL)panel:(id)sender validateURL:(NSURL *)url error:(NSError * _Nullable *)outError; -{ - // We handle filename validation after the panel closes - return YES; -} - -@end - -wxIMPLEMENT_CLASS(FileDialog, FileDialogBase) - -FileDialog::FileDialog() -: FileDialogBase() -{ - Init(); -} - -FileDialog::FileDialog(wxWindow *parent, - const wxString& message, - const wxString& defaultDir, - const wxString& defaultFile, - const wxString& wildCard, - long style, - const wxPoint& pos, - const wxSize& sz, - const wxString& name) -: FileDialogBase() -{ - Init(); - - Create(parent,message,defaultDir,defaultFile,wildCard,style,pos,sz,name); -} - -void FileDialog::Init() -{ - m_filterIndex = -1; - m_delegate = nil; - m_filterPanel = NULL; - m_filterChoice = NULL; -} - -void FileDialog::Create( - wxWindow *parent, const wxString& message, - const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard, - long style, const wxPoint& pos, const wxSize& sz, const wxString& name) -{ - - FileDialogBase::Create(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name); -} - -FileDialog::~FileDialog() -{ -} - -bool FileDialog::SupportsExtraControl() const -{ - return true; -} - -NSArray* GetTypesFromExtension( const wxString extensiongroup, wxArrayString& extensions ) -{ - NSMutableArray* types = nil; - extensions.Clear(); - - wxStringTokenizer tokenizer( extensiongroup, wxT(";") ) ; - while ( tokenizer.HasMoreTokens() ) - { - wxString extension = tokenizer.GetNextToken() ; - // Remove leading '*' - if ( extension.length() && (extension.GetChar(0) == '*') ) - extension = extension.Mid( 1 ); - - // Remove leading '.' - if ( extension.length() && (extension.GetChar(0) == '.') ) - extension = extension.Mid( 1 ); - - // Remove leading '*', this is for handling *.* - if ( extension.length() && (extension.GetChar(0) == '*') ) - extension = extension.Mid( 1 ); - - if ( extension.IsEmpty() ) - { - extensions.Clear(); - [types release]; - types = nil; - return nil; - } - - if ( types == nil ) - types = [[NSMutableArray alloc] init]; - - extensions.Add(extension.Lower()); - wxCFStringRef cfext(extension); - [types addObject: (NSString*)cfext.AsNSString() ]; - } - - [types autorelease]; - return types; -} - -NSArray* GetTypesFromFilter( const wxString& filter, wxArrayString& names, wxArrayString& extensiongroups ) -{ - NSMutableArray* types = nil; - bool allowAll = false; - - names.Clear(); - extensiongroups.Clear(); - - if ( !filter.empty() ) - { - wxStringTokenizer tokenizer( filter, wxT("|") ); - int numtokens = (int)tokenizer.CountTokens(); - if(numtokens == 1) - { - // we allow for compatibility reason to have a single filter expression (like *.*) without - // an explanatory text, in that case the first part is name and extension at the same time - wxString extension = tokenizer.GetNextToken(); - names.Add( extension ); - extensiongroups.Add( extension ); - } - else - { - int numextensions = numtokens / 2; - for(int i = 0; i < numextensions; i++) - { - wxString name = tokenizer.GetNextToken(); - wxString extension = tokenizer.GetNextToken(); - names.Add( name ); - extensiongroups.Add( extension ); - } - } - - const size_t extCount = extensiongroups.GetCount(); - wxArrayString extensions; - for ( size_t i = 0 ; i < extCount; i++ ) - { - NSArray* exttypes = GetTypesFromExtension(extensiongroups[i], extensions); - if ( exttypes != nil ) - { - if ( allowAll == false ) - { - if ( types == nil ) - types = [[NSMutableArray alloc] init]; - - [types addObjectsFromArray:exttypes]; - } - } - else - { - allowAll = true; - [types release]; - types = nil; - } - } - } - [types autorelease]; - return types; -} - -void FileDialog::DoOnFilterSelected(int index) -{ - if (index == wxNOT_FOUND) - { - return; - } - - NSArray* types = GetTypesFromExtension(m_filterExtensions[index],m_currentExtensions); - NSSavePanel* panel = (NSSavePanel*) GetWXWindow(); - [panel setAllowedFileTypes:types]; - - m_filterIndex = index; - - wxFileCtrlEvent event( wxEVT_FILECTRL_FILTERCHANGED, this, GetId() ); - event.SetFilterIndex( m_filterIndex ); - GetEventHandler()->ProcessEvent( event ); -} - -// An item has been selected in the file filter wxChoice: -void FileDialog::OnFilterSelected( wxCommandEvent &WXUNUSED(event) ) -{ - DoOnFilterSelected( m_filterChoice->GetSelection() ); -} - -void FileDialog::DoViewResized(void* object) -{ - m_filterPanel->Layout(); -} - -void FileDialog::DoSendFolderChangedEvent(void* panel, const wxString & path) -{ - m_dir = path; - - wxFileCtrlEvent event( wxEVT_FILECTRL_FOLDERCHANGED, this, GetId() ); - - event.SetDirectory( m_dir ); - - GetEventHandler()->ProcessEvent( event ); -} - -void FileDialog::DoSendSelectionChangedEvent(void* panel) -{ - if ( HasFlag( wxFD_SAVE ) ) - { - NSSavePanel* sPanel = (NSSavePanel*) panel; - NSString* path = [[sPanel URL] path]; - wxFileName fn(wxCFStringRef::AsStringWithNormalizationFormC( path )); - if (!fn.GetFullPath().empty()) - { - m_path = fn.GetFullPath(); - m_dir = fn.GetPath(); - m_fileName = fn.GetFullName(); - m_fileNames.Clear(); - m_fileNames.Add( m_fileName ); - } - } - else - { - NSOpenPanel* oPanel = (NSOpenPanel*) panel; - m_paths.Clear(); - m_fileNames.Clear(); - - NSArray* urls = [oPanel URLs]; - for ( size_t i = 0 ; i < [urls count] ; ++ i ) - { - NSString *path = [[urls objectAtIndex:i] path]; - wxString fnstr = wxCFStringRef::AsStringWithNormalizationFormC( path ); - m_paths.Add( fnstr ); - m_fileNames.Add( wxFileNameFromPath( fnstr ) ); - if ( i == 0 ) - { - m_path = fnstr; - m_fileName = wxFileNameFromPath( fnstr ); - m_dir = wxPathOnly( fnstr ); - } - } - } - - wxFileCtrlEvent event( wxEVT_FILECTRL_SELECTIONCHANGED, this, GetId() ); - - event.SetDirectory( m_dir ); - event.SetFiles( m_fileNames ); - - GetEventHandler()->ProcessEvent( event ); -} - -void FileDialog::SetupExtraControls(WXWindow nativeWindow) -{ - NSSavePanel* panel = (NSSavePanel*) nativeWindow; - // for sandboxed app we cannot access the outer structures - // this leads to problems with extra controls, so as a temporary - // workaround for crashes we don't support those yet - if ( [panel contentView] == nil || getenv("APP_SANDBOX_CONTAINER_ID") != NULL ) - return; - - OSPanelDelegate* del = [[OSPanelDelegate alloc]init]; - [del setFileDialog:this]; - [panel setDelegate:del]; - m_delegate = del; - - wxNonOwnedWindow::Create( GetParent(), nativeWindow ); - - m_filterPanel = NULL; - m_filterChoice = NULL; - NSView* accView = nil; - - if ( m_useFileTypeFilter || HasUserPaneCreator() ) - { - wxBoxSizer *verticalSizer = new wxBoxSizer( wxVERTICAL ); - - m_filterPanel = new wxPanel( this, wxID_ANY ); - accView = m_filterPanel->GetHandle(); - - NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; - [center addObserver:del - selector:@selector(viewResized:) - name:NSViewFrameDidChangeNotification - object:accView]; - - if ( m_useFileTypeFilter ) - { - wxBoxSizer *horizontalSizer = new wxBoxSizer( wxHORIZONTAL ); - - wxStaticText *stattext = new wxStaticText( m_filterPanel, wxID_ANY, _("File type:") ); - horizontalSizer->Add( stattext, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_filterChoice = new wxChoice( m_filterPanel, wxID_ANY ); - m_filterChoice->Append( m_filterNames ); - if ( m_filterNames.GetCount() > 0 ) - { - if ( m_firstFileTypeFilter >= 0 ) - m_filterChoice->SetSelection( m_firstFileTypeFilter ); - } - m_filterChoice->Bind(wxEVT_CHOICE, &FileDialog::OnFilterSelected, this); - - horizontalSizer->Add( m_filterChoice, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - verticalSizer->Add( horizontalSizer, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); - } - - if ( HasUserPaneCreator() ) - { - wxPanel *userpane = new wxPanel( m_filterPanel, wxID_ANY ); - CreateUserPane( userpane ); - - wxBoxSizer *horizontalSizer = new wxBoxSizer( wxHORIZONTAL ); - horizontalSizer->Add( userpane, 1, wxEXPAND, 0 ); - verticalSizer->Add( horizontalSizer, 1, wxEXPAND, 0 ); - } - - m_filterPanel->SetSizer( verticalSizer ); - m_filterPanel->Layout(); - - wxSize ws = m_filterPanel->GetBestSize(); - m_filterPanel->SetSize(ws); - m_filterPanel->SetMinSize(ws); - } - - if ( accView != nil ) - { - [accView removeFromSuperview]; - [accView setAutoresizingMask:NSViewWidthSizable]; - - [panel setAccessoryView:accView]; - } -} - -int FileDialog::ShowModal() -{ - WX_HOOK_MODAL_DIALOG(); - - wxCFEventLoopPauseIdleEvents pause; - - wxMacAutoreleasePool autoreleasepool; - - wxCFStringRef cf( m_message ); - - wxCFStringRef dir( m_dir ); - wxCFStringRef file( m_fileName ); - - m_path.clear(); - m_fileNames.Clear(); - m_paths.Clear(); - - wxNonOwnedWindow* parentWindow = NULL; - int returnCode = -1; - - if (GetParent()) - { - parentWindow = dynamic_cast(wxGetTopLevelParent(GetParent())); - } - - NSArray* types = GetTypesFromFilter( m_wildCard, m_filterNames, m_filterExtensions ) ; - - m_useFileTypeFilter = m_filterExtensions.GetCount() > 0; - -#if defined(we_always_want_the_types) - if( HasFlag(wxFD_OPEN) ) - { - if ( !(wxSystemOptions::HasOption( wxOSX_FILEDIALOG_ALWAYS_SHOW_TYPES ) && (wxSystemOptions::GetOptionInt( wxOSX_FILEDIALOG_ALWAYS_SHOW_TYPES ) == 1)) ) - m_useFileTypeFilter = false; - } -#endif - - m_firstFileTypeFilter = wxNOT_FOUND; - - if ( m_useFileTypeFilter - && m_filterIndex >= 0 && m_filterIndex < m_filterExtensions.GetCount() ) - { - m_firstFileTypeFilter = m_filterIndex; - } - else if ( m_useFileTypeFilter ) - { - types = nil; - bool useDefault = true; - for ( size_t i = 0; i < m_filterExtensions.GetCount(); ++i ) - { - types = GetTypesFromExtension(m_filterExtensions[i], m_currentExtensions); - if ( m_currentExtensions.GetCount() == 0 ) - { - useDefault = false; - m_firstFileTypeFilter = i; - break; - } - - for ( size_t j = 0; j < m_currentExtensions.GetCount(); ++j ) - { - if ( m_fileName.EndsWith(m_currentExtensions[j]) ) - { - m_firstFileTypeFilter = i; - useDefault = false; - break; - } - } - if ( !useDefault ) - break; - } - if ( useDefault ) - { - types = GetTypesFromExtension(m_filterExtensions[0], m_currentExtensions); - m_firstFileTypeFilter = 0; - } - } - - OSXBeginModalDialog(); - - if ( HasFlag(wxFD_SAVE) ) - { - NSSavePanel* sPanel = [NSSavePanel savePanel]; - - SetupExtraControls(sPanel); - - // PRL: - // Hack for bug 1300: intercept key down events, implement a - // Command+V handler, but it's a bit crude. It always pastes - // the entire text field, ignoring the insertion cursor, and ignoring - // which control really has the focus. - id handler; - if (wxTheClipboard->IsSupported(wxDF_TEXT)) { - handler = [ - NSEvent addLocalMonitorForEventsMatchingMask:NSKeyDownMask - handler:^NSEvent *(NSEvent *event) - { - if ([event modifierFlags] & NSCommandKeyMask) - { - auto chars = [event charactersIgnoringModifiers]; - auto character = [chars characterAtIndex:0]; - if (character == 'v') - { - if (wxTheClipboard->Open()) { - wxTextDataObject data; - wxTheClipboard->GetData(data); - wxTheClipboard->Close(); - wxString text = data.GetText(); - auto rawText = text.utf8_str(); - auto length = text.Length(); - NSString *myString = [[NSString alloc] - initWithBytes:rawText.data() - length: rawText.length() - encoding: NSUTF8StringEncoding - ]; - [sPanel setNameFieldStringValue:myString]; - [myString release]; - return nil; - } - } - } - - return event; - } - ]; - } - - // makes things more convenient: - [sPanel setCanCreateDirectories:YES]; - [sPanel setMessage:cf.AsNSString()]; - // if we should be able to descend into pacakges we must somehow - // be able to pass this in - [sPanel setTreatsFilePackagesAsDirectories:NO]; - [sPanel setCanSelectHiddenExtension:YES]; - [sPanel setExtensionHidden:NO]; - [sPanel setAllowedFileTypes:types]; - [sPanel setAllowsOtherFileTypes:YES]; - - if ( HasFlag(wxFD_OVERWRITE_PROMPT) ) - { - } - - /* - Let the file dialog know what file type should be used initially. - If this is not done then when setting the filter index - programmatically to 1 the file will still have the extension - of the first file type instead of the second one. E.g. when file - types are foo and bar, a filename "myletter" with SetDialogIndex(1) - would result in saving as myletter.foo, while we want myletter.bar. - */ -// if(m_firstFileTypeFilter > 0) - { - DoOnFilterSelected(m_firstFileTypeFilter); - } - - [sPanel setDirectoryURL:[NSURL fileURLWithPath:dir.AsNSString()]]; - [sPanel setNameFieldStringValue:file.AsNSString()]; - returnCode = [sPanel runModal]; - ModalFinishedCallback(sPanel, returnCode); - if (wxTheClipboard->IsSupported(wxDF_TEXT)) - [NSEvent removeMonitor:handler]; - } - else - { - NSOpenPanel* oPanel = [NSOpenPanel openPanel]; - - SetupExtraControls(oPanel); - - [oPanel setTreatsFilePackagesAsDirectories:NO]; - [oPanel setCanChooseDirectories:NO]; - [oPanel setResolvesAliases:YES]; - [oPanel setCanChooseFiles:YES]; - [oPanel setMessage:cf.AsNSString()]; - [oPanel setAllowsMultipleSelection: (HasFlag(wxFD_MULTIPLE) ? YES : NO )]; - - // Note that the test here is intentionally different from the one - // above, in the wxFD_SAVE case: we need to call DoOnFilterSelected() - // even for m_firstFileTypeFilter == 0, i.e. when using the default - // filter. - if ( m_firstFileTypeFilter >= 0 ) - { - DoOnFilterSelected(m_firstFileTypeFilter); - } - else - { - [oPanel setAllowedFileTypes: (m_delegate == nil ? types : nil)]; - } - if ( !m_dir.IsEmpty() ) - [oPanel setDirectoryURL:[NSURL fileURLWithPath:dir.AsNSString() - isDirectory:YES]]; - - { - DoOnFilterSelected(m_firstFileTypeFilter); - } - - returnCode = [oPanel runModal]; - - ModalFinishedCallback(oPanel, returnCode); - } - - OSXEndModalDialog(); - - return GetReturnCode(); -} - -void FileDialog::ModalFinishedCallback(void* panel, int returnCode) -{ - m_paths.Clear(); - m_fileNames.Clear(); - - int result = wxID_CANCEL; - if (HasFlag(wxFD_SAVE)) - { - NSSavePanel* sPanel = (NSSavePanel*)panel; - if (returnCode == NSOKButton ) - { - result = wxID_OK; - - NSString* path = [[sPanel URL] path]; - wxFileName fn(wxCFStringRef::AsStringWithNormalizationFormC( path )); - m_dir = fn.GetPath(); - m_fileName = fn.GetFullName(); - m_path = fn.GetFullPath(); - - if (m_filterChoice) - { - m_filterIndex = m_filterChoice->GetSelection(); - } - } - [sPanel setDelegate:nil]; - } - else - { - NSOpenPanel* oPanel = (NSOpenPanel*)panel; - if (returnCode == NSOKButton ) - { - panel = oPanel; - result = wxID_OK; - - if (m_filterChoice) - { - m_filterIndex = m_filterChoice->GetSelection(); - } - - NSArray* filenames = [oPanel URLs]; - for ( size_t i = 0 ; i < [filenames count] ; ++ i ) - { - wxString fnstr = wxCFStringRef::AsStringWithNormalizationFormC([[filenames objectAtIndex:i] path]); - m_paths.Add( fnstr ); - m_fileNames.Add( wxFileNameFromPath(fnstr) ); - if ( i == 0 ) - { - m_path = fnstr; - m_fileName = wxFileNameFromPath(fnstr); - m_dir = wxPathOnly( fnstr ); - } - } - } - [oPanel setDelegate:nil]; - } - - if ( m_delegate ) - { - [[NSNotificationCenter defaultCenter] removeObserver:m_delegate]; - - [m_delegate release]; - m_delegate = nil; - } - - SetReturnCode(result); - - if (GetModality() == wxDIALOG_MODALITY_WINDOW_MODAL) - SendWindowModalDialogEvent ( wxEVT_WINDOW_MODAL_DIALOG_CLOSED ); - - // workaround for sandboxed app, see above - if ( m_isNativeWindowWrapper ) - UnsubclassWin(); - [(NSSavePanel*) panel setAccessoryView:nil]; -} - -// Change the currently displayed extension -void FileDialog::SetFileExtension(const wxString& extension) -{ - NSSavePanel* sPanel = (NSSavePanel*) GetWXWindow(); - m_filterExtensions[m_filterIndex] = extension; - NSArray* types = GetTypesFromExtension(m_filterExtensions[m_filterIndex],m_currentExtensions); - [sPanel setAllowedFileTypes:types]; -} - diff --git a/lib-src/FileDialog/win/FileDialogPrivate.cpp b/lib-src/FileDialog/win/FileDialogPrivate.cpp deleted file mode 100644 index 0f95a7c9e..000000000 --- a/lib-src/FileDialog/win/FileDialogPrivate.cpp +++ /dev/null @@ -1,1224 +0,0 @@ -// -// Copied from wxWidgets 3.0.2 and modified for Audacity -// -///////////////////////////////////////////////////////////////////////////// -// Name: src/msw/filedlg.cpp -// Purpose: wxFileDialog -// Author: Julian Smart -// Modified by: Leland Lucius -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include - #include - #include - #include - #include - #include - #include - #include - #include -#endif - -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include "../FileDialog.h" - -#include - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -#ifdef __WIN32__ -# define wxMAXPATH 65534 -#else -# define wxMAXPATH 1024 -#endif - -# define wxMAXFILE 1024 - -# define wxMAXEXT 5 - -// ---------------------------------------------------------------------------- -// globals -// ---------------------------------------------------------------------------- - -// standard dialog size -static wxRect gs_rectDialog(0, 0, 428, 266); - -// ============================================================================ -// implementation -// ============================================================================ - -IMPLEMENT_CLASS(FileDialog, wxFileDialogBase) - -// ---------------------------------------------------------------------------- - -namespace -{ - -#if wxUSE_DYNLIB_CLASS - -typedef BOOL (WINAPI *GetProcessUserModeExceptionPolicy_t)(LPDWORD); -typedef BOOL (WINAPI *SetProcessUserModeExceptionPolicy_t)(DWORD); - -GetProcessUserModeExceptionPolicy_t gs_pfnGetProcessUserModeExceptionPolicy - = (GetProcessUserModeExceptionPolicy_t) -1; - -SetProcessUserModeExceptionPolicy_t gs_pfnSetProcessUserModeExceptionPolicy - = (SetProcessUserModeExceptionPolicy_t) -1; - -DWORD gs_oldExceptionPolicyFlags = 0; - -bool gs_changedPolicy = false; - -#endif // #if wxUSE_DYNLIB_CLASS - -/* -Since Windows 7 by default (callback) exceptions aren't swallowed anymore -with native x64 applications. Exceptions can occur in a file dialog when -using the hook procedure in combination with third-party utilities. -Since Windows 7 SP1 the swallowing of exceptions can be enabled again -by using SetProcessUserModeExceptionPolicy. -*/ -void ChangeExceptionPolicy() -{ -#if wxUSE_DYNLIB_CLASS - gs_changedPolicy = false; - - wxLoadedDLL dllKernel32(wxT("kernel32.dll")); - - if ( gs_pfnGetProcessUserModeExceptionPolicy - == (GetProcessUserModeExceptionPolicy_t) -1) - { - wxDL_INIT_FUNC(gs_pfn, GetProcessUserModeExceptionPolicy, dllKernel32); - wxDL_INIT_FUNC(gs_pfn, SetProcessUserModeExceptionPolicy, dllKernel32); - } - - if ( !gs_pfnGetProcessUserModeExceptionPolicy - || !gs_pfnSetProcessUserModeExceptionPolicy - || !gs_pfnGetProcessUserModeExceptionPolicy(&gs_oldExceptionPolicyFlags) ) - { - return; - } - - if ( gs_pfnSetProcessUserModeExceptionPolicy(gs_oldExceptionPolicyFlags - | 0x1 /* PROCESS_CALLBACK_FILTER_ENABLED */ ) ) - { - gs_changedPolicy = true; - } - -#endif // wxUSE_DYNLIB_CLASS -} - -void RestoreExceptionPolicy() -{ -#if wxUSE_DYNLIB_CLASS - if (gs_changedPolicy) - { - gs_changedPolicy = false; - (void) gs_pfnSetProcessUserModeExceptionPolicy(gs_oldExceptionPolicyFlags); - } -#endif // wxUSE_DYNLIB_CLASS -} - -} // unnamed namespace - -// ---------------------------------------------------------------------------- -// hook function for moving the dialog -// ---------------------------------------------------------------------------- - -UINT_PTR APIENTRY FileDialog::ParentHook(HWND hDlg, UINT iMsg, WPARAM wParam, LPARAM lParam) -{ - OPENFILENAME *pOfn = reinterpret_cast(GetWindowLongPtr(hDlg, GWLP_USERDATA)); - return reinterpret_cast(pOfn->lCustData)->MSWParentHook(hDlg, iMsg, wParam, lParam, pOfn); -} - -UINT_PTR FileDialog::MSWParentHook(HWND hDlg, UINT iMsg, WPARAM wParam, LPARAM lParam, OPENFILENAME *pOfn) -{ - // Allow default handling to process first - UINT_PTR ret = CallWindowProc(mParentProc, hDlg, iMsg, wParam, lParam); - - if (iMsg == WM_SIZE) - { - MSWOnSize(mParentDlg, pOfn); - } - - if (iMsg == WM_GETMINMAXINFO) - { - MSWOnGetMinMaxInfo(mParentDlg, pOfn, reinterpret_cast(lParam)); - } - - return ret; -} - -void FileDialog::MSWOnSize(HWND hDlg, LPOPENFILENAME pOfn) -{ - wxRect r; - wxCopyRECTToRect(wxGetClientRect(hDlg), r); - - SetHWND(mChildDlg); - - SetWindowPos(mChildDlg, - HWND_TOP, - 0, - 0, - r.GetWidth(), - r.GetHeight(), - SWP_NOZORDER | SWP_NOMOVE); - - SetSize(r); - - if (mRoot) - { - mRoot->SetSize(r.GetWidth(), mRoot->GetSize().GetHeight()); - } - - SetHWND(NULL); -} - -// Provide the minimum size of the dialog -// -// We've captured the full dialog size in MSWOnInitDone() below. This will be returned -// as the minimum size. -// -// When the user tries to resize the dialog, for some unknown reason the common dialog control -// doesn't let the user resize it smaller than it was the last time the dialog was used. This -// may be a problem in this code and/or may only be a concern under Windows 10. Either way, we -// override the minimum size supplied by the common dialog control with our own size here. -void FileDialog::MSWOnGetMinMaxInfo(HWND hwnd, LPOPENFILENAME pOfn, LPMINMAXINFO pMmi) -{ - if (mMinSize.x > 0 && mMinSize.y > 0) - { - pMmi->ptMinTrackSize = mMinSize; - } -} - -UINT_PTR APIENTRY FileDialog::DialogHook(HWND hDlg, UINT iMsg, WPARAM wParam, LPARAM lParam) -{ - OPENFILENAME *pOfn; - - if (iMsg == WM_INITDIALOG) - { - pOfn = reinterpret_cast(lParam); - } - else - { - pOfn = reinterpret_cast(GetWindowLongPtr(hDlg, GWLP_USERDATA)); - } - - return reinterpret_cast(pOfn->lCustData)->MSWDialogHook(hDlg, iMsg, wParam, lParam, pOfn); -} - -UINT_PTR FileDialog::MSWDialogHook(HWND hDlg, UINT iMsg, WPARAM WXUNUSED(wParam), LPARAM lParam, OPENFILENAME *pOfn) -{ - switch (iMsg) - { - case WM_INITDIALOG: - MSWOnInitDialog(hDlg, pOfn); - break; - - case WM_DESTROY: - MSWOnDestroy(hDlg, pOfn); - break; - - case WM_NOTIFY: - { - NMHDR * const pNM = reinterpret_cast(lParam); - if (pNM->code > CDN_LAST && pNM->code <= CDN_FIRST) - { - OFNOTIFY * const pNotifyCode = reinterpret_cast(lParam); - switch (pNotifyCode->hdr.code) - { - case CDN_INITDONE: - MSWOnInitDone(hDlg, pOfn); - break; - - case CDN_FOLDERCHANGE: - MSWOnFolderChange(hDlg, pOfn); - break; - - case CDN_SELCHANGE: - MSWOnSelChange(hDlg, pOfn); - break; - - case CDN_TYPECHANGE: - MSWOnTypeChange(hDlg, pOfn); - break; - } - } - } - break; - } - - // do the default processing - return 0; -} - -void FileDialog::MSWOnInitDialog(HWND hDlg, LPOPENFILENAME pOfn) -{ - // Since we've specified the OFN_EXPLORER flag, the "real" dialog is the parent of this one - mParentDlg = ::GetParent(hDlg); - - // Now we can initialize the disabler - mDisabler.Init(this, mParentDlg); - - // This is the dialog were our controls will go - mChildDlg = hDlg; - - // Store the OPENFILENAME pointer in each window - SetWindowLongPtr(mParentDlg, GWLP_USERDATA, reinterpret_cast(pOfn)); - SetWindowLongPtr(mChildDlg, GWLP_USERDATA, reinterpret_cast(pOfn)); - - // Subclass the parent dialog so we can receive WM_SIZE messages - mParentProc = reinterpret_cast(SetWindowLongPtr(mParentDlg, GWLP_WNDPROC, reinterpret_cast(&ParentHook))); - - // set HWND for wx - SetHWND(mChildDlg); - - if (HasUserPaneCreator()) - { - // Create the root window - wxBoxSizer *verticalSizer = new wxBoxSizer(wxVERTICAL); - mRoot = new wxPanel(this, wxID_ANY); - - wxPanel *userpane = new wxPanel(mRoot, wxID_ANY); - CreateUserPane(userpane); - - wxBoxSizer *horizontalSizer = new wxBoxSizer(wxHORIZONTAL); - horizontalSizer->Add(userpane, 1, wxEXPAND); - verticalSizer->Add(horizontalSizer, 1, wxEXPAND); - - mRoot->SetSizer(verticalSizer); - mRoot->Layout(); - mRoot->Fit(); - - // This reserves space for the additional panel - wxSize sz = mRoot->GetBestSize(); - SetWindowPos(mChildDlg, - HWND_TOP, - 0, - 0, - sz.GetWidth(), - sz.GetHeight(), - SWP_NOZORDER | SWP_NOMOVE); - - } - - SetHWND(NULL); -} - -void FileDialog::MSWOnDestroy(HWND hDlg, LPOPENFILENAME WXUNUSED(pOfn)) -{ - // Save final dialog position for next time - wxCopyRECTToRect(wxGetWindowRect(mParentDlg), gs_rectDialog); - - // Must explicitly delete the root window. Otherwise, wx will try to - // destroy it when the FileDialog is deleted. But, the windows will - // have already been deleted as a result of the OpenFile dialog being - // destroyed. - delete mRoot; -} - -void FileDialog::MSWOnInitDone(HWND hDlg, LPOPENFILENAME pOfn) -{ - // set HWND so that our DoMoveWindow() works correctly - SetHWND(mChildDlg); - - // capture the full initial size of the dialog to use as the minimum size - RECT r; - GetWindowRect(mParentDlg, &r); - mMinSize = {r.right - r.left, r.bottom - r.top}; - - if (m_centreDir) - { - // now we have the real dialog size, remember it - RECT rect; - GetWindowRect(mParentDlg, &rect); - gs_rectDialog = wxRectFromRECT(rect); - - // and position the window correctly: notice that we must use the base - // class version as our own doesn't do anything except setting flags - wxFileDialogBase::DoCentre(m_centreDir); - } - else // need to just move it to the correct place - { - SetPosition(gs_rectDialog.GetPosition()); - } - - // Filter change event must be sent once initialized - MSWOnTypeChange(hDlg, pOfn); - - // we shouldn't destroy this HWND - SetHWND(NULL); -} - -void FileDialog::MSWOnFolderChange(HWND hDlg, LPOPENFILENAME pOfn) -{ - FilterFiles(mParentDlg, true); - - wxChar path[wxMAXPATH]; - int result = CommDlg_OpenSave_GetFolderPath(::GetParent(hDlg), path, WXSIZEOF(path)); - if (result < 0 || result > WXSIZEOF(path)) - { - return; - } - - m_dir = path; - - wxFileCtrlEvent event(wxEVT_FILECTRL_FOLDERCHANGED, this, GetId()); - event.SetDirectory(m_dir); - GetEventHandler()->ProcessEvent(event); -} - -void FileDialog::MSWOnSelChange(HWND hDlg, LPOPENFILENAME pOfn) -{ - // set HWND for wx - SetHWND(mChildDlg); - - // Get pointer to the ListView control - HWND lv = ::GetDlgItem(::GetDlgItem(mParentDlg, lst2), 1); - if (lv == NULL) - { - return; - } - - wxChar path[wxMAXPATH]; - int result = CommDlg_OpenSave_GetFilePath(::GetParent(hDlg), path, WXSIZEOF(path)); - if (result < 0 || result > WXSIZEOF(path)) - { - return; - } - - m_path = path; - m_fileName = wxFileNameFromPath(m_path); - m_dir = wxPathOnly(m_path); - - m_fileNames.Clear(); - m_fileNames.Add(m_fileName); - - wxFileCtrlEvent event(wxEVT_FILECTRL_SELECTIONCHANGED, this, GetId()); - event.SetDirectory(m_dir); - event.SetFiles(m_fileNames); - GetEventHandler()->ProcessEvent(event); - - // we shouldn't destroy this HWND - SetHWND(NULL); -} - -void FileDialog::MSWOnTypeChange(HWND hDlg, LPOPENFILENAME pOfn) -{ - // set HWND for wx - SetHWND(mChildDlg); - - ParseFilter(pOfn->nFilterIndex); - FilterFiles(mParentDlg, true); - - m_filterIndex = pOfn->nFilterIndex - 1; - - wxFileCtrlEvent event(wxEVT_FILECTRL_FILTERCHANGED, this, GetId()); - event.SetFilterIndex(m_filterIndex); - GetEventHandler()->ProcessEvent(event); - - // we shouldn't destroy this HWND - SetHWND(NULL); -} - -#define WM_GETISHELLBROWSER WM_USER + 7 - -void FileDialog::FilterFiles(HWND hwnd, bool refresh) -{ - IShellFolder *ishell = NULL; - IShellBrowser *ishellbrowser = NULL; // Does not have to be released - IShellView *ishellview = NULL; - IFolderView *ifolderview = NULL; - LPMALLOC imalloc = NULL; - HRESULT hr; - - // Get pointer to the ListView control - HWND lv = ::GetDlgItem(::GetDlgItem(hwnd, lst2), 1); - if (lv == NULL) - { - return; - } - - // Get shell's memory allocation interface (must be Release()'d) - hr = SHGetMalloc(&imalloc); - if ((hr != NOERROR) || (imalloc == NULL)) - { - wxASSERT((hr == NOERROR) && (imalloc != NULL)); - return; - } - - // Get IShellBrowser interface for current dialog - ishellbrowser = (IShellBrowser*)::SendMessage(hwnd, WM_GETISHELLBROWSER, 0, 0); - if (ishellbrowser) - { - // Get IShellBrowser interface for returned browser - if (ishellbrowser->QueryActiveShellView(&ishellview) == S_OK) - { - // Get the IFolderView interface...available on XP or greater - ishellview->QueryInterface(IID_IFolderView, (void **)&ifolderview); - } - } - - // Init - LVITEM lvi; - wxZeroMemory(lvi); - - // Process all items - int fltcnt = (int) m_Filters.GetCount(); - int itmcnt = ListView_GetItemCount(lv); - for (int itm = 0; itm < itmcnt; itm++) - { - // Retrieve the file IDL - lvi.iItem = itm; - lvi.mask = LVIF_PARAM; - if (ListView_GetItem(lv, &lvi) != TRUE) - { - wxASSERT(FALSE); - break; - } - - LPCITEMIDLIST fidl = (LPCITEMIDLIST) lvi.lParam; - - // On Vista, lParam no longer contains the pidl so retrieve it via the - // IFolderView interface. This interface is only available on XP or higher - // so if that limitation isn't workable, use IShellView::GetItemObject() to - // retrieve items. - if (fidl == NULL && ifolderview != NULL) - { - ifolderview->Item(itm, (LPITEMIDLIST *) &fidl); - } - - if (fidl == NULL) - { - wxASSERT(fidl != NULL); - break; - } - - // Retrieve the IShellFolder interface of the parent (must be Release()'d) - if (ishell == NULL) - { - hr = SHBindToParent(fidl, IID_IShellFolder, (void **)&ishell, NULL); - if (!SUCCEEDED(hr)) - { - wxASSERT(SUCCEEDED(hr)); - break; - } - } - - // Get the attributes of the object - DWORD attr = SFGAO_FOLDER | SFGAO_BROWSABLE; - hr = ishell->GetAttributesOf(1, &fidl, &attr); - if (!SUCCEEDED(hr)) - { - wxASSERT(SUCCEEDED(hr)); - break; - } - - // Allow all folders (things like zip files get filtered below) - if ((attr & (SFGAO_FOLDER)) && !(attr & SFGAO_BROWSABLE)) - { - continue; - } - - // Retrieve the parsable name of the object (includes extension) - STRRET str; - hr = ishell->GetDisplayNameOf(fidl, SHGDN_INFOLDER | SHGDN_FORPARSING, &str); - if (hr != NOERROR) - { - // For some objects, we get back an error of 80070057. I'm assuming this - // means there is no way to represent the name (like some sort of virtual name) - // or I've not used the correct PIDL. But, in either case, it "probably" - // represents some sort of folder (at least in all cases I've seen), so we - // simply allow it to display. - continue; - } - - // Convert result to wxString - wxString filename; - switch (str.uType) - { - case STRRET_WSTR: - filename = str.pOleStr; - imalloc->Free(str.pOleStr); - break; - - case STRRET_OFFSET: - filename = wxString(((char *)fidl) + str.uOffset, wxConvISO8859_1); - break; - - case STRRET_CSTR: - filename = wxString(str.cStr, wxConvISO8859_1); - break; - } - - // Convert the filename to lowercase (and remember to write filters in lowercase!) - filename = filename.Lower(); - - // Attempt to match it to all of our filters - bool match = false; - for (int flt = 0; flt < fltcnt; flt++) - { - if (wxMatchWild(m_Filters[flt], filename, false)) - { - match = true; - break; - } - } - - // Remove it from the display if it didn't match any of the filters. - if (!match) - { - ListView_DeleteItem(lv, itm); - itm--; - itmcnt--; - } - } - - // On Vista and maybe XP, we seem to need to refresh the view after - // changing the filters. But, only refresh for type changes and not - // selection changes since it causes additional selection change - // events to occur. - if (ishellview && refresh) - { - ishellview->Refresh(); - } - - // Release the interface - if (ifolderview) - { - ifolderview->Release(); - } - - // Release the interface - if (ishellview) - { - ishellview->Release(); - } - - // Release the interface - if (ishell) - { - ishell->Release(); - } - - // Release the interface - if (imalloc) - { - imalloc->Release(); - } -} - -void FileDialog::ParseFilter(int index) -{ - m_Filters.Empty(); - - wxStringTokenizer tokenWild(m_FilterGroups[index - 1], wxT(";")); - - while (tokenWild.HasMoreTokens()) - { - wxString token = tokenWild.GetNextToken(); - if (m_Filters.Index(token, false) == wxNOT_FOUND) - { - m_Filters.Add(token); - } - } -} - -// ---------------------------------------------------------------------------- -// FileDialog -// ---------------------------------------------------------------------------- - -FileDialog::FileDialog() -: FileDialogBase() -{ - Init(); -} - -FileDialog::FileDialog(wxWindow *parent, - const wxString& message, - const wxString& defaultDir, - const wxString& defaultFile, - const wxString& wildCard, - long style, - const wxPoint& pos, - const wxSize& sz, - const wxString& name) -: FileDialogBase() -{ - Init(); - - FileDialogBase::Create(parent,message,defaultDir,defaultFile,wildCard,style,pos,sz,name); -} - -void FileDialog::Init() -{ - mRoot = NULL; - mMinSize = {0, 0}; - - // NB: all style checks are done by wxFileDialogBase::Create - - m_bMovedWindow = false; - m_centreDir = 0; - - // Must set to zero, otherwise the wx routines won't size the window - // the second time you call the file dialog, because it thinks it is - // already at the requested size.. (when centering) - gs_rectDialog.x = - gs_rectDialog.y = 0; -} - -void FileDialog::GetPaths(wxArrayString& paths) const -{ - paths.Empty(); - - wxString dir(m_dir); - if (m_dir.empty() || m_dir.Last() != wxT('\\')) - dir += wxT('\\'); - - size_t count = m_fileNames.GetCount(); - for (size_t n = 0; n < count; n++) - { - if (wxFileName(m_fileNames[n]).IsAbsolute()) - paths.Add(m_fileNames[n]); - else - paths.Add(dir + m_fileNames[n]); - } -} - -void FileDialog::GetFilenames(wxArrayString& files) const -{ - files = m_fileNames; -} - -void FileDialog::SetFileExtension(const wxString& extension) -{ - if (mParentDlg) - { - wxChar path[wxMAXPATH]; - - if (CommDlg_OpenSave_GetFilePath(mParentDlg, path, WXSIZEOF(path))) - { - wxFileName fn(path); - fn.SetExt(extension); - - // Change the currently entered file name. - CommDlg_OpenSave_SetControlText(mParentDlg, edt1, fn.GetFullName().t_str()); - - // Make this the default extension as well. So if the user specifies a file - // name without an extension, this one will be used instead of the first - // extension in the filter list. - CommDlg_OpenSave_SetDefExt(mParentDlg, fn.GetExt().t_str()); - } - } -} - -void FileDialog::DoGetPosition( int *x, int *y ) const -{ - if (x) - *x = gs_rectDialog.x; - if (y) - *y = gs_rectDialog.y; -} - -void FileDialog::DoGetSize(int *width, int *height) const -{ - if (width) - *width = gs_rectDialog.width; - if (height) - *height = gs_rectDialog.height; -} - -void FileDialog::DoMoveWindow(int x, int y, int WXUNUSED(width), int WXUNUSED(height)) -{ - m_bMovedWindow = true; - - gs_rectDialog.x = x; - gs_rectDialog.y = y; - - // our HWND is only set when we're called from MSWOnInitDone(), test if - // this is the case - HWND hwnd = GetHwnd(); - if (hwnd) - { - // size of the dialog can't be changed because the controls are not - // laid out correctly then - ::SetWindowPos(hwnd, HWND_TOP, x, y, 0, 0, SWP_NOZORDER | SWP_NOSIZE); - } - else // just remember that we were requested to move the window - { - m_bMovedWindow = true; - - // if Centre() had been called before, it shouldn't be taken into - // account now - m_centreDir = 0; - } -} - -void FileDialog::DoCentre(int dir) -{ - m_centreDir = dir; - m_bMovedWindow = true; - - // it's unnecessary to do anything else at this stage as we'll redo it in - // MSWOnInitDone() anyhow -} - -// helper used below in ShowCommFileDialog(): style is used to determine -// whether to show the "Save file" dialog (if it contains wxFD_SAVE bit) or -// "Open file" one; returns true on success or false on failure in which case -// err is filled with the CDERR_XXX constant -static bool DoShowCommFileDialog(OPENFILENAME *of, long style, DWORD *err) -{ - if (style & wxFD_SAVE ? GetSaveFileName(of) : GetOpenFileName(of)) - return true; - - if (err) - { - *err = CommDlgExtendedError(); - } - - return false; -} - -// We want to use OPENFILENAME struct version 5 (Windows 2000/XP) but we don't -// know if the OPENFILENAME declared in the currently used headers is a V5 or -// V4 (smaller) one so we try to manually extend the struct in case it is the -// old one. -// -// We don't do this on Windows CE nor under Win64, however, as there are no -// compilers with old headers for these architectures -#if defined(__WXWINCE__) || defined(__WIN64__) -typedef OPENFILENAME wxOPENFILENAME; - -static const DWORD gs_ofStructSize = sizeof(OPENFILENAME); -#else // !__WXWINCE__ || __WIN64__ -#define wxTRY_SMALLER_OPENFILENAME - -struct wxOPENFILENAME : public OPENFILENAME -{ - // fields added in Windows 2000/XP comdlg32.dll version - void *pVoid; - DWORD dw1; - DWORD dw2; -}; - -// hardcoded sizeof(OPENFILENAME) in the Platform SDK: we have to do it -// because sizeof(OPENFILENAME) in the headers we use when compiling the -// library could be less if _WIN32_WINNT is not >= 0x500 -static const DWORD wxOPENFILENAME_V5_SIZE = 88; - -// this is hardcoded sizeof(OPENFILENAME_NT4) from Platform SDK -static const DWORD wxOPENFILENAME_V4_SIZE = 76; - -// always try the new one first -static DWORD gs_ofStructSize = wxOPENFILENAME_V5_SIZE; -#endif // __WXWINCE__ || __WIN64__/!... - -static bool ShowCommFileDialog(OPENFILENAME *of, long style) -{ - DWORD errCode; - bool success = DoShowCommFileDialog(of, style, &errCode); - -#ifdef wxTRY_SMALLER_OPENFILENAME - // the system might be too old to support the new version file dialog - // boxes, try with the old size - if (!success && errCode == CDERR_STRUCTSIZE && - of->lStructSize != wxOPENFILENAME_V4_SIZE) - { - of->lStructSize = wxOPENFILENAME_V4_SIZE; - - success = DoShowCommFileDialog(of, style, &errCode); - - if (success || !errCode) - { - // use this struct size for subsequent dialogs - gs_ofStructSize = of->lStructSize; - } - } -#endif // wxTRY_SMALLER_OPENFILENAME - - if (!success && errCode == FNERR_INVALIDFILENAME && of->lpstrFile[0]) - { - // this can happen if the default file name is invalid, try without it - // now - of->lpstrFile[0] = wxT('\0'); - success = DoShowCommFileDialog(of, style, &errCode); - } - - if (!success) - { - // common dialog failed - why? - if (errCode != 0) - { - wxLogError(_("File dialog failed with error code %0lx."), errCode); - } - //else: it was just cancelled - - return false; - } - - return true; -} - -int FileDialog::ShowModal() -{ - WX_HOOK_MODAL_DIALOG(); - - HWND hWnd = 0; - if (m_parent) hWnd = (HWND) m_parent->GetHWND(); - if (!hWnd && wxTheApp->GetTopWindow()) - hWnd = (HWND) wxTheApp->GetTopWindow()->GetHWND(); - - static wxChar fileNameBuffer [ wxMAXPATH ]; // the file-name - wxChar titleBuffer [ wxMAXFILE+1+wxMAXEXT ]; // the file-name, without path - - *fileNameBuffer = wxT('\0'); - *titleBuffer = wxT('\0'); - - // We always need EXPLORER and ENABLEHOOK to use our filtering code - DWORD msw_flags = OFN_HIDEREADONLY | OFN_EXPLORER | OFN_ENABLEHOOK | OFN_ENABLESIZING | OFN_ENABLETEMPLATEHANDLE; - - if (HasFdFlag(wxFD_FILE_MUST_EXIST)) - msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; - - /* - If the window has been moved the programmer is probably - trying to center or position it. Thus we set the callback - or hook function so that we can actually adjust the position. - Without moving or centering the dlg, it will just stay - in the upper left of the frame, it does not center - automatically. - */ - if (m_bMovedWindow || HasExtraControlCreator()) // we need these flags. - { - ChangeExceptionPolicy(); - msw_flags |= OFN_EXPLORER|OFN_ENABLEHOOK; -#ifndef __WXWINCE__ - msw_flags |= OFN_ENABLESIZING; -#endif - } - - wxON_BLOCK_EXIT0(RestoreExceptionPolicy); - - if (HasFdFlag(wxFD_MULTIPLE)) - { - // OFN_EXPLORER must always be specified with OFN_ALLOWMULTISELECT - msw_flags |= OFN_EXPLORER | OFN_ALLOWMULTISELECT; - } - - // if wxCHANGE_DIR flag is not given we shouldn't change the CWD which the - // standard dialog does by default (notice that under NT it does it anyhow, - // OFN_NOCHANGEDIR or not, see below) - if (!HasFdFlag(wxFD_CHANGE_DIR)) - { - msw_flags |= OFN_NOCHANGEDIR; - } - - if (HasFdFlag(wxFD_OVERWRITE_PROMPT)) - { - msw_flags |= OFN_OVERWRITEPROMPT; - } - - // Define a dummy dialog box template - GlobalPtr hgbl(256, GMEM_ZEROINIT); - GlobalPtrLock hgblLock(hgbl); - LPDLGTEMPLATE lpdt = static_cast((void *)hgblLock); - lpdt->style = DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS; - lpdt->cdit = 0; // Number of controls - lpdt->x = 0; - lpdt->y = 0; - lpdt->cx = 0; - lpdt->cy = 0; - - OPENFILENAME of; - wxZeroMemory(of); - - // Allow Places bar to show on supported platforms - of.lStructSize = sizeof(OPENFILENAME); - of.hwndOwner = hWnd; - of.lpstrTitle = m_message.t_str(); - of.lpstrFileTitle = titleBuffer; - of.nMaxFileTitle = wxMAXFILE + 1 + wxMAXEXT; - of.hInstance = (HINSTANCE) lpdt; - - // Convert forward slashes to backslashes (file selector doesn't like - // forward slashes) and also squeeze multiple consecutive slashes into one - // as it doesn't like two backslashes in a row neither - - wxString dir; - size_t i, len = m_dir.length(); - dir.reserve(len); - for ( i = 0; i < len; i++ ) - { - wxChar ch = m_dir[i]; - switch ( ch ) - { - case wxT('/'): - // convert to backslash - ch = wxT('\\'); - - // fall through - - case wxT('\\'): - while ( i < len - 1 ) - { - wxChar chNext = m_dir[i + 1]; - if ( chNext != wxT('\\') && chNext != wxT('/') ) - break; - - // ignore the next one, unless it is at the start of a UNC path - if (i > 0) - i++; - else - break; - } - // fall through - - default: - // normal char - dir += ch; - } - } - - of.lpstrInitialDir = dir.c_str(); - - of.Flags = msw_flags; - of.lpfnHook = DialogHook; - of.lCustData = (LPARAM) this; - - wxArrayString wildDescriptions; - - size_t items = wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, m_FilterGroups); - - wxASSERT_MSG( items > 0 , wxT("empty wildcard list") ); - - wxString filterBuffer; - - for (i = 0; i < items ; i++) - { - filterBuffer += wildDescriptions[i]; - filterBuffer += wxT("|"); - filterBuffer += m_FilterGroups[i]; - filterBuffer += wxT("|"); - } - - // Replace | with \0 - for (i = 0; i < filterBuffer.Len(); i++ ) - { - if ( filterBuffer.GetChar(i) == wxT('|') ) - { - filterBuffer[i] = wxT('\0'); - } - } - - of.lpstrFilter = (LPCTSTR)filterBuffer.c_str(); - of.nFilterIndex = m_filterIndex + 1; - - ParseFilter(of.nFilterIndex); - - //=== Setting defaultFileName >>========================================= - - wxStrlcpy(fileNameBuffer, m_fileName.c_str(), WXSIZEOF(fileNameBuffer)); - - of.lpstrFile = fileNameBuffer; // holds returned filename - of.nMaxFile = wxMAXPATH; - - // we must set the default extension because otherwise Windows would check - // for the existing of a wrong file with wxOVERWRITE_PROMPT (i.e. if the - // user types "foo" and the default extension is ".bar" we should force it - // to check for "foo.bar" existence and not "foo") - wxString defextBuffer; // we need it to be alive until GetSaveFileName()! - if (HasFdFlag(wxFD_SAVE)) - { - const wxChar* extension = filterBuffer; - int maxFilter = (int)(of.nFilterIndex*2L) - 1; - - for( int i = 0; i < maxFilter; i++ ) // get extension - extension = extension + wxStrlen( extension ) + 1; - - // use dummy name a to avoid assert in AppendExtension - defextBuffer = AppendExtension(wxT("a"), extension); - if (defextBuffer.StartsWith(wxT("a."))) - { - defextBuffer = defextBuffer.Mid(2); // remove "a." - of.lpstrDefExt = defextBuffer.c_str(); - } - } - - // store off before the standard windows dialog can possibly change it - const wxString cwdOrig = wxGetCwd(); - - //== Execute FileDialog >>================================================= - - if (!ShowCommFileDialog(&of, m_windowStyle)) - return wxID_CANCEL; - - // GetOpenFileName will always change the current working directory on - // (according to MSDN) "Windows NT 4.0/2000/XP" because the flag - // OFN_NOCHANGEDIR has no effect. If the user did not specify - // wxFD_CHANGE_DIR let's restore the current working directory to what it - // was before the dialog was shown. - if (msw_flags & OFN_NOCHANGEDIR) - { - wxSetWorkingDirectory(cwdOrig); - } - - m_fileNames.Empty(); - - if ((HasFdFlag(wxFD_MULTIPLE)) && -#if defined(OFN_EXPLORER) - ( fileNameBuffer[of.nFileOffset-1] == wxT('\0') ) -#else - ( fileNameBuffer[of.nFileOffset-1] == wxT(' ') ) -#endif // OFN_EXPLORER - ) - { -#if defined(OFN_EXPLORER) - m_dir = fileNameBuffer; - i = of.nFileOffset; - m_fileName = &fileNameBuffer[i]; - m_fileNames.Add(m_fileName); - i += m_fileName.Len() + 1; - - while (fileNameBuffer[i] != wxT('\0')) - { - m_fileNames.Add(&fileNameBuffer[i]); - i += wxStrlen(&fileNameBuffer[i]) + 1; - } -#else - wxStringTokenizer toke(fileNameBuffer, wxT(" \t\r\n")); - m_dir = toke.GetNextToken(); - m_fileName = toke.GetNextToken(); - m_fileNames.Add(m_fileName); - - while (toke.HasMoreTokens()) - m_fileNames.Add(toke.GetNextToken()); -#endif // OFN_EXPLORER - - wxString dir(m_dir); - if ( m_dir.Last() != wxT('\\') ) - dir += wxT('\\'); - - m_path = dir + m_fileName; - m_filterIndex = (int)of.nFilterIndex - 1; - } - else - { - //=== Adding the correct extension >>================================= - m_filterIndex = (int)of.nFilterIndex - 1; - - if ( !of.nFileExtension || - (of.nFileExtension && fileNameBuffer[of.nFileExtension] == wxT('\0')) ) - { - // User has typed a filename without an extension: - const wxChar* extension = filterBuffer; - int maxFilter = (int)(of.nFilterIndex*2L) - 1; - - for( int i = 0; i < maxFilter; i++ ) // get extension - extension = extension + wxStrlen( extension ) + 1; - - m_fileName = AppendExtension(fileNameBuffer, extension); - wxStrlcpy(fileNameBuffer, m_fileName.c_str(), WXSIZEOF(fileNameBuffer)); - } - - m_path = fileNameBuffer; - m_fileName = wxFileNameFromPath(fileNameBuffer); - m_fileNames.Add(m_fileName); - m_dir = wxPathOnly(fileNameBuffer); - } - - return wxID_OK; -} - -FileDialog::Disabler::Disabler() -{ - mRoot = NULL; - mHwnd = (HWND) INVALID_HANDLE_VALUE; - mModalCount = 0; - - Register(); -} - -void FileDialog::Disabler::Init(wxWindow *root, HWND hwnd) -{ - mRoot = root; - mHwnd = hwnd; -} - -int FileDialog::Disabler::Enter(wxDialog *dialog) -{ - if (mHwnd != (HWND) INVALID_HANDLE_VALUE) - { - if (IsChild(dialog)) { - ::EnableWindow(mHwnd, FALSE); - mModalCount++; - } - } - - return wxID_NONE; -} - -void FileDialog::Disabler::Exit(wxDialog *dialog) -{ - if (mHwnd != (HWND) INVALID_HANDLE_VALUE) - { - if (IsChild(dialog)) - { - mModalCount--; - if (mModalCount == 0) - { - ::EnableWindow(mHwnd, TRUE); - ::SetWindowPos(mHwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); - } - } - } -} - -bool FileDialog::Disabler::IsChild(const wxDialog *dialog) const -{ - if (!dialog) - { - return false; - } - - for (const wxWindow *w = dialog->GetParent(); w != NULL; w = w->GetParent()) - { - if (w == mRoot) - { - return true; - } - } - - return false; -} diff --git a/lib-src/FileDialog/win/FileDialogPrivate.h b/lib-src/FileDialog/win/FileDialogPrivate.h deleted file mode 100644 index dfc95d9d2..000000000 --- a/lib-src/FileDialog/win/FileDialogPrivate.h +++ /dev/null @@ -1,124 +0,0 @@ -// -// Copied from wxWidgets 3.0.2 and modified for Audacity -// -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/filedlg.h -// Purpose: wxFileDialog class -// Author: Julian Smart -// Modified by: Leland Lucius -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WIN_FILEDIALOGPRIVATE_H_ -#define _WIN_FILEDIALOGPRIVATE_H_ - -#include - -#include - -//------------------------------------------------------------------------- -// FileDialog -//------------------------------------------------------------------------- - -class AUDACITY_DLL_API FileDialog : public FileDialogBase -{ -public: - FileDialog(); - FileDialog(wxWindow *parent, - const wxString& message = wxFileSelectorPromptStr, - const wxString& defaultDir = wxEmptyString, - const wxString& defaultFile = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize, - const wxString& name = wxFileDialogNameStr); - - virtual void GetPaths(wxArrayString& paths) const; - virtual void GetFilenames(wxArrayString& files) const; - virtual int ShowModal(); - - virtual void SetFileExtension(const wxString& extension); - -protected: - // ----------------------------------------- - // wxMSW-specific implementation from now on - // ----------------------------------------- - -#if !(defined(__SMARTPHONE__) && defined(__WXWINCE__)) - virtual void DoMoveWindow(int x, int y, int width, int height); - virtual void DoCentre(int dir); - virtual void DoGetSize(int *width, int *height) const; - virtual void DoGetPosition(int *x, int *y) const; -#endif // !(__SMARTPHONE__ && __WXWINCE__) - -private: - void Init(); - - wxString GetFullPath(HWND hwnd, int itm); - void FilterFiles(HWND hwnd, bool refresh); - void ParseFilter(int index); - - // Parent dialog hook - static UINT_PTR APIENTRY ParentHook(HWND hDlg, UINT iMsg, WPARAM wParam, LPARAM lParam); - virtual UINT_PTR MSWParentHook(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam, OPENFILENAME *pOfn); - - // Message handlers for the parent dialog - virtual void MSWOnSize(HWND hwnd, LPOPENFILENAME pOfn); - virtual void MSWOnGetMinMaxInfo(HWND hwnd, LPOPENFILENAME pOfn, LPMINMAXINFO pMmi); - - // Child dialog hook - static UINT_PTR APIENTRY DialogHook(HWND hDlg, UINT iMsg, WPARAM wParam, LPARAM lParam); - virtual UINT_PTR MSWDialogHook(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam, OPENFILENAME *pOfn); - - // Message handlers for the child dialog - virtual void MSWOnInitDialog(HWND hwnd, LPOPENFILENAME pOfn); - virtual void MSWOnDestroy(HWND hwnd, LPOPENFILENAME pOfn); - virtual void MSWOnInitDone(HWND hwnd, LPOPENFILENAME pOfn); - virtual void MSWOnFolderChange(HWND hwnd, LPOPENFILENAME pOfn); - virtual void MSWOnSelChange(HWND hwnd, LPOPENFILENAME pOfn); - virtual void MSWOnTypeChange(HWND hwnd, LPOPENFILENAME pOfn); - -private: - wxArrayString m_fileNames; - - // remember if our SetPosition() or Centre() (which requires special - // treatment) was called - bool m_bMovedWindow; - int m_centreDir; // nothing to do if 0 - - wxArrayString m_FilterGroups; - wxArrayString m_Filters; - - HWND mParentDlg; - HWND mChildDlg; - WNDPROC mParentProc; - POINT mMinSize; - - wxPanel *mRoot; - - class Disabler : public wxModalDialogHook - { - public: - Disabler(); - void Init(wxWindow *root, HWND hwnd); - - protected: - int Enter(wxDialog *dialog); - void Exit(wxDialog *dialog); - bool IsChild(const wxDialog *dialog) const; - - private: - wxWindow *mRoot; - HWND mHwnd; - int mModalCount; - } mDisabler; - - DECLARE_DYNAMIC_CLASS(FileDialog) - DECLARE_NO_COPY_CLASS(FileDialog) -}; - -#endif - diff --git a/lib-src/audacity-patches.txt b/lib-src/audacity-patches.txt index cfa99466b..aea3c14dd 100644 --- a/lib-src/audacity-patches.txt +++ b/lib-src/audacity-patches.txt @@ -12,12 +12,6 @@ Version in Audacity SVN: 2.1.0 Patches: None Upstream version: 2.1.0 -FileDialog ----------- -The customised file saving dialogs for wxwidgets to provide the options -button for format preferences. This is written and maintained by us so doesn't -have an upstream at the moment. - libflac ------- http://flac.sourceforge.net/ @@ -115,9 +109,6 @@ Versions in Audacity SVN: sratom-0.6.4 suil-0.10.6 -mod-script-pipe ---------------- - portaudio-v19 ------------- http://portaudio.com/ diff --git a/lib-src/mod-null/ModNullCallback.cpp b/lib-src/mod-null/ModNullCallback.cpp deleted file mode 100644 index 3bd7aa6de..000000000 --- a/lib-src/mod-null/ModNullCallback.cpp +++ /dev/null @@ -1,167 +0,0 @@ -/********************************************************************** - - Audacity: A Digital Audio Editor - - ModNullCallback.cpp - - James Crook - - Audacity is free software. - This file is licensed under the wxWidgets license, see License.txt - -********************************************************************//** - -\class ModNullCallback -\brief ModNullCallback is a class containing all the callback -functions for this demonstartion module. These functions are -added into the standard Audacity Project Menus. - -*//*****************************************************************//** - -\class ModNullCommandFunctor -\brief We create one of these functors for each menu item or -command which we register with the Command Manager. These take the -click from the menu into the actaul function to be called. - -*//********************************************************************/ - -#include -#include "ModNullCallback.h" -#include "Audacity.h" -#include "ModuleManager.h" -#include "ShuttleGui.h" -#include "Project.h" -#include "commands/CommandManager.h" -#include "CommonCommandFlags.h" - -/* -There are several functions that can be used in a GUI module. - -//#define versionFnName "GetVersionString" -If the version is wrong, the module will be rejected. -That is it will be loaded and then unloaded. - -//#define ModuleDispatchName "ModuleDispatch" -The most useful function. See the example in this -file. It has several cases/options in it. - -//#define scriptFnName "RegScriptServerFunc" -This function is run from a non gui thread. It was originally -created for the benefit of mod-script-pipe. - -//#define mainPanelFnName "MainPanelFunc" -This function is the hijacking function, to take over Audacity -and replace the main project window with our own wxFrame. - -*/ - -#ifdef _MSC_VER - #define DLL_API _declspec(dllexport) - #define DLL_IMPORT _declspec(dllimport) -#else - #define DLL_API __attribute__ ((visibility("default"))) - #define DLL_IMPORT -#endif - -// derived from wxFrame as it needs to be some kind of event handler. -class ModNullCallback : public wxFrame -{ -public: -// Name these OnFuncXXX functions by whatever they will do. - void OnFuncFirst(const CommandContext &); - void OnFuncSecond(const CommandContext &); -}; - -void ModNullCallback::OnFuncFirst(const CommandContext &) -{ - int k=32; -} - -void ModNullCallback::OnFuncSecond(const CommandContext &) -{ - int k=42; -} -ModNullCallback * pModNullCallback=NULL; - -#define ModNullFN(X) static_cast((&ModNullCallback:: X)) - -extern "C" { - -static CommandHandlerObject &ident(AudacityProject&project) -{ -// no specific command handler object ... use the project. -return project; -} - -// GetVersionString -// REQUIRED for the module to be accepted by Audacity. -// Without it Audacity will see a version number mismatch. -extern DLL_API const wxChar * GetVersionString(); -const wxChar * GetVersionString() -{ - // Make sure that this version of the module requires the version - // of Audacity it is built with. - // For now, the versions must match exactly for Audacity to - // agree to load the module. - return AUDACITY_VERSION_STRING; -} - -namespace { -void RegisterMenuItems() -{ - // Get here only after the module version check passes - using namespace MenuTable; - // We add two new commands into the Analyze menu. - static AttachedItem sAttachment{ wxT("Analyze"), - ( FinderScope( ident ), Section( wxT("NullModule"), - Command( - _T("A New Command"), // internal name - XXO("1st Experimental Command..."), //displayed name - ModNullFN( OnFuncFirst ), - AudioIONotBusyFlag() ), - Command( - _T("Another New Command"), - XXO("2nd Experimental Command"), - ModNullFN( OnFuncSecond ), - AudioIONotBusyFlag() ) - ) ) - }; -} -} - -// This is the function that connects us to Audacity. -extern int DLL_API ModuleDispatch(ModuleDispatchTypes type); -int ModuleDispatch(ModuleDispatchTypes type) -{ - switch (type) - { - case ModuleInitialize: - RegisterMenuItems(); - break; - case AppInitialized: - break; - case AppQuiting: - break; - default: - break; - } - - return 1; -} - -//Example code commented out. -#if 0 -// This is an example function to hijack the main panel -int DLL_API MainPanelFunc(int ix) -{ - ix=ix;//compiler food - // If we wanted to hide Audacity's Project, - // we'd create a new wxFrame right here and return a pointer to it - // as our return result. - -// Don't hijack the main panel, just return a NULL; - return NULL; -} -#endif - -} // End extern "C" diff --git a/lib-src/mod-null/ModNullCallback.h b/lib-src/mod-null/ModNullCallback.h deleted file mode 100644 index 82da774f9..000000000 --- a/lib-src/mod-null/ModNullCallback.h +++ /dev/null @@ -1,18 +0,0 @@ -// The following ifdef block is the standard way of creating macros which make exporting -// from a DLL simpler. All files within this DLL are compiled with the LIBSCRIPT_EXPORTS -// symbol defined on the command line. this symbol should not be defined on any project -// that uses this DLL. This way any other project whose source files include this file see -// MOD_NULL_DLL_API functions as being imported from a DLL, wheras this DLL sees symbols -// defined with this macro as being exported. - - -/* Magic for dynamic library import and export. This is unfortunately - * compiler-specific because there isn't a standard way to do it. Currently it - * works with the Visual Studio compiler for windows, and for GCC 4+. Anything - * else gets all symbols made public, which gets messy */ -/* The Visual Studio implementation */ -#ifdef _MSC_VER -#define DLL_API _declspec(dllexport) -#else -#define DLL_API __attribute__ ((visibility("default"))) -#endif diff --git a/lib-src/mod-nyq-bench/NyqBench.cpp b/lib-src/mod-nyq-bench/NyqBench.cpp deleted file mode 100755 index 8b3e4129e..000000000 --- a/lib-src/mod-nyq-bench/NyqBench.cpp +++ /dev/null @@ -1,1759 +0,0 @@ -/********************************************************************** - - NyqBench.cpp - - Leland Lucius - -**********************************************************************/ - -#include "Audacity.h" - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "AudioIOBase.h" -#include "CommonCommandFlags.h" -#include "LabelTrack.h" -#include "ModuleManager.h" -#include "Prefs.h" -#include "Project.h" -#include "ShuttleGui.h" -#include "effects/EffectManager.h" -#include "effects/EffectUI.h" -#include "effects/nyquist/Nyquist.h" -#include "../images/AudacityLogo.xpm" -#include "../../src/commands/CommandContext.h" -#include "../../src/commands/CommandManager.h" -#include "widgets/AudacityMessageBox.h" - -#include "NyqBench.h" - -#include -#include -#include - -// -// Images are from the Tango Icon Gallery -// http://tango.freedesktop.org/Tango_Icon_Gallery -// -#include "images/document-new-small.xpm" -#include "images/document-open-small.xpm" -#include "images/document-save-as-small.xpm" -#include "images/document-save-small.xpm" -#include "images/edit-clear-small.xpm" -#include "images/edit-copy-small.xpm" -#include "images/edit-cut-small.xpm" -#include "images/edit-delete-small.xpm" -#include "images/edit-find-small.xpm" -#include "images/edit-paste-small.xpm" -#include "images/edit-redo-small.xpm" -#include "images/edit-select-all-small.xpm" -#include "images/edit-undo-small.xpm" -#include "images/go-top-small.xpm" -#include "images/go-up-small.xpm" -#include "images/go-previous-small.xpm" -#include "images/go-next-small.xpm" -#include "images/system-search-small.xpm" -#include "images/media-playback-start-small.xpm" -#include "images/media-playback-stop-small.xpm" - -#include "images/document-new-large.xpm" -#include "images/document-open-large.xpm" -#include "images/document-save-as-large.xpm" -#include "images/document-save-large.xpm" -#include "images/edit-clear-large.xpm" -#include "images/edit-copy-large.xpm" -#include "images/edit-cut-large.xpm" -#include "images/edit-delete-large.xpm" -#include "images/edit-find-large.xpm" -#include "images/edit-paste-large.xpm" -#include "images/edit-redo-large.xpm" -#include "images/edit-select-all-large.xpm" -#include "images/edit-undo-large.xpm" -#include "images/go-top-large.xpm" -#include "images/go-up-large.xpm" -#include "images/go-previous-large.xpm" -#include "images/go-next-large.xpm" -#include "images/system-search-large.xpm" -#include "images/media-playback-start-large.xpm" -#include "images/media-playback-stop-large.xpm" - -/* -There are several functions that can be used in a GUI module. - -//#define versionFnName "GetVersionString" -If the version is wrong, the module will be rejected. -That is it will be loaded and then unloaded. - -//#define ModuleDispatchName "ModuleDispatch" -The most useful function. See the example in this -file. It has several cases/options in it. - -//#define scriptFnName "RegScriptServerFunc" -This function is run from a non gui thread. It was originally -created for the benefit of mod-script-pipe. - -//#define mainPanelFnName "MainPanelFunc" -This function is the hijacking function, to take over Audacity -and replace the main project window with our own wxFrame. - -*/ - -namespace { -CommandHandlerObject &findme(AudacityProject&) -{ - return *NyqBench::GetBench(); -} - -void RegisterMenuItems() -{ - // Get here only after the module version check passes - using namespace MenuTable; - static AttachedItem sAttachment{ wxT("Tools"), - ( FinderScope( findme ), Section( wxT("NyquistWorkBench"), - Command( wxT("NyqBench"), XXO("&Nyquist Workbench..."), - static_cast(&NyqBench::ShowNyqBench), - AudioIONotBusyFlag()) - ) ) - }; -} -} - -extern "C" -{ - static NyqBench *gBench = NULL; - - #ifdef _MSC_VER - #define DLL_API _declspec(dllexport) - #else - #define DLL_API __attribute__ ((visibility("default"))) - #endif - - extern DLL_API const wxChar * GetVersionString(); - // GetVersionString - // REQUIRED for the module to be accepted by Audacity. - // Without it Audacity will see a version number mismatch. - const wxChar * GetVersionString() - { - // For now, the versions must match exactly for Audacity to - // agree to load the module. - return AUDACITY_VERSION_STRING; - } - - extern int DLL_API ModuleDispatch(ModuleDispatchTypes type); - // ModuleDispatch - // is called by Audacity to initialize/terminate the module - int ModuleDispatch(ModuleDispatchTypes type){ - switch (type){ - case ModuleInitialize: - RegisterMenuItems(); - break; - case AppQuiting: { - //It is perfectly OK for gBench to be NULL. - //Can happen if the menu item was never invoked. - //wxASSERT(gBench != NULL); - if (gBench) { - // be sure to do this while gPrefs still exists: - gBench->SavePrefs(); - gBench->Destroy(); - gBench = NULL; - } - } - break; - default: - break; - } - return 1; - } -}; - -//---------------------------------------------------------------------------- -// NyqTextCtrl -//---------------------------------------------------------------------------- - -BEGIN_EVENT_TABLE(NyqTextCtrl, wxTextCtrl) -#if defined(__WXMAC__) - EVT_KEY_DOWN(NyqTextCtrl::OnKeyDown) -#endif - EVT_KEY_UP(NyqTextCtrl::OnKeyUp) - EVT_CHAR(NyqTextCtrl::OnChar) - EVT_UPDATE_UI(wxID_ANY, NyqTextCtrl::OnUpdate) -END_EVENT_TABLE() - -NyqTextCtrl::NyqTextCtrl(wxWindow *parent, - wxWindowID id, - const wxString &value, - const wxPoint & pos, - const wxSize & size, - int style) -: wxTextCtrl(parent, id, value, pos, size, style) -{ - mLastCaretPos = -1; - mLeftParen = -1; - mRightParen = -1; - - mOn.SetTextColour(*wxRED); - mOff.SetTextColour(*wxBLACK); -} - -void NyqTextCtrl::SetFocusFromKbd() -{ -#if defined(__WXMSW__) - // We do this to prevent wxMSW from selecting all text when the - // user tabs into the text controls. - wxWindowBase::SetFocusFromKbd(); -#else - wxTextCtrl::SetFocusFromKbd(); -#endif -} - -void NyqTextCtrl::MarkDirty() -{ - wxTextCtrl::MarkDirty(); - FindParens(); -} - -void NyqTextCtrl::OnChar(wxKeyEvent & e) -{ - e.Skip(); - - // Hide any previously highlighted parens - if (mLeftParen >= 0) { -#if defined(__WXMSW__) - Freeze(); // Prevents selection flashing on Windows -#endif - - SetStyle(mLeftParen, mLeftParen + 1, mOff); - SetStyle(mLeftParens[mLeftParen], mLeftParens[mLeftParen] + 1, mOff); - mLeftParen = -1; - mRightParen = -1; - -#if defined(__WXMSW__) - Thaw(); // Prevents selection flashing on Windows -#endif - } -} - -#if defined(__WXMAC__REMOVED_UNTIL_ITS_PROVEN_THAT_IT_IS_STILL_NEEDED) -#include - -// This is hackage to correct a problem on Leopard where the -// caret jumps up two lines when the up arrow is pressed and -// the caret is at the beginning of the line. -void NyqTextCtrl::OnKeyDown(wxKeyEvent & e) -{ - e.Skip(); - if (UMAGetSystemVersion() >= 0x1050) { - if (e.GetKeyCode() == WXK_UP && e.GetModifiers() == 0) { - long x; - long y; - - PositionToXY(GetInsertionPoint(), &x, &y); - if (x == 0 && y > 1) { - y--; - SetInsertionPoint(XYToPosition(x, y) - 1); - e.Skip(false); - } - } - } -} -#endif - -void NyqTextCtrl::OnKeyUp(wxKeyEvent & e) -{ - e.Skip(); - - int pos = GetInsertionPoint(); - int lpos = wxMax(0, pos - 1); - - wxString text = GetRange(lpos, pos); - - if (text[0] == wxT('(')) { - wxLongToLongHashMap::const_iterator left = mLeftParens.find(lpos); - if (left != mLeftParens.end()) { - Colorize(lpos, left->second); - } - } - else if (text[0] == wxT(')')) { - wxLongToLongHashMap::const_iterator right = mRightParens.find(lpos); - if (right != mRightParens.end()) { - Colorize(right->second, lpos); - } - } -} - -void NyqTextCtrl::OnUpdate(wxUpdateUIEvent & e) -{ - int pos = GetInsertionPoint(); - - if (pos != mLastCaretPos) { - int lpos = wxMax(0, pos - 1); - - wxString text = GetRange(lpos, pos); - if (text.Length() > 0) { - if (text[0] == wxT('(')) { - wxLongToLongHashMap::const_iterator left = mLeftParens.find(lpos); - if (left != mLeftParens.end()) { - Colorize(lpos, left->second); - } - } - else if (text[0] == wxT(')')) { - wxLongToLongHashMap::const_iterator right = mRightParens.find(lpos); - if (right != mRightParens.end()) { - Colorize(right->second, lpos); - } - } - } - - mLastCaretPos = pos; - } -} - -void NyqTextCtrl::GoMatch() -{ - MoveCursor(mRightParen, mLeftParen); -} - -void NyqTextCtrl::GoTop() -{ - wxLongToLongHashMap::const_iterator it; - long first = -1; - long second = -1; - - if (mLeftParen != -1) { - for (it = mLeftParens.begin(); it != mLeftParens.end(); it++) { - if (mLeftParen > it->first && mLeftParen < it->second) { - if (first == -1 || it->first < first) { - first = it->first; - second = it->second; - } - } - } - } - - if (first != -1) { - MoveCursor(first, second); - } -} - -void NyqTextCtrl::GoUp() -{ - wxLongToLongHashMap::const_iterator it; - long first = -1; - long second = -1; - - if (mLeftParen != -1) { - for (it = mLeftParens.begin(); it != mLeftParens.end(); it++) { - if (mLeftParen > it->first && mLeftParen < it->second) { - if (first == -1 || it->first > first) { - first = it->first; - second = it->second; - } - } - } - } - - if (first != -1) { - MoveCursor(first, second); - } -} - -void NyqTextCtrl::GoPrev() -{ - wxLongToLongHashMap::const_iterator it; - long first = -1; - long second = -1; - - if (mLeftParen != -1) { - for (it = mLeftParens.begin(); it != mLeftParens.end(); it++) { - if (it->first < mLeftParen && it->first >= first) { - first = it->first; - second = it->second; - } - } - } - - if (first != -1) { - MoveCursor(first, second); - } -} - -void NyqTextCtrl::GoNext() -{ - wxLongToLongHashMap::const_iterator it; - long first = -1; - long second = -1; - - if (mLeftParen != -1) { - for (it = mLeftParens.begin(); it != mLeftParens.end(); it++) { - if (it->first > mLeftParen && (first == -1 || it->first < first)) { - first = it->first; - second = it->second; - } - } - } - - if (first != -1) { - MoveCursor(first, second); - } -} - -void NyqTextCtrl::MoveCursor(long first, long second) -{ - int pos = GetInsertionPoint(); - int lpos = wxMax(0, pos - 1); - - wxString text = GetRange(lpos, pos); - - if (text[0] == wxT('(')) { - SetInsertionPoint(first + 1); - Colorize(first, second); - } - else if (text[0] == wxT(')')) { - SetInsertionPoint(second + 1); - Colorize(first, second); - } -} - -void NyqTextCtrl::Colorize(long left, long right) -{ - // Hide any previously highlighted parens - if (mLeftParen >= 0) { -#if defined(__WXMSW__) - Freeze(); // Prevents selection flashing on Windows -#endif - - SetStyle(mLeftParen, mLeftParen + 1, mOff); - SetStyle(mLeftParens[mLeftParen], mLeftParens[mLeftParen] + 1, mOff); - mLeftParen = -1; - mRightParen = -1; - -#if defined(__WXMSW__) - Thaw(); // Prevents selection flashing on Windows -#endif - } - - mLeftParen = left; - mRightParen = right; - - if (mLeftParen != -1) { - SetStyle(mLeftParen, mLeftParen + 1, mOn); - SetStyle(mRightParen, mRightParen + 1, mOn); - - SetStyle(mLeftParen + 1, mLeftParen + 1, mOff); - SetStyle(mRightParen + 1, mRightParen + 1, mOff); - } -} - -void NyqTextCtrl::FindParens() -{ - wxString text = GetValue(); - bool inquotes = false; - wxArrayInt stack; - long len = (long) text.Length(); - long pos; - - mLeftParens.clear(); - mRightParens.clear(); - - for (pos = 0; pos < len; pos++) { - wxChar c = text[pos]; - switch (c) - { - case wxT('"'): - inquotes = !inquotes; - break; - - case wxT(';'): - if (!inquotes) { - pos = (long)text.find(wxT('\n'), pos); - if (pos == (long)wxString::npos) { - pos = len; - } - } - break; - - case wxT('#'): - if (!inquotes) { - long ndx = pos + 1; - if (ndx < len && text[(int)ndx] == wxT('|')) { - // Shamelessly stolen from xlread.c/pcomment() - wxChar lastch = -1; - int n = 1; - - /* look for the matching delimiter (and handle nesting) */ - while (n > 0 && ++pos < len) { - wxChar ch = text[(int)pos]; - if (lastch == '|' && ch == '#') { - --n; - ch = -1; - } - else if (lastch == '#' && ch == '|') { - ++n; - ch = -1; - } - lastch = ch; - } - } - } - break; - - case wxT('('): - if (!inquotes) { - stack.Add(pos); - } - break; - - case wxT(')'): - if (!inquotes) { - if (stack.GetCount() > 0) { - int left = stack.Last(); - stack.RemoveAt(stack.GetCount() - 1); - - mLeftParens[left] = pos; - mRightParens[pos] = left; - } - } - break; - } - } -} - -//---------------------------------------------------------------------------- -// NyqRedirector -//---------------------------------------------------------------------------- - -NyqRedirector::NyqRedirector(NyqTextCtrl *text) -: mText(text) -{ - mOld = std::cout.rdbuf(this); -} - -NyqRedirector::~NyqRedirector() -{ - std::cout.flush(); - std::cout.rdbuf(mOld); - if (s.length() > 0) { - AppendText(); - } -} - -int NyqRedirector::overflow(int c) -{ - s += (char)c; - if (c == '\n') { - AppendText(); - } - - return 0; -} - -void NyqRedirector::AppendText() -{ - mText->AppendText(wxString(s.c_str(), wxConvISO8859_1)); - s.clear(); -} - -//---------------------------------------------------------------------------- -// NyqBench -//---------------------------------------------------------------------------- - -enum -{ - ID_AUTOLOAD = 20000, - - ID_AUTOWRAP, - - ID_FONT, - ID_SPLITV, - ID_SPLITH, - ID_TOGGLECODE, - ID_TOGGLEOUTPUT, - ID_SMALLICONS, - ID_LARGEICONS, - ID_MATCH, - ID_TOP, - ID_UP, - ID_PREVIOUS, - ID_NEXT, - - ID_GO, - ID_STOP, - - ID_SCRIPT, - ID_OUTPUT -}; - -BEGIN_EVENT_TABLE(NyqBench, wxFrame) - EVT_CLOSE(NyqBench::OnClose) - EVT_MOVE(NyqBench::OnMove) - EVT_SIZE(NyqBench::OnSize) - - EVT_MENU(wxID_NEW, NyqBench::OnNew) - EVT_MENU(wxID_OPEN, NyqBench::OnOpen) - EVT_MENU(wxID_SAVE, NyqBench::OnSave) - EVT_MENU(wxID_SAVEAS, NyqBench::OnSaveAs) - EVT_MENU(wxID_REVERT_TO_SAVED, NyqBench::OnRevert) - EVT_MENU(ID_AUTOLOAD, NyqBench::OnAutoLoad) - EVT_MENU(wxID_CLOSE, NyqBench::OnCloseWindow) - - EVT_MENU(wxID_UNDO, NyqBench::OnUndo) - EVT_MENU(wxID_REDO, NyqBench::OnRedo) - EVT_MENU(wxID_CUT, NyqBench::OnCut) - EVT_MENU(wxID_COPY, NyqBench::OnCopy) - EVT_MENU(wxID_PASTE, NyqBench::OnPaste) - EVT_MENU(wxID_CLEAR, NyqBench::OnClear) - EVT_MENU(wxID_SELECTALL, NyqBench::OnSelectAll) - EVT_MENU(wxID_FIND, NyqBench::OnFind) - EVT_MENU(ID_MATCH, NyqBench::OnGoMatch) - EVT_MENU(ID_TOP, NyqBench::OnGoTop) - EVT_MENU(ID_UP, NyqBench::OnGoUp) - EVT_MENU(ID_PREVIOUS, NyqBench::OnGoPrev) - EVT_MENU(ID_NEXT, NyqBench::OnGoNext) - EVT_MENU(ID_AUTOWRAP, NyqBench::OnAutoWrap) - - EVT_MENU(ID_FONT, NyqBench::OnFont) - EVT_MENU(ID_SPLITV, NyqBench::OnSplitV) - EVT_MENU(ID_SPLITH, NyqBench::OnSplitH) - EVT_MENU(ID_TOGGLECODE, NyqBench::OnToggleCode) - EVT_MENU(ID_TOGGLEOUTPUT, NyqBench::OnToggleOutput) - EVT_MENU(ID_SMALLICONS, NyqBench::OnSmallIcons) - EVT_MENU(ID_LARGEICONS, NyqBench::OnLargeIcons) - - EVT_MENU(ID_GO, NyqBench::OnGo) - EVT_MENU(ID_STOP, NyqBench::OnStop) - - EVT_MENU(wxID_ABOUT, NyqBench::OnAbout) - - EVT_FIND(wxID_ANY, NyqBench::OnFindDialog) - EVT_FIND_NEXT(wxID_ANY, NyqBench::OnFindDialog) - EVT_FIND_REPLACE(wxID_ANY, NyqBench::OnFindDialog) - EVT_FIND_REPLACE_ALL(wxID_ANY, NyqBench::OnFindDialog) - EVT_FIND_CLOSE(wxID_ANY, NyqBench::OnFindDialog) - - EVT_TEXT(ID_SCRIPT, NyqBench::OnTextUpdate) - - EVT_UPDATE_UI(wxID_SAVE, NyqBench::OnMenuUpdate) - EVT_UPDATE_UI(wxID_SAVEAS, NyqBench::OnMenuUpdate) - EVT_UPDATE_UI(wxID_REVERT_TO_SAVED, NyqBench::OnMenuUpdate) - - EVT_UPDATE_UI(wxID_UNDO, NyqBench::OnUndoUpdate) - EVT_UPDATE_UI(wxID_REDO, NyqBench::OnRedoUpdate) - EVT_UPDATE_UI(wxID_CUT, NyqBench::OnCutUpdate) - EVT_UPDATE_UI(wxID_COPY, NyqBench::OnCopyUpdate) - EVT_UPDATE_UI(wxID_PASTE, NyqBench::OnPasteUpdate) - EVT_UPDATE_UI(wxID_CLEAR, NyqBench::OnClearUpdate) - - EVT_UPDATE_UI(ID_SPLITH, NyqBench::OnViewUpdate) - EVT_UPDATE_UI(ID_SPLITV, NyqBench::OnViewUpdate) - EVT_UPDATE_UI(ID_TOGGLECODE, NyqBench::OnViewUpdate) - EVT_UPDATE_UI(ID_TOGGLEOUTPUT, NyqBench::OnViewUpdate) - - EVT_UPDATE_UI(ID_GO, NyqBench::OnRunUpdate) - - EVT_UPDATE_UI(ID_SCRIPT, NyqBench::OnScriptUpdate) - EVT_UPDATE_UI(ID_OUTPUT, NyqBench::OnOutputUpdate) -END_EVENT_TABLE() - -/*static*/ NyqBench *NyqBench::GetBench() -{ - if (gBench == nullptr) - { - gBench = new NyqBench(NULL); - } - - return gBench; -} - -NyqBench::NyqBench(wxWindow * parent) -: wxFrame(NULL, - wxID_ANY, - wxEmptyString, - wxDefaultPosition, - wxDefaultSize, - wxDEFAULT_FRAME_STYLE | - wxMINIMIZE_BOX | - wxMAXIMIZE_BOX | - wxRESIZE_BORDER) -{ - mFindDlg = NULL; - mRunning = false; - mScriptBox = NULL; - mOutputBox = NULL; - mScript = NULL; - mOutput = NULL; - - mPath = gPrefs->Read(wxT("NyqBench/Path"), wxEmptyString); - mAutoLoad = (gPrefs->Read(wxT("NyqBench/AutoLoad"), 0L) != 0); - mAutoWrap = (gPrefs->Read(wxT("NyqBench/AutoWrap"), true) != 0); - mLargeIcons = (gPrefs->Read(wxT("NyqBench/LargeIcons"), 0L) != 0); - mSplitMode = gPrefs->Read(wxT("NyqBench/SplitMode"), wxSPLIT_VERTICAL); - mShowCode = (gPrefs->Read(wxT("NyqBench/ShowScript"), true) != 0); - mShowOutput = (gPrefs->Read(wxT("NyqBench/ShowOutput"), true) != 0); - - SetIcon(wxICON(AudacityLogo)); - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); - ShuttleGui S(this, eIsCreating); - PopulateOrExchange(S); - wxMenuBar *bar = new wxMenuBar(); - - wxMenu *menu = new wxMenu(); - menu->Append(wxID_NEW, wxT("&New\tCtrl+N")); - menu->Append(wxID_OPEN, wxT("&Open...\tCtrl+O")); - menu->Append(wxID_SAVE, wxT("&Save...\tCtrl+S")); - menu->Append(wxID_SAVEAS, wxT("Save &As...\tCtrl+Shift+S")); - menu->AppendSeparator(); - menu->Append(wxID_REVERT_TO_SAVED, _T("&Revert to Saved")); - menu->AppendSeparator(); - menu->AppendCheckItem(ID_AUTOLOAD, _T("Auto &Load Last File"))->Check(mAutoLoad); - menu->AppendSeparator(); - menu->Append(wxID_CLOSE, wxT("&Close Window\tCtrl+W")); - bar->Append(menu, wxT("&File")); - - menu = new wxMenu(); - menu->Append(wxID_UNDO, _("&Undo\tCtrl+Z")); - menu->Append(wxID_REDO, _("&Redo\tCtrl+Y")); - menu->AppendSeparator(); - menu->Append(wxID_CUT, _("Cu&t\tCtrl+X")); - menu->Append(wxID_COPY, _("&Copy\tCtrl+C")); - menu->Append(wxID_PASTE, _("&Paste\tCtrl+V")); - menu->Append(wxID_CLEAR, _("Cle&ar\tCtrl+L")); - menu->AppendSeparator(); - menu->Append(wxID_SELECTALL, _("Select A&ll\tCtrl+A")); - menu->AppendSeparator(); - menu->Append(wxID_FIND, _("&Find...\tCtrl+F")); - menu->AppendSeparator(); - wxMenu *sub = new wxMenu(); - sub->Append(ID_MATCH, _("&Matching Paren\tF8")); - sub->Append(ID_TOP, _("&Top S-expr\tF9")); - sub->Append(ID_UP, _("&Higher S-expr\tF10")); - sub->Append(ID_PREVIOUS, _("&Previous S-expr\tF11")); - sub->Append(ID_NEXT, _("&Next S-expr\tF12")); - menu->AppendSubMenu(sub, _("&Go to")); - menu->AppendSeparator(); - menu->AppendCheckItem(ID_AUTOWRAP, _T("Auto &Wrap"))->Check(mAutoWrap); - bar->Append(menu, wxT("&Edit")); - - menu = new wxMenu(); - menu->Append(ID_FONT, _("Select &Font...")); - menu->AppendSeparator(); - menu->Append(ID_SPLITV, _("Split &Vertically")); - menu->Append(ID_SPLITH, _("Split &Horizontally")); - menu->AppendSeparator(); - menu->AppendCheckItem(ID_TOGGLECODE, _("Show S&cript")); - menu->AppendCheckItem(ID_TOGGLEOUTPUT, _("Show &Output")); - menu->AppendSeparator(); - sub = new wxMenu(); - sub->AppendRadioItem(ID_LARGEICONS, _("&Large Icons")); - sub->AppendRadioItem(ID_SMALLICONS, _("&Small Icons")); - menu->AppendSubMenu(sub, _("Toolbar")); - bar->Append(menu, wxT("&View")); - - menu = new wxMenu(); - menu->Append(ID_GO, _("&Go\tF5")); - menu->Append(ID_STOP, _("&Stop\tF6")); - bar->Append(menu, wxT("&Run")); - -#if defined(__WXMAC__) - menu->Append(wxID_ABOUT, _("&About")); -#else - menu = new wxMenu(); - menu->Append(wxID_ABOUT, _("&About")); - bar->Append(menu, wxT("Help")); -#endif - - SetMenuBar(bar); - - RecreateToolbar(mLargeIcons); - - wxRect r; - r.SetX(gPrefs->Read(wxT("NyqBench/Window/X"), -1)); - r.SetY(gPrefs->Read(wxT("NyqBench/Window/Y"), -1)); - r.SetWidth(gPrefs->Read(wxT("NyqBench/Window/Width"), -1)); - r.SetHeight(gPrefs->Read(wxT("NyqBench/Window/Height"), -1)); - if (r == wxRect(-1, -1, -1, -1)) { - Center(); - } - else { - SetSize(r); - } - - bool maximized = false; - gPrefs->Read(wxT("NyqBench/Window/Maximized"), maximized); - if (maximized) { - Maximize(); - } - - long sashpos; - sashpos = gPrefs->Read(wxT("NyqBench/SplitX"), 0l); - if (sashpos > 0) { - mSplitter->SetSashPosition(sashpos); - } - - wxString dflt = wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT).GetNativeFontInfoDesc(); - wxString desc; - wxTextAttr attr; - - desc = gPrefs->Read(wxT("NyqBench/ScriptFont"), dflt); - mScriptFont.SetNativeFontInfo(desc); -#if defined(__WXMSW__) - // Force SYSTEM encoding to prevent conversion to Unicode in wxTextCtrl::DoWriteText(). - // I don't know if this is something I'm doing wrong, but I'll have to look at this - // later if I get bored. - mScriptFont.SetEncoding(wxFONTENCODING_SYSTEM); -#endif - attr.SetFont(mScriptFont); - mScript->SetDefaultStyle(attr); - - desc = gPrefs->Read(wxT("NyqBench/OutputFont"), dflt); - mOutputFont.SetNativeFontInfo(desc); -#if defined(__WXMSW__) - // Force SYSTEM encoding to prevent conversion to Unicode in wxTextCtrl::DoWriteText(). - // I don't know if this is something I'm doing wrong, but I'll have to look at this - // later if I get bored. - mOutputFont.SetEncoding(wxFONTENCODING_SYSTEM); -#endif - attr.SetFont(mOutputFont); - mOutput->SetDefaultStyle(attr); - - if (mAutoLoad && !mPath.GetFullPath().IsEmpty()) { - LoadFile(); - } - - SetWindowTitle(); -} - -NyqBench::~NyqBench() -{ -} - -void NyqBench::SavePrefs() -{ - gPrefs->Write(wxT("NyqBench/Window/Maximized"), IsMaximized()); - if (!IsMaximized()) { - wxRect r = GetRect(); - -#if !defined(__WXMAC__) - if (IsIconized()) { - r = mLastSize; - } -#endif - - gPrefs->Write(wxT("NyqBench/Window/X"), r.GetX()); - gPrefs->Write(wxT("NyqBench/Window/Y"), r.GetY()); - gPrefs->Write(wxT("NyqBench/Window/Width"), r.GetWidth()); - gPrefs->Write(wxT("NyqBench/Window/Height"), r.GetHeight()); - } - - gPrefs->Write(wxT("NyqBench/AutoLoad"), mAutoLoad); - gPrefs->Write(wxT("NyqBench/AutoWrap"), mAutoWrap); - gPrefs->Write(wxT("NyqBench/ScriptFont"), mScriptFont.GetNativeFontInfoDesc()); - gPrefs->Write(wxT("NyqBench/OutputFont"), mOutputFont.GetNativeFontInfoDesc()); - gPrefs->Write(wxT("NyqBench/LargeIcons"), mLargeIcons); - gPrefs->Write(wxT("NyqBench/SplitX"), mSplitter->IsSplit() ? mSplitter->GetSashPosition() : 0); - gPrefs->Write(wxT("NyqBench/SplitMode"), mSplitter->IsSplit() ? mSplitter->GetSplitMode() : 0); - gPrefs->Write(wxT("NyqBench/ShowCode"), mScript->IsShown()); - gPrefs->Write(wxT("NyqBench/ShowOutput"), mOutput->IsShown()); -} - -void NyqBench::PopulateOrExchange(ShuttleGui & S) -{ - S.StartHorizontalLay(wxEXPAND, true); - { - wxPanel *scriptp; - wxPanel *outputp; - wxStaticBoxSizer *scripts; - wxStaticBoxSizer *outputs; - wxBoxSizer *bs; - - mSplitter = new wxSplitterWindow(this, - wxID_ANY, - wxDefaultPosition, - wxDefaultSize, - wxSP_LIVE_UPDATE | - wxSP_3DSASH | - wxSP_NOBORDER); - - scriptp = new wxPanel(mSplitter, - wxID_ANY, - wxDefaultPosition, - wxDefaultSize, - wxNO_FULL_REPAINT_ON_RESIZE | - wxCLIP_CHILDREN); - bs = new wxBoxSizer(wxVERTICAL); - scriptp->SetSizer(bs); - - mScriptBox = new wxStaticBox(scriptp, - wxID_ANY, - _("Script")); - - scripts = new wxStaticBoxSizer(mScriptBox, - wxVERTICAL); - bs->Add(scripts, true, wxEXPAND); - - mScript = new NyqTextCtrl(scriptp, - ID_SCRIPT, - wxEmptyString, - wxDefaultPosition, - wxDefaultSize, - wxTE_RICH2 | wxTE_RICH | - (mAutoWrap ? wxTE_BESTWRAP : wxTE_DONTWRAP) | - wxTE_NOHIDESEL | - wxTE_MULTILINE); - scripts->Add(mScript, true, wxEXPAND); - - outputp = new wxPanel(mSplitter, - wxID_ANY, - wxDefaultPosition, - wxDefaultSize, - wxNO_FULL_REPAINT_ON_RESIZE | - wxCLIP_CHILDREN); - bs = new wxBoxSizer(wxVERTICAL); - outputp->SetSizer(bs); - - mOutputBox = new wxStaticBox(outputp, - wxID_ANY, - _("Output")); - outputs = new wxStaticBoxSizer(mOutputBox, - wxVERTICAL); - bs->Add(outputs, true, wxEXPAND); - - mOutput = new NyqTextCtrl(outputp, - ID_OUTPUT, - wxEmptyString, - wxDefaultPosition, - wxDefaultSize, - wxTE_READONLY | -#if !defined(__WXMAC__) -// I could not get the bloody horizontal scroll bar to appear on -// wxMac, so we can't use wxTE_DONTWRAP as you can't easily scroll -// left and right. - wxTE_DONTWRAP | -#endif - wxTE_NOHIDESEL | - wxTE_MULTILINE); - outputs->Add(mOutput, true, wxEXPAND); - - switch (mSplitMode) - { - case wxSPLIT_VERTICAL: - mSplitter->SplitVertically(scriptp, outputp, 300); - break; - - case wxSPLIT_HORIZONTAL: - mSplitter->SplitHorizontally(scriptp, outputp, 300); - break; - - default: - mSplitter->Initialize((mShowCode ? scriptp : outputp)); - break; - } - - mSplitter->SetMinimumPaneSize(50); - - S.AddSpace(5, 1); - S.Prop(true); - S.Position(wxEXPAND).AddWindow(mSplitter); - S.AddSpace(5, 1); - - mSplitter->SetMinSize(wxSize(600, 400)); - } - S.EndHorizontalLay(); - - S.AddSpace(1, 5); - - return; -} - -void NyqBench::OnClose(wxCloseEvent & e) -{ - if (!Validate()) { - e.Veto(); - } - else { - Show(false); - } -} - -void NyqBench::OnMove(wxMoveEvent & e) -{ - e.Skip(); - if (!IsIconized() && !IsMaximized()) { - mLastSize.SetPosition(e.GetPosition()); - } -} - -void NyqBench::OnSize(wxSizeEvent & e) -{ - e.Skip(); - if (!IsIconized() && !IsMaximized()) { - mLastSize.SetSize(e.GetSize()); - } -} - -void NyqBench::OnCloseWindow(wxCommandEvent & e) -{ - Close(); -} - -void NyqBench::OnNew(wxCommandEvent & e) -{ - if (!Validate()) { - return; - } - - mPath.SetFullName(wxEmptyString); - - while (mScript->CanUndo()) { - mScript->Undo(); - } - - mScript->Clear(); - mScript->DiscardEdits(); - - SetWindowTitle(); -} - -void NyqBench::OnOpen(wxCommandEvent & e) -{ - if (mScript->IsModified() && !Validate()) { - return; - } - - wxFileDialog dlog(this, - _("Load Nyquist script"), - mPath.GetPath(), - wxEmptyString, - _("Nyquist scripts (*.ny)|*.ny|Lisp scripts (*.lsp)|*.lsp|All files|*"), - wxFD_OPEN | wxRESIZE_BORDER); - - if (dlog.ShowModal() != wxID_OK) { - return; - } - - mPath = dlog.GetPath(); - gPrefs->Write(wxT("NyqBench/Path"), mPath.GetFullPath()); - - LoadFile(); - - SetWindowTitle(); -} - -void NyqBench::OnSave(wxCommandEvent & e) -{ - if (mScript->GetLastPosition() == 0) { - return; - } - - if (mPath.GetFullPath().IsEmpty()) { - OnSaveAs(e); - return; - } - - if (!mScript->SaveFile(mPath.GetFullPath())) - { - AudacityMessageBox(XO("Script was not saved."), - XO("Warning"), - wxICON_EXCLAMATION, - this); - return; - } -} - -void NyqBench::OnSaveAs(wxCommandEvent & e) -{ - if (mScript->GetLastPosition() == 0) { - return; - } - - wxFileDialog dlog(this, - _("Save Nyquist script"), - mPath.GetFullPath(), - wxEmptyString, - _("Nyquist scripts (*.ny)|*.ny|Lisp scripts (*.lsp)|*.lsp|All files|*"), - wxFD_SAVE | wxFD_OVERWRITE_PROMPT | wxRESIZE_BORDER); - - if (dlog.ShowModal() != wxID_OK) { - return; - } - - mPath = dlog.GetPath(); - gPrefs->Write(wxT("NyqBench/Path"), mPath.GetFullPath()); - - if (!mScript->SaveFile(mPath.GetFullPath())) - { - AudacityMessageBox(XO("Script was not saved."), - XO("Warning"), - wxICON_EXCLAMATION, - this); - return; - } - - SetWindowTitle(); -} - -void NyqBench::OnAutoLoad(wxCommandEvent & e) -{ - mAutoLoad = e.IsChecked(); -} - -void NyqBench::OnRevert(wxCommandEvent & e) -{ - if (mPath.GetFullPath().IsEmpty()) { - return; - } - - if (!Validate()) { - return; - } - - LoadFile(); -} - -void NyqBench::OnUndo(wxCommandEvent & e) -{ - (FindFocus() == mScript ? mScript : mOutput)->Undo(); -} - -void NyqBench::OnRedo(wxCommandEvent & e) -{ - (FindFocus() == mScript ? mScript : mOutput)->Redo(); -} - -void NyqBench::OnCut(wxCommandEvent & e) -{ - (FindFocus() == mScript ? mScript : mOutput)->Cut(); -} - -void NyqBench::OnCopy(wxCommandEvent & e) -{ - (FindFocus() == mScript ? mScript : mOutput)->Copy(); -} - -void NyqBench::OnPaste(wxCommandEvent & e) -{ - (FindFocus() == mScript ? mScript : mOutput)->Paste(); -} - -void NyqBench::OnClear(wxCommandEvent & e) -{ - (FindFocus() == mScript ? mScript : mOutput)->Clear(); -} - -void NyqBench::OnSelectAll(wxCommandEvent & e) -{ - (FindFocus() == mScript ? mScript : mOutput)->SetSelection(-1, -1); -} - -void NyqBench::OnFind(wxCommandEvent & e) -{ - if (mFindDlg ) { - delete mFindDlg; - mFindDlg = NULL; - } - else { - NyqTextCtrl *w = (NyqTextCtrl *) FindFocus(); - if (w == mScript || w == mOutput) { - mFindText = w; - - int flags = 0; - - flags |= (gPrefs->Read(wxT("NyqBench/Find/Down"), 0L) ? wxFR_DOWN : 0); - flags |= (gPrefs->Read(wxT("NyqBench/Find/Word"), 0L) ? wxFR_WHOLEWORD : 0); - flags |= (gPrefs->Read(wxT("NyqBench/Find/Case"), 0L) ? wxFR_MATCHCASE : 0); - - mFindData.SetFlags(flags); - - mFindDlg = new wxFindReplaceDialog(this, - &mFindData, - _("Find dialog"), - wxFR_NOWHOLEWORD); - mFindDlg->Show(true); - } - } -} - -void NyqBench::OnGoMatch(wxCommandEvent & e) -{ - mScript->GoMatch(); -} - -void NyqBench::OnGoTop(wxCommandEvent & e) -{ - mScript->GoTop(); -} - -void NyqBench::OnGoUp(wxCommandEvent & e) -{ - mScript->GoUp(); -} - -void NyqBench::OnGoPrev(wxCommandEvent & e) -{ - mScript->GoPrev(); -} - -void NyqBench::OnGoNext(wxCommandEvent & e) -{ - mScript->GoNext(); -} - -void NyqBench::OnAutoWrap(wxCommandEvent & e) -{ - mAutoWrap = e.IsChecked(); - - wxWindow *parent = mScript->GetParent(); - wxString text = mScript->GetValue(); - bool focused = wxWindow::FindFocus() == mScript; - long pos = mScript->GetInsertionPoint(); - long from; - long to; - mScript->GetSelection(&from, &to); - - wxSizer *s = mScript->GetContainingSizer(); - s->Detach(mScript); - delete mScript; - - mScript = new NyqTextCtrl(parent, - ID_SCRIPT, - wxEmptyString, - wxDefaultPosition, - wxDefaultSize, - (mAutoWrap ? wxTE_BESTWRAP : wxTE_DONTWRAP) | - wxTE_NOHIDESEL | wxTE_RICH2 | - wxTE_MULTILINE); - s->Add(mScript, 1, wxEXPAND); - s->Layout(); - - mScript->ChangeValue(text); - mScript->SetInsertionPoint(pos); - mScript->SetSelection(from, to); - - if (focused) { - mScript->SetFocus(); - } -} - -void NyqBench::OnFont(wxCommandEvent & e) -{ - wxWindow *w = FindFocus(); - wxFontData data; - wxFontDialog dlg(this, data); - - if (w != mScript && w != mOutput) { - return; - } - - data.SetInitialFont(w == mScript ? mScriptFont : mOutputFont); - - if (dlg.ShowModal() == wxID_OK) { - wxFontData retData = dlg.GetFontData(); - wxFont font = retData.GetChosenFont(); - wxTextAttr attr; - attr.SetFont(font); - - if (w == mScript) { - mScriptFont = font; - } - else { - mOutputFont = font; - } - - ((wxTextCtrl *)w)->SetDefaultStyle(attr); - ((wxTextCtrl *)w)->SetStyle(0, ((wxTextCtrl *)w)->GetLastPosition(), attr); - w->Refresh(); - } -} - -void NyqBench::OnSplitV(wxCommandEvent & e) -{ - if (mSplitter->IsSplit()) { - mSplitter->Unsplit(); - } - - mSplitter->SplitVertically(mScript->GetParent(), mOutput->GetParent()); -} - -void NyqBench::OnSplitH(wxCommandEvent & e) -{ - if (mSplitter->IsSplit()) { - mSplitter->Unsplit(); - } - - mSplitter->SplitHorizontally(mScript->GetParent(), mOutput->GetParent()); -} - -void NyqBench::OnToggleCode(wxCommandEvent & e) -{ - if (e.IsChecked()) { - if (mSplitter->IsSplit()) { - // Should never happen - return; - } - - if (mSplitMode == wxSPLIT_VERTICAL) { - mSplitter->SplitVertically(mScript->GetParent(), mOutput->GetParent()); - } - else { - mSplitter->SplitHorizontally(mScript->GetParent(), mOutput->GetParent()); - } - } - else { - if (!mSplitter->IsSplit()) { - // Should never happen - return; - } - - mSplitMode = mSplitter->GetSplitMode(); - mSplitter->Unsplit(mScript->GetParent()); - } -} - -void NyqBench::OnToggleOutput(wxCommandEvent & e) -{ - if (e.IsChecked()) { - if (mSplitter->IsSplit()) { - // Should never happen - return; - } - - if (mSplitMode == wxSPLIT_VERTICAL) { - mSplitter->SplitVertically(mScript->GetParent(), mOutput->GetParent()); - } - else { - mSplitter->SplitHorizontally(mScript->GetParent(), mOutput->GetParent()); - } - } - else { - if (!mSplitter->IsSplit()) { - // Should never happen - return; - } - - mSplitMode = mSplitter->GetSplitMode(); - mSplitter->Unsplit(mOutput->GetParent()); - } -} - -void NyqBench::OnSmallIcons(wxCommandEvent & e) -{ - RecreateToolbar(false); -} - -void NyqBench::OnLargeIcons(wxCommandEvent & e) -{ - RecreateToolbar(true); -} - -void NyqBench::OnGo(wxCommandEvent & e) -{ - // No need to delete...EffectManager will do it - mEffect = new NyquistEffect(wxT("Nyquist Effect Workbench")); - const PluginID & ID = EffectManager::Get().RegisterEffect(mEffect); - - mEffect->SetCommand(mScript->GetValue()); - mEffect->RedirectOutput(); - - AudacityProject *p = GetActiveProject(); - wxASSERT(p != NULL); - - if (p) { - wxWindowDisabler disable(this); - NyqRedirector redir((NyqTextCtrl *)mOutput); - - mRunning = true; - UpdateWindowUI(); - - EffectUI::DoEffect(ID, CommandContext(*p), 0); - - mRunning = false; - UpdateWindowUI(); - } - - Raise(); - - EffectManager::Get().UnregisterEffect(ID); -} - -void NyqBench::OnStop(wxCommandEvent & e) -{ - mRunning = false; - mEffect->Stop(); -} - -void NyqBench::OnAbout(wxCommandEvent & e) -{ - wxAboutDialogInfo i; - - i.AddArtist(_("Harvey Lubin (logo)")); - i.AddArtist(_("Tango Icon Gallery (toolbar icons)")); - i.AddDeveloper(_("Leland Lucius")); - i.SetCopyright(_("(C) 2009 by Leland Lucius")); - i.SetDescription(_("External Audacity module which provides a simple IDE for writing effects.")); - i.SetName(_("Nyquist Effect Workbench")); - i.SetVersion(__TDATE__); - - wxAboutBox(i); -} - -void NyqBench::OnFindDialog(wxFindDialogEvent & e) -{ - wxEventType type = e.GetEventType(); - - if (type == wxEVT_COMMAND_FIND_CLOSE) { - wxFindReplaceDialog *dlg = e.GetDialog(); - - dlg->Destroy(); - - int flags = mFindData.GetFlags(); - - gPrefs->Write(wxT("NyqBench/Find/Down"), (flags & wxFR_DOWN) != 0); - gPrefs->Write(wxT("NyqBench/Find/Word"), (flags & wxFR_WHOLEWORD) != 0); - gPrefs->Write(wxT("NyqBench/Find/Case"), (flags & wxFR_MATCHCASE) != 0); - - mFindDlg = NULL; - mFindText = NULL; - - return; - } - - wxString text = mFindText->GetValue(); - -#if defined(__WXMSW__) - // We cheat on Windows. We know that the Windows text control - // uses CRLF for line endings and if we don't account for that, - // the selection positions will be off. - // - // Not sure why I thought I needed this, but it appears not to - // be. Leaving just in case. - // - // text.Replace(wxT("\n"), wxT("\r\n")); -#endif - - size_t startpos = mFindText->GetInsertionPoint(); - size_t len = mFindText->GetLastPosition(); - size_t pos; - - wxString find = e.GetFindString(); - bool down = (e.GetFlags() & wxFR_DOWN) != 0; - bool mixed = (e.GetFlags() & wxFR_MATCHCASE) != 0; - - if (!mixed) { - text.MakeUpper(); - find.MakeUpper(); - } - - if (down) { - pos = text.find(find, startpos); - if (type == wxEVT_COMMAND_FIND_NEXT && pos == startpos && pos < len) { - pos = text.find(find, startpos + 1); - } - } - else { - pos = text.rfind(find, startpos); - if (type == wxEVT_COMMAND_FIND_NEXT && pos == startpos && pos > 0) { - pos = text.rfind(find, startpos - 1); - } - } - - if (pos == wxString::npos) { - AudacityMessageBox(XO("No matches found"), - XO("Nyquist Effect Workbench"), - wxOK | wxCENTER, - e.GetDialog()); - - return; - } - - mFindText->SetInsertionPoint((long)pos); - -#if defined(__WXGTK__) - // GTK's selection and intertion pointer interact where the insertion - // pointer winds up after the second parameter, so we reverse them to - // force the pointer at the beginning of the selection. Doing so - // allows reverse find to work properly. - mFindText->SetSelection((long)(pos + find.Length()), (long)pos); -#else - mFindText->SetSelection((long)pos, (long)(pos + find.Length())); -#endif - -#if defined(__WXMAC__) - // Doing this coaxes the text control to update the selection. Without - // it the selection doesn't appear to change if the found string is within - // the currently displayed text, i.e., no reposition is needed. - mFindText->Show(false); - mFindText->Show(true); -#endif -} - -void NyqBench::OnTextUpdate(wxCommandEvent & e) -{ - // This really shouldn't be necessary, but Paste()ing doesn't mark the - // control as dirty...at least on the Mac. - ((NyqTextCtrl *) e.GetEventObject())->MarkDirty(); -} - -void NyqBench::OnMenuUpdate(wxUpdateUIEvent & e) -{ - if (e.GetId() != wxID_REVERT_TO_SAVED) { - e.Enable((mScript->GetLastPosition() > 0) || mScript->IsModified()); - } - else { - e.Enable(mScript->IsModified()); - } -} - -void NyqBench::OnUndoUpdate(wxUpdateUIEvent & e) -{ - e.Enable((FindFocus() == mScript ? mScript : mOutput)->CanUndo()); -} - -void NyqBench::OnRedoUpdate(wxUpdateUIEvent & e) -{ - e.Enable((FindFocus() == mScript ? mScript : mOutput)->CanRedo()); -} - -void NyqBench::OnCutUpdate(wxUpdateUIEvent & e) -{ - e.Enable((FindFocus() == mScript ? mScript : mOutput)->CanCut()); -} - -void NyqBench::OnCopyUpdate(wxUpdateUIEvent & e) -{ - e.Enable((FindFocus() == mScript ? mScript : mOutput)->CanCopy()); -} - -void NyqBench::OnPasteUpdate(wxUpdateUIEvent & e) -{ - e.Enable((FindFocus() == mScript ? mScript : mOutput)->CanPaste()); -} - -void NyqBench::OnClearUpdate(wxUpdateUIEvent & e) -{ - e.Enable(FindFocus() == mOutput ? true : false); -} - -void NyqBench::OnViewUpdate(wxUpdateUIEvent & e) -{ - wxMenuBar *bar = GetMenuBar(); - bar->Enable(ID_SPLITV, !mSplitter->IsSplit() || mSplitter->GetSplitMode() != wxSPLIT_VERTICAL); - bar->Enable(ID_SPLITH, !mSplitter->IsSplit() || mSplitter->GetSplitMode() != wxSPLIT_HORIZONTAL); - bar->Check(ID_TOGGLECODE, mScript->GetParent()->IsShown()); - bar->Check(ID_TOGGLEOUTPUT, mOutput->GetParent()->IsShown()); - bar->Check(ID_LARGEICONS, mLargeIcons); - bar->Check(ID_SMALLICONS, !mLargeIcons); -} - -void NyqBench::OnRunUpdate(wxUpdateUIEvent & e) -{ - AudacityProject *p = GetActiveProject(); - wxToolBar *tbar = GetToolBar(); - wxMenuBar *mbar = GetMenuBar(); - - auto gAudioIO = AudioIOBase::Get(); - if (p && gAudioIO->IsBusy()) { - mbar->Enable(ID_GO, false); - mbar->Enable(ID_STOP, false); - - tbar->EnableTool(ID_GO, false); - tbar->EnableTool(ID_STOP, false); - } - else { - mbar->Enable(ID_GO, (mScript->GetLastPosition() > 0) && !mRunning); - mbar->Enable(ID_STOP, (mScript->GetLastPosition() > 0) && mRunning); - - tbar->EnableTool(ID_GO, (mScript->GetLastPosition() > 0) && !mRunning); - tbar->EnableTool(ID_STOP, (mScript->GetLastPosition() > 0) && mRunning); - } -} - -void NyqBench::OnScriptUpdate(wxUpdateUIEvent & e) -{ - if (mScriptBox && mScript && FindFocus() == mScript) { - wxString label = mScriptBox->GetLabel(); - if (label == _("Script")) { - label += wxT("*"); - mScriptBox->SetLabel(label); - mOutputBox->SetLabel(_("Output")); - } - } -} - -void NyqBench::OnOutputUpdate(wxUpdateUIEvent & e) -{ - if (mOutputBox && mOutput && FindFocus() == mOutput) { - wxString label = mOutputBox->GetLabel(); - if (label == _("Output")) { - label += wxT("*"); - mOutputBox->SetLabel(label); - mScriptBox->SetLabel(_("Script")); - } - } -} - -bool NyqBench::Validate() -{ - if (mScript->GetLastPosition() > 0 && mScript->IsModified()) { - int ans; - ans = AudacityMessageBox(XO("Code has been modified. Are you sure?"), - XO("Warning"), - wxYES_NO | wxICON_QUESTION, - this); - if (ans == wxNO) { - return false; - } - } - - return true; -} - -void NyqBench::SetWindowTitle() -{ - wxString name = _("Untitled"); - - if (!mPath.GetFullPath().IsEmpty()) { - name = mPath.GetFullName(); - } - - SetTitle(_("Nyquist Effect Workbench - ") + name); -} - -void NyqBench::RecreateToolbar(bool large) -{ - mLargeIcons = large; - - wxToolBar *tb = GetToolBar(); - if (tb) { - delete tb; - } - tb = CreateToolBar(); - - wxSize sz; - - if (!mLargeIcons) { - tb->SetToolBitmapSize(wxSize(16, 16)); - mPics[0] = wxBitmap(document_new_small); - mPics[1] = wxBitmap(document_open_small); - mPics[2] = wxBitmap(document_save_as_small); - mPics[3] = wxBitmap(document_save_small); - mPics[4] = wxBitmap(edit_copy_small); - mPics[5] = wxBitmap(edit_cut_small); - mPics[6] = wxBitmap(edit_paste_small); - mPics[7] = wxBitmap(edit_clear_small); - mPics[8] = wxBitmap(edit_delete_small); - mPics[9] = wxBitmap(edit_select_all_small); - mPics[10] = wxBitmap(edit_undo_small); - mPics[11] = wxBitmap(edit_redo_small); - mPics[12] = wxBitmap(edit_find_small); - mPics[13] = wxBitmap(system_search_small); - mPics[14] = wxBitmap(go_top_small); - mPics[15] = wxBitmap(go_up_small); - mPics[16] = wxBitmap(go_previous_small); - mPics[17] = wxBitmap(go_next_small); - mPics[18] = wxBitmap(media_playback_start_small); - mPics[19] = wxBitmap(media_playback_stop_small); - } - else { - tb->SetToolBitmapSize(wxSize(32, 32)); - mPics[0] = wxBitmap(document_new_large); - mPics[1] = wxBitmap(document_open_large); - mPics[2] = wxBitmap(document_save_as_large); - mPics[3] = wxBitmap(document_save_large); - mPics[4] = wxBitmap(edit_copy_large); - mPics[5] = wxBitmap(edit_cut_large); - mPics[6] = wxBitmap(edit_paste_large); - mPics[7] = wxBitmap(edit_clear_large); - mPics[8] = wxBitmap(edit_delete_large); - mPics[9] = wxBitmap(edit_select_all_large); - mPics[10] = wxBitmap(edit_undo_large); - mPics[11] = wxBitmap(edit_redo_large); - mPics[12] = wxBitmap(edit_find_large); - mPics[13] = wxBitmap(system_search_large); - mPics[14] = wxBitmap(go_top_large); - mPics[15] = wxBitmap(go_up_large); - mPics[16] = wxBitmap(go_previous_large); - mPics[17] = wxBitmap(go_next_large); - mPics[18] = wxBitmap(media_playback_start_large); - mPics[19] = wxBitmap(media_playback_stop_large); - } - - tb->SetMargins(2, 2); - - tb->AddTool(wxID_NEW, _("New"), mPics[0], _("New script")); - tb->AddTool(wxID_OPEN, _("Open"), mPics[1], _("Open script")); - tb->AddTool(wxID_SAVE, _("Save"), mPics[2], _("Save script")); - tb->AddTool(wxID_SAVEAS, _("Save As"), mPics[3], _("Save script as...")); - tb->AddSeparator(); - tb->AddTool(wxID_COPY, _("Copy"), mPics[4], _("Copy to clipboard")); - tb->AddTool(wxID_CUT, _("Cut"), mPics[5], _("Cut to clipboard")); - tb->AddTool(wxID_PASTE, _("Paste"), mPics[6], _("Paste from clipboard")); - tb->AddTool(wxID_CLEAR, _("Clear"), mPics[7], _("Clear selection")); - tb->AddTool(wxID_SELECTALL, _("Select All"), mPics[9], _("Select all text")); - tb->AddSeparator(); - tb->AddTool(wxID_UNDO, _("Undo"), mPics[10], _("Undo last change")); - tb->AddTool(wxID_REDO, _("Redo"), mPics[11], _("Redo previous change")); - tb->AddSeparator(); - tb->AddTool(wxID_FIND, _("Find"), mPics[12], _("Find text")); - tb->AddSeparator(); - tb->AddTool(ID_MATCH, _("Match"), mPics[13], _("Go to matching paren")); - tb->AddTool(ID_TOP, _("Top"), mPics[14], _("Go to top S-expr")); - tb->AddTool(ID_UP, _("Up"), mPics[15], _("Go to higher S-expr")); - tb->AddTool(ID_PREVIOUS, _("Previous"), mPics[16], _("Go to previous S-expr")); - tb->AddTool(ID_NEXT, _("Next"), mPics[17], _("Go to next S-expr")); - tb->AddSeparator(); - tb->AddTool(ID_GO, _("Start"), mPics[18], _("Start script")); - tb->AddTool(ID_STOP, _("Stop"), mPics[19], _("Stop script")); - - tb->Realize(); - - Layout(); - Fit(); - SetMinSize(GetSize()); -} - -void NyqBench::LoadFile() -{ - wxString path = mPath.GetFullPath(); - - if (path.IsEmpty()) { - return; - } - - wxFFile f(path); - if (f.IsOpened()) { - wxString t; - if (f.ReadAll(&t)) { -//#if defined(__WXGTK__) || defined(__WXMAC__) - t.Replace(wxT("\r\n"), wxT("\n")); - t.Replace(wxT("\r"), wxT("\n")); -//#elif defined(__WXMSW__) -// t.Replace("\r\n", "\n"); -//#endif - mScript->SetValue(t); - mScript->DiscardEdits(); - } - } - -// mScript->LoadFile(mPath.GetFullPath()); -} - -//---------------------------------------------------------------------------- -// Connects Audacity menu item to an action in this dll. -// Only one action implemented so far. -//---------------------------------------------------------------------------- -void NyqBench::ShowNyqBench(const CommandContext &) -{ - Show(); -} diff --git a/lib-src/mod-nyq-bench/NyqBench.h b/lib-src/mod-nyq-bench/NyqBench.h deleted file mode 100755 index 30a99c934..000000000 --- a/lib-src/mod-nyq-bench/NyqBench.h +++ /dev/null @@ -1,227 +0,0 @@ -/********************************************************************** - - NyqBench.h - - Leland Lucius - -**********************************************************************/ - -#ifndef __NYQUIST_EFFECT_WORKBENCH__ -#define __NYQUIST_EFFECT_WORKBENCH__ - -#include // wxFindReplaceData member variable -#include // to inherit -#include - -#include -#include -#include - -#include "commands/CommandManager.h" -#include "effects/nyquist/Nyquist.h" - -class wxFileName; - -//---------------------------------------------------------------------------- -// NyqTextCtrl -//---------------------------------------------------------------------------- - -class NyqTextCtrl:public wxTextCtrl -{ - public: - NyqTextCtrl(wxWindow *parent, - wxWindowID id, - const wxString & value, - const wxPoint & pos, - const wxSize & size, - int style = 0); - - void SetFocusFromKbd(); - void MarkDirty(); - - void GoMatch(); - void GoTop(); - void GoUp(); - void GoPrev(); - void GoNext(); - - private: -#if defined(__WXMAC__REMOVED_UNTIL_ITS_PROVEN_THAT_IT_IS_STILL_NEEDED) - void OnKeyDown(wxKeyEvent & e); -#endif - void OnKeyUp(wxKeyEvent & e); - void OnChar(wxKeyEvent & e); - void OnUpdate(wxUpdateUIEvent & e); - - void MoveCursor(long first, long second); - void Colorize(long left, long right); - void FindParens(); - - private: - wxLongToLongHashMap mLeftParens; - wxLongToLongHashMap mRightParens; - - long mLeftParen; - long mRightParen; - - long mLastCaretPos; - - wxTextAttr mOn; - wxTextAttr mOff; - - DECLARE_EVENT_TABLE(); -}; - -//---------------------------------------------------------------------------- -// NyqRedirector -//---------------------------------------------------------------------------- - -class NyqRedirector:wxSTD streambuf -{ - public: - NyqRedirector(NyqTextCtrl *text); - virtual ~NyqRedirector(); - - int overflow(int c); - - private: - void AppendText(); - - std::string s; - std::streambuf *mOld; - NyqTextCtrl *mText; -}; - -//---------------------------------------------------------------------------- -// NyqBench -//---------------------------------------------------------------------------- - -class NyqBench:public wxFrame -{ - public: - NyqBench(wxWindow *parent); - virtual ~NyqBench(); - - virtual bool Validate(); - - void ShowNyqBench(const CommandContext&); - - static NyqBench *GetBench(); - void SavePrefs(); - - private: - void PopulateOrExchange(ShuttleGui & S); - - void OnClose(wxCloseEvent & e); - void OnMove(wxMoveEvent & e); - void OnSize(wxSizeEvent & e); - - void OnNew(wxCommandEvent & e); - void OnOpen(wxCommandEvent & e); - void OnSave(wxCommandEvent & e); - void OnSaveAs(wxCommandEvent & e); - void OnRevert(wxCommandEvent & e); - void OnAutoLoad(wxCommandEvent & e); - void OnCloseWindow(wxCommandEvent & e); - - void OnUndo(wxCommandEvent & e); - void OnRedo(wxCommandEvent & e); - void OnCut(wxCommandEvent & e); - void OnCopy(wxCommandEvent & e); - void OnPaste(wxCommandEvent & e); - void OnClear(wxCommandEvent & e); - void OnSelectAll(wxCommandEvent & e); - void OnFind(wxCommandEvent & e); - void OnGoMatch(wxCommandEvent & e); - void OnGoTop(wxCommandEvent & e); - void OnGoUp(wxCommandEvent & e); - void OnGoPrev(wxCommandEvent & e); - void OnGoNext(wxCommandEvent & e); - void OnAutoWrap(wxCommandEvent & e); - - void OnFont(wxCommandEvent & e); - void OnSplitV(wxCommandEvent & e); - void OnSplitH(wxCommandEvent & e); - void OnToggleCode(wxCommandEvent & e); - void OnToggleOutput(wxCommandEvent & e); - void OnSmallIcons(wxCommandEvent & e); - void OnLargeIcons(wxCommandEvent & e); - - void OnGo(wxCommandEvent & e); - void OnStop(wxCommandEvent & e); - - void OnAbout(wxCommandEvent & e); - - void OnFindDialog(wxFindDialogEvent & e); - - void OnTextUpdate(wxCommandEvent & e); - - void OnMenuUpdate(wxUpdateUIEvent & e); - - void OnUndoUpdate(wxUpdateUIEvent & e); - void OnRedoUpdate(wxUpdateUIEvent & e); - void OnCutUpdate(wxUpdateUIEvent & e); - void OnCopyUpdate(wxUpdateUIEvent & e); - void OnPasteUpdate(wxUpdateUIEvent & e); - void OnClearUpdate(wxUpdateUIEvent & e); - - void OnViewUpdate(wxUpdateUIEvent & e); - - void OnRunUpdate(wxUpdateUIEvent & e); - - void OnScriptUpdate(wxUpdateUIEvent & e); - void OnOutputUpdate(wxUpdateUIEvent & e); - - void SetWindowTitle(); - - void RecreateToolbar(bool large = false); - - void LoadFile(); - - private: - wxStaticBox *mScriptBox; - wxStaticBox *mOutputBox; - NyqTextCtrl *mScript; - NyqTextCtrl *mOutput; - wxSplitterWindow *mSplitter; - - wxFindReplaceDialog *mFindDlg; - wxFindReplaceData mFindData; - NyqTextCtrl *mFindText; - - NyquistEffect *mEffect; - - wxFont mScriptFont; - wxFont mOutputFont; - - wxBitmap mPics[20]; - - int mSplitMode; - bool mShowCode; - bool mShowOutput; - - bool mLargeIcons; - - bool mRunning; - - wxFileName mPath; - bool mAutoLoad; - bool mAutoWrap; - - wxRect mLastSize; - - DECLARE_EVENT_TABLE(); -}; - -#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: cad436f5-7c97-40a2-8ee9-3748e8f3e56f diff --git a/lib-src/mod-nyq-bench/Readme.txt b/lib-src/mod-nyq-bench/Readme.txt deleted file mode 100644 index bb6b75768..000000000 --- a/lib-src/mod-nyq-bench/Readme.txt +++ /dev/null @@ -1,19 +0,0 @@ -THIS MODULE IS OBSOLETE. - -As of Audacity 2.3.2, this module is no longer maintained. -The instructions below are very old and probably incorrect. -For more information see: -https://wiki.audacityteam.org/wiki/Proposal_Nyquist_IDE - -Notes from original developer: - -Two things first... - -1) This is only an example of a dynamic module. The interfaces - it uses WILL change in the future. -2) The NyqBench effect is just my (Leland Lucius) hairbrained idea and it - may not produce desired results. - -For Mac and Linux user, you must change the AUDACITY_DIR variable -at the top of your Makefile to point to the base of the Audacity -source directory. diff --git a/lib-src/mod-nyq-bench/images/document-new-large.xpm b/lib-src/mod-nyq-bench/images/document-new-large.xpm deleted file mode 100644 index 2f05909f4..000000000 --- a/lib-src/mod-nyq-bench/images/document-new-large.xpm +++ /dev/null @@ -1,214 +0,0 @@ -/* XPM */ -static const char *document_new_large[] = { -/* columns rows colors chars-per-pixel */ -"32 32 176 2", -" c gray20", -". c #4C4C4C", -"X c #4E4E4E", -"o c #505050", -"O c #515151", -"+ c gray32", -"@ c #535353", -"# c gray33", -"$ c gray34", -"% c #5D5C51", -"& c #585858", -"* c #5A5A5A", -"= c gray37", -"- c gray38", -"; c #646464", -": c #686868", -"> c gray42", -", c gray43", -"< c #727272", -"1 c gray46", -"2 c gray47", -"3 c #7B7B7B", -"4 c #7E7E7E", -"5 c #918D3C", -"6 c #ADA83D", -"7 c #AFAA3F", -"8 c #B6B032", -"9 c #BCB635", -"0 c #C2BB2B", -"q c #FFF315", -"w c #FFF316", -"e c #FFF414", -"r c #FFF417", -"t c #FFF41A", -"y c #FFF41C", -"u c #FFF41F", -"i c #D7CF2A", -"p c #D8D02B", -"a c #FFF52D", -"s c #EEE532", -"d c #FCF237", -"f c #FDF338", -"g c #FEF439", -"h c #FEF43A", -"j c #95925B", -"k c #A19D4D", -"l c #AAA540", -"z c #ABA644", -"x c #84836C", -"c c #FCF340", -"v c #FDF441", -"b c #F9F14C", -"n c #FAF24C", -"m c #F1EA52", -"M c #F6EF5E", -"N c #F8F056", -"B c #F9F157", -"V c #F7F05E", -"C c #FDF55B", -"Z c #FEF65C", -"A c #FDF65E", -"S c #FDF65F", -"D c #FEF75F", -"F c #F2EC66", -"G c #F4ED66", -"H c #F9F260", -"J c #FEF760", -"K c #FDF665", -"L c #FDF666", -"P c #F7F068", -"I c #F4EE70", -"U c #F6F072", -"Y c #F7F173", -"T c #FDF771", -"R c #FDF77A", -"E c #818181", -"W c gray51", -"Q c #848484", -"! c #868686", -"~ c gray53", -"^ c #898989", -"/ c gray54", -"( c #8D8D8D", -") c gray56", -"_ c #909090", -"` c gray57", -"' c #939393", -"] c gray58", -"[ c #979797", -"{ c #989898", -"} c #9A9A9A", -"| c #9B9B9B", -" . c #9D9D9D", -".. c #9F9F9F", -"X. c #B1B1B1", -"o. c #B2B2B2", -"O. c #F2ED82", -"+. c #F3EE83", -"@. c #F0EB89", -"#. c #F1EC8A", -"$. c #F2ED8B", -"%. c #F4EF8D", -"&. c #F5F085", -"*. c #FDF787", -"=. c #F5F08E", -"-. c #FEF888", -";. c #FFF988", -":. c #FFF989", -">. c #EEEA99", -",. c #F1ED9C", -"<. c #F3EF9E", -"1. c #FCF795", -"2. c #FDF896", -"3. c #F1EEAD", -"4. c #FEF9A3", -"5. c #FEF9A4", -"6. c #FFFAA4", -"7. c #EAE7B0", -"8. c #EDEAB3", -"9. c #EBE9B9", -"0. c #EDEBBB", -"q. c #F0EDB6", -"w. c #F1EEB7", -"e. c #F2EFB8", -"r. c #F2F0BE", -"t. c #FCF9B9", -"y. c gray86", -"u. c gainsboro", -"i. c #DDDDDD", -"p. c gray87", -"a. c #DFDFDF", -"s. c #E7E5C7", -"d. c #EDEBCD", -"f. c #F1F0C4", -"g. c #E4E4DD", -"h. c #EEEDD8", -"j. c #EEEDDA", -"k. c #F0EFDA", -"l. c #FAF9D7", -"z. c #FEFCD5", -"x. c #FEFCD6", -"c. c gray88", -"v. c #E1E1E1", -"b. c #E2E2E2", -"n. c gray89", -"m. c #E4E4E4", -"M. c gray90", -"N. c #E6E6E6", -"B. c #E7E7E7", -"V. c #EBEBE4", -"C. c gray91", -"Z. c #E9E9E9", -"A. c #EAEAEA", -"S. c gray92", -"D. c #EEEEEB", -"F. c #ECECEC", -"G. c gray93", -"H. c #EEEEEE", -"J. c #EFEFEF", -"K. c #FBFAE3", -"L. c gray94", -"P. c #F1F1F1", -"I. c gray95", -"U. c #F3F3F3", -"Y. c #F4F4F4", -"T. c gray96", -"R. c #F6F6F6", -"E. c gray97", -"W. c #F8F8F8", -"Q. c #F9F9F9", -"!. c gray98", -"~. c #FBFBFB", -"^. c gray99", -"/. c #FDFDFD", -"(. c #FEFEFE", -"). c None", -/* pixels */ -").).).).).).).).).).).).).).).).).).).).).).).).).).).).).).).).", -").).).).).).).).).).).).).).).).).).).).).).).).).).).).).).).).", -").).).).).| | . . .| | ] ) ) ^ Q E 3 3 x j k z z 6 6 0 ).).).).", -").).).).| (.(.(.!.(.(.(.(.(.!.(.(.(.(.K.t.2.R L Z Z L 9 ).).).).", -").).).).` (.p.p.y.N.c.c.c.N.c.c.c.N.g.7.@.G b d h v h p w ).).).", -").).).).` (.p.p.y.N.c.c.c.c.N.N.N.c.s.>.I b h S T T D s y e ).).", -").).).).` (.c.c.p.N.c.N.N.N.c.N.N.N.9.@.M d S *.5.5.:.m y t ).).", -").).).).) (.c.c.p.N.N.c.N.c.N.N.N.N.8.O.N c T 5.x.x.5.F a t ).).", -").).).).) !.c.c.c.A.N.c.N.N.N.A.B.B.8.+.N v T 4.x.x.5.F a t ).).", -").).).).^ (.c.c.c.A.N.N.N.N.N.N.B.V.0.#.V d S ;.5.5.:.m y t ).).", -").).).).^ (.N.c.p.A.N.N.N.N.N.A.A.Z.d.,.U n v S T T J s y e ).).", -").).).).Q (.c.X.c.A.N.N.N.A.A.A.A.A.V.w.%.P n g c v h i e ).).).", -").).).).E (.N.N.c.F.N.A.N.A.A.A.A.F.F.j.3.%.Y V B B L 8 ).).).).", -").).).).3 (.c.N.c.F.N.A.A.A.A.F.A.F.F.F.k.w.<.=.&.+.1.5 ).).).).", -").).).).3 (.c.N.c.F.A.N.A.A.A.F.F.F.J.J.F.J.k.f.r.r.l.% ).).).).", -").).).).3 !.N.N.N.F.A.A.A.A.F.F.F.J.J.J.J.J.J.J.J.D.!.@ ).).).).", -").).).).1 (.N.N.N.F.A.A.F.F.F.F.J.J.L.L.L.L.L.L.L.L.W.O ).).).).", -").).).).< !.N.A.c.F.A.A.F.F.P.P.L.L.L.P.P.I.I.P.P.P.W.o ).).).).", -").).).)., !.N.N.N.F.F.F.F.F.P.F.P.P.P.I.I.Y.I.I.I.I.W.X ).).).).", -").).).).: !.N.A.N.P.F.F.F.F.F.P.P.I.I.I.I.Y.T.Y.I.Y.W.. ).).).).", -").).).).: (.N.X.N.F.F.F.F.F.P.P.P.I.I.T.Y.T.T.T.T.I.!.. ).).).).", -").).).).- !.N.F.N.F.F.F.P.F.P.P.I.I.Y.T.T.R.R.R.T.T.R.. ).).).).", -").).).).- !.N.A.N.P.F.F.F.P.P.P.Y.Y.T.R.R.R.R.R.T.T.R.. ).).).).", -").).).).= !.A.N.N.P.F.F.P.F.P.T.I.T.T.R.R.!.!.R.R.T.!.. ).).).).", -").).).).= !.N.A.N.F.F.F.F.P.P.P.T.I.T.T.R.!.!.!.!.T.R.. ).).).).", -").).).).$ !.N.A.N.P.F.F.F.P.P.P.I.T.T.!.!.!.R.R.R.T.!.. ).).).).", -").).).).O !.N.A.N.F.F.F.P.P.P.P.I.T.T.R.T.!.R.!.!.T.!.. ).).).).", -").).).).O !.N.A.N.P.F.F.F.P.P.P.I.T.T.R.R.T.!.R.T.T.R.. ).).).).", -").).).).$ R.T.!.P.!.T.T.T.T.T.T.R.R.R.!.T.R.!.T.R.R.R.@ ).).).).", -").).).).).$ & & $ * * * * * * * * & & & & * & & * & * ).).).).", -").).).).).).).).).).).).).).).).).).).).).).).).).).).).).).).).", -").).).).).).).).).).).).).).).).).).).).).).).).).).).).).).).)." -}; diff --git a/lib-src/mod-nyq-bench/images/document-new-small.xpm b/lib-src/mod-nyq-bench/images/document-new-small.xpm deleted file mode 100644 index ece0a51cd..000000000 --- a/lib-src/mod-nyq-bench/images/document-new-small.xpm +++ /dev/null @@ -1,81 +0,0 @@ -/* XPM */ -static const char *document_new_small[] = { -/* columns rows colors chars-per-pixel */ -"16 16 59 1", -" c #F9EF1E", -". c #F6EC24", -"X c #FAEF22", -"o c #F4EB28", -"O c #FAF022", -"+ c #EDE436", -"@ c #FCF43A", -"# c #FBF23C", -"$ c #8C8C7C", -"% c #969677", -"& c #9F9F72", -"* c #AFAE6A", -"= c #F7EF46", -"- c #FCF343", -"; c #FDF440", -": c #FBF345", -"> c #FBF346", -", c #FAF24D", -"< c #FAF24E", -"1 c #F7EF5D", -"2 c #F8F163", -"3 c #F8F167", -"4 c #FDF667", -"5 c #F7F069", -"6 c #F7F06A", -"7 c #FDF668", -"8 c #FDF56B", -"9 c #FDF66A", -"0 c #FDF66E", -"q c #FDF771", -"w c #FDF772", -"e c #818181", -"r c gray62", -"t c #F4EF96", -"y c #F2EE9B", -"u c #F3EF9B", -"i c #F2EE9C", -"p c #F5F092", -"a c #F5F09A", -"s c #F1EEB1", -"d c #F0EDB4", -"f c #F3F0B1", -"g c #FEFAB5", -"h c #FEFAB8", -"j c #FEFABB", -"k c #FEFBBF", -"l c #EFEEE0", -"z c #EEEEE2", -"x c #EAEAEA", -"c c gray92", -"v c #ECECEC", -"b c gray93", -"n c #EEEEEE", -"m c #EFEFEF", -"M c gray94", -"N c #F1F1F1", -"B c gray95", -"V c gray100", -"C c None", -/* pixels */ -"reeeeeeee$&*+CCC", -"eVVVVVVVVy6<=oCC", -"eVvxxxvvd6@78# C", -"eVxxvvvvi<4gh7XC", -"eVxvxvvva<8hk8OC", -"eVxvvvvvd3;ww-.C", -"eVxxvvvvlp2-:2CC", -"eVvvvvvMnzfpu%CC", -"eVvvvvvMnMMMVeCC", -"eVvvvvMvMnMMVeCC", -"eVvvMMMMMBMMVeCC", -"eVvvMvvMMMBBVeCC", -"eVvvvMMMMMMMVeCC", -"eVVVVVVVVVVVVeCC", -"reeeeeeeeeeeerCC", -"CCCCCCCCCCCCCCCC" -}; diff --git a/lib-src/mod-nyq-bench/images/document-open-large.xpm b/lib-src/mod-nyq-bench/images/document-open-large.xpm deleted file mode 100644 index bf1daa9d8..000000000 --- a/lib-src/mod-nyq-bench/images/document-open-large.xpm +++ /dev/null @@ -1,286 +0,0 @@ -/* XPM */ -static const char *document_open_large[] = { -/* columns rows colors chars-per-pixel */ -"32 32 248 2", -" c gray29", -". c #4B4B4B", -"X c gray30", -"o c #4E4E4E", -"O c gray31", -"+ c #505050", -"@ c #515151", -"# c gray32", -"$ c #535353", -"% c #555555", -"& c #585858", -"* c #5A5A5A", -"= c #5B5B5B", -"- c gray36", -"; c #5D5D5D", -": c gray37", -"> c #5F5F5F", -", c #5C6571", -"< c #606060", -"1 c gray38", -"2 c #626262", -"3 c #646464", -"4 c gray40", -"5 c #676767", -"6 c #686868", -"7 c DimGray", -"8 c #6A6A6A", -"9 c #6C6C6C", -"0 c gray43", -"q c #6F6F6F", -"w c #717171", -"e c #727272", -"r c #747474", -"t c #767676", -"y c #777777", -"u c #797979", -"i c gray49", -"p c #7E7E7E", -"a c #7F7F7F", -"s c #3F6089", -"d c #326098", -"f c #3665A2", -"g c #3665A3", -"h c #3465A4", -"j c #3565A4", -"k c #3566A4", -"l c #3666A5", -"z c #3667A5", -"x c #3766A6", -"c c #3769A6", -"v c #3769A7", -"b c #376AA7", -"n c #3D6AA2", -"m c #3A69A5", -"M c #3969A6", -"N c #3868A7", -"B c #3969A7", -"V c #3B6CA8", -"C c #3D6DAA", -"Z c #3C6EAA", -"A c #4D6686", -"S c #436692", -"D c #406EA6", -"F c #4C75AA", -"G c #4E7AB1", -"H c #537DB0", -"J c #5782B8", -"K c #5483BA", -"L c #5986BC", -"P c #6082AD", -"I c #768EAE", -"U c #638CBD", -"Y c #648DBE", -"T c #5C8DC3", -"R c #6D92C0", -"E c #6093CA", -"W c #6194C9", -"Q c #6094CA", -"! c #6194CA", -"~ c #6195CA", -"^ c #6295CA", -"/ c #6697CB", -"( c #6698CB", -") c #6798CB", -"_ c #6798CC", -"` c #6898CC", -"' c #6B9ACD", -"] c #6A9BCD", -"[ c #6B9BCD", -"{ c #6C9ACD", -"} c #6C9BCD", -"| c #6D9BCD", -" . c #6D9CCD", -".. c #739BC9", -"X. c #779DCA", -"o. c #709ECE", -"O. c #719ECE", -"+. c #729FCF", -"@. c #739FCF", -"#. c #73A0CF", -"$. c #77A0CD", -"%. c #74A1CF", -"&. c #7FA1CA", -"*. c #7DA3CF", -"=. c #74A0D0", -"-. c #74A1D0", -";. c #75A1D0", -":. c #75A1D1", -">. c #76A2D0", -",. c #77A2D1", -"<. c #77A3D1", -"1. c #78A3D1", -"2. c #79A4D1", -"3. c #7AA4D2", -"4. c #7AA5D2", -"5. c #7BA5D2", -"6. c #7BA6D2", -"7. c #7CA6D2", -"8. c #7DA6D3", -"9. c #7DA7D3", -"0. c #7EA7D3", -"q. c #7FA8D3", -"w. c #7FA8D4", -"e. c #818181", -"r. c gray52", -"t. c #868686", -"y. c #898989", -"u. c gray54", -"i. c #8B8B8B", -"p. c #8D8D8D", -"a. c gray56", -"s. c #909090", -"d. c #929292", -"f. c #939393", -"g. c gray58", -"h. c #9B9B9B", -"j. c #8898AD", -"k. c #98A1AD", -"l. c #8FA3BC", -"z. c #A0A0A0", -"x. c gray63", -"c. c #A2A2A2", -"v. c gray64", -"b. c #A4A4A4", -"n. c gray65", -"m. c #A7A7A7", -"M. c gray66", -"N. c #A9A9A9", -"B. c gray67", -"V. c #ACACAC", -"C. c gray68", -"Z. c #AEAEAE", -"A. c #AFAFAF", -"S. c gray69", -"D. c #B1B1B1", -"F. c gray70", -"G. c #B3B5B7", -"H. c #B4B4B4", -"J. c #B6B6B6", -"K. c #B7B7B7", -"L. c gray72", -"P. c #B9B9B9", -"I. c gray73", -"U. c #BBBBBB", -"Y. c #BCBCBC", -"T. c gray74", -"R. c gray", -"E. c gray75", -"W. c #80A8D4", -"Q. c #80A9D4", -"!. c #81A9D4", -"~. c #81AAD4", -"^. c #82AAD4", -"/. c #83AAD5", -"(. c #82ABD5", -"). c #83ABD5", -"_. c #84ABD5", -"`. c #86ACD6", -"'. c #8AAAD1", -"]. c #88AED6", -"[. c #8FAFD4", -"{. c #8BB1D7", -"}. c #8EB2D9", -"|. c #8FB2D9", -" X c #90B3D9", -".X c #96B6D9", -"XX c #96B7DC", -"oX c #9BB9DA", -"OX c #9BBBDD", -"+X c #9DBCDE", -"@X c #AEB7C2", -"#X c #A1BFDF", -"$X c #A5C1DF", -"%X c #A3C0E0", -"&X c #A9C5E2", -"*X c #B1CAE4", -"=X c #BBCFE6", -"-X c #C0C0C0", -";X c #C1C1C1", -":X c gray76", -">X c #C3C3C3", -",X c #C3C3C4", -"X;X2X;X2X;XF.5 FXFXFX", -"FXFXc.F.m.m.: jXL.A.c.c.z.c.z.z.c.z.z.c.c.m.L.U.L.L.Y.t.FXFXFXFX", -"FXFXp.c.d.t.e aXA.M.M.A.V.V.A.A.A.A.A.A.A.A.S.S.F.F.A.: FXFXFXFX", -"FXFXe.L.c.e ;XG.h h h h h h h h h h h h h h h h h h h h h h h h ", -"FXFXe m.i.# yXk.H fXfXfXgXgXgXgXdXdXgXgXgXgXgXfXdXdXdXdXdXdX=Xc ", -"FXFX5 Y.i.u 7Xj.Y *X^.`.`.^.`.^.(.(.W._.W.(.(.W.W.W.W.W.W.OX'.c ", -"FXFX* M.7 K.L.I '.#X^.^.^.`.^.^.^.^.^.^.W.q.^.W.w.W.q.w.8.#XU FX", -"FXFX: H.5 ;XU.P [.OX_.W.(.(.W.W.^.w.W.W.W.W.w.q.9.9.8.9.#.&XC FX", -"FXFX< z.% 2X-XF oX{.W.W.^.W.W.W.q.q.q.q.8.8.w.9.9.9.1.@.9..Xh FX", -"FXFX< b.O 9X>Xm $XW.W.w.q.q.W.q.9.9.9.9.8.8.6.6.6.:.o.@.].X.b FX", -"FXFX< d. wX@XG +Xq.q.9.9.q.8.8.9.9.6.9.6.6.<.:.o.@.@.@. XJ FXFX", -"FXFX= a.O 6Xl.U Xq.q.9.8.9.1.1.$.:.:.:.$.@.@.o.o.@.o.@. Xb FXFX", -"FXFXFXa O s .._.6.:.:.@.@.o.@.@.@.@.@.@.@.@.@.:.o.:.1.$.v FXFX", -"FXFXFXt i.e n 5.1.o.#.o.@.o.o.o.o.o.o.o. .@. .@.o.o.o.6.L x FXFX", -"FXFXFX7 i , D 1. . . . .} } } } } } } } ] ] .] ' } } :.C FXFXFX", -"FXFXFX: i S K ' / ` ` _ _ _ / _ ) / ) ) / / / / / / ' T h FXFXFX", -"FXFXFX# A m ^ ^ ^ / ^ ^ ^ ^ / ^ ^ ^ ^ / ^ ^ E ^ E E ^ C FXFXFXFX", -"FXFXFX h h h h f f f h h h f f h h x f h d h h h h h d FXFXFXFX", -"FXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFX", -"FXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFX", -"FXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFX", -"FXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFX", -"FXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFX" -}; diff --git a/lib-src/mod-nyq-bench/images/document-open-small.xpm b/lib-src/mod-nyq-bench/images/document-open-small.xpm deleted file mode 100644 index 2c0a68686..000000000 --- a/lib-src/mod-nyq-bench/images/document-open-small.xpm +++ /dev/null @@ -1,91 +0,0 @@ -/* XPM */ -static const char *document_open_small[] = { -/* columns rows colors chars-per-pixel */ -"16 16 69 1", -" c #555753", -". c #595B57", -"X c #5D5F5B", -"o c #61635F", -"O c #455D79", -"+ c #636561", -"@ c #676965", -"# c #6A6C68", -"$ c #6D6F6B", -"% c #3F6086", -"& c #3E6089", -"* c #3465A4", -"= c #436B9D", -"- c #537196", -"; c #58769B", -": c #617A9A", -"> c #6395CC", -", c #6496CC", -"< c #6597CC", -"1 c #6598CD", -"2 c #6698CC", -"3 c #6898CD", -"4 c #6899CD", -"5 c #6999CD", -"6 c #6A9ACD", -"7 c #6B9ACD", -"8 c #6B9BCD", -"9 c #6A9ACE", -"0 c #6C9BCE", -"q c #6D9CCE", -"w c #6E9CCE", -"e c #6E9DCE", -"r c #709DCF", -"t c #709ECE", -"y c #729FCF", -"u c #76A2D0", -"i c #7CA6D2", -"p c #969795", -"a c #969992", -"s c #9A9C98", -"d c gray65", -"f c #A7A9A4", -"g c #A9ABA9", -"h c #C0C0BF", -"j c #81A9D4", -"k c #85ACD5", -"l c #88AED6", -"z c #89AED6", -"x c #89AFD7", -"c c #8AAFD7", -"v c #8BB0D7", -"b c #8CB1D8", -"n c #94B6DB", -"m c #9BBBDD", -"M c #9ABADE", -"N c #9CBBDD", -"B c #A6C2E0", -"V c #ADC7E3", -"C c #AEC7E3", -"Z c #BED2E8", -"A c #C6C6C5", -"S c gray79", -"D c #CCCCCA", -"F c #CECECE", -"G c #D8D8D7", -"H c #C6D8EB", -"J c #F5F5F4", -"K c gray100", -"L c None", -/* pixels */ -"L$$$$$@@LLLLLLLL", -"$FFFFFFA+LLLLLLL", -"#hppsfffffffffaL", -"@SddfKKKKKKKKKfL", -"ohppfKJJJJJJJKfL", -"XSddfKJDDDDDJKfL", -"XhppfKJJJJJJJKfL", -".SddfKJDDDGJJKfL", -" h:************=", -" S*HZZZHZZZZZZH*", -" h*CllbbbbbbblB*", -" S*CbbbllkjiuyN*", -" h;Nyqqqq0q555n*", -" gv50555211>>M-O", -"&*************%L", -"LLLLLLLLLLLLLLLL" -}; diff --git a/lib-src/mod-nyq-bench/images/document-save-as-large.xpm b/lib-src/mod-nyq-bench/images/document-save-as-large.xpm deleted file mode 100644 index da9c7d4e8..000000000 --- a/lib-src/mod-nyq-bench/images/document-save-as-large.xpm +++ /dev/null @@ -1,121 +0,0 @@ -/* XPM */ -static const char *document_save_as_large[] = { -/* columns rows colors chars-per-pixel */ -"32 32 83 1", -" c black", -". c #535353", -"X c #5B5B5B", -"o c #4D5766", -"O c #656565", -"+ c DimGray", -"@ c #7D7D7D", -"# c #1F4A87", -"$ c #1F4C8A", -"% c #284E83", -"& c #214C89", -"* c #2C558E", -"= c #325A92", -"- c #395E94", -"; c #3C6093", -": c #3B6298", -"> c #3364A4", -", c #3969A7", -"< c #3D6CA9", -"1 c #42679A", -"2 c #426A9E", -"3 c #486A9B", -"4 c #58769F", -"5 c #466DA1", -"6 c #416FAA", -"7 c #4C71A4", -"8 c #4370AB", -"9 c #4A76AE", -"0 c #5377A7", -"q c #5A78A3", -"w c #557AAC", -"e c #5A7CAB", -"r c #4E79B0", -"t c #5B80AF", -"y c #5B82B5", -"u c #5F85B8", -"i c #6C87AC", -"p c #6F89AD", -"a c #6284B2", -"s c #6A8BB6", -"d c #6187B8", -"f c #6489BA", -"g c #6A8EBD", -"h c #6E91BF", -"j c #7E93B1", -"k c #7293BF", -"l c #7596C2", -"z c #7C9BC3", -"x c #818181", -"c c gray58", -"v c #9E9E9E", -"b c #869BB9", -"n c #A7A7A7", -"m c #ACACAC", -"M c #A2ABB8", -"N c #AEB4BD", -"B c #B1B1B1", -"V c #B0B5BB", -"C c #BCBCBC", -"Z c #809FC6", -"A c #84A1C7", -"S c #84A2C8", -"D c #8AA6CB", -"F c #8DA9CC", -"G c #9CADC3", -"H c #92ACCE", -"J c #96AFD0", -"K c #97B0D0", -"L c #99B2D1", -"P c #A2B0C2", -"I c #AFBCCE", -"U c #BABFC6", -"Y c #BBC3CE", -"T c #C4C4C5", -"R c #CCCCCC", -"E c #CBCED2", -"W c #D4D4D4", -"Q c #DBDCDC", -"! c #E4E4E4", -"~ c #EAEAEA", -"^ c #F2F2F2", -"/ c #FDFDFD", -"( c None", -/* pixels */ -"((((((((((((((((((((((((((((((((", -"(((((((((&&&&&((((((((((((((((((", -"(((((((&*tkDAs-$((((((((((((((((", -"((((((#0DFHHJLKs&(((((((((((((((", -"(((((#ee15aFJFDJz&((((((((((((((", -"(((((=*&(($=AFAAFs&(((((((((((((", -"((((&&((((((=FzzzH=(((((((((((((", -"((((#((((((($gAllAy&((((((((((((", -"((((((.XXXXXo1Dkklz%XXXXX.((((((", -"(((((.B/////^=DgggD*^^^^^c((((((", -"(((((.^I####&&DfddK&&&&#iQ.(((((", -"(((((c/!G-zASDFuyyHLLLa3Q~x(((((", -"((((.!~!!b:zfyyyyr8,hs=EW!T.((((", -"((((O/!!!!i2zy96>>>yk*YQQQ~X((((", -"(((.C~!!!!Qq,g,>>>rZ*PQQQW!v((((", -"(((.^!!!!!QQ35k,>6Z:jQWQQQQQ.(((", -"(((c^Q~QQQQWE-wk c #41749A", -", c #44789F", -"< c #547D9B", -"1 c #6B7F88", -"2 c #5186AF", -"3 c #5892BD", -"4 c #688BA0", -"5 c #6E99B6", -"6 c #7798B0", -"7 c #719FBF", -"8 c #739FC0", -"9 c #79A7CA", -"0 c #92A6AC", -"q c #95A9AF", -"w c #9AAEB4", -"e c #A2A4A1", -"r c #A3A4A1", -"t c #AEB0AD", -"y c #AFB0AD", -"u c #AEB0AE", -"i c #AFB0AE", -"p c #B7B8B6", -"a c #C5CBBF", -"s c #8FB3CE", -"d c #92B7D3", -"f c #96BBD8", -"g c #9EBFD9", -"h c #98BFDC", -"j c #ACBCC3", -"k c #9BC2DF", -"l c #ABC8DF", -"z c #ABCBE2", -"x c #ACCBE3", -"c c #B1CEE6", -"v c #CACFC4", -"b c #CED4C8", -"n c #C9D6DD", -"m c #DCDBDB", -"M c #DBDCDB", -"N c #DCDCDB", -"B c #DCDBDC", -"V c #DBDCDC", -"C c gainsboro", -"Z c #DDE1D6", -"A c #DFE2DE", -"S c #E2E6DD", -"D c #C1D9EB", -"F c #C5DBEC", -"G c #D5DFE5", -"H c #D0DFEF", -"J c gray89", -"K c #E4E4E4", -"L c #E9E9EA", -"P c #EAE9EA", -"I c #EBECEC", -"U c #ECECEC", -"Y c gray93", -"T c #EDEEED", -"R c #EDEDEE", -"E c #EDEEEE", -"W c #EEEEEE", -"Q c #EEEFEE", -"! c #EEEEEF", -"~ c #EFEEEF", -"^ c #EFEFEF", -"/ c gray94", -"( c #F1F1F1", -") c gray95", -"_ c #F3F3F3", -"` c #F3F4F3", -"' c #F4F4F4", -"] c gray97", -"[ c #F9F9F9", -"{ c gray98", -"} c #FCFBFC", -"| c gray99", -" . c #FDFDFD", -".. c gray100", -"X. c None", -/* pixels */ -"X.X.X.$ $ $ % . X X.X.X.X.X.X.X.", -"X.X.X.c H F k 4 ; X.X.X.X.X.X.X.", -"1 @ # - > , g D 2 . o o o o o o ", -"O S ..Z n 5 $ x d 2 V .....' o ", -"+ ..W W A 6 $ 9 s * j W W W ` o ", -"o { I $ $ $ $ 9 3 $ $ $ $ I _ o ", -"o { L v $ h 7 7 7 7 f $ q L _ o ", -"o { { J a $ h 7 7 l $ 0 J _ _ o ", -"o { W { K a $ x h * 0 J { W _ o ", -"o ' J W { { b = $ w { ..W J W o ", -"o r r r r r r r r r r r r r r o ", -"o C m N C B V B B V V M m m o ", -"o ! i y y y y y y y W W W ! o ", -"o ..p p p p p p p p .. ......o ", -"o .................... ......o ", -"o o o o o o o o o o o o o o o o " -}; diff --git a/lib-src/mod-nyq-bench/images/document-save-large.xpm b/lib-src/mod-nyq-bench/images/document-save-large.xpm deleted file mode 100644 index 1c2a6e3ff..000000000 --- a/lib-src/mod-nyq-bench/images/document-save-large.xpm +++ /dev/null @@ -1,122 +0,0 @@ -/* XPM */ -static const char *document_save_large[] = { -/* columns rows colors chars-per-pixel */ -"32 32 84 1", -" c #535353", -". c #5B5B5B", -"X c #4D5766", -"o c #656565", -"O c DimGray", -"+ c #7F7F7F", -"@ c #1F4A87", -"# c #1F4C8A", -"$ c #284E83", -"% c #214C89", -"& c #2C558E", -"* c #325A92", -"= c #395E94", -"- c #3C6093", -"; c #3B6298", -": c #3364A4", -"> c #3969A7", -", c #3D6CA9", -"< c #42679A", -"1 c #426A9E", -"2 c #486A9B", -"3 c #58769F", -"4 c #466DA1", -"5 c #416FAA", -"6 c #4C71A4", -"7 c #4370AB", -"8 c #4A76AE", -"9 c #5377A7", -"0 c #5A78A3", -"q c #557AAC", -"w c #5A7CAB", -"e c #4E79B0", -"r c #5B80AF", -"t c #5B82B5", -"y c #5F85B8", -"u c #6C87AC", -"i c #6F89AD", -"p c #6284B2", -"a c #6A8BB6", -"s c #6187B8", -"d c #6489BA", -"f c #6A8EBD", -"g c #6E91BF", -"h c #7E93B1", -"j c #7293BF", -"k c #7596C2", -"l c #7C9BC3", -"z c #868686", -"x c #8D8D8D", -"c c #939393", -"v c #9C9C9C", -"b c #869BB9", -"n c #A4A4A4", -"m c #ACACAC", -"M c #A2ABB8", -"N c #AEB4BD", -"B c #B4B4B4", -"V c #B0B5BB", -"C c #BBBBBB", -"Z c #809FC6", -"A c #84A1C7", -"S c #84A2C8", -"D c #8AA6CB", -"F c #8DA9CC", -"G c #9CADC3", -"H c #92ACCE", -"J c #96AFD0", -"K c #97B0D0", -"L c #99B2D1", -"P c #A2B0C2", -"I c #AFBCCE", -"U c #BABFC6", -"Y c #BBC3CE", -"T c #C3C3C3", -"R c #CCCCCC", -"E c #CBCED2", -"W c #CDD0D5", -"Q c #D4D4D4", -"! c #DBDBDB", -"~ c #E3E3E3", -"^ c #EAEAEA", -"/ c #F4F4F4", -"( c #FCFCFC", -") c None", -/* pixels */ -"))))))))))))))))))))))))))))))))", -")))))))))@%%%%))))))))))))))))))", -")))))))%&rkDSa=#))))))))))))))))", -"))))))@9DDHJJLKa%)))))))))))))))", -")))))@ww<4pFJFFKl%))))))))))))))", -")))))*&%))@*SFSlFa%)))))))))))))", -"))))%%))))))*FlllH*)))))))))))))", -"))))@)))))))@fSkkSr@))))))))))))", -")))))) ...oXfa*EQ~T ))))", -"))))O(~~^~u;lt85:::yj&Y!Q!^.))))", -"))) C^~~~~~04f>:::el*P!!!!~n))))", -"))) /~~~~~!!14g>:,S;h!Q!!!!! )))", -")))c/!^~!!QQE=qj,l60RQRQQ!Q~+)))", -")) Q^!~!QQQQQU&rDq-TRRRQ!!Q!C ))", -"))O/!QQ~~QQQRTN&6&NTTRRQ!RQQ~o))", -"))C^!!!Q!~!QQRRM#MTRQQ!QRRQQ!v))", -") ^~(^Q!QQQ!!!!!W!!!QQRQQQ~/!Q )", -") /!!Q!!!!!!!!QQQQQQQQ!QQQ!QQ^ )", -") /!~~~!~!~!!!!!!!!!!!Q!QQQQQQ )", -") ^CCBCCBBBBmBBmmmmnmnnnnnnvvC )", -") ^CCzxxvvnnmmmmmmvTcTcTcTcCnC )", -") ^CBzxcvvnnmmmmmmcTcTcTcCxCvB )", -") ^CCxxxvvnnmmmmmnvTcTcTcTxTvB )", -") ~CBCBCBmBmmmmmmmvTcTcTxCcCnm )", -") T~~!!!!QQQQRRRTRTTCCCCBBBBmc )", -")) ))", -"))))))))))))))))))))))))))))))))", -"))))))))))))))))))))))))))))))))" -}; diff --git a/lib-src/mod-nyq-bench/images/document-save-small.xpm b/lib-src/mod-nyq-bench/images/document-save-small.xpm deleted file mode 100644 index d01e95c76..000000000 --- a/lib-src/mod-nyq-bench/images/document-save-small.xpm +++ /dev/null @@ -1,129 +0,0 @@ -/* XPM */ -static const char *document_save_small[] = { -/* columns rows colors chars-per-pixel */ -"16 16 107 2", -" c #4E6A7D", -". c #58787A", -"X c #6E706B", -"o c #6B716E", -"O c #72756B", -"+ c #667173", -"@ c #627075", -"# c #38678B", -"$ c #3D698A", -"% c #3B6B8F", -"& c #3D6B8E", -"* c #3F6C8E", -"= c #4A6D85", -"- c #436E88", -"; c #4A7180", -": c #41749A", -"> c #44789F", -", c #547D9B", -"< c #6B7F88", -"1 c #5186AF", -"2 c #5892BD", -"3 c #688BA0", -"4 c #6E99B6", -"5 c #7798B0", -"6 c #719FBF", -"7 c #739FC0", -"8 c #79A7CA", -"9 c #9F9F9F", -"0 c #92A6AC", -"q c #95A9AF", -"w c #9AAEB4", -"e c #A8A7A7", -"r c #A8A7A8", -"t c #A9A9A9", -"y c #AAAAA9", -"u c #AFAFAF", -"i c #B4B4B4", -"p c #B7B6B6", -"a c #B9B9B9", -"s c #BCBCBC", -"d c #C5CBBF", -"f c #8FB3CE", -"g c #92B7D3", -"h c #96BBD8", -"j c #9EBFD9", -"k c #98BFDC", -"l c #ACBCC3", -"z c #9BC2DF", -"x c #ABC8DF", -"c c #ABCBE2", -"v c #ACCBE3", -"b c #B1CEE6", -"n c gray76", -"m c #C3C3C3", -"M c gray77", -"N c #C5C5C5", -"B c #CACFC4", -"V c #C8C8C8", -"C c gray79", -"Z c #CACACA", -"A c #CBCBCB", -"S c #CDCDCD", -"D c #CECECE", -"F c gray81", -"G c #CED4C8", -"H c #C9D6DD", -"J c #D0D0D0", -"K c gray82", -"L c #D2D2D2", -"P c #D5D5D5", -"I c gray84", -"U c gainsboro", -"Y c #DDDDDD", -"T c #DDE1D6", -"R c #DFE2DE", -"E c #E2E6DD", -"W c #C1D9EB", -"Q c #C5DBEC", -"! c #D5DFE5", -"~ c #D0DFEF", -"^ c gray89", -"/ c #E4E4E4", -"( c #E9E9EA", -") c #EAE9EA", -"_ c gray92", -"` c #EBECEC", -"' c #ECECEC", -"] c gray93", -"[ c #EDEEED", -"{ c #EDEDEE", -"} c #EDEEEE", -"| c #EEEEEE", -" . c gray94", -".. c #F1F1F1", -"X. c gray95", -"o. c #F3F3F3", -"O. c #F3F4F3", -"+. c #F4F4F4", -"@. c gray97", -"#. c #F9F9F9", -"$. c gray98", -"%. c #FCFBFC", -"&. c gray99", -"*. c #FDFDFD", -"=. c #FEFEFE", -"-. c gray100", -";. c None", -/* pixels */ -";.;.;.# # # $ . ;.;.;.;.;.;.;.", -";.;.;.b ~ Q z 3 - ;.;.;.;.;.;.;.", -"< + @ = : > j W 1 X X X X X X ", -"o E -.T H 4 # v g 1 U &.-.-.+.X ", -"O -.| | R 5 # 8 f & l | | | O.X ", -"X $.` # # # # 8 2 # # # # ` o.X ", -"X $.( B # k 6 6 6 6 h # q ( o.X ", -"X $.$.^ d # k 6 6 x # 0 ^ o.o.X ", -"X $.| $./ d # v k & 0 ^ $.| o.X ", -"X +.^ | $.$.G & # w $.-.| ^ | X ", -"X -.-.-.-.-.-.-.-.+.+.( ( ^ .X ", -"X D C C C C N C C N N N N N I X ", -"X D N 9 u a N V D t L t L a C X ", -"X D m t i n M V A e L e L p C X ", -"X U U U U I I J J D D J J J A X ", -"X X X X X X X X X X X X X X X X " -}; diff --git a/lib-src/mod-nyq-bench/images/edit-clear-large.xpm b/lib-src/mod-nyq-bench/images/edit-clear-large.xpm deleted file mode 100644 index 856ccaf67..000000000 --- a/lib-src/mod-nyq-bench/images/edit-clear-large.xpm +++ /dev/null @@ -1,210 +0,0 @@ -/* XPM */ -static const char *edit_clear_large[] = { -/* columns rows colors chars-per-pixel */ -"32 32 172 2", -" c #6E0200", -". c #720402", -"X c #740A02", -"o c #79130D", -"O c #890802", -"+ c #950300", -"@ c #81110A", -"# c #881610", -"$ c #991C18", -"% c #AA0000", -"& c #B70000", -"* c #BF0000", -"= c #AE1110", -"- c #B21A1A", -"; c #86280B", -": c #8F3C02", -"> c #842411", -", c #BF3130", -"< c #CD1010", -"1 c #C01F1F", -"2 c #D22B2B", -"3 c #E33333", -"4 c #925B03", -"5 c #945E08", -"6 c #934117", -"7 c #974B11", -"8 c #A0590C", -"9 c #966001", -"0 c #976412", -"q c #9E6914", -"w c #9B6A1B", -"e c #BF7B0F", -"r c #A06C19", -"t c #B77A16", -"y c #BF7C10", -"u c #A47221", -"i c #AD7620", -"p c #A07328", -"a c #A7792F", -"s c #AB7C2E", -"d c #DF4545", -"f c #EE4747", -"g c #F44B4B", -"h c #A88900", -"j c #B08F00", -"k c #BA8E00", -"l c #B49400", -"z c #BD9601", -"x c #BF9E00", -"c c #BD8F18", -"v c #BE8E22", -"b c #B08132", -"n c #BA8A3B", -"m c #C39E01", -"M c #C59F09", -"N c #C38219", -"B c #C5A202", -"V c #C9A605", -"C c #CDAD06", -"Z c #C7A60D", -"A c #C9A60B", -"S c #CBAB0C", -"D c #D1B304", -"F c #D5BB05", -"G c #D2B40B", -"H c #C8A510", -"J c #CBAB14", -"K c #C5A11B", -"L c #CDAF1A", -"P c #D7B714", -"I c #D7B913", -"U c #DABC14", -"Y c #D1B41F", -"T c #C58621", -"R c #C1892E", -"E c #C7913C", -"W c #CEAF23", -"Q c #D2B525", -"! c #D4B823", -"~ c #D0B22B", -"^ c #D7BD29", -"/ c #D6BD3B", -"( c #D8BF3E", -") c #DCC10B", -"_ c #DDC413", -"` c #DFC913", -"' c #DBC21B", -"] c #E2C715", -"[ c #E0C31B", -"{ c #E4CB1A", -"} c #E8CF19", -"| c #DEC921", -" . c #DFC828", -".. c #D8C131", -"X. c #DDC830", -"o. c #DAC13B", -"O. c #DDC83A", -"+. c #E2C721", -"@. c #E5CB22", -"#. c #E5CD2A", -"$. c #EDD424", -"%. c #EDD42D", -"&. c #F0D82B", -"*. c #E3CB31", -"=. c #E9CF37", -"-. c #E1CC3C", -";. c #F0D734", -":. c #F3DB35", -">. c #F7DF3C", -",. c #F9E234", -"<. c #FCE43E", -"1. c #BF9551", -"2. c #C29242", -"3. c #C3934D", -"4. c #C49351", -"5. c #D4AF4D", -"6. c #D5BC42", -"7. c #C7A05E", -"8. c #D1A051", -"9. c #D5A75D", -"0. c #D7BF51", -"q. c #CDA76B", -"w. c #D4A962", -"e. c #DCBD71", -"r. c #D1B07A", -"t. c #DCC543", -"y. c #DDC842", -"u. c #DECA55", -"i. c #DFCC5A", -"p. c #E0CC44", -"a. c #E3CE49", -"s. c #E3D145", -"d. c #E8D540", -"f. c #E2D14A", -"g. c #F3DE44", -"h. c #E4D352", -"j. c #EEDD5D", -"k. c #F0DB53", -"l. c #F7E34E", -"z. c #FBE54A", -"x. c #F7E154", -"c. c #FCE650", -"v. c #F3E35A", -"b. c #F9E65F", -"n. c #E5D362", -"m. c #E7D864", -"M. c #EBDB62", -"N. c #E5D56C", -"B. c #ECDC6F", -"V. c #E1CF75", -"C. c #E5D473", -"Z. c #E7D878", -"A. c #F9E564", -"S. c #FCEA65", -"D. c #F1E278", -"F. c #FDEE7A", -"G. c #DBBE8F", -"H. c #DEC192", -"J. c #E1C18D", -"K. c #E9DC85", -"L. c #E3C697", -"P. c #E2C79D", -"I. c #EEE289", -"U. c #F4E583", -"Y. c #FBED8C", -"T. c #EEE294", -"R. c #EEE39C", -"E. c #F4E595", -"W. c #FDF091", -"Q. c #FEF5B4", -"!. c #EEEEEC", -"~. c None", -/* pixels */ -"~.~.~.~.4 4 4 4 ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", -"~.~.~.4 b P.G.1.4 ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", -"~.~.~.4 H.q 0 a s ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", -"~.~.~.4 r.p !.w q.4 ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", -"~.~.~.4 7.w w q L.w ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", -"~.~.~.~.5 H.E e 8.3.4 ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", -"~.~.~.~.~.u J.T N w.9 ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", -"~.~.~.~.~.4 n 9.y E i 9 A B ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", -"~.~.~.~.~.~.4 2.R t c m t.Z ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", -"~.~.~.~.~.~.~.5 v Z W U.E.7 ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", -"~.~.~.~.~.~.~.z H M.W.4.o $ = ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", -"~.~.~.~.~.~.B ^ j.5.> # d f 2 . ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", -"~.~.~.~.~.~.B K : o = 3 g 2 X 7 B ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", -"~.~.~.~.~.~.~.X + < < 1 > o e.W.B.W B ~.~.~.~.~.~.~.~.~.~.~.~.~.", -"~.~.~.~.~.~.~. % & O X 3.Q.F.z.l.D.o.B ~.~.~.~.~.~.~.~.~.~.~.~.", -"~.~.~.~.~.~.~.~. 5 E.Y.F.b.c.,.%.M.i.V ~.~.~.~.~.~.~.~.~.~.~.", -"~.~.~.~.~.~.~.~.~.k h.S.z.S.k.l.:.$.` f.C.Z ~.~.~.~.~.~.~.~.~.~.", -"~.~.~.~.~.~.~.~.~.m a.c.<.g.k.=.:.$.@.F h.K.J ~.~.~.~.~.~.~.~.~.", -"~.~.~.~.~.~.~.~.~.m o.j.:.:.l.*.%.+.{ .D y.T.W ~.~.~.~.~.~.~.~.", -"~.~.~.~.~.~.~.~.~.~.! j.$.&.%.<.P ;.U ` .D O.R.6.B ~.~.~.~.~.~.", -"~.~.~.~.~.~.~.~.~.~.S B.] $.[ ,.+.P *.G _ O.C ..T.C.Z ~.~.~.~.~.", -"~.~.~.~.~.~.~.~.~.~.B m.' } U $.g.V #.! D | s.J Q T.R.Z ~.~.~.~.", -"~.~.~.~.~.~.~.~.~.~.B -.O.) _ U :.-.C d.S F *.f.o.J ~ B ~.~.~.~.", -"~.~.~.~.~.~.~.~.~.~.~.J n.D { S { j.J ' y.V ' I.N.B l ~.~.~.~.~.", -"~.~.~.~.~.~.~.~.~.~.~.B h.t.F ^ G =.f.B s.u.J Q m ~.~.~.~.~.~.~.", -"~.~.~.~.~.~.~.~.~.~.~.~.L C.G -.A ' M./ / i.B l ~.~.~.~.~.~.~.~.", -"~.~.~.~.~.~.~.~.~.~.~.~.x y.V.p.n.A Z.u.m l ~.~.~.~.~.~.~.~.~.~.", -"~.~.~.~.~.~.~.~.~.~.~.~.~.m i.0.t.J m h ~.~.~.~.~.~.~.~.~.~.~.~.", -"~.~.~.~.~.~.~.~.~.~.~.~.~.~.m x h ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", -"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", -"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", -"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~." -}; diff --git a/lib-src/mod-nyq-bench/images/edit-clear-small.xpm b/lib-src/mod-nyq-bench/images/edit-clear-small.xpm deleted file mode 100644 index 26d16a843..000000000 --- a/lib-src/mod-nyq-bench/images/edit-clear-small.xpm +++ /dev/null @@ -1,130 +0,0 @@ -/* XPM */ -static const char *edit_clear_small[] = { -/* columns rows colors chars-per-pixel */ -"16 16 108 2", -" c #7B4A00", -". c #7C4B00", -"X c #AB1B0D", -"o c #A12400", -"O c #A03600", -"+ c #B8381D", -"@ c #804E01", -"# c #845201", -"$ c #865203", -"% c #AD4213", -"& c #876400", -"* c #A6690A", -"= c #A96B0A", -"- c #AB6D0B", -"; c #B2760B", -": c #B2720C", -"> c #BC7A0F", -", c #B06917", -"< c #BB4A28", -"1 c #C17D10", -"2 c #C86D33", -"3 c #9A8500", -"4 c #9C8800", -"5 c #9C8B00", -"6 c #9D8C00", -"7 c #9E8D00", -"8 c #9F8D00", -"9 c #9E8D01", -"0 c #9F8D01", -"q c #9F8E00", -"w c #9F8E01", -"e c #9F8E04", -"r c #9F8F05", -"t c #A18801", -"y c #A08E01", -"u c #A08F01", -"i c #A08F05", -"p c #A19008", -"a c #A29009", -"s c #A59411", -"d c #AB9B1A", -"f c #AE9E1B", -"g c #B1A01D", -"h c #BBA529", -"j c #BEAE32", -"k c #C0B02F", -"l c #C6B530", -"z c #C5B432", -"x c #C6B633", -"c c #C5B536", -"v c #DAC203", -"b c #DBC304", -"n c #DCC407", -"m c #DCC510", -"M c #DCC610", -"N c #DCC615", -"B c #E3CB11", -"V c #E5CD14", -"C c #E7D018", -"Z c #DFCA26", -"A c #EED723", -"S c #F3DB2A", -"D c #F6DE2F", -"F c #FBE437", -"G c #FCE53C", -"H c #FDE63C", -"J c #CDBD41", -"K c #CCBD43", -"L c #CDBE45", -"P c #D7B162", -"I c #CFC149", -"U c #D2C34F", -"Y c #D8C84F", -"T c #D6C856", -"R c #DCCD58", -"E c #DDCF5E", -"W c #EDDA46", -"Q c #E4D249", -"! c #E4D34C", -"~ c #E5D44E", -"^ c #E6D656", -"/ c #E1D35B", -"( c #E7D75B", -") c #E7D85F", -"_ c #FBE544", -"` c #FDE952", -"' c #FDEA5F", -"] c #E2D467", -"[ c #E7D96D", -"{ c #ECDC68", -"} c #E8DA6C", -"| c #F6D861", -" . c #EADC72", -".. c #EBDD77", -"X. c #EBDE77", -"o. c #F3E365", -"O. c #FDEB61", -"+. c #FDEA63", -"@. c #FDEC6B", -"#. c #FDEB6C", -"$. c #FDEC6D", -"%. c #FDEE7D", -"&. c #FBEA84", -"*. c #FDEF84", -"=. c #F8EA88", -"-. c #FBED8B", -";. c #FDEF8A", -":. c None", -/* pixels */ -":.. :.:.:.:.:.:.:.:.:.:.:.:.:.", -" * - :.:.:.:.:.:.:.:.:.:.:.:.", -" : 1 = :.4 :.:.:.:.:.:.:.:.:.", -":.$ > 1 # 3 9 :.:.:.:.:.:.:.:.:.", -":. @ ; t j g :.:.:.:.:.:.:.:.:.", -":.:.& 4 J X., O u :.:.:.:.:.:.:.", -":.:.9 Y { 2 X P .J a 9 :.:.:.:.", -":.:.9 h < + | +.$.%.=.L i 9 :.:.", -":.:.:.o % &.@.*.$.` _ o.X.I f 9 ", -":.:.:.:.j ;.' +.` H S C M Q ] 9 ", -":.:.:.:.a ;.H F D A V b v ^ x 9 ", -":.:.:.:.u E W C B n b v ! R e :.", -":.:.:.:.:.d } M v v N ( T i :.:.", -":.:.:.:.:.u c ) Z ! [ x 9 :.:.:.", -":.:.:.:.:.:.9 U / x a 9 :.:.:.:.", -":.:.:.:.:.:.:.4 9 9 :.:.:.:.:.:." -}; diff --git a/lib-src/mod-nyq-bench/images/edit-copy-large.xpm b/lib-src/mod-nyq-bench/images/edit-copy-large.xpm deleted file mode 100644 index 94e2ce9fc..000000000 --- a/lib-src/mod-nyq-bench/images/edit-copy-large.xpm +++ /dev/null @@ -1,102 +0,0 @@ -/* XPM */ -static const char *edit_copy_large[] = { -/* columns rows colors chars-per-pixel */ -"32 32 64 1", -" c #878985", -". c #868A84", -"X c #878A84", -"o c #878B85", -"O c #888A85", -"+ c #888B85", -"@ c #888B86", -"# c #888D87", -"$ c #898D87", -"% c #898C88", -"& c #898D88", -"* c #898E88", -"= c #8D8E89", -"- c #8D8F8A", -"; c #8C908A", -": c #929590", -"> c #929491", -", c #959794", -"< c #959893", -"1 c #969994", -"2 c #989A97", -"3 c #A2A3A1", -"4 c #B1B1B1", -"5 c #BCBCBC", -"6 c gray74", -"7 c #C0C0C0", -"8 c #C1C1C1", -"9 c gray76", -"0 c #C3C3C3", -"q c gray77", -"w c #C5C5C5", -"e c #C6C6C6", -"r c gray78", -"t c #CDCDCD", -"y c #CECECE", -"u c #D0D0D0", -"i c #E1E2E1", -"p c #E7E7E7", -"a c gray91", -"s c #E9E9E9", -"d c #EAEAEA", -"f c gray92", -"g c #ECECEC", -"h c gray93", -"j c #EEEEEE", -"k c #EFEFEF", -"l c gray94", -"z c #F1F1F1", -"x c gray95", -"c c #F3F3F2", -"v c #F3F3F3", -"b c #F4F4F4", -"n c gray96", -"m c #F6F6F6", -"M c gray97", -"N c #F8F8F8", -"B c #F9F9F9", -"V c gray98", -"C c #FBFBFB", -"Z c gray99", -"A c #FDFDFD", -"S c #FEFEFE", -"D c gray100", -"F c None", -/* pixels */ -"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", -"FF FFFFFFFFFF", -"F DDDDDDDDDDDDDDDDDDDD FFFFFFFFF", -"F DkkkkkkkkjkkkkkkkkkD FFFFFFFFF", -"F DkkkkkjljlkkkkkkkkkD FFFFFFFFF", -"F DkkkkkjjljkkkkkkkkkD FFFFFFFFF", -"F Dkkkkkk,OOOOOOOOOO..OOOOOOOO-F", -"F DkkrrrrODDDDDDDDDDDDDDDDDDDDOF", -"F Dkkkkkk.DkkkkkkkkkkkkkkkkkkD F", -"F Dkkkkkk.DkkkkkkkkkkkkkkkkkkDOF", -"F DkkrrrrODkkkkkkkkkkkkkkkkkkDOF", -"F DkkkkkkODkkkkkkkkkkkkkkkkkkDOF", -"F DkkkkkgODkkrrrrrrrrrrrrrrfkD.F", -"F Dkkr0rqODkkkkkkkkkkkfkfkffkDOF", -"F DkkkffkODkkkkkkkkkkkkfkfffkDOF", -"F DkkfkffODkkrrrrrrrr0rr00fffDOF", -"F Dgkq000ODkkkkkkkkkkffkfffffD F", -"F Dgfffff.DkkkkkkfffffffffffpDOF", -"F DkfffaaODkkrrqrrr000000fpfpDOF", -"F ZffafafODkgkkkffffffffpfppfDOF", -"F NkfaaaaODkkgkffffffffpfppppNOF", -"F NfaafppODgfr0000000000006ppNOF", -"FOmffppppODgfffffffppfpppppfkNOF", -"FOlfpppppODgffffffpfppppppkklDOF", -"F vllllllODfffffafpppppffklmNiOF", -"FF OO ODfafaffaapppfg.**:;1 F", -"FFFFFFFFFONfffaappppafkl.uyyr,$F", -"FFFFFFFFFOmfpppappffklmN$y651*FF", -"FFFFFFFFFOmfaapfpfkkmmND q4>OFFF", -"FFFFFFFFFOlblkkllbmmNDDl 3**FFFF", -"FFFFFFFFF-OOOOOOOOOOOO$ #FFFFFF", -"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" -}; diff --git a/lib-src/mod-nyq-bench/images/edit-copy-small.xpm b/lib-src/mod-nyq-bench/images/edit-copy-small.xpm deleted file mode 100644 index afeb9cc96..000000000 --- a/lib-src/mod-nyq-bench/images/edit-copy-small.xpm +++ /dev/null @@ -1,49 +0,0 @@ -/* XPM */ -static const char *edit_copy_small[] = { -/* columns rows colors chars-per-pixel */ -"16 16 27 1", -" c #888A85", -". c #898B86", -"X c #8A8C87", -"o c #8C8E89", -"O c #8D8F8A", -"+ c #989A95", -"@ c #989A96", -"# c #9A9B97", -"$ c #C3C4C3", -"% c #C7C7C6", -"& c gray83", -"* c #E3E3E2", -"= c #E3E4E2", -"- c #EEEEEE", -"; c #F0F0EF", -": c #F3F3F3", -"> c #F4F4F4", -", c #F6F6F5", -"< c #F7F7F6", -"1 c #F8F8F7", -"2 c #FAFAF9", -"3 c gray98", -"4 c #FBFBFB", -"5 c #FCFCFB", -"6 c #FEFEFD", -"7 c gray100", -"8 c None", -/* pixels */ -"8888888888888888", -"8888888888888888", -"8888888888888888", -"8888# ... . . .O", -"8888X7777777777.", -"8888.7;;;;;;-;7.", -"8888X7;%%%%%%;7 ", -"8888.7;;;;;;;-7 ", -"8888.7;%%%%%;;7.", -"8888.7;;;;;-;2:.", -"8888o7;%%%%%-,$ ", -"8888.7;;;;;OOoo ", -"8888.7;;;;2+2,=.", -"8888.2;;;22+2* .", -"8888.><,54&+*.88", -"8888o. 888" -}; diff --git a/lib-src/mod-nyq-bench/images/edit-cut-large.xpm b/lib-src/mod-nyq-bench/images/edit-cut-large.xpm deleted file mode 100644 index 75e550ad4..000000000 --- a/lib-src/mod-nyq-bench/images/edit-cut-large.xpm +++ /dev/null @@ -1,258 +0,0 @@ -/* XPM */ -static const char *edit_cut_large[] = { -/* columns rows colors chars-per-pixel */ -"32 32 220 2", -" c #930202", -". c #950202", -"X c #900404", -"o c #930404", -"O c #9A0C00", -"+ c #9B0C02", -"@ c #9D0C01", -"# c #9D0D01", -"$ c #9E0E02", -"% c #9E0E03", -"& c #9F0F03", -"* c #9D1207", -"= c #9D160A", -"- c #9A1910", -"; c #A50101", -": c #A60101", -"> c #A50201", -", c #A50202", -"< c #A60202", -"1 c #A70202", -"2 c #A70302", -"3 c #A60303", -"4 c #A70303", -"5 c #A60404", -"6 c #A60505", -"7 c #A70505", -"8 c #A70704", -"9 c #A70606", -"0 c #A80303", -"q c #A80404", -"w c #A90404", -"e c #A90505", -"r c #AA0505", -"t c #AB0505", -"y c #A90705", -"u c #A90606", -"i c #AA0606", -"p c #AB0606", -"a c #AB0707", -"s c #AC0707", -"d c #A00B02", -"f c #A10C03", -"g c #AE0808", -"h c #B00A0A", -"j c #B20C0C", -"k c #B30D0D", -"l c #B40D0D", -"z c #B50D0D", -"x c #B50E0E", -"c c #B50F0F", -"v c #AC150C", -"b c #AD170F", -"n c #B3160E", -"m c #B91111", -"M c #BA1212", -"N c #BB1212", -"B c #BB1313", -"V c #BC1313", -"C c #BD1313", -"Z c #BB1414", -"A c #B51910", -"S c #BE1B15", -"D c #BF1C17", -"F c #A4251B", -"G c #C01818", -"H c #C11818", -"J c #C21919", -"K c #C31919", -"L c #C11D18", -"P c #CC1D1D", -"I c #C8221E", -"U c #CD2121", -"Y c #CF2323", -"T c #CE2522", -"R c #CF2523", -"E c #D12020", -"W c #D22424", -"Q c #D22525", -"! c #D52626", -"~ c #D72727", -"^ c #D82727", -"/ c #D52828", -"( c #D62828", -") c #D72828", -"_ c #D72929", -"` c #D32D29", -"' c #DA2828", -"] c #DA2A28", -"[ c #D92B2B", -"{ c #DB2C2C", -"} c #DC2D2D", -"| c #DD2D2D", -" . c #DC2E2E", -".. c #DD2F2F", -"X. c #DE2E2E", -"o. c #DE3030", -"O. c #DF3030", -"+. c #E02F2F", -"@. c #E03030", -"#. c #E03131", -"$. c #E13131", -"%. c #E13232", -"&. c #E23333", -"*. c #E33333", -"=. c #E43333", -"-. c #E53333", -";. c #E33434", -":. c #E53535", -">. c #E53636", -",. c #E93838", -"<. c #EC3B3B", -"1. c #EC3C3C", -"2. c #ED3C3C", -"3. c #ED3D3D", -"4. c #F13F3F", -"5. c #AD4F46", -"6. c #B25F5D", -"7. c #92655E", -"8. c #916963", -"9. c #D34343", -"0. c #F24141", -"q. c #F34141", -"w. c #F44242", -"e. c #F44343", -"r. c #888A85", -"t. c #8B8C88", -"y. c #8B8D88", -"u. c #8B8D89", -"i. c #8B8E89", -"p. c #8C8D89", -"a. c #8C8E88", -"s. c #8C8E89", -"d. c #8D8F89", -"f. c #8C8E8A", -"g. c #8D8F8A", -"h. c #8D8F8B", -"j. c #8E8F8B", -"k. c #958681", -"l. c #8D908A", -"z. c #8E908B", -"x. c #8E918B", -"c. c #8F918B", -"v. c #8E908C", -"b. c #8F908C", -"n. c #8E918C", -"m. c #8F918C", -"M. c #90928D", -"N. c #91938E", -"B. c #939590", -"V. c #949591", -"C. c #949691", -"Z. c #949692", -"A. c #959893", -"S. c #969994", -"D. c #9A9C98", -"F. c #9B9C98", -"G. c #9B9D99", -"H. c #9D9F9A", -"J. c #9D9F9B", -"K. c #9FA09C", -"L. c #A1A39F", -"P. c #A8A49F", -"I. c #A4A6A1", -"U. c #A9AAA7", -"Y. c #AAACA7", -"T. c #AEAFAC", -"R. c #B7ADAA", -"E. c #B1B0AD", -"W. c #B0B1AD", -"Q. c #B5B7B4", -"!. c #B6B7B4", -"~. c #B7B8B5", -"^. c #B8B9B7", -"/. c #B9BAB7", -"(. c #C0C0BE", -"). c #C1C2BF", -"_. c #C2C3C0", -"`. c #C3C4C2", -"'. c #C5C6C2", -"]. c #C6C6C3", -"[. c #C7C8C6", -"{. c #CACAC9", -"}. c #CACBC9", -"|. c #CBCBC9", -" X c #CFCFCE", -".X c #D2D2D0", -"XX c #D3D4D1", -"oX c #D7D7D5", -"OX c #D8D8D8", -"+X c #DBDBD8", -"@X c #DADADA", -"#X c #DBDBDA", -"$X c gray86", -"%X c gainsboro", -"&X c #DDDDDC", -"*X c #DDDDDD", -"=X c #DDDEDC", -"-X c #DEDEDD", -";X c gray87", -":X c #DFDFDE", -">X c #DFDFDF", -",X c #E0E0DF", -"X2XW.j.uXuXuXuXuXuXM.9X>X>XoXj.uXuXuXuXuXuXuX", -"uXuXuXuXuXuXuXj.oX2X,XyXl.uXuXuXuXuXj..X:X>X9XV.uXuXuXuXuXuXuXuX", -"uXuXuXuXuXuXuXuXV.yX>X>X|.l.uXuXuXuXI.2X>X:X).l.uXuXuXuXuXuXuXuX", -"uXuXuXuXuXuXuXuXj.).>X>X9XF.uXuXuXj.2X@X@X2Xi.uXuXuXuXuXuXuXuXuX", -"uXuXuXuXuXuXuXuXuXj.9X>X>X%Xj.uXM._.>X@X6XI.uXuXuXuXuXuXuXuXuXuX", -"uXuXuXuXuXuXuXuXuXa.U.2X@X>XQ.j.V.6X@X>XXXj.uXuXuXuXuXuXuXuXuXuX", -"uXuXuXuXuXuXuXuXuXuXl.oX%X#XyXl.|.@X@XyXN.uXuXuXuXuXuXuXuXuXuXuX", -"uXuXuXuXuXuXuXuXuXuXuXV.yX@X@X XH.OX>X^.l.uXuXuXuXuXuXuXuXuXuXuX", -"uXuXuXuXuXuXuXuXuXuXuXv._.>XQ.>XI.^.2Xi.uXuXuXuXuXuXuXuXuXuXuXuX", -"uXuXuXuXuXuXuXuXuXuXuXuXj.yXD.[.>XM.H.uXuXuXuXuXuXuXuXuXuXuXuXuX", -"uXuXuXuXuXuXuXuXuXuXuXuX7.I.6X@X@XR.8.uXuXuXuXuXuXuXuXuXuXuXuXuX", -"uXuXuXuXuXuXuXuXuXuXuXuX= k.W.5.F * O - uXuXuXuXuXuXuXuXuXuXuXuX", -"uXuXuXuXuXuXuXuXuXuXuX@ W 9.6.O S ] ] @ uXuXuXuXuXuXuXuXuXuXuXuX", -"uXuXuXuXuXuXuXuXr , , e ~ +.b O @ E ~ D f , r r uXuXuXuXuXuXuXuX", -"uXuXuXuXuXuX, C ) -.-.U r n @ uX@ A P ^ v 0.0.*.H , uXuXuXuXuXuX", -"uXuXuXuXuXr / Q x , r X.Q r uXuXuX& L P T s r C X.*.r uXuXuXuXuX", -"uXuXuXuX0 .M , uXuXuXk ,., uXuXuXuXd I g uXuXuX, H :.r uXuXuXuX", -"uXuXuX, ] M 0 uXuXuXuXr 2., uXuXuXuX, ` 0 uXuXuXuX0 G *.0 uXuXuX", -"uXuXuXM ] , uXuXuXuXuXM O.r uXuXuXuXr O.x uXuXuXuXuX0 *.H uXuXuX", -"uXuX0 ~ Z uXuXuXuXuX0 O.H uXuXuXuXuXuXH ~ 0 uXuXuXuXuXH *.r uXuX", -"uXuX, *.h uXuXuXuXr H :.5 uXuXuXuXuXuX3 ] M 3 uXuXuXuXx 0., uXuX", -"uXuX0 -.C uXuXuX3 H 3.g uXuXuXuXuXuXuXuXr O.Z , uXuXuXH e.0 uXuX", -"uXuXr Y *.r 3 c O.:.u o uXuXuXuXuXuXuXuXX r X./ k 3 u 3.X.r uXuX", -"uXuXuX0 Y <.4.;.H 3 uXuXuXuXuXuXuXuXuXuXuXuX, H *.0.e.] r uXuXuX", -"uXuXuXuX5 3 3 5 . uXuXuXuXuXuXuXuXuXuXuXuXuXuX 5 5 r 5 uXuXuXuX", -"uXuXuXuXuXuXuXuXuXuXuXuXuXuXuXuXuXuXuXuXuXuXuXuXuXuXuXuXuXuXuXuX" -}; diff --git a/lib-src/mod-nyq-bench/images/edit-cut-small.xpm b/lib-src/mod-nyq-bench/images/edit-cut-small.xpm deleted file mode 100644 index 5f8a25a43..000000000 --- a/lib-src/mod-nyq-bench/images/edit-cut-small.xpm +++ /dev/null @@ -1,110 +0,0 @@ -/* XPM */ -static const char *edit_cut_small[] = { -/* columns rows colors chars-per-pixel */ -"16 16 88 1", -" c #A60101", -". c #A60202", -"X c #A40502", -"o c #A60606", -"O c #A70606", -"+ c #A80303", -"@ c #A80403", -"# c #A80606", -"$ c #A80707", -"% c #A90707", -"& c #AA0808", -"* c #AA0909", -"= c #A90A0A", -"- c #A90B0B", -"; c #AA0B0B", -": c #AA0C0C", -"> c #AA0D0D", -", c #AB0D0D", -"< c #AA0E0E", -"1 c #B50B0B", -"2 c #B70F0E", -"3 c #B80D0D", -"4 c #AB1010", -"5 c #AB1111", -"6 c #AB1313", -"7 c #AB1414", -"8 c #AB1616", -"9 c #AD1717", -"0 c #AE1818", -"q c #9C2F2C", -"w c #C01513", -"e c #C01514", -"r c #C71A19", -"t c #C91A1A", -"y c #CA1B1A", -"u c #CB1F1F", -"i c #CD1D1C", -"p c #CD1D1D", -"a c #CE1D1D", -"s c #CF1D1D", -"d c #CE1E1E", -"f c #D01F1F", -"g c #D11F1F", -"h c #D12020", -"j c #D22020", -"k c #D32121", -"l c #D42222", -"z c #D52323", -"x c #D62323", -"c c #DB2727", -"v c #A34A45", -"b c #898984", -"n c #8A8C87", -"m c #8B8D88", -"M c #8C8E89", -"N c #8D8F8A", -"B c #8E908B", -"V c #8F918C", -"C c #90918D", -"Z c #91938E", -"A c #92948F", -"S c #939590", -"D c #9A9C97", -"F c #9FA09C", -"G c #A8A9A5", -"H c #AAACA7", -"J c #AEAFAB", -"K c #B3B2AF", -"L c #B3B5B0", -"P c #B5B6B2", -"I c #B5B6B3", -"U c #B6B8B3", -"Y c #B8BAB5", -"T c #BABBB7", -"R c #C5C6C3", -"E c #C6C8C3", -"W c #CCCEC9", -"Q c #CDCECB", -"! c #D2D3D0", -"~ c #D2D4D0", -"^ c #DBDCD9", -"/ c #E1E1DF", -"( c #E7E8E6", -") c #EFF0EF", -"_ c #F5F6F5", -"` c #F7F7F6", -"' c gray97", -"] c None", -/* pixels */ -"]]]]NS]]]]mV]]]]", -"]]]B_n]]]]C!V]]]", -"]]]m~)A]]]HEN]]]", -"]]]NP_m]]BWJm]]]", -"]]]]m^_VNUWm]]]]", -"]]]]NP_mDPTm]]]]", -"]]]]]m/_DHm]]]]]", -"]]]]]NT(HNn]]]]]", -"]]]]]]bRLq]]]]]]", -"]]]]07Ov.t90]]]]", -"]]]%hf3X+thu=]]]", -"]]%h&2.]]pe+pO]]", -"]9l]]p=]]+y]]h7]", -"],g]1l:]]*x3]g5]", -"]7cgp%]]]]=lpp5]", -"]]::9]]]]]]:::]]" -}; diff --git a/lib-src/mod-nyq-bench/images/edit-delete-large.xpm b/lib-src/mod-nyq-bench/images/edit-delete-large.xpm deleted file mode 100644 index f88918aa2..000000000 --- a/lib-src/mod-nyq-bench/images/edit-delete-large.xpm +++ /dev/null @@ -1,138 +0,0 @@ -/* XPM */ -static const char *edit_delete_large[] = { -/* columns rows colors chars-per-pixel */ -"32 32 100 2", -" c #253A55", -". c #273E5A", -"X c #283F5C", -"o c #29415F", -"O c #2B4463", -"+ c #2D4768", -"@ c #2E496A", -"# c #304B6D", -"$ c #3C5074", -"% c #454744", -"& c #484946", -"* c #5F5F5D", -"= c #704D72", -"- c #6B5178", -"; c #646763", -": c #6A6B67", -"> c #6C6D6A", -", c #737573", -"< c #787A76", -"1 c #7D7E7B", -"2 c #AB1214", -"3 c #89425D", -"4 c #BB4D52", -"5 c #884B67", -"6 c #E17E7E", -"7 c #204A87", -"8 c #224D8A", -"9 c #29528D", -"0 c #395983", -"q c #3B5D88", -"w c #2B5793", -"e c #2F5892", -"r c #325F9C", -"t c #3965A2", -"y c #406492", -"u c #5477AE", -"i c #587BAB", -"p c #4977B3", -"a c #4878B5", -"s c #4C7DBC", -"d c #5179B1", -"f c #667AB0", -"g c #7D8181", -"h c #5581BA", -"j c #5F81BC", -"k c #6A8CB7", -"l c #6D8FBA", -"z c #758BBC", -"x c #7393BC", -"c c #7897BE", -"v c #7998BF", -"b c #5485C5", -"n c #5C86C2", -"m c #598BCB", -"M c #668DC1", -"N c #6291CD", -"B c #7C9AC2", -"V c #7499C8", -"C c #759ED3", -"Z c #838581", -"A c #888A85", -"S c #868A88", -"D c #8C8D89", -"F c #8F918B", -"G c #91938F", -"H c #949692", -"J c #979995", -"K c #999A95", -"L c #9E9E9D", -"P c #9FA09C", -"I c #A1A29E", -"U c #A4A5A3", -"Y c #A7A9A3", -"T c #AAABA7", -"R c #ACADAA", -"E c #AEB0AB", -"W c #B1B3AE", -"Q c #B4B5B3", -"! c #B9BAB6", -"~ c #BCBDBB", -"^ c #E18080", -"/ c #BFC0BD", -"( c #C1C2BE", -") c #819EC3", -"_ c #C4C4C3", -"` c #C7C8C5", -"' c #C9C9C6", -"] c #CBCCCB", -"[ c #D1D1CF", -"{ c #D3D4D2", -"} c #D7D8D4", -"| c #D9D9D6", -" . c #DDDDDC", -".. c #E0E0DF", -"X. c #E3E3E3", -"o. c #E8E8E6", -"O. c #EBEBEA", -"+. c #F5F5F5", -"@. c #F8F8F8", -"#. c None", -/* pixels */ -"#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.", -"#.#.#.#.#.#.D A S S S A A A A A A A A A S S S S S D #.#.#.#.#.#.", -"#.#.#.#.#.#.D +.@.+.@.+.@.+.@.+.+.+.+.@.+.+.+.+.@.A #.#.#.#.#.#.", -"#.#.#.#.#.#.A +.o.X.X.X.X.X.X.X.X.X.X.X.X. .X.X.+.A #.#.#.#.#.#.", -"#.#.#.#.7 8 S +.X.] _ _ _ ~ _ _ _ ( _ _ / _ ] .+.A 8 8 #.#.#.#.", -"#.#.#.8 b m g .[ ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ..1 m s 8 #.#.#.", -"#.#.#.t N m , ' ~ U L P L L L L U ! Q Q Q Q Q Q ' , m m r #.#.#.", -"#.#.8 n m y ; > : : : - > > : : : : > > > : > > > : 0 m s 8 #.#.", -"#.#.w C m q . X X X o o O O O O + + + + # # $ b m e #.#.", -"#.8 d C m m m m m m m m m m m m m m m m m m m m k 3 2 2 5 u 8 #.", -"#.8 V N m m m m m m m m m m m m m m m m m m m m f 4 6 6 4 z 8 #.", -"#.8 B h a a a a p a a a a a a a a a a a a a a a a p = - a M e #.", -"#.8 i ) ) ) ) ) ) ) ) ) B B B B c c c c V z x x x x l l l k 9 #.", -"#.#.7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 #.", -"#.#.#.S ! D Z ` ~ ~ Q _ W ] R R _ ] W R ~ ] ! R Q < L ~ ` #.#.#.", -"#.#.#.g ! A Z ( ~ ~ Q ( / ] U Q ] _ W W _ ] Q R ! 1 T ' ~ #.#.#.", -"#.#.#., ~ D S _ ~ / Q _ ~ { U Q _ ] Q W _ [ Q Q ~ S ! { ~ #.#.#.", -"#.#.#.: ` H D ] _ _ ~ _ / { W ! ] { ~ Q ` { _ Q ~ D ~ | Q #.#.#.", -"#.#.#.#.' K G | .] _ ] _ | ~ _ { ._ _ ] ..{ Q _ J ` .R #.#.#.", -"#.#.#.#.] L H o.] | { X.L X.[ ' { .] [ [ X.X.Q ] L ] ..I #.#.#.", -"#.#.#.#.] U R @.U o.X.O.G ...} . .{ .{ o.+.T X.I [ X.G #.#.#.", -"#.#.#.#.' T ..@.H O.O.{ E _ O.| X.{ ] o.| O.O.L O.W [ O.Z #.#.#.", -"#.#.#.#.` ! U ..J ..{ R Q I o.{ .~ R { { X.X.L I ! } O.< #.#.#.", -"#.#.#.#./ ~ U L W L J W #.Q H K L L R L J J J U W ' } O.#.#.#.#.", -"#.#.#.#.~ ( #.#.#.#.#.#.#.#.#.#.! #.#.#.#.#.#.#.#.] | O.#.#.#.#.", -"#.#.#.#.Q ( #.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.] | o.#.#.#.#.", -"#.#.#.#.T ` Q W E E E E E E E E E E E E E E E E W ( | ..#.#.#.#.", -"#.#.#.#.K _ W E R E W W E W W W W W Q W W Q W Q Q / } | #.#.#.#.", -"#.#.#.#.> } ] ' ` ` ` _ ` ` ` ` ` ` _ ` ` _ ` ` ( ` ./ #.#.#.#.", -"#.#.#.#.& W . . ... . . . . ..... . . ..... . ... .( * #.#.#.#.", -"#.#.#.#.#.% % % % % % % % % % % % % % % % % % % % % % #.#.#.#.#.", -"#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#." -}; diff --git a/lib-src/mod-nyq-bench/images/edit-delete-small.xpm b/lib-src/mod-nyq-bench/images/edit-delete-small.xpm deleted file mode 100644 index 021c3d29a..000000000 --- a/lib-src/mod-nyq-bench/images/edit-delete-small.xpm +++ /dev/null @@ -1,105 +0,0 @@ -/* XPM */ -static const char *edit_delete_small[] = { -/* columns rows colors chars-per-pixel */ -"16 16 83 1", -" c #4E5B6A", -". c #686965", -"X c #6D6E6A", -"o c #6D6E6B", -"O c #6E6F6C", -"+ c #6F706C", -"@ c #71726E", -"# c #757672", -"$ c #787976", -"% c #7A7C77", -"& c #7B7E79", -"* c #7D7E7B", -"= c #7F807C", -"- c #204987", -"; c #204A87", -": c #2B5186", -"> c #2C5286", -", c #588ACA", -"< c #729FCF", -"1 c #858883", -"2 c #888985", -"3 c #888A85", -"4 c #8D8E8B", -"5 c #8C8D8C", -"6 c #8F8F8E", -"7 c #8F908C", -"8 c #91938F", -"9 c #92938F", -"0 c #929490", -"q c #939491", -"w c #979894", -"e c #979994", -"r c #989996", -"t c #989A96", -"y c #9A9B98", -"u c #9B9B9B", -"i c #9A9C98", -"p c #9B9C99", -"a c #9C9D9B", -"s c #9D9E9B", -"d c gray61", -"f c #9E9F9C", -"g c #9E9F9E", -"h c #9FA09D", -"j c #ABACAA", -"k c #ACADAB", -"l c #ADAEAD", -"z c #AEAFAE", -"x c #AFB0AD", -"c c #AFB0AE", -"v c #B1B2B0", -"b c #B3B3B2", -"n c #B7B8B7", -"m c #BCBCBC", -"M c gray74", -"N c gray75", -"B c #9CBBDD", -"V c #C0C0C0", -"C c gray77", -"Z c #C8C9C7", -"A c gray79", -"S c #CACBC9", -"D c #CBCCCA", -"F c #CDCDCC", -"G c #CDCECC", -"H c #D5D5D5", -"J c gray84", -"K c #D7D7D7", -"L c gray85", -"P c #DADADA", -"I c gainsboro", -"U c #DEDFDE", -"Y c #E3E3E2", -"T c #E7E7E7", -"R c #E9E9E9", -"E c #EAEAEA", -"W c gray92", -"Q c #EEEEED", -"! c #F1F1F1", -"~ c #F6F6F6", -"^ c gray98", -"/ c gray100", -"( c None", -/* pixels */ -"((833333332228((", -"((3!WWWWWWWWW1((", -"(;3TJJJJJJHLI3;(", -";B%LMMMMmmmMV%B;", -";B Addduuuuuu B;", -";B>:::::>>>>>>B;", -";B,,,,,,,,,,,,B;", -";BBBBBBBBBBBBBB;", -";B<<<<<<<<<<< c #4372AB", -", c #4A76AC", -"< c #4C78AF", -"1 c #4E7AB1", -"2 c #557DB1", -"3 c #5A82B4", -"4 c #6188B6", -"5 c #6F92BD", -"6 c #7897BA", -"7 c #799CC6", -"8 c #848484", -"9 c #878985", -"0 c #8A8C87", -"q c #8C8D8B", -"w c #8E908B", -"e c #90928F", -"r c #939492", -"t c #979994", -"y c #999A97", -"u c #9C9C9C", -"i c #9EA09B", -"p c #A3A4A2", -"a c #A6A9A4", -"s c #A9AAA7", -"d c #AAACA8", -"f c #B0B1AF", -"g c #B4B4B3", -"h c #B9BAB7", -"j c #BDBDBD", -"k c #BEC1BC", -"l c #C0C1BF", -"z c #87A2C2", -"x c #83A4CB", -"c c #8CABCF", -"v c #91A8C2", -"b c #95AECA", -"n c #9EB0C4", -"m c #9AB1CB", -"M c #87AAD0", -"N c #97B6D5", -"B c #A3B5C7", -"V c #ACB9C6", -"C c #A6B9CE", -"Z c #AABACC", -"A c #A4BBD5", -"S c #AABCD0", -"D c #A3BFDD", -"F c #AEC0D3", -"G c #A8C2DC", -"H c #B4C4D5", -"J c #AEC7E0", -"K c #B4CAE2", -"L c #BCD0E4", -"P c #C1C1C1", -"I c #CBCDCA", -"U c #D0D1CF", -"Y c #C1CDDA", -"T c #C7D0D7", -"R c #CBD2D5", -"E c #CCD4DA", -"W c #D2D3D2", -"Q c #D7D9D5", -"! c #D8DAD7", -"~ c #DDDDDC", -"^ c #DEE0DB", -"/ c #E0E2DD", -"( c #C2D3E6", -") c #CBD7E3", -"_ c #C4D6E9", -"` c #CDDBEA", -"' c #D3DCE6", -"] c #D2DDE9", -"[ c #D5E1ED", -"{ c #DAE4EE", -"} c #D7E3F0", -"| c #DBE5F1", -" . c #DEE8F3", -".. c #E4E4E4", -"X. c #E0E6EA", -"o. c #E7EBED", -"O. c #EBEBEB", -"+. c #EFF1EE", -"@. c #E3EBF3", -"#. c #ECF1F4", -"$. c #F3F4F3", -"%. c #F8F8F7", -"&. c #FBFBFB", -"*. c None", -/* pixels */ -"*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.", -"*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.", -"*.*.*.*.*.u u u u u u y y r q q 8 8 = & % $ # @ @ + + *.*.*.*.*.", -"*.*.*.*.u &.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.%.&.&.&.+ *.*.*.*.", -"*.*.*.*.r &...~ ~ ........~ ........................&.O *.*.*.*.", -"*.*.*.*.r &./ ' ~ ....~ ~ ..........................%.O *.*.*.*.", -"*.*.*.*.r &./ / ~ ....j j j j j j V l j j j j l ....%.O *.*.*.*.", -"*.*.*.*.e &.../ ~ ..................O...O.....O...O.&.O *.*.*.*.", -"*.*.*.*.q &...' ~ O...j j j j j j j j j j j j P O...%.o *.*.*.*.", -"*.*.*.*.q &...../ O...........O.O...O.O.O.O.O.O.O.O.%.o *.*.*.*.", -"*.*.*.*.8 &.....~ O...P j j j j j j j l j j P P O.O.%.o *.*.*.*.", -"*.*.*.*.8 &...f / O...O.O...O.O.O.O.O.O.O.O.O.O.O.O.%.o *.*.*.*.", -"*.*.*.*.8 &...O...O.O.P j j g u q 0 q y s j l P O.O.%.o *.*.*.*.", -"*.*.*.*.= &.......O...O.~ p d / &.&.&.O.l r U O.O.O.%.o *.*.*.*.", -"*.*.*.*.& &.....~ O.O.h q ! &.S 2 - < b #.O.r f #.+.&.X *.*.*.*.", -"*.*.*.*.& &.......O.O.u ! O.< x ` ] ( c : ) +.q ..+.&.X *.*.*.*.", -"*.*.*.*.$ &.O.....O.U s $., A @.@.@.} ] A > { I f +.%.X *.*.*.*.", -"*.*.*.*.$ %.......O.s ! C 7 } @.#.#. .} L M 5 $.e O.%.. *.*.*.*.", -"*.*.*.*.$ %...O...+.r ..2 G } @.@.@.@.} G G > O.i ! %. *.*.*.*.", -"*.*.*.*.@ &...O...+.e ~ ; A ) ] ] ] ' H m b , E a U %. *.*.*.*.", -"*.*.*.*.@ %.O.g ..O.r ! 1 N ` [ . .] _ L K > R r ! %. *.*.*.*.", -"*.*.*.*.+ %...O...+.s W v 4 m S Z V V V B z 2 / 8 +.%. *.*.*.*.", -"*.*.*.*.+ %.O.O...+.W p O.< c K ( ) ] ` K 1 Y l $ ! %. *.*.*.*.", -"*.*.*.*.O &...O...+.O.y Q O., 4 v B n 6 : Y +.I s $ j *.*.*.*.", -"*.*.*.*.o %.O.O...+.+...y ! %.S 3 - 1 m #.O.I h i p # X *.*.*.*.", -"*.*.*.*.o &...O...+.O.P h y s ..%.&.&.O.h % i j g p p 8 X *.*.*.", -"*.*.*.*.X &.O.....#.O.+.O.$.! g u e e p I #.0 r h g p p r X *.*.", -"*.*.*.*.X &...O...+.O.O.+.#.+.$.$.$.+.$.$.$.O.w 8 g g p h a X *.", -"*.*.*.*.X $.%.%.$.%.$.%.$.$.O.O.O...............i # g k Q ^ X *.", -"*.*.*.*.*.o X o o o o X X X X X . . O g ^ d X *.", -"*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.. X . *.*.", -"*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*." -}; diff --git a/lib-src/mod-nyq-bench/images/edit-find-small.xpm b/lib-src/mod-nyq-bench/images/edit-find-small.xpm deleted file mode 100644 index fb1e1c0bb..000000000 --- a/lib-src/mod-nyq-bench/images/edit-find-small.xpm +++ /dev/null @@ -1,99 +0,0 @@ -/* XPM */ -static const char *edit_find_small[] = { -/* columns rows colors chars-per-pixel */ -"16 16 77 1", -" c #6C6E6A", -". c #757673", -"X c #7E807B", -"o c #818380", -"O c #828480", -"+ c #848482", -"@ c #888A85", -"# c #898B86", -"$ c #8A8C87", -"% c #8C8E89", -"& c #8D8F8A", -"* c #8D8E8C", -"= c #9A9B97", -"- c #A3A4A3", -"; c #A8A9A6", -": c #A3AEBB", -"> c #B8B8B7", -", c #85A9CF", -"< c #8BACCF", -"1 c #90ADCB", -"2 c #97AFCB", -"3 c #93AFCE", -"4 c #81A6D0", -"5 c #80A7D1", -"6 c #80A8D1", -"7 c #89ABD0", -"8 c #8AACD2", -"9 c #8EB2D8", -"0 c #97B4D3", -"q c #91B3D6", -"w c #99B3D0", -"e c #9FB8D1", -"r c #9CBAD9", -"t c #A7B5C3", -"y c #A8B7C8", -"u c #AEBAC8", -"i c #A8B9CD", -"p c #A2B8D0", -"a c #A6BCD2", -"s c #A2BAD4", -"d c #A0BAD6", -"f c #A9BFD6", -"g c #A3BDDA", -"h c #A0BEDF", -"j c #A5C0DF", -"k c #AFC5DF", -"l c #B3C8DC", -"z c #A5C1E0", -"x c #B2CAE3", -"c c #B3CAE5", -"v c #BFD3E7", -"b c #BCD0E8", -"n c #C7C7C6", -"m c #CFCFCD", -"M c #D6D6D5", -"N c #D6D7D5", -"B c #C1D4E9", -"V c #C1D4EA", -"C c #C3D7EB", -"Z c #C5D7EA", -"A c #C8D9EC", -"S c #CADAEC", -"D c #CDDCED", -"F c #CFDDEE", -"G c #D0DEEE", -"H c #D9E4F1", -"J c #DAE5F2", -"K c #DCE6F2", -"L c #DDE7F2", -"P c #F0F0EF", -"I c #E0EAF3", -"U c #E4ECF5", -"Y c #E8EEF7", -"T c #FAFAF9", -"R c #FEFEFD", -"E c gray100", -"W c None", -/* pixels */ -"=@@@@@@@@@@&WWWW", -"$EEEEEEEEEE@WWWW", -"@EPPPPPPPPE@WWWW", -"$EPnnnnnnPE@WWWW", -"$EPPPPNooooOWWWW", -"$EPnn;ouasioWWWW", -"@EPPNoy8vZr1oWWW", -"$EPno:,KYUS92oWW", -"$EPPOihJIKVh5oWW", -"@TPPOjjGJDAb5oWW", -"$TPPOt7cCVGg3oWW", -"@EEEmOeqkxs0o.WW", -"&@@@@Xol<6wo-- W", -"WWWWWW oooo*>--+", -"WWWWWWWWWWWW*>-+", -"WWWWWWWWWWWWW**+" -}; diff --git a/lib-src/mod-nyq-bench/images/edit-paste-large.xpm b/lib-src/mod-nyq-bench/images/edit-paste-large.xpm deleted file mode 100644 index 59158816d..000000000 --- a/lib-src/mod-nyq-bench/images/edit-paste-large.xpm +++ /dev/null @@ -1,204 +0,0 @@ -/* XPM */ -static const char *edit_paste_large[] = { -/* columns rows colors chars-per-pixel */ -"32 32 166 2", -" c #604113", -". c #694614", -"X c #704B16", -"o c #714C15", -"O c #724C15", -"+ c #724D15", -"@ c #714C16", -"# c #714D16", -"$ c #724D16", -"% c #754D16", -"& c #774F16", -"* c gray36", -"= c #5D5D5C", -"- c gray37", -"; c #5F5F5F", -": c #60605E", -"> c #7F7F71", -", c #89601F", -"< c #8B611F", -"1 c #8D621F", -"2 c #8E631F", -"3 c #906520", -"4 c #926620", -"5 c #936720", -"6 c #956820", -"7 c #976920", -"8 c #986A21", -"9 c #9A6B21", -"0 c #9C6C21", -"q c #9D6D21", -"w c #9F6E21", -"e c #A16F22", -"r c #A27122", -"t c #A37122", -"y c #A47222", -"u c #A67322", -"i c #A87423", -"p c #A97523", -"a c #AB7623", -"s c #AD7723", -"d c #AE7823", -"f c #B07924", -"g c #B27B24", -"h c #B37C24", -"j c #B57D24", -"k c #B77E25", -"l c #B87F25", -"z c #BA8025", -"x c #BC8125", -"c c #BD8225", -"v c #BD8226", -"b c #BF8326", -"n c #C18426", -"m c #C28526", -"M c #C48726", -"N c #C58727", -"B c #C68827", -"V c #80807D", -"C c #81837E", -"Z c #81837F", -"A c #8C8678", -"S c #8A8A7D", -"D c #908979", -"F c #918A79", -"G c #968D7A", -"H c #828480", -"J c #828580", -"K c #878984", -"L c #868A84", -"P c #878A84", -"I c #878A85", -"U c #878B85", -"Y c #878B86", -"T c #888A84", -"R c #888A85", -"E c #8B8E89", -"W c #8C8F8A", -"Q c #8E8E8B", -"! c #8D918B", -"~ c #8E918C", -"^ c #97978A", -"/ c #91918D", -"( c #99998D", -") c #9B9B8E", -"_ c #989897", -"` c #A1A195", -"' c #A4A499", -"] c #A4A49A", -"[ c #A8A89D", -"{ c #A3A3A0", -"} c #A3A3A2", -"| c #AAAAA0", -" . c #ABABA0", -".. c #AAAAA1", -"X. c #ABABA2", -"o. c #ACACA1", -"O. c #ACACA2", -"+. c #ADADA2", -"@. c #AEAEA3", -"#. c #A9ABA9", -"$. c #B6B6AC", -"%. c #B6B6AD", -"&. c #B7B7AD", -"*. c #B7B7AE", -"=. c #B8B8AE", -"-. c #B8B8AF", -";. c #B9B9AF", -":. c #B9B9B0", -">. c #BABAB1", -",. c #BCBCB3", -"<. c #C6C6BE", -"1. c #C3C3C3", -"2. c #C4C4C3", -"3. c gray77", -"4. c #C4C5C4", -"5. c #C5C5C4", -"6. c #C5C5C5", -"7. c #C6C6C5", -"8. c #C6C6C6", -"9. c #C7C7C6", -"0. c #C9C9C2", -"q. c #C8C8C7", -"w. c #D0D0CF", -"e. c #D0D0D0", -"r. c gray83", -"t. c #D5D5D5", -"y. c #D5D6D4", -"u. c gray84", -"i. c #D8D8D8", -"p. c #D9DBD9", -"a. c #DCDCDB", -"s. c gray87", -"d. c #E3E3E2", -"f. c #E6E6E5", -"g. c gray91", -"h. c #E9E9E8", -"j. c #E9E9E9", -"k. c #EAEAE9", -"l. c #EAEAEA", -"z. c #EBEBEA", -"x. c gray92", -"c. c #ECECEB", -"v. c #ECECEC", -"b. c #EDEDEC", -"n. c gray93", -"m. c #EEEEED", -"M. c #EEEEEE", -"N. c #EFEFEE", -"B. c #EFEFEF", -"V. c #F0F0EF", -"C. c gray94", -"Z. c #F1F1F1", -"A. c gray95", -"S. c #F3F3F3", -"D. c #F4F4F4", -"F. c #F6F6F6", -"G. c gray97", -"H. c #F8F8F8", -"J. c #F9F9F8", -"K. c #F9F9F9", -"L. c gray98", -"P. c #FBFBFB", -"I. c #FDFDFD", -"U. c #FEFEFE", -"Y. c gray100", -"T. c None", -/* pixels */ -"T.T.T.T.T.T.T.T.T.T.T.T.- * = * * - * * T.T.T.T.T.T.T.T.T.T.T.T.", -"T.T.T.T.T.T.T.T.T.T.T.T.* ( ) ( ( ) ( * T.T.T.T.T.T.T.T.T.T.T.T.", -"T.T.T.T.T.T.T.T.T.: * * * S > > > > S * * * : T.T.T.T.T.T.T.T.T.", -"T.T.& + + + X + X = ` ' ' ' ^ ^ ^ ^ ' ' ' ` - X + X + X + & T.T.", -"T.T.+ N N B B B M - :.X.o.o.o.o.+.+.o.+.+.,.* v B B B B n @ T.T.", -"T.T.+ B B G R R K - 0.:.;.=.=.=.&.&.&.$.&.<.* C R R F y N + T.T.", -"T.T.X B B R Y.Y.Y.- [ o.o.X.X.X.X.X.[ X.X.' - A.Y.Y.R r B @ T.T.", -"T.T.+ B B R Y.V.C.} - * * * * * * * * * * - _ f.V.Y.R e B @ T.T.", -"T.T.@ B M R Y.V.V.V.d.i.i.i.i.i.i.i.i.i.i.i.i.z.V.Y.R e M X T.T.", -"T.T.@ B m R Y.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.A.N.N.Y.R q B + T.T.", -"T.T.@ B m R Y.V.V.V.V.V.V.V.V.V.V.V.V.V.V.N.N.N.N.Y.K 9 B X T.T.", -"T.T.@ B v R Y.V.V.q.q.q.q.q.q.q.q.q.q.9.9.9.9.N.N.Y.K 9 B + T.T.", -"T.T.@ B v R Y.V.V.V.V.V.V.V.V.V.V.V.N.N.N.z.N.N.N.Y.R 9 B @ T.T.", -"T.T.@ B v R Y.V.V.V.V.V.V.V.V.V.N.N.N.N.N.N.z.v.z.Y.R 6 B + T.T.", -"T.T.@ B l R Y.V.V.q.q.q.q.q.9.9.9.9.9.1.9.1.s.v.z.Y.R 6 B @ T.T.", -"T.T.@ B l R Y.V.V.V.V.V.V.N.N.N.N.N.z.N.v.v.z.z.z.Y.R 5 B @ T.T.", -"T.T.+ B k R Y.N.B.N.N.N.N.N.N.N.z.N.z.z.v.v.g.v.g.Y.R 5 B + T.T.", -"T.T.@ B k K Y.N.B.9.9.9.9.9.1.1.1.1.1.1.1.v.z.g.g.I.Y 2 B + T.T.", -"T.T.+ N f R Y.N.N.N.N.v.v.v.v.v.z.z.z.z.v.g.g.g.g.I.K 2 B @ T.T.", -"T.T.+ B h R Y.N.N.N.N.z.N.v.v.v.v.z.z.z.g.l.g.g.g.L.K 1 B @ T.T.", -"T.T.@ B f R Y.N.N.9.1.1.1.1.1.1.1.e.z.g.g.g.g.g.v.K.K 1 B @ T.T.", -"T.T.@ B d R Y.N.z.v.c.c.v.v.z.g.z.g.g.g.g.g.v.M.C.L.Y , B @ T.T.", -"T.T.@ B s R Y.N.v.z.z.z.z.g.z.z.g.g.g.g.z.v.C.D.C.p.K , B @ T.T.", -"T.T.@ B a K L.z.v.v.z.z.z.g.g.g.g.g.z.v.K K K L ! K K 1 B @ T.T.", -"T.T.@ B a R Y.z.z.z.z.g.z.g.g.g.g.v.B.A.K t.u.u.e.! K , B @ T.T.", -"T.T.@ B y R F.z.g.z.g.g.g.g.g.v.B.C.D.G.K u.u.9.W H K , B X T.T.", -"T.T.@ B y R F.z.g.z.g.g.g.v.v.A.D.K.L.D.! t.#.K Z Q K , B @ T.T.", -"T.T.@ B y R D.A.A.A.A.A.A.A.F.F.K.I.I.t.L E H C ~ } K 1 B @ T.T.", -"T.T.@ N y F R R R R R R R R R R Y K Y K K Y R R K K A 1 B @ T.T.", -"T.T.@ n N B B N B B B B B B B B B B B B B B B B B B B B v @ T.T.", -"T.T.. + @ @ @ @ @ @ @ @ @ @ @ @ + + + # @ @ @ @ X X @ @ @ T.T.", -"T.T.T.T.T.T.T.T.T.T.T.T.T.T.T.T.T.T.T.T.T.T.T.T.T.T.T.T.T.T.T.T." -}; diff --git a/lib-src/mod-nyq-bench/images/edit-paste-small.xpm b/lib-src/mod-nyq-bench/images/edit-paste-small.xpm deleted file mode 100644 index 02ae0c6da..000000000 --- a/lib-src/mod-nyq-bench/images/edit-paste-small.xpm +++ /dev/null @@ -1,99 +0,0 @@ -/* XPM */ -static const char *edit_paste_small[] = { -/* columns rows colors chars-per-pixel */ -"16 16 77 1", -" c #6A4200", -". c #6B4301", -"X c #6C4301", -"o c #6B4403", -"O c #6C4401", -"+ c #6D4401", -"@ c #6E4502", -"# c #6E4602", -"$ c #6F4602", -"% c #5C5C5B", -"& c gray36", -"* c gray37", -"= c #5F5F5E", -"- c #666864", -"; c #676964", -": c #6E6C64", -"> c #6E6D64", -", c #6A6C68", -"< c #706D63", -"1 c #706D64", -"2 c #716F64", -"3 c #736F64", -"4 c #7E7E7B", -"5 c #7F7F7C", -"6 c #B37B22", -"7 c #B97F23", -"8 c #BA7F23", -"9 c #A77D3B", -"0 c #A37C3D", -"q c #A47E3E", -"w c #A17C40", -"e c #C08424", -"r c #C58726", -"t c #C58727", -"y c #C68827", -"u c #C28628", -"i c #80807D", -"p c #959589", -"a c #97978A", -"s c #B1B2B2", -"d c #B2B4B4", -"f c #B3B5B5", -"g c #B7B7B4", -"h c #B8B9B5", -"j c #B9B9B6", -"k c #B9BAB6", -"l c #BBBBBB", -"z c #C1C2BE", -"x c #CCCDCA", -"c c #CDCECB", -"v c #D8D8D5", -"b c #D9D9D6", -"n c #DADAD8", -"m c #DBDBD9", -"M c gray88", -"N c #E7E7E4", -"B c #E7E7E5", -"V c #E8E8E6", -"C c #E9E9E7", -"Z c #EAEAE8", -"A c #EBEBE9", -"S c #EBEBEA", -"D c #ECECEA", -"F c #ECECEB", -"G c #EDEDEB", -"H c #EDEDEC", -"J c #EDEEED", -"K c #EEEEED", -"L c #EFEFED", -"P c #EFEFEE", -"I c #F0F0EF", -"U c #F1F1F1", -"Y c gray95", -"T c #FEFEFD", -"R c #FEFEFE", -"E c gray100", -"W c None", -/* pixels */ -"WWWWW******WWWWW", -"WWOOo*pppp&oooWW", -"WOeq,*iwii*,w8oW", -"W$y2UMllllMY,uoW", -"W$r;EIIIIUIE,uXW", -"W$r-EIffffHE;u W", -"W$y-EIIIIIHE;u W", -"WOy;EIffdsZE;u W", -"WOr-EUHHZZnE;u W", -"WOr-EHHZCncE;e W", -"W$r-EDZCcjjE;u W", -"WOr;ECNvjEEE;u W", -"W$y;ENvzgEE;yu W", -"W$r2HEEEHE;uyu W", -"WX7q3,,,,,0006OW", -"WWXXOOOOOOOOOXWW" -}; diff --git a/lib-src/mod-nyq-bench/images/edit-redo-large.xpm b/lib-src/mod-nyq-bench/images/edit-redo-large.xpm deleted file mode 100644 index 8de009507..000000000 --- a/lib-src/mod-nyq-bench/images/edit-redo-large.xpm +++ /dev/null @@ -1,212 +0,0 @@ -/* XPM */ -static const char *edit_redo_large[] = { -/* columns rows colors chars-per-pixel */ -"32 32 174 2", -" c #4C9605", -". c #4E9A06", -"X c #4E9B06", -"o c #4F9B06", -"O c #4F9A07", -"+ c #4F9C06", -"@ c #4F9C07", -"# c #4F9C08", -"$ c #509D06", -"% c #519D06", -"& c #509D07", -"* c #509E07", -"= c #509B08", -"- c #509B09", -"; c #519B0A", -": c #509C08", -"> c #519C0A", -", c #519D0A", -"< c #539F0B", -"1 c #55A00E", -"2 c #59A311", -"3 c #5AA013", -"4 c #5BA414", -"5 c #5CA417", -"6 c #5EA917", -"7 c #5CA21A", -"8 c #5FA61D", -"9 c #5FA51E", -"0 c #68A50B", -"q c #69A710", -"w c #6BA71C", -"e c #66B11F", -"r c #69AF25", -"t c #6BAD2D", -"y c #6CAF2D", -"u c #6BB623", -"i c #6CB725", -"p c #74BD2C", -"a c #71B531", -"s c #73D216", -"d c #74D217", -"f c #75D219", -"g c #79C52F", -"h c #79D420", -"j c #7AD422", -"k c #7CD526", -"l c #7DD528", -"z c #7CC336", -"x c #7DBD40", -"c c #7FBE44", -"v c #81C532", -"b c #82C934", -"n c #86CA36", -"m c #83C43B", -"M c #80C83A", -"N c #84CC3F", -"B c #85D835", -"V c #87D838", -"C c #88D93A", -"Z c #8AD93C", -"A c #80BD43", -"S c #84CA41", -"D c #88CF42", -"F c #87C54B", -"G c #87C14E", -"H c #88C74B", -"J c #8AD242", -"K c #8BD246", -"L c #8FD445", -"P c #8CDA40", -"I c #8DDA42", -"U c #8FDB45", -"Y c #8ED549", -"T c #90DB46", -"R c #90D74C", -"E c #91DB48", -"W c #91DB49", -"Q c #92D84B", -"! c #93DB4D", -"~ c #94DB4F", -"^ c #93DC4C", -"/ c #90CE55", -"( c #92CE56", -") c #93CD5B", -"_ c #95DC50", -"` c #97DD53", -"' c #97DC55", -"] c #99DE55", -"[ c #95D45A", -"{ c #9AD55F", -"} c #9BDE58", -"| c #9BDF59", -" . c #9CDF5A", -".. c #9CDF5B", -"X. c #9DDF5C", -"o. c #9DDF5D", -"O. c #9FDF5F", -"+. c #9EE05F", -"@. c #98CF63", -"#. c #9FDE60", -"$. c #9CD169", -"%. c #A0DA67", -"&. c #A1D76C", -"*. c #A2DF68", -"=. c #A3DF69", -"-. c #A3DB6C", -";. c #A5DD6C", -":. c #A5DA71", -">. c #A6DE70", -",. c #A5D874", -"<. c #AADD79", -"1. c #9FE060", -"2. c #A0E060", -"3. c #A0E061", -"4. c #A1E062", -"5. c #A1E063", -"6. c #A1E163", -"7. c #A1E064", -"8. c #A2E064", -"9. c #A2E164", -"0. c #A2E165", -"q. c #A2E166", -"w. c #A3E167", -"e. c #A4E168", -"r. c #A4E269", -"t. c #A5E26A", -"y. c #A6E26A", -"u. c #A7E26C", -"i. c #A7E36D", -"p. c #A8E36F", -"a. c #A8E370", -"s. c #A9E370", -"d. c #AAE372", -"f. c #ABE474", -"g. c #ACE475", -"h. c #ADE476", -"j. c #ADE478", -"k. c #AEE478", -"l. c #AEE578", -"z. c #AEE579", -"x. c #AFE47A", -"c. c #AFE57A", -"v. c #AFE57B", -"b. c #AEE17D", -"n. c #AFE27D", -"m. c #B0E57C", -"M. c #B2E57F", -"N. c #B1E67E", -"B. c #B2E67F", -"V. c #AFDE82", -"C. c #B2E680", -"Z. c #B2E582", -"A. c #B4E782", -"S. c #B4E783", -"D. c #B4E685", -"F. c #B5E785", -"G. c #B7E787", -"H. c #B6E689", -"J. c #B8E78B", -"K. c #B9E78D", -"L. c #B9E88B", -"P. c #BAE98D", -"I. c #BBE88E", -"U. c #BAE88F", -"Y. c #BBE98F", -"T. c #BCE990", -"R. c #BCE991", -"E. c #BDE992", -"W. c #BDE993", -"Q. c #C0E898", -"!. c #C0E999", -"~. c #C2EB9A", -"^. c #C4EC9E", -"/. c None", -/* pixels */ -"/./././././././././././././././././././././././././././././././.", -"/./././././././././././././././.o /././././././././././././././.", -"/./././././././././././././././.o $ /./././././././././././././.", -"/./././././././././././././././.o x $ /././././././././././././.", -"/./././././././././././././././.o Z.F o /./././././././././././.", -"/./././././././././././././././.o D.x.( # /././././././././././.", -"/./././././././././././././././.. H...g.@., /./././././././././.", -"/./././././././././././././././.. K.o.} p.*.1 /././././././././.", -"/././././././././././././.o $ + ; K.1. .] y.;.4 + /././././././.", -"/././././././././././.+ u ( -.b.K.P.6.o.} _ #.=.6 + /./././././.", -"/././././././././.+ 9 :.^.Y.S.m.d.y.6.+.} ^ h l ~ e + /././././.", -"/./././././././.+ G !.E.S.C.g.g.i.y.6.+.+.k s s j _ i + /./././.", -"/././././././.$ F !.F.L.S.m.m.f.d.y.0.1.U s s s B R 2 + /./././.", -"/././././././.t E.C.C.F.F.m.l.g.i.y.0.1.h s s V Y 1 /./././././.", -"/./././././.+ V.C.l.m.m.C.L.Y.E.P.E.6.E s s Z K , /././././././.", -"/./././././.a P.s.g.l.P.!.$.A y 7 K.6.k s P J , /./././././././.", -"/././././.+ ) l.p.s.P.&.5 ; /./.; K.V f P S , /././././././././.", -"/././././.$ ,.p.e.H.@.+ /./././.; *.f U M + /./././././././././.", -"/././././., <.e.p.x.; /././././.o ' E z # /././././././././././.", -"/././././.+ ;.6.x.c /./././././.o ^ p + /./././././././././././.", -"/././././.$ [ *.g.9 /./././././.o u + /././././././././././././.", -"/./././././.m 0.p.3 /./././././.o o /./././././././././././././.", -"/./././././.q #.0.w /./././././. /././././././././././././././.", -"/././././././.n o.v /./././././././././././././././././././././.", -"/./././././././.L E 0 /././././././././././././././././././././.", -"/././././././././.J b /././././././././././././././././././././.", -"/./././././././././.S g /./././././././././././././././././././.", -"/./././././././././././././././././././././././././././././././.", -"/./././././././././././././././././././././././././././././././.", -"/./././././././././././././././././././././././././././././././.", -"/./././././././././././././././././././././././././././././././.", -"/./././././././././././././././././././././././././././././././." -}; diff --git a/lib-src/mod-nyq-bench/images/edit-redo-small.xpm b/lib-src/mod-nyq-bench/images/edit-redo-small.xpm deleted file mode 100644 index 046efedc9..000000000 --- a/lib-src/mod-nyq-bench/images/edit-redo-small.xpm +++ /dev/null @@ -1,69 +0,0 @@ -/* XPM */ -static const char *edit_redo_small[] = { -/* columns rows colors chars-per-pixel */ -"16 16 47 1", -" c #4E9A06", -". c #529D0A", -"X c #559F0C", -"o c #5AA80F", -"O c #73D216", -"+ c #77D014", -"@ c #75D318", -"# c #8F9B0C", -"$ c #919D05", -"% c #9A9902", -"& c #99A605", -"* c #93A10B", -"= c #AFD71A", -"- c #9BD622", -"; c #97DD2A", -": c #9DC230", -"> c #AFC723", -", c #A1DA23", -"< c #A0DB24", -"1 c #A4DE24", -"2 c #A5DF26", -"3 c #B3D937", -"4 c #B8DD3A", -"5 c #8AE234", -"6 c #BAE031", -"7 c #C8D009", -"8 c #CBD417", -"9 c #CCD41E", -"0 c #CDD624", -"q c #C0D62C", -"w c #D9DE23", -"e c #A9D846", -"r c #ACD945", -"t c #A9DE49", -"y c #BEE246", -"u c #A1E950", -"i c #A6EF61", -"p c #AFEF67", -"a c #B1E963", -"s c #B1ED60", -"d c #B2EC64", -"f c #B1EF65", -"g c #AEF16A", -"h c #AEF26B", -"j c #AEF36C", -"k c #B3F573", -"l c None", -/* pixels */ -"lllllllll llllll", -"lllllllll lllll", -"lllllllll j llll", -"llllll jj lll", -"llll #tgjkiOj ll", -"lll rpu11-1OOj l", -"ll ef2;--=OOO@j ", -"l :s2==7+@OOO5 l", -"lXa68-,,1-w@5 ll", -"l.f0* 95 lll", -"l y& llll 5 llll", -"l 3 lllll lllll", -"l 4 lllll llllll", -"l >$llllllllllll", -"lloq%lllllllllll", -"llllllllllllllll" -}; diff --git a/lib-src/mod-nyq-bench/images/edit-select-all-large.xpm b/lib-src/mod-nyq-bench/images/edit-select-all-large.xpm deleted file mode 100644 index 4a72a71bf..000000000 --- a/lib-src/mod-nyq-bench/images/edit-select-all-large.xpm +++ /dev/null @@ -1,106 +0,0 @@ -/* XPM */ -static const char *edit_select_all_large[] = { -/* columns rows colors chars-per-pixel */ -"32 32 68 1", -" c black", -". c #878985", -"X c #878A85", -"o c #888A85", -"O c #8B8D88", -"+ c #8B8D89", -"@ c #8C8E88", -"# c #8C8E89", -"$ c #8D8F8B", -"% c #859CB4", -"& c #ACC3DA", -"* c #ACC3DB", -"= c #ADC4DC", -"- c #AEC5DC", -"; c #AEC5DD", -": c #AFC6DD", -"> c #AFC6DE", -", c #B0C7DE", -"< c #B0C7DF", -"1 c #B1C8DF", -"2 c #B1C8E0", -"3 c #B2C9E0", -"4 c #B2C9E1", -"5 c #B3CAE1", -"6 c #B3CAE2", -"7 c #B4CBE2", -"8 c #B4CBE3", -"9 c #B5CCE3", -"0 c #E2E2DE", -"q c #E2E2DF", -"w c #E3E3DF", -"e c #E3E3E0", -"r c #E3E3E1", -"t c #E4E4E1", -"y c #E4E4E2", -"u c #E5E5E3", -"i c #E5E5E4", -"p c #E6E6E4", -"a c #E6E6E5", -"s c #E6E6E6", -"d c #E7E7E6", -"f c #E7E7E7", -"g c gray91", -"h c #E9E9E9", -"j c #EAEAEA", -"k c #EBEBEA", -"l c gray92", -"z c #ECECEB", -"x c #ECECEC", -"c c #EDEDEC", -"v c gray93", -"b c #EEEEED", -"n c #EEEEEE", -"m c #EFEFEE", -"M c #EFEFEF", -"N c #F0F0EF", -"B c gray94", -"V c #F1F1F0", -"C c #F1F1F1", -"Z c #F2F2F1", -"A c #F3F3F2", -"S c #F4F4F3", -"D c #F5F5F4", -"F c #F6F6F5", -"G c #F7F7F6", -"H c #F8F8F7", -"J c gray100", -"K c None", -/* pixels */ -"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK", -"KKK$oooooooooooooooooooooooo+KKK", -"KKKoJJJJJJJJJJJJJJJJJJJJJJJJ$KKK", -"KKKoJHHHHHHHHHHHHHHHHHHHHHGJOKKK", -"KKKoJHHHHHHHHHHHHHHHHHHHHGGJOKKK", -"KKKoJH99999999999999999888SJOKKK", -"KKKoJH99999999999999998855SJ+KKK", -"KKKoJH9%%%%%%%9%%%%%%%%%55AJOKKK", -"KKKoJH9%%%%%%%999988445555AJOKKK", -"KKKoJH9%%%%%%%999889455525NJOKKK", -"KKKoJH9%%%%%%%98884485522AMJ+KKK", -"KKKoJH9%%%%%%%8%%%%%%%%22nMJOKKK", -"KKKoJH9%%%%%%%5545555<22-MMJOKKK", -"KKKoJH9999988855555<25<<-MzJOKKK", -"KKKoJH999888555525<22--MMkzJ+KKK", -"KKKoJH9%%%%%%%%%%%%%%5-kMlkJOKKK", -"KKKoJH844445255222<<2- c #B0C6DE", -", c #B1C7DF", -"< c #B2C8E0", -"1 c #B3C9E1", -"2 c gray92", -"3 c #ECECEC", -"4 c #EEEEEE", -"5 c gray94", -"6 c gray95", -"7 c #F4F4F4", -"8 c gray96", -"9 c #F6F6F6", -"0 c gray97", -"q c #F8F8F8", -"w c #F9F9F9", -"e c gray98", -"r c #FBFBFB", -"t c gray99", -"y c #FDFDFD", -"u c #FEFEFE", -"i c None", -/* pixels */ -"io............Xi", -"i.uuuuurrrrrrroi", -"i.u$$*$******qXi", -"i.u$@@#@*@@@-qoi", -"i.u$@@@@-----qXi", -"i.u*@@@@-;;;20oi", -"i.u*@@@#;@@;3qXi", -"i.r**-;;>>>>4qoi", -"i.u*-;>;>>>,50oi", -"i.r-@@@#@@@<5roi", -"i.r-;;>> < >70Xi", -"i.r-;>>>< 0000oi", -"i.r-####< 0000Xi", -"i.r--->>< 0r00oi", -"i.000r00 r q0rXi", -"io............+i" -}; diff --git a/lib-src/mod-nyq-bench/images/edit-undo-large.xpm b/lib-src/mod-nyq-bench/images/edit-undo-large.xpm deleted file mode 100644 index 23bfc7df5..000000000 --- a/lib-src/mod-nyq-bench/images/edit-undo-large.xpm +++ /dev/null @@ -1,221 +0,0 @@ -/* XPM */ -static const char *edit_undo_large[] = { -/* columns rows colors chars-per-pixel */ -"32 32 183 2", -" c #BE9A00", -". c #BE9D00", -"X c #C2A100", -"o c #C4A000", -"O c #C5A000", -"+ c #C6A100", -"@ c #C5A200", -"# c #C6A200", -"$ c #C6A300", -"% c #C7A300", -"& c #C6A201", -"* c #C6A301", -"= c #C5A102", -"- c #C5A203", -"; c #C5A303", -": c #C6A202", -"> c #C6A302", -", c #C2A400", -"< c #C6A400", -"1 c #C7A400", -"2 c #C4A600", -"3 c #C4A502", -"4 c #C5A304", -"5 c #C5A305", -"6 c #C6A304", -"7 c #C6A406", -"8 c #C6A407", -"9 c #C8A305", -"0 c #C8A506", -"q c #C7A50B", -"w c #C8A60D", -"e c #C8A70E", -"r c #C9A80C", -"t c #CFAF0C", -"y c #CDB200", -"u c #D0B202", -"i c #D1B005", -"p c #D2B108", -"a c #D6B90A", -"s c #CBAA10", -"d c #CBAA11", -"f c #C9A812", -"g c #D3B511", -"h c #D5B713", -"j c #D6B910", -"k c #D6B911", -"l c #D2B41B", -"z c #D4B71F", -"x c #DABE1A", -"c c #D9BD1D", -"v c #CCAE20", -"b c #CDAE20", -"n c #CDAF23", -"m c #CEAF24", -"M c #D2B420", -"N c #D2B629", -"B c #D9BF31", -"V c #DAC208", -"C c #EDD400", -"Z c #EDD401", -"A c #EDD402", -"S c #EDD403", -"D c #EDD506", -"F c #EDD509", -"G c #EDD50A", -"H c #EDD60E", -"J c #E5CB16", -"K c #EED610", -"L c #EED611", -"P c #EED713", -"I c #EAD314", -"U c #EED715", -"Y c #EED71B", -"T c #EAD31F", -"R c #EED81A", -"E c #EED81C", -"W c #EFD81D", -"Q c #DCC331", -"! c #DDC436", -"~ c #E4CB20", -"^ c #E4CD2E", -"/ c #EFD920", -"( c #EFD921", -") c #EFD922", -"_ c #EFDA26", -"` c #EFDA29", -"' c #F0DB2D", -"] c #E2CA31", -"[ c #E2CB3C", -"{ c #EFDC33", -"} c #ECD835", -"| c #F0DC32", -" . c #F0DC34", -".. c #F0DC35", -"X. c #D7BD43", -"o. c #D8BD42", -"O. c #DDC543", -"+. c #E2CB49", -"@. c #E7D240", -"#. c #EBD740", -"$. c #EAD649", -"%. c #EDDA4A", -"&. c #F1DE40", -"*. c #F1DF44", -"=. c #F2DF47", -"-. c #E2CD58", -";. c #E0CA5C", -":. c #EBD857", -">. c #EBDA5D", -",. c #F1DF5D", -"<. c #F2E04B", -"1. c #F2E04C", -"2. c #F2E04D", -"3. c #F2E150", -"4. c #F3E255", -"5. c #F3E256", -"6. c #F3E25A", -"7. c #F3E35A", -"8. c #F3E35B", -"9. c #F3E35C", -"0. c #F3E35E", -"q. c #F3E45F", -"w. c #EBD962", -"e. c #EFDE62", -"r. c #E4D26C", -"t. c #E9D76D", -"y. c #ECDD7B", -"u. c #F3E460", -"i. c #F3E461", -"p. c #F3E462", -"a. c #F3E463", -"s. c #F4E464", -"d. c #F4E565", -"f. c #F4E566", -"g. c #F4E568", -"h. c #F4E56A", -"j. c #F4E66B", -"k. c #F4E66C", -"l. c #F4E66D", -"z. c #F4E66E", -"x. c #F4E66F", -"c. c #F2E572", -"v. c #F4E670", -"b. c #F4E771", -"n. c #F1E277", -"m. c #F3E574", -"M. c #F4E775", -"N. c #F5E775", -"B. c #F5E776", -"V. c #F4E777", -"C. c #F1E47A", -"Z. c #F4E778", -"A. c #F5E779", -"S. c #F5E878", -"D. c #F5E87B", -"F. c #F5E87C", -"G. c #F5E87D", -"H. c #F5E97D", -"J. c #F5E97F", -"K. c #EFE287", -"L. c #F6EA87", -"P. c #F6EB8B", -"I. c #F5EA8D", -"U. c #F6EB8D", -"Y. c #EFE191", -"T. c #F2E897", -"R. c #F7EC95", -"E. c #F3E99A", -"W. c #F7EE9C", -"Q. c #F8EE9D", -"!. c #F4EAA6", -"~. c #F8EFA3", -"^. c #F8EFA5", -"/. c #F8EFA6", -"(. c #F6EEA9", -"). c #F7EEAC", -"_. c #F8F0A8", -"`. c #F8F0A9", -"'. c #F8F0AA", -"]. c #F8F0AB", -"[. c #F8F1AE", -"{. c #F8F0AF", -"}. c None", -/* pixels */ -"}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.", -"}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.o }.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.", -"}.}.}.}.}.}.}.}.}.}.}.}.}.}.> # }.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.", -"}.}.}.}.}.}.}.}.}.}.}.}.}.# -.7 }.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.", -"}.}.}.}.}.}.}.}.}.}.}.}.q y.^.7 }.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.", -"}.}.}.}.}.}.}.}.}.}.}.b T.P.^.# }.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.", -"}.}.}.}.}.}.}.}.}.# X.(.F.8._.6 }.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.", -"}.}.}.}.}.}.}.}.# r.[.F.a.q._.7 }.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.", -"}.}.}.}.}.}.}.e Y.[.F.k.j.q.].7 # > > }.}.}.}.}.}.}.}.}.}.}.}.}.", -"}.}.}.}.}.}.m !.~.F.V.v.f.q.].W.I.C.:.! 0 # }.}.}.}.}.}.}.}.}.}.", -"}.}.}.}.# X.).U.V.V.v.k.s.q.8.<.{ _ | 8.D.+.f }.}.}.}.}.}.}.}.}.", -"}.}.}.# ;.].V.k.k.k.j.f.s.4.P A A A A A H =.n.N > }.}.}.}.}.}.}.", -"}.}.}.}.b E.U.a.s.s.s.q.2.H A A A A A A S S U V.Q # }.}.}.}.}.}.", -"}.}.}.}.}.e K.R.s.8.7.2.G A A A A A A A S S A P c.n }.}.}.}.}.}.", -"}.}.}.}.}.}.# t.W.9...G A A D.D.v.f.4.` S S S S ` w.# }.}.}.}.}.", -"}.}.}.}.}.}.}.# O.V._ A A A F.r f l Q >.k.{ S S S a.z }.}.}.}.}.", -"}.}.}.}.}.}.}.}.1 M m.| A A D.6 }.}.}.> g ,.&.S S ' [ # }.}.}.}.", -"}.}.}.}.}.}.}.}.}.# f e.&.A z.6 }.}.}.}.o q %.' A Y @.# }.}.}.}.", -"}.}.}.}.}.}.}.}.}.}.}.0 $.2.a.X }.}.}.}.}.}.p 2.S H } # }.}.}.}.", -"}.}.}.}.}.}.}.}.}.}.}.}.> ] 8.6 }.}.}.}.}.}.# ^ R P } 6 }.}.}.}.", -"}.}.}.}.}.}.}.}.}.}.}.}.}.# c # }.}.}.}.}.}.}.x ) R ~ # }.}.}.}.", -"}.}.}.}.}.}.}.}.}.}.}.}.}.}.# # }.}.}.}.}.}.}.k ) ) k }.}.}.}.}.", -"}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.. }.}.}.}.}.}.}.k W T 6 }.}.}.}.}.", -"}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.> J W i }.}.}.}.}.}.", -"}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.i I a X }.}.}.}.}.}.", -"}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.> V u . }.}.}.}.}.}.}.", -"}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.2 y > }.}.}.}.}.}.}.}.}.", -"}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.", -"}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.", -"}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.", -"}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.", -"}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}.}." -}; diff --git a/lib-src/mod-nyq-bench/images/edit-undo-small.xpm b/lib-src/mod-nyq-bench/images/edit-undo-small.xpm deleted file mode 100644 index d0a75dffb..000000000 --- a/lib-src/mod-nyq-bench/images/edit-undo-small.xpm +++ /dev/null @@ -1,83 +0,0 @@ -/* XPM */ -static const char *edit_undo_small[] = { -/* columns rows colors chars-per-pixel */ -"16 16 61 1", -" c #BB9F15", -". c #BEA113", -"X c #BCA114", -"o c #BCA015", -"O c #BDA116", -"+ c #BBA11B", -"@ c #BFA31B", -"# c #C4A000", -"$ c #C4A901", -"% c #C8AC02", -"& c #CBAA0E", -"* c #C2A211", -"= c #C1A313", -"- c #C2A611", -"; c #C1A314", -": c #C1A319", -"> c #C0A41A", -", c #C5AB1B", -"< c #C0A623", -"1 c #D6C004", -"2 c #DAC304", -"3 c #D8C207", -"4 c #DFC80A", -"5 c #DFC80B", -"6 c #DFC90F", -"7 c #F7DD05", -"8 c #E3CD16", -"9 c #E8D21D", -"0 c #F1DB29", -"q c #F4DF2C", -"w c #ECD936", -"e c #FAE320", -"r c #FBE425", -"t c #F5E02F", -"y c #F6E02F", -"u c #F6E131", -"i c #F7E232", -"p c #F8E232", -"a c #D8C543", -"s c #DBC443", -"d c #E1CD40", -"f c #E3CE41", -"g c #E9DA5D", -"h c #EADB66", -"j c #EBDC6F", -"k c #EEE16E", -"l c #F2E469", -"z c #F3E56A", -"x c #F6E769", -"c c #F5E66D", -"v c #F7E86C", -"b c #F7E86E", -"n c #F9EA69", -"m c #FAEB6F", -"M c #EFE276", -"N c #FAEC73", -"B c #FBED76", -"V c #FBED79", -"C c #F2E788", -"Z c #FBF3AD", -"A c None", -/* pixels */ -"AAAAAA#AAAAAAAAA", -"AAAAA##AAAAAAAAA", -"AAAA#Z#AAAAAAAAA", -"AAA#Zr##.o+AAAAA", -"AA#ZueNmbno;AAAA", -"A#Zyu0y08wxf=AAA", -"#Zyppuy0999wdoAA", -"A#Vpy1119995z,oA", -"AA#B2Bnnnn741j@A", -"AAA#BB####$M5z>A", -"AAAA#B#AAAA#cM>A", -"AAAAA##AAAAA%C=A", -"AAAAAA#AAAAA&g c #41790B", -", c #41790C", -"< c #42790D", -"1 c #427A0E", -"2 c #4E9905", -"3 c #4F9B05", -"4 c #509C05", -"5 c #519E06", -"6 c #529F06", -"7 c #529E07", -"8 c #488016", -"9 c #4B8116", -"0 c #4C821A", -"q c #4D821B", -"w c #50851D", -"e c #52A007", -"r c #53A007", -"t c #54A207", -"y c #54A307", -"u c #54A308", -"i c #55A408", -"p c #56A508", -"a c #57A608", -"s c #57A709", -"d c #58A809", -"f c #59A909", -"g c #59AA09", -"h c #58A80B", -"j c #59AA0A", -"k c #5AAC0A", -"l c #5BAD0A", -"z c #5BAE0B", -"x c #5CAD0B", -"c c #5CAE0B", -"v c #5CAF0B", -"b c #5DAF0B", -"n c #5DB00B", -"m c #5EB10B", -"M c #5EB10C", -"N c #5EB20C", -"B c #5FB20C", -"V c #5FB30C", -"C c #5BA810", -"Z c #60B40C", -"A c #60B50D", -"S c #61B50D", -"D c #61B60D", -"F c #61B70D", -"G c #62B70D", -"H c #63B90E", -"J c #63BA0E", -"K c #64BB0E", -"L c #65BC0F", -"P c #61A41F", -"I c #62A61F", -"U c #62AD18", -"Y c #62B015", -"T c #67BF10", -"R c #67B31B", -"E c #578B23", -"W c #578B25", -"Q c #598C29", -"! c #5B8B2C", -"~ c #5D8D2E", -"^ c #689C37", -"/ c #6A9D39", -"( c #65A625", -") c #66A727", -"_ c #68AB27", -"` c #69A92B", -"' c #69B221", -"] c #6DB328", -"[ c #6EB22C", -"{ c #6FB02F", -"} c #70B52C", -"| c #75BE2B", -" . c #6EAE30", -".. c #70AD35", -"X. c #71AD37", -"o. c #73AF39", -"O. c #74AF3B", -"+. c #71B132", -"@. c #77B23C", -"#. c #76B03E", -"$. c #79B63E", -"%. c #7BBB3D", -"&. c #68C010", -"*. c #6AC411", -"=. c #6CC317", -"-. c #6DC714", -";. c #6FC818", -":. c #72CB19", -">. c #7AD223", -",. c #729E46", -"<. c #77A24E", -"1. c #7AAA4A", -"2. c #78B140", -"3. c #78B141", -"4. c #79B342", -"5. c #7AB242", -"6. c #7AB343", -"7. c #7AB344", -"8. c #7CB644", -"9. c #7EB745", -"0. c #7DB447", -"q. c #7DB646", -"w. c #7CB940", -"e. c #7CB841", -"r. c #7CBA40", -"t. c #7EBC41", -"y. c #7FBA45", -"u. c #7FB946", -"i. c #7EB24A", -"p. c #7EB549", -"a. c #7FB54A", -"s. c #7FB54B", -"d. c #7FB848", -"f. c #84C93E", -"g. c #80BB47", -"h. c #80B64C", -"j. c #81B74C", -"k. c #81B64D", -"l. c #82B74F", -"z. c #80BB48", -"x. c #81B94A", -"c. c #82B94D", -"v. c #83BA4C", -"b. c #83BA4D", -"n. c #84BA4D", -"m. c #85AF5D", -"M. c #83B750", -"N. c #84B850", -"B. c #84B851", -"V. c #85B952", -"C. c #85B853", -"Z. c #86B953", -"A. c #86BA52", -"S. c #86BA53", -"D. c #86B954", -"F. c #88BB57", -"G. c #8AB65C", -"H. c #8BBC5B", -"J. c #8CBD5D", -"K. c #8DBD5E", -"L. c #8EB469", -"P. c #94BE6B", -"I. c #97BD70", -"U. c #8FC25E", -"Y. c #91C35E", -"T. c #94D455", -"R. c #91C064", -"E. c #92C064", -"W. c #92C065", -"Q. c #92C066", -"!. c #96C36A", -"~. c #9CCB6D", -"^. c #9DCD6E", -"/. c #9EC776", -"(. c #A2DD67", -"). c #A1C67D", -"_. c #A0C979", -"`. c #A2C97E", -"'. c #A3CA7E", -"]. c #A3CB7E", -"[. c #A4CC7E", -"{. c #A6CF7F", -"}. c #A3D075", -"|. c #A4D275", -" X c #AEDE7D", -".X c #AEDF7D", -"XX c #AFE37C", -"oX c #AEE07E", -"OX c #9FC280", -"+X c #A8CB85", -"@X c #A8D180", -"#X c #AAD480", -"$X c #ACD781", -"%X c #ADD982", -"&X c #AFDB82", -"*X c #AFDC84", -"=X c #ADD08B", -"-X c #AFD18E", -";X c #B0DD83", -":X c #B1DE83", -">X c #B0D18F", -",X c #AECD91", -"Xm.* dXdXdXdXdXdXdX", -"dXdXdXdXdX+ 1X3.7.0.p.k.v.v.v.n.v.g.x.8.7.@.3.[.I.1 dXdXdXdXdXdX", -"dXdXdXdXdX+ 1XO.O.3.3.8.8.y.z.g.g.y.e.+._ I P ( R.).q dXdXdXdXdX", -"dXdXdXdXdX+ .(.Y.> dXdXdXdXdXdXdXdXdXdXdXdX", -"dXdXdXdXdXdXdXdXdXdXdXdXdXdX* 7XXXi.* dXdXdXdXdXdXdXdXdXdXdXdXdX", -"dXdXdXdXdXdXdXdXdXdXdXdXdXdX* ;X/ # dXdXdXdXdXdXdXdXdXdXdXdXdXdX", -"dXdXdXdXdXdXdXdXdXdXdXdXdXdX+ w X dXdXdXdXdXdXdXdXdXdXdXdXdXdXdX", -"dXdXdXdXdXdXdXdXdXdXdXdXdXdX+ dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX", -"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX", -"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX", -"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX", -"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX" -}; diff --git a/lib-src/mod-nyq-bench/images/go-next-small.xpm b/lib-src/mod-nyq-bench/images/go-next-small.xpm deleted file mode 100644 index 9986bade1..000000000 --- a/lib-src/mod-nyq-bench/images/go-next-small.xpm +++ /dev/null @@ -1,122 +0,0 @@ -/* XPM */ -static const char *go_next_small[] = { -/* columns rows colors chars-per-pixel */ -"16 16 100 2", -" c #3A7304", -". c #3A7404", -"X c #3B7404", -"o c #3B7504", -"O c #3A7405", -"+ c #3B7604", -"@ c #3C7604", -"# c #3C7804", -"$ c #40790A", -"% c #427A0E", -"& c #437A10", -"* c #467C14", -"= c #4E9A06", -"- c #4F9C06", -"; c #4D8418", -": c #538B1E", -"> c #52A007", -", c #54A408", -"< c #57A709", -"1 c #5AAC0B", -"2 c #5BAE0B", -"3 c #5EB30D", -"4 c #5FB20E", -"5 c #61B70E", -"6 c #62B90E", -"7 c #64BC0F", -"8 c #64BA11", -"9 c #66BF10", -"0 c #66B817", -"q c #6CBA1F", -"w c #6CBF1C", -"e c #568926", -"r c #598C2A", -"t c #5E8F30", -"y c #5F8F31", -"u c #68A92B", -"i c #6BAC2F", -"p c #6FBA26", -"a c #6AA136", -"s c #6EAC33", -"d c #71A63E", -"f c #74AF3B", -"g c #78B63D", -"h c #7FCB34", -"j c #80BE44", -"k c #82BE49", -"l c #81AB5A", -"z c #82AB5A", -"x c #85B954", -"c c #88BB58", -"v c #8BBC5B", -"b c #8BBB5D", -"n c #8BBD5C", -"m c #8CBE5C", -"M c #84C249", -"N c #88C44D", -"B c #89C350", -"V c #8AC255", -"C c #8DC655", -"Z c #8BC158", -"A c #8CC358", -"S c #8DC25A", -"D c #8DC15C", -"F c #92D352", -"G c #8FC161", -"H c #91C164", -"J c #99C46F", -"K c #9BCA6D", -"L c #9CD267", -"P c #9DC873", -"I c #9EC976", -"U c #9CC37A", -"Y c #A0D56C", -"T c #A3CA7E", -"R c #A4CC7E", -"E c #A5D773", -"W c #A6D37B", -"Q c #A7D17F", -"! c #A8DA78", -"~ c #A4C684", -"^ c #AACE89", -"/ c #AAD581", -"( c #ABD681", -") c #ABD781", -"_ c #AFD48C", -"` c #B1D291", -"' c #B7D49C", -"] c #B9D79C", -"[ c #BBD99F", -"{ c #BDD9A3", -"} c #C0DBA7", -"| c #C2DCAA", -" . c #C3DCAB", -".. c #C5DDAD", -"X. c #C6DEAF", -"o. c #C7DEB0", -"O. c #CBE0B6", -"+. c #CBE1B7", -"@. c #CEE3BB", -"#. c None", -/* pixels */ -"#.#.#.#.#.. #.#.#.#.#.#.#.#.#.#.", -"#.#.#.#.#. r . #.#.#.#.#.#.#.#.", -"#.#.#.#.#. +.l . #.#.#.#.#.#.#.", -"#.#.#.#.#. @. .~ & #.#.#.#.#.#.", -". . +.J ` ' t . #.#.#.#.", -" } | ....o.o.G G P [ l . #.#.#.", -" { x c m v v D A V D _ U * #.#.", -" ] f s u s g M B N M j K ^ y @ ", -" T = = = > < 1 5 0 p p C I e X ", -" T = = = , 1 3 6 6 w L c % #.#.", -" T T T R Q ) 5 9 h ! d @ #.#.#.", -". . # ) 8 F E : @ #.#.#.#.", -"#.#.#.#.#.. ) Y D $ #.#.#.#.#.#.", -"#.#.#.#.#.. W a . #.#.#.#.#.#.#.", -"#.#.#.#.#.. ; . #.#.#.#.#.#.#.#.", -"#.#.#.#.#.@ #.#.#.#.#.#.#.#.#.#." -}; diff --git a/lib-src/mod-nyq-bench/images/go-previous-large.xpm b/lib-src/mod-nyq-bench/images/go-previous-large.xpm deleted file mode 100644 index 0159b1b3f..000000000 --- a/lib-src/mod-nyq-bench/images/go-previous-large.xpm +++ /dev/null @@ -1,277 +0,0 @@ -/* XPM */ -static const char *go_previous_large[] = { -/* columns rows colors chars-per-pixel */ -"32 32 239 2", -" c #326304", -". c #376D03", -"X c #376F04", -"o c #397403", -"O c #3A7304", -"+ c #3B7304", -"@ c #3A7205", -"# c #3A7404", -"$ c #3B7404", -"% c #3B7504", -"& c #3B7405", -"* c #3B7505", -"= c #3B7604", -"- c #3B7605", -"; c #3B7705", -": c #3C7604", -"> c #3C7605", -", c #3F7709", -"< c #3F770B", -"1 c #3F790A", -"2 c #42790D", -"3 c #427A0E", -"4 c #437A10", -"5 c #447A10", -"6 c #467D13", -"7 c #4F9B05", -"8 c #509D06", -"9 c #519E06", -"0 c #549D0E", -"q c #488014", -"w c #4E831B", -"e c #4E841C", -"r c #50831E", -"t c #52A007", -"y c #53A007", -"u c #53A107", -"i c #54A307", -"p c #55A408", -"a c #56A508", -"s c #57A709", -"d c #57A809", -"f c #58A809", -"g c #59AA09", -"h c #59AA0A", -"j c #5AAC0A", -"k c #5BAD0A", -"l c #5BAE0B", -"z c #5CAE0B", -"x c #5CAF0B", -"c c #5DAF0B", -"v c #5BAB0D", -"b c #5DB00B", -"n c #5EB10B", -"m c #5EB10C", -"M c #5EB20C", -"N c #5FB20C", -"B c #5FB30C", -"V c #59A410", -"C c #59A016", -"Z c #5FAA14", -"A c #60B40C", -"S c #60B50D", -"D c #61B50D", -"F c #61B60D", -"G c #61B70D", -"H c #62B70D", -"J c #63B80E", -"K c #63B90E", -"L c #63BA0E", -"P c #64BB0E", -"I c #65BB0E", -"U c #65BC0F", -"Y c #60A61B", -"T c #62AA1B", -"R c #66AF1D", -"E c #61B014", -"W c #67BF10", -"Q c #548920", -"! c #5B8C2C", -"~ c #5C8D2E", -"^ c #5C902C", -"/ c #60972D", -"( c #649731", -") c #629135", -"_ c #67AD22", -"` c #68AC25", -"' c #6AAB2A", -"] c #6BAA2E", -"[ c #69B023", -"{ c #6DB32A", -"} c #6EB528", -"| c #75BB2E", -" . c #6DAB30", -".. c #6DAB31", -"X. c #70AD35", -"o. c #71AD36", -"O. c #71AD37", -"+. c #73AE39", -"@. c #73AF3A", -"#. c #75AF3C", -"$. c #75B734", -"%. c #76B03E", -"&. c #7BBB3D", -"*. c #68C010", -"=. c #6AC411", -"-. c #6CC712", -";. c #6BC415", -":. c #75CC1E", -">. c #739E48", -",. c #76AA42", -"<. c #76A847", -"1. c #77A24D", -"2. c #78B141", -"3. c #78B340", -"4. c #7AB243", -"5. c #7CB346", -"6. c #7DB744", -"7. c #7DB547", -"8. c #7FBD43", -"9. c #7FB54A", -"0. c #7FB54B", -"q. c #81B74C", -"w. c #82B74F", -"e. c #80BA48", -"r. c #81B84B", -"t. c #83BC4B", -"y. c #84BA4D", -"u. c #84BB4F", -"i. c #86BF4D", -"p. c #85BD4E", -"a. c #83B850", -"s. c #84B851", -"d. c #85B952", -"f. c #86B953", -"g. c #87BB53", -"h. c #86BE50", -"j. c #88BD53", -"k. c #88BF53", -"l. c #89BB57", -"z. c #88BD54", -"x. c #89BF54", -"c. c #8ABE57", -"v. c #87B459", -"b. c #8ABB59", -"n. c #8ABC58", -"m. c #8ABC5A", -"M. c #8BBD5A", -"N. c #8BBC5B", -"B. c #8CBD5B", -"V. c #8CBF5A", -"C. c #8EBF5E", -"Z. c #8EBE5F", -"A. c #8FBF60", -"S. c #8FBF61", -"D. c #8EB568", -"F. c #8EB46A", -"G. c #90BF62", -"H. c #93BE69", -"J. c #84C643", -"K. c #88C150", -"L. c #89C152", -"P. c #8AC154", -"I. c #8AC055", -"U. c #8CC058", -"Y. c #8CC05A", -"T. c #8EC05D", -"R. c #8FC05F", -"E. c #95D159", -"W. c #91C064", -"Q. c #92C065", -"!. c #93C167", -"~. c #94C168", -"^. c #94C268", -"/. c #95C26A", -"(. c #96C36B", -"). c #97C36C", -"_. c #98C46E", -"`. c #98C969", -"'. c #9CC96F", -"]. c #9AC570", -"[. c #9BC571", -"{. c #9BC673", -"}. c #9EC776", -"|. c #9FC27D", -" X c #9FC878", -".X c #A2DA6B", -"XX c #A0CE73", -"oX c #A2CE77", -"OX c #A3CA7E", -"+X c #A4CB7E", -"@X c #A4CC7E", -"#X c #A6CF7F", -"$X c #AADF77", -"%X c #A9CD86", -"&X c #AACE87", -"*X c #A6C788", -"=X c #ABCB8C", -"-X c #A8D180", -";X c #AAD580", -":X c #ACD781", -">X c #ADD982", -",X c #AFDB82", -".vX4 MXMXMXMXMXMXMXMXMXMXMXMXMXMX", -"MXMXMXMXMXMXMXMXMXMXMXMXMX: F.kXmX4 MXMXMXMXMXMXMXMXMXMXMXMXMXMX", -"MXMXMXMXMXMXMXMXMXMXMXMX3 *XhX[.nX4 MXMXMXMXMXMXMXMXMXMXMXMXMXMX", -"MXMXMXMXMXMXMXMXMXMXMXr eXsX[.(.lX5 MXMXMXMXMXMXMXMXMXMXMXMXMXMX", -"MXMXMXMXMXMXMXMXMX- ) kX9X_.).^.vX4 + + + + + + + + + MXMXMXMXMX", -"MXMXMXMXMXMXMXMX- 1.nX%X_.(.^.W.nXlXlXfXfXdXaXrXqX0X- MXMXMXMXMX", -"MXMXMXMXMXMXMX- D.lX}.^.!.G.W.C.B.l.s.s.9.5.3.#.o.8X- MXMXMXMXMX", -"MXMXMXMXMXMX2 |.wX^.C.W.G.C.Y.N.c.k.u.q.9.3.#.+.o.7X+ MXMXMXMXMX", -"MXMXMXMXMXw =XX:X;X-X-X@X+ MXMXMXMXMX", -"MXMXMXMXMXMXMXMXMX. r XXJ.P *.-.yX+ + + + - + + o + + MXMXMXMXMX", -"MXMXMXMXMXMXMXMXMXMX q `.E.;.-.uX+ MXMXMXMXMXMXMXMXMXMXMXMXMXMX", -"MXMXMXMXMXMXMXMXMXMXMXMX, b..X:.pX+ MXMXMXMXMXMXMXMXMXMXMXMXMXMX", -"MXMXMXMXMXMXMXMXMXMXMXMXMX- ,.$XuX+ MXMXMXMXMXMXMXMXMXMXMXMXMXMX", -"MXMXMXMXMXMXMXMXMXMXMXMXMXMX+ / yX+ MXMXMXMXMXMXMXMXMXMXMXMXMXMX", -"MXMXMXMXMXMXMXMXMXMXMXMXMXMXMXX e + MXMXMXMXMXMXMXMXMXMXMXMXMXMX", -"MXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMX+ MXMXMXMXMXMXMXMXMXMXMXMXMXMX", -"MXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMX", -"MXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMX", -"MXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMX", -"MXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMX" -}; diff --git a/lib-src/mod-nyq-bench/images/go-previous-small.xpm b/lib-src/mod-nyq-bench/images/go-previous-small.xpm deleted file mode 100644 index 138d73a79..000000000 --- a/lib-src/mod-nyq-bench/images/go-previous-small.xpm +++ /dev/null @@ -1,120 +0,0 @@ -/* XPM */ -static const char *go_previous_small[] = { -/* columns rows colors chars-per-pixel */ -"16 16 98 2", -" c #3A7304", -". c #3A7404", -"X c #3B7404", -"o c #3B7504", -"O c #3A7405", -"+ c #3B7604", -"@ c #3C7604", -"# c #3D7904", -"$ c #3F790A", -"% c #41790E", -"& c #437A10", -"* c #457C13", -"= c #4E9A06", -"- c #519E07", -"; c #4D8419", -": c #52891E", -"> c #55A409", -", c #56A609", -"< c #58A90A", -"1 c #59AC0B", -"2 c #5AAD0B", -"3 c #5CAD0E", -"4 c #5EB30D", -"5 c #5EA31D", -"6 c #60B50D", -"7 c #61B60E", -"8 c #61B70E", -"9 c #62AF17", -"0 c #65B519", -"q c #578927", -"w c #598B29", -"e c #5A8C2C", -"r c #5D8D2E", -"t c #60A420", -"y c #66AF20", -"u c #66AC22", -"i c #65A827", -"p c #68A92B", -"a c #6BA236", -"s c #6EA23D", -"d c #70AD35", -"f c #71B035", -"g c #75B23C", -"h c #67C111", -"j c #69C211", -"k c #6EC915", -"l c #7CC833", -"z c #7BB642", -"x c #7AB742", -"c c #7FB947", -"v c #7DB549", -"b c #7DA855", -"n c #7FA956", -"m c #80B64D", -"M c #82B74F", -"N c #85B954", -"B c #87BB54", -"V c #87BA57", -"C c #87B65B", -"Z c #88BB58", -"A c #89BC59", -"S c #8ABC5A", -"D c #8BBD5C", -"F c #90BF63", -"G c #97BD72", -"H c #8DC459", -"J c #97DA54", -"K c #91C064", -"L c #96CA65", -"P c #94C26A", -"I c #9DC477", -"U c #A5DC6E", -"Y c #A0C37E", -"T c #A3CA7E", -"R c #A6CF7F", -"E c #A3D572", -"W c #A5D576", -"Q c #A9D77D", -"! c #A5C982", -"~ c #A7CD84", -"^ c #AACF88", -"/ c #A9D480", -"( c #ACD881", -") c #AEDB82", -"_ c #B0DE83", -"` c #B3D296", -"' c #B5D497", -"] c #B8D69B", -"[ c #BDD9A3", -"{ c #BFDAA6", -"} c #C2DCAA", -"| c #C4DDAC", -" . c #C5DEAE", -".. c #C6DEAE", -"X. c #C7DFB1", -"o. c #C8DFB1", -"O. c #CAE0B5", -"+. c None", -/* pixels */ -"+.+.+.+.+.+.+.+.+.+.O +.+.+.+.+.", -"+.+.+.+.+.+.+.+.o w +.+.+.+.+.", -"+.+.+.+.+.+.+. n o. +.+.+.+.+.", -"+.+.+.+.+.+.& Y [ o. +.+.+.+.+.", -"+.+.+.+.o r ` ^ F o. O ", -"+.+.+.o b ' P V D | | X.X.| } ", -"+.+.* G ~ m v M V V C S Z V } ", -"o e ! F d g z c x d i 5 9 p ] ", -"@ q Y B i 0 9 3 2 < , - = = ! ", -"+.+.% C L 0 8 8 8 4 2 , - = T ", -"+.+.+.O s W l j h ) ( / R T T ", -"+.+.+.+.O : E J k _ # ", -"+.+.+.+.+.+.$ H U _ +.+.+.+.+.", -"+.+.+.+.+.+.+.O a Q +.+.+.+.+.", -"+.+.+.+.+.+.+.+.o ; +.+.+.+.+.", -"+.+.+.+.+.+.+.+.+.+.o +.+.+.+.+." -}; diff --git a/lib-src/mod-nyq-bench/images/go-top-large.xpm b/lib-src/mod-nyq-bench/images/go-top-large.xpm deleted file mode 100644 index 2d62bea33..000000000 --- a/lib-src/mod-nyq-bench/images/go-top-large.xpm +++ /dev/null @@ -1,275 +0,0 @@ -/* XPM */ -static const char *go_top_large[] = { -/* columns rows colors chars-per-pixel */ -"32 32 237 2", -" c #3A7403", -". c #3A7304", -"X c #3B7404", -"o c #3A7504", -"O c #3B7504", -"+ c #3B7405", -"@ c #3A7604", -"# c #3B7604", -"$ c #3B7605", -"% c #3D7706", -"& c #3D7508", -"* c #3E7609", -"= c #3F770B", -"- c #3F7809", -"; c #40770C", -": c #40780B", -"> c #41780C", -", c #41790C", -"< c #41780D", -"1 c #427A0E", -"2 c #467D13", -"3 c #467D14", -"4 c #477E14", -"5 c #497F15", -"6 c #487D16", -"7 c #4F9B05", -"8 c #529D07", -"9 c #519E06", -"0 c #539C0D", -"q c #559D0F", -"w c #4E831C", -"e c #599F15", -"r c #53A107", -"t c #54A308", -"y c #56A508", -"u c #57A609", -"i c #58A909", -"p c #59AA0A", -"a c #5AAC0A", -"s c #5BAC0A", -"d c #5CAE0B", -"f c #5DAE0F", -"g c #5DB00B", -"h c #5EB20C", -"j c #5FB20C", -"k c #5FB30C", -"l c #5BA414", -"z c #5FAA14", -"x c #5EA41B", -"c c #5FA31D", -"v c #60B40D", -"b c #61B50D", -"n c #61B60D", -"m c #62B70D", -"M c #62B80D", -"N c #63B80E", -"B c #63B90E", -"V c #64BA0E", -"C c #64BB0E", -"Z c #65BB0E", -"A c #66BD0F", -"S c #66BE0F", -"D c #67BE0F", -"F c #67BF0F", -"G c #67BF10", -"H c #66B319", -"J c #67B519", -"K c #538720", -"L c #578D28", -"P c #598C28", -"I c #5A8C29", -"U c #619233", -"Y c #629530", -"T c #61A420", -"R c #64A523", -"E c #69AF22", -"W c #68AC27", -"Q c #68A829", -"! c #69A92B", -"~ c #6AAA2D", -"^ c #6BAB2D", -"/ c #6BAA2E", -"( c #6EAF2E", -") c #6EAE2F", -"_ c #69B221", -"` c #70B62B", -"' c #70B42C", -"] c #70B42E", -"[ c #6EAB32", -"{ c #6EAC31", -"} c #6FAC34", -"| c #70AD34", -" . c #70AE34", -".. c #72AF35", -"X. c #71AD36", -"o. c #71AD37", -"O. c #71AE36", -"+. c #72AE38", -"@. c #73AE39", -"#. c #73AF3A", -"$. c #74AF3A", -"%. c #74AF3B", -"&. c #75AF3C", -"*. c #6FB030", -"=. c #70B031", -"-. c #70B230", -";. c #71B330", -":. c #71B133", -">. c #73B532", -",. c #72B134", -"<. c #76B03E", -"1. c #77B13F", -"2. c #69C210", -"3. c #69C311", -"4. c #6AC411", -"5. c #6BC411", -"6. c #6CC712", -"7. c #6DC912", -"8. c #6EC912", -"9. c #6ECA13", -"0. c #71CE14", -"q. c #71A043", -"w. c #76A647", -"e. c #73A048", -"r. c #7AA64F", -"t. c #78B140", -"y. c #78B141", -"u. c #7AB243", -"i. c #7AB344", -"p. c #7BB345", -"a. c #7CB346", -"s. c #7DB447", -"d. c #7DB448", -"f. c #7EB549", -"g. c #80B64C", -"h. c #81B64D", -"j. c #81B74D", -"k. c #82B74E", -"l. c #83B851", -"z. c #84B851", -"x. c #86B953", -"c. c #85BA54", -"v. c #87BA56", -"b. c #8AB65D", -"n. c #89BB58", -"m. c #8ABB59", -"M. c #8ABB5A", -"N. c #8CBD5D", -"B. c #8DBD5E", -"V. c #89B461", -"C. c #8EB667", -"Z. c #8FBE60", -"A. c #8FBF61", -"S. c #90BF62", -"D. c #91B96B", -"F. c #91C064", -"G. c #92C065", -"H. c #97C26C", -"J. c #98C46E", -"K. c #9AC572", -"L. c #9FC47B", -"P. c #A1C67C", -"I. c #A1C97A", -"U. c #A2C87D", -"Y. c #A4CC7E", -"T. c #A5CE7F", -"R. c #A7CF7F", -"E. c #A6D27B", -"W. c #A7D47A", -"Q. c #A8D67B", -"!. c #A8D17F", -"~. c #A9D87B", -"^. c #AAD97C", -"/. c #ABD97C", -"(. c #A6CB82", -"). c #A7CC82", -"_. c #A6CC83", -"`. c #A6C885", -"'. c #A6C886", -"]. c #A7CC84", -"[. c #A8CD84", -"{. c #A8CD85", -"}. c #A9CE87", -"|. c #AACE87", -" X c #ABCD89", -".X c #ABCE88", -"XX c #ABCF89", -"oX c #ACCE8B", -"OX c #ACCF8B", -"+X c #ACD781", -"@X c #ADD881", -"#X c #ADD982", -"$X c #AED883", -"%X c #AEDA82", -"&X c #AFDC82", -"*X c #ACD088", -"=X c #ADD28A", -"-X c #ADD08D", -";X c #AFD18E", -":X c #AFD18F", -">X c #B0DE83", -",X c #B1DF83", -".] H z i s s i i +XT.T.T.P.2 nXnXnXnXnXnX", -"nXnXnXnX. % ; 1 : ; 2X` H j k j j j j s E.* . . . . nXnXnXnXnX", -"nXnXnXnXnXnXnXnXnX. 1XJ v n n C M n n k W.= nXnXnXnXnXnXnXnXnXnX", -"nXnXnXnXnXnXnXnXnX. X>X>XuX>X>X>X>X#X1 nXnXnXnXnXnXnXnXnXnX", -"nXnXnXnXnXnXnXnXnX. . . . . . . % . . . . . nXnXnXnXnXnXnXnXnXnX", -"nXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnX", -"nXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnX", -"nXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnX", -"nXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnX", -"nXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnX", -"nXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnXnX" -}; diff --git a/lib-src/mod-nyq-bench/images/go-top-small.xpm b/lib-src/mod-nyq-bench/images/go-top-small.xpm deleted file mode 100644 index f7bcd529e..000000000 --- a/lib-src/mod-nyq-bench/images/go-top-small.xpm +++ /dev/null @@ -1,126 +0,0 @@ -/* XPM */ -static const char *go_top_small[] = { -/* columns rows colors chars-per-pixel */ -"16 16 104 2", -" c #3A7304", -". c #3A7404", -"X c #3B7404", -"o c #3B7504", -"O c #3B7604", -"+ c #3C7704", -"@ c #3E7A05", -"# c #3E770A", -"$ c #40780D", -"% c #41790E", -"& c #41790F", -"* c #4D8419", -"= c #4F841D", -"- c #53A108", -"; c #58AA0A", -": c #59AB0B", -"> c #5CB00C", -", c #5EB30D", -"< c #5FB40D", -"1 c #5CA21A", -"2 c #60B50D", -"3 c #60B40F", -"4 c #61B80E", -"5 c #62B90E", -"6 c #63BA0F", -"7 c #63BB0F", -"8 c #64BB0F", -"9 c #63AE1C", -"0 c #61B114", -"q c #66BE10", -"w c #66BF10", -"e c #65B618", -"r c #68B61B", -"t c #588B28", -"y c #588B29", -"u c #689D35", -"i c #6A9C3B", -"p c #6CAF2C", -"a c #74BD2E", -"s c #73B137", -"d c #67C010", -"f c #68C111", -"g c #69C311", -"h c #6BC612", -"j c #6CC813", -"k c #79A64F", -"l c #79B242", -"z c #7BB345", -"x c #7EBE41", -"c c #7FB64B", -"v c #7FA957", -"b c #82B74F", -"n c #84B555", -"m c #85BB53", -"M c #86B35C", -"N c #8BBD5C", -"B c #8FBE62", -"V c #97BD73", -"C c #84C347", -"Z c #86C24D", -"A c #8AC156", -"S c #8FC15F", -"D c #92C95F", -"F c #92C660", -"G c #95C369", -"H c #96C26B", -"J c #97C66A", -"K c #96C36C", -"L c #97C36E", -"P c #9BCF6A", -"I c #9AC471", -"U c #9CC674", -"Y c #9DC775", -"T c #A2CA7C", -"R c #A2C87F", -"E c #A8D57C", -"W c #A3C583", -"Q c #A9CC89", -"! c #A9D381", -"~ c #AAD581", -"^ c #ACD781", -"/ c #ADD982", -"( c #ADDA82", -") c #AEDB82", -"_ c #AFDC83", -"` c #B0DE83", -"' c #B2D393", -"] c #B6D599", -"[ c #B8D49E", -"{ c #B2E184", -"} c #B3E384", -"| c #B5E685", -" . c #BCD8A2", -".. c #BEDCA1", -"X. c #C1DEA5", -"o. c #C7DFB0", -"O. c #C9DFB3", -"+. c #C5E1A9", -"@. c #C7E2AD", -"#. c #C8E3AF", -"$. c #C9E2B1", -"%. c #CBE2B5", -"&. c #CDE2B9", -"*. c None", -/* pixels */ -" ", -" . . . ", -"*.*.*.*.*.*.$ Q W $ *.*.*.*.*.*.", -"*.*.*.*.*.. V I J M . *.*.*.*.*.", -"*.*.*.*.. k ' b l G i . *.*.*.*.", -"*.*.*.*.y .B b z 1 I = *.*.*.*.", -"*.*.*.$ [ T N m s - p L # *.*.*.", -"*.*.. W ] G S A 9 : : Z n . *.*.", -"*.. v o.Y J F x : 2 < 0 P u O *.", -"*.y O.&.%.$.F e 2 q _ _ ) E * *.", -". . @ @.C 5 q g { @ . . . . ", -"*.*.*.*.. @.a 5 g j | *.*.*.*.", -"*.*.*.*. +.r 5 d h { *.*.*.*.", -"*.*.*.*. X.0 2 7 d ` *.*.*.*.", -"*.*.*.*. ..! ~ ) ^ ) *.*.*.*.", -"*.*.*.*. . . *.*.*.*." -}; diff --git a/lib-src/mod-nyq-bench/images/go-up-large.xpm b/lib-src/mod-nyq-bench/images/go-up-large.xpm deleted file mode 100644 index c8647b22f..000000000 --- a/lib-src/mod-nyq-bench/images/go-up-large.xpm +++ /dev/null @@ -1,233 +0,0 @@ -/* XPM */ -static const char *go_up_large[] = { -/* columns rows colors chars-per-pixel */ -"32 32 195 2", -" c #3A7403", -". c #3B7503", -"X c #3B7603", -"o c #3A7304", -"O c #3B7304", -"+ c #3A7404", -"@ c #3B7404", -"# c #3A7504", -"$ c #3B7504", -"% c #3B7604", -"& c #3B7605", -"* c #3C7404", -"= c #3C7504", -"- c #3E7609", -"; c #3F760A", -": c #3E7809", -"> c #40770C", -", c #40780A", -"< c #41790B", -"1 c #41780C", -"2 c #417B0D", -"3 c #467D12", -"4 c #467D13", -"5 c #4E9905", -"6 c #4F9B05", -"7 c #4F9906", -"8 c #509C05", -"9 c #519E06", -"0 c #509A08", -"q c #519B0A", -"w c #539E0A", -"e c #539C0C", -"r c #4A8017", -"t c #4B8117", -"y c #50851E", -"u c #579E12", -"i c #53A007", -"p c #54A207", -"a c #55A309", -"s c #56A608", -"d c #57A709", -"f c #58A909", -"g c #59A909", -"h c #5AAB0A", -"j c #5BAD0A", -"k c #5CAE0B", -"l c #5CAF0B", -"z c #5BAA0C", -"x c #5DB00B", -"c c #5FB20C", -"v c #5AA017", -"b c #5EA915", -"n c #5CA119", -"m c #5DA418", -"M c #60B40C", -"N c #60B50D", -"B c #62B70D", -"V c #62B80D", -"C c #63B90E", -"Z c #64BB0E", -"A c #65BC0F", -"S c #66BE0F", -"D c #67BE0F", -"F c #67BF0F", -"G c #61A41F", -"H c #67BB15", -"J c #67BC14", -"K c #68BC15", -"L c #67B31C", -"P c #68B61C", -"I c #538821", -"U c #578A26", -"Y c #578B28", -"T c #5C8F29", -"R c #659733", -"E c #649336", -"W c #61A420", -"Q c #63A522", -"! c #64A624", -"~ c #64A625", -"^ c #65A625", -"/ c #66A726", -"( c #66A727", -") c #63A820", -"_ c #68AB27", -"` c #6AAF26", -"' c #69A92B", -"] c #6AA92C", -"[ c #6AA92D", -"{ c #6BAA2E", -"} c #6CAA2F", -"| c #6EAD2F", -" . c #69B222", -".. c #6DB823", -"X. c #71AD36", -"o. c #71AD37", -"O. c #72AF36", -"+. c #73AF39", -"@. c #6FB230", -"#. c #74B436", -"$. c #76B736", -"%. c #76B13C", -"&. c #76B03D", -"*. c #78B43C", -"=. c #7BBC3B", -"-. c #7AB93C", -";. c #68C010", -":. c #69C210", -">. c #6AC311", -",. c #6AC411", -"<. c #6CC611", -"1. c #6CC612", -"2. c #6DC812", -"3. c #6DC912", -"4. c #6EC912", -"5. c #6FCB13", -"6. c #71CE14", -"7. c #6E9D42", -"8. c #6FA041", -"9. c #78A84A", -"0. c #7BB643", -"q. c #7AB344", -"w. c #7BB345", -"e. c #7EB943", -"r. c #7FBF40", -"t. c #7FBC42", -"y. c #7DB448", -"u. c #7EB548", -"i. c #7FB54B", -"p. c #7BA650", -"a. c #80B74A", -"s. c #80B64C", -"d. c #83B850", -"f. c #85B953", -"g. c #84B159", -"h. c #88B55C", -"j. c #8BBC5C", -"k. c #8CBD5C", -"l. c #8CBD5D", -"z. c #8DBE5E", -"x. c #89B160", -"c. c #8FB769", -"v. c #95BF6C", -"b. c #96BE6E", -"n. c #92C166", -"m. c #97C36C", -"M. c #9AC571", -"N. c #9BC572", -"B. c #9CC674", -"V. c #9DC775", -"C. c #9EC677", -"Z. c #9EC37A", -"A. c #9FC37C", -"S. c #9FC879", -"D. c #A0C878", -"F. c #A2C87D", -"G. c #A4CB7E", -"H. c #A5CD7E", -"J. c #A6CE7F", -"K. c #A7CF7F", -"L. c #A8D67B", -"P. c #A8D77B", -"I. c #A9D77C", -"U. c #A6C983", -"Y. c #A9CE85", -"T. c #ABCC8B", -"R. c #ACCF89", -"E. c #ADCD8F", -"W. c #A9D280", -"Q. c #AAD580", -"!. c #ACD781", -"~. c #ADD982", -"^. c #ADDA82", -"/. c #AEDA82", -"(. c #AEDB82", -"). c #AFDB82", -"_. c #AFDC82", -"`. c #AFD986", -"'. c #B0DE83", -"]. c #B1DF83", -"[. c #B3D295", -"{. c #B4D395", -"}. c #B5D496", -"|. c #B9DD96", -" X c #BBD99E", -".X c #BEDE9E", -"XX c #BEDE9F", -"oX c #B2E084", -"OX c #BDD9A1", -"+X c #BEDBA1", -"@X c #BDD9A2", -"#X c #BEDCA0", -"$X c #C2DBA9", -"%X c #C2DCAA", -"&X c None", -/* pixels */ -"&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X&X&X&X&X&X&X% > &X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X&X&X&X&X&X&XY T.3 &X&X&X&X&X&X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X&X&X&X&X&X4 U.D.b.: &X&X&X&X&X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X&X&X&X&X< D.z.Q n.g.% &X&X&X&X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X&X&X&X+ c.C.' ( Q M.8.% &X&X&X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X&X&X+ p.Y.%.] ( Q ~ C.T + &X&X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X&X&XE }.i.X.] ( n n ] C.t &X&X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X&Xy [.j.&.X.} ( Q n u X.m.< &X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X2 E.M.w.&.X.} ( Q n u q y.h.% &X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X A.Y.s.q.&.X.} ( Q n v 5 5 z.9. &X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X+ x.}.f.i.q.&.X.} _ G m w 6 5 w m.R % &X&X&X&X&X&X&X", -"&X&X&X&X&X+ 7.@Xz.d.a.0.*.$.@.` b p i i i 6 u C.I * &X&X&X&X&X&X", -"&X&X&X&X&XU $X%X@X X#Xe.=.$. .z f f f s K.K.U.G.F.3 &X&X&X&X&X&X", -"&X&X&X&Xo - > > < < .Xa.=.L k k x x x h W.o o % % o o &X&X&X&X&X", -"&X&X&X&X&X&X&X&X&X .Xr.P M M M c c c x Q.* &X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X&X+ .X..M M A V Z V V c ^. &X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X&X+ |.M V J F F ;.;.J V ^.% &X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X&Xo `.V A F 1.1.<.,.;.Z ^. &X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X&X+ I.J F >.1.6.5.3.:.S _. &X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X&Xo P.K F ,.3.6.6.3.,.;._.+ &X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X&Xo P.H S >.1.3.3.3.;.;._. &X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X&Xo !.^.'.'.'.oX'.'.'.'.^.% &X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X&Xo o o o o o o % o o o o o &X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X", -"&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X&X" -}; diff --git a/lib-src/mod-nyq-bench/images/go-up-small.xpm b/lib-src/mod-nyq-bench/images/go-up-small.xpm deleted file mode 100644 index 53aaa65b2..000000000 --- a/lib-src/mod-nyq-bench/images/go-up-small.xpm +++ /dev/null @@ -1,127 +0,0 @@ -/* XPM */ -static const char *go_up_small[] = { -/* columns rows colors chars-per-pixel */ -"16 16 105 2", -" c #3A7304", -". c #3A7404", -"X c #3B7404", -"o c #3B7504", -"O c #3C7804", -"+ c #3E7A05", -"@ c #3E770A", -"# c #40780D", -"$ c #41790E", -"% c #41790F", -"& c #4C8418", -"* c #4F841D", -"= c #53A308", -"- c #59AB0B", -"; c #59AC0B", -": c #5EB30D", -"> c #5FB20F", -", c #5FB40D", -"< c #5FB50D", -"1 c #5CA21A", -"2 c #63BA0F", -"3 c #64BC0F", -"4 c #65B616", -"5 c #65BD10", -"6 c #65BE10", -"7 c #66BE10", -"8 c #66BF10", -"9 c #66B01D", -"0 c #68BA19", -"q c #6DBD1F", -"w c #568926", -"e c #578928", -"r c #578A28", -"t c #588B28", -"y c #679C35", -"u c #6A9C3B", -"i c #6CAF2C", -"p c #74B438", -"a c #76B13F", -"s c #67C011", -"d c #67C111", -"f c #69C311", -"g c #6AC512", -"h c #6BC712", -"j c #6CC813", -"k c #6DC913", -"l c #71CF15", -"z c #78C331", -"x c #78A54E", -"c c #7AB344", -"v c #7DB448", -"b c #7FA956", -"n c #80B64D", -"m c #84B455", -"M c #86BC51", -"N c #86B35B", -"B c #8BBE5A", -"V c #8CBD5F", -"C c #96BD72", -"Z c #81C143", -"A c #85C14D", -"S c #89C94B", -"D c #8BC356", -"F c #91C560", -"G c #96CA63", -"H c #97CD63", -"J c #95C26A", -"K c #96C569", -"L c #97C36E", -"P c #9BCE6A", -"I c #9ACA6C", -"U c #9AC471", -"Y c #9AC572", -"T c #A0CB77", -"R c #A2C77E", -"E c #A0C97A", -"W c #A6D37B", -"Q c #A1C480", -"! c #A7CA87", -"~ c #AAD581", -"^ c #ABD781", -"/ c #ACD982", -"( c #ADD982", -") c #ADDA82", -"_ c #AEDB82", -"` c #AFDC83", -"' c #B0DE83", -"] c #B0D291", -"[ c #B5D597", -"{ c #B7D49C", -"} c #B2E184", -"| c #B3E384", -" . c #B4E585", -".. c #BBD7A0", -"X. c #C1DFA5", -"o. c #C7DFB0", -"O. c #C5E2A9", -"+. c #C8E4AD", -"@. c #CAE5B0", -"#. c #CBE5B3", -"$. c #CBE6B2", -"%. c #CAE0B5", -"&. c #CEE5B8", -"*. c #D0E5BC", -"=. c None", -/* pixels */ -"=.=.=.=.=.=.=.. X =.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.t w =.=.=.=.=.=.=.", -"=.=.=.=.=.=.# ! R # =.=.=.=.=.=.", -"=.=.=.=.=.. C Y J N . =.=.=.=.=.", -"=.=.=.=.. x ] v a J u =.=.=.=.", -"=.=.=.=.t ..V n c 1 Y * =.=.=.=.", -"=.=.=.# { E B M p = i Y @ =.=.=.", -"=.=.. Q [ K F D 9 - ; A m X =.=.", -"=.. b o.T P H n : < < : P y =.", -"=.t %.*.&.+.H 0 3 3 ` _ _ W & =.", -". . + $.S 8 f h } + . ", -"=.=.=.=. +.z 8 k l .. =.=.=.=.", -"=.=.=.=. +.q 8 f k | =.=.=.=.", -"=.=.=.=. O.4 5 8 s ' =.=.=.=.", -"=.=.=.=. X.~ ~ _ _ _ =.=.=.=.", -"=.=.=.=.. . =.=.=.=." -}; diff --git a/lib-src/mod-nyq-bench/images/media-playback-pause-large.xpm b/lib-src/mod-nyq-bench/images/media-playback-pause-large.xpm deleted file mode 100644 index 80a4638bb..000000000 --- a/lib-src/mod-nyq-bench/images/media-playback-pause-large.xpm +++ /dev/null @@ -1,80 +0,0 @@ -/* XPM */ -static const char *media_playback_pause_large[] = { -/* columns rows colors chars-per-pixel */ -"32 32 42 1", -" c #545753", -". c #5A5D59", -"X c #626661", -"o c #6B6F6A", -"O c #747873", -"+ c #7D807B", -"@ c #868984", -"# c #8F928D", -"$ c #989B95", -"% c #D9DBD6", -"& c #DADCD6", -"* c #DEE0DB", -"= c #DEE0DC", -"- c #E2E3DF", -"; c #E2E4E0", -": c #E3E4E1", -"> c #E3E5E1", -", c #E4E5E2", -"< c #E5E6E3", -"1 c #E6E7E4", -"2 c #E7E8E5", -"3 c #E9EAE8", -"4 c #EBECE9", -"5 c #EDEDEB", -"6 c #F4F4F3", -"7 c #F4F5F3", -"8 c #F5F5F4", -"9 c #F5F6F4", -"0 c #F6F6F5", -"q c #F7F7F6", -"w c #F7F8F6", -"e c #F7F8F7", -"r c #F8F8F7", -"t c #F8F9F8", -"y c #F9F9F8", -"u c #FAFAF9", -"i c gray98", -"p c #FAFBFA", -"a c gray99", -"s c #FDFDFD", -"d c #FEFEFE", -"f c None", -/* pixels */ -"ffffffffffffffffffffffffffffffff", -"ffffffffffffffffffffffffffffffff", -"ffffffffffffffffffffffffffffffff", -"ffffffffffffffffffffffffffffffff", -"ffffffffffffffffffffffffffffffff", -"ffffffffffffffffffffffffffffffff", -"ffffffffffffffffffffffffffffffff", -"ffffffffffffffffffffffffffffffff", -"ffffffffffffffffffffffffffffffff", -"fffffffff fff ffffffff", -"fffffffff dttd fff dttd ffffffff", -"fffffffff d<1d fff d<2d ffffffff", -"fffffffff d-;t fff d- c #737570", -", c #D6DAD2", -"< c #D8DBD5", -"1 c #D9DDD6", -"2 c #DCDFD8", -"3 c #DDDFDA", -"4 c #DFE2DC", -"5 c #E0E3DD", -"6 c #E1E3DE", -"7 c #E1E4DF", -"8 c #E4E5E2", -"9 c #E4E6E2", -"0 c #E5E8E4", -"q c #E9EBE7", -"w c #ECEDEB", -"e c #EEEFEC", -"r c #EFF0ED", -"t c #F0F1EF", -"y c #F1F3F0", -"u c #F3F3F3", -"i c #F3F4F2", -"p c #F4F5F3", -"a c #F7F8F7", -"s c gray99", -"d c #FCFDFC", -"f c gray100", -"g c None", -/* pixels */ -"gggggggggggggggg", -"gggggggggggggggg", -"gggggggggggggggg", -"ggg gg ggg", -"ggg.ff.gg.ff.ggg", -"gggXf>>gg>>>>ggg", -"gggggggggggggggg", -"gggggggggggggggg", -"gggggggggggggggg" -}; diff --git a/lib-src/mod-nyq-bench/images/media-playback-start-large.xpm b/lib-src/mod-nyq-bench/images/media-playback-start-large.xpm deleted file mode 100644 index 5178905b0..000000000 --- a/lib-src/mod-nyq-bench/images/media-playback-start-large.xpm +++ /dev/null @@ -1,143 +0,0 @@ -/* XPM */ -static const char *media_playback_start_large[] = { -/* columns rows colors chars-per-pixel */ -"32 32 105 2", -" c #41433F", -". c #464743", -"X c #494B45", -"o c #4A4B47", -"O c #4A4C47", -"+ c #494B48", -"@ c #4B4C49", -"# c #4F4F4B", -"$ c #4F514D", -"% c #50514D", -"& c #52524D", -"* c #51514F", -"= c #51524E", -"- c #525350", -"; c #535450", -": c #545652", -"> c #555652", -", c #5B5C57", -"< c #5F5F5C", -"1 c #5E605B", -"2 c #60615C", -"3 c #62625F", -"4 c #636360", -"5 c #656761", -"6 c #656662", -"7 c #666762", -"8 c #696B66", -"9 c #6B6C67", -"0 c #6F706C", -"q c #70726C", -"w c #767771", -"e c #777972", -"r c #787A77", -"t c #797B77", -"y c #7B7C78", -"u c #7C7D78", -"i c #7C7E79", -"p c #7E807C", -"a c #898986", -"s c #959692", -"d c #959693", -"f c #9C9E9A", -"g c #AAABA9", -"h c #B7B7B6", -"j c #B8B9B6", -"k c #BABBB8", -"l c #C1C2C1", -"z c #CCCCCB", -"x c #D0D1CF", -"c c #D2D3D1", -"v c #D7D8D6", -"b c #E1E1DF", -"n c #E2E5E0", -"m c #E3E6E1", -"M c #E4E6E4", -"N c #E6E8E5", -"B c #E6E9E5", -"V c #E7E9E5", -"C c #E7EAE6", -"Z c #E8EAE6", -"A c #E9EBE7", -"S c #EAEBEA", -"D c #E9ECE8", -"F c #EAECE8", -"G c #EAEDE9", -"H c #EBEDE9", -"J c #EBEDEA", -"K c #EBEDEB", -"L c #EBEEEA", -"P c #ECEEEA", -"I c #ECEEEB", -"U c #EDEFEB", -"Y c #EDEFEC", -"T c #EDEEED", -"R c #EEEFEC", -"E c #EEEFED", -"W c #EDF0EC", -"Q c #EEF0ED", -"! c #EEF0EE", -"~ c #EFF1EE", -"^ c #EFF1EF", -"/ c #F0F1EF", -"( c #F0F2EF", -") c #F1F1F0", -"_ c #F1F2F0", -"` c #F1F3F0", -"' c #F2F4F1", -"] c #F3F4F2", -"[ c #F4F5F3", -"{ c #F4F4F4", -"} c #F4F5F4", -"| c #F4F6F4", -" . c #F5F6F4", -".. c #F5F6F5", -"X. c #F6F7F5", -"o. c #F6F7F6", -"O. c #F7F8F6", -"+. c #F7F8F7", -"@. c #F8F8F8", -"#. c #F8F9F8", -"$. c #F9F9F8", -"%. c #F9FAF9", -"&. c #FAFBFA", -"*. c #FDFEFD", -"=. c None", -/* pixels */ -"=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.X =.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.. 4 @ =.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.. &.l - . =.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.. [ L I f $ =.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.. [ A A R M r # =.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.. [ A A F F R c < @ =.=.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.. [ A A A A F F Q k * =.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.. | L I F L L L L I I d * =.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.. | Q Q R Q Q Q Q R Q _ M 0 * =.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.. +.( _ _ ( Q Q L L V m n R x ; : =.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.. | A A A F F F D A A V L _ h X =.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.@ | L R R / ( ( Q ( Q ] v 6 < =.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.* &.R _ ] | | o.o.&.L i 4 =.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.: @.( ] | o.&.*.{ g 7 =.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=., @.( ( [ | &.z 8 r =.=.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.2 o.I R | b i y =.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.6 [ ( I d w =.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.9 &.j e =.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.q i a =.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.", -"=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=." -}; diff --git a/lib-src/mod-nyq-bench/images/media-playback-start-small.xpm b/lib-src/mod-nyq-bench/images/media-playback-start-small.xpm deleted file mode 100644 index b7f9c5944..000000000 --- a/lib-src/mod-nyq-bench/images/media-playback-start-small.xpm +++ /dev/null @@ -1,80 +0,0 @@ -/* XPM */ -static const char *media_playback_start_small[] = { -/* columns rows colors chars-per-pixel */ -"16 16 58 1", -" c #464745", -". c #474745", -"X c #464845", -"o c #4A4B47", -"O c #4B4C49", -"+ c #4C4D4A", -"@ c #4D4E4B", -"# c #4E4F4C", -"$ c #50514E", -"% c #545551", -"& c #555754", -"* c #595B57", -"= c #5E5F5C", -"- c #646561", -"; c #696B67", -": c #6C6E69", -"> c #6F716C", -", c #787A73", -"< c #797B77", -"1 c #7E807A", -"2 c #7F807C", -"3 c #858781", -"4 c #898A85", -"5 c #92958F", -"6 c #949591", -"7 c #959592", -"8 c #959694", -"9 c #9D9D9A", -"0 c #A3A4A2", -"q c #A6A7A4", -"w c #B0B2AF", -"e c #B3B5B1", -"r c #D7DAD3", -"t c #DCDFDA", -"y c #DEDEDD", -"u c #E0E3DE", -"i c #E1E3DE", -"p c #E1E4DF", -"a c #E5E7E3", -"s c #E6E7E5", -"d c #E8E8E6", -"f c #EBEBEA", -"g c #EBECE9", -"h c #ECEEEA", -"j c #EDEEEB", -"k c #EEEFEC", -"l c #F2F3F0", -"z c #F3F3F2", -"x c #F5F5F4", -"c c #F6F6F5", -"v c #F6F7F6", -"b c #F9F9F9", -"n c #F9FAF9", -"m c #FAFAF9", -"M c #FAFBFA", -"N c #FBFBFA", -"B c #FBFBFB", -"V c None", -/* pixels */ -"VVVVVVVVVVVVVVVV", -"VVVVVVVVVVVVVVVV", -"VVV VVVVVVVVVVVV", -"VVV++oVVVVVVVVVV", -"VVVOBw+ VVVVVVVV", -"VVV#Bls0$XVVVVVV", -"VVV%BcBBy9&VVVVV", -"VVV*Bhhkhhs8:VVV", -"VVV=Bpuuacf71VVV", -"VVV-Brtcz7>VVVVV", -"VVV;BxBqBe36VVVVVVVV", -"VVV,41VVVVVVVVVV", -"VVV>VVVVVVVVVVVV", -"VVVVVVVVVVVVVVVV", -"VVVVVVVVVVVVVVVV" -}; diff --git a/lib-src/mod-nyq-bench/images/media-playback-stop-large.xpm b/lib-src/mod-nyq-bench/images/media-playback-stop-large.xpm deleted file mode 100644 index d52c78b9b..000000000 --- a/lib-src/mod-nyq-bench/images/media-playback-stop-large.xpm +++ /dev/null @@ -1,116 +0,0 @@ -/* XPM */ -static const char *media_playback_stop_large[] = { -/* columns rows colors chars-per-pixel */ -"32 32 78 1", -" c #545753", -". c #585B57", -"X c #595C58", -"o c #626561", -"O c #6B6E6A", -"+ c #747772", -"@ c #7D807B", -"# c #868984", -"$ c #8F928D", -"% c #989B95", -"& c #D5D8D3", -"* c #D6D8D2", -"= c #D9DBD5", -"- c #DADCD7", -"; c #DBDDD8", -": c #DBDED9", -"> c #DCDDD8", -", c #DCDED9", -"< c #DDDFDA", -"1 c #DEE0DB", -"2 c #DFE1DC", -"3 c #E0E1DD", -"4 c #E1E1DE", -"5 c #E0E2DE", -"6 c #E1E3DF", -"7 c #E2E3DF", -"8 c #E2E4E0", -"9 c #E3E4E0", -"0 c #E3E4E1", -"q c #E3E5E1", -"w c #E4E5E1", -"e c #E4E5E2", -"r c #E5E6E2", -"t c #E5E6E3", -"y c #E5E7E3", -"u c #E6E7E3", -"i c #E5E7E4", -"p c #E6E7E4", -"a c #E7E8E5", -"s c #E7E8E6", -"d c #E8E9E6", -"f c #E9EAE7", -"g c #E9EAE8", -"h c #EAEBE8", -"j c #EAEBE9", -"k c #EBECEA", -"l c #ECEDEB", -"z c #EDEDEC", -"x c #EEEEED", -"c c #EFEFEE", -"v c #F1F1F0", -"b c #F2F3F1", -"n c #F3F3F2", -"m c #F3F4F2", -"M c #F4F4F3", -"N c #F4F5F4", -"B c #F5F5F4", -"V c gray96", -"C c #F5F6F4", -"Z c #F5F6F5", -"A c #F6F6F5", -"S c #F6F7F6", -"D c #F7F7F6", -"F c #F7F8F6", -"G c #F7F8F7", -"H c #F8F8F7", -"J c #F8F8F8", -"K c #F8F9F8", -"L c #F9F9F8", -"P c #F9F9F9", -"I c #F9FAF9", -"U c #FAFBFA", -"Y c #FBFBFB", -"T c #FCFCFB", -"R c gray99", -"E c #FDFDFD", -"W c #FEFEFE", -"Q c None", -/* pixels */ -"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ", -"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ", -"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ", -"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ", -"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ", -"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ", -"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ", -"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ", -"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ", -"QQQQQQQQQ ............. QQQQQQQQ", -"QQQQQQQQQ EYYGYHYYYHYYE QQQQQQQQ", -"QQQQQQQQQ Etqq7tq6qqq6E QQQQQQQQ", -"QQQQQQQQQ Gq6677666766T QQQQQQQQ", -"QQQQQQQQQ Yq6677667766T QQQQQQQQ", -"QQQQQQQQQ Gttt777t77q6Y QQQQQQQQ", -"QQQQQQQQQ Dattaattttt2D QQQQQQQQ", -"QQQQQQQQQ.Dkffat73:=&&D.QQQQQQQQ", -"QQQQQQQQQoDt66111<<>:-DoQQQQQQQQ", -"QQQQQQQQQODttqqq666121DOQQQQQQQQ", -"QQQQQQQQQ+Dfffaatttq76M+QQQQQQQQ", -"QQQQQQQQQ@YzzzkkffppttM@QQQQQQQQ", -"QQQQQQQQQ#HvzzkkhffpttM#QQQQQQQQ", -"QQQQQQQQQ$HGDDDDMDnMmnn$QQQQQQQQ", -"QQQQQQQQQ%%%%%%%%%%%%%%%QQQQQQQQ", -"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ", -"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ", -"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ", -"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ", -"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ", -"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ", -"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ", -"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ" -}; diff --git a/lib-src/mod-nyq-bench/images/media-playback-stop-small.xpm b/lib-src/mod-nyq-bench/images/media-playback-stop-small.xpm deleted file mode 100644 index 10fe09653..000000000 --- a/lib-src/mod-nyq-bench/images/media-playback-stop-small.xpm +++ /dev/null @@ -1,77 +0,0 @@ -/* XPM */ -static const char *media_playback_stop_small[] = { -/* columns rows colors chars-per-pixel */ -"16 16 55 1", -" c #545652", -". c #555753", -"X c #595B57", -"o c #5C5E5A", -"O c #5D5F5B", -"+ c #5F615D", -"@ c #60625E", -"# c #626460", -"$ c #636661", -"% c #656763", -"& c #676964", -"* c #696B66", -"= c #6A6C68", -"- c #6C6E69", -"; c #6D706B", -": c #6F716C", -"> c #70736E", -", c #72746F", -"< c #737570", -"1 c #D3D7CF", -"2 c #D5D9D1", -"3 c #D7DBD3", -"4 c #D7DBD4", -"5 c #D8DBD4", -"6 c #D8DBD5", -"7 c #DBDED8", -"8 c #DCDFD8", -"9 c #DDE0DA", -"0 c #DEE1DB", -"q c #DFE2DC", -"w c #E0E2DD", -"e c #E0E3DD", -"r c #E1E4DF", -"t c #E3E5E0", -"y c #E3E6E1", -"u c #E4E7E2", -"i c #E6E8E4", -"p c #E6E9E4", -"a c #E7E9E4", -"s c #E7E9E5", -"d c #E8EAE6", -"f c #EAEBE8", -"g c #EBEDEA", -"h c #EDEEEB", -"j c #EEEFEC", -"k c #EFF1EE", -"l c #F0F1EF", -"z c #F0F2EF", -"x c #F3F4F2", -"c c #F7F8F6", -"v c #F7F8F7", -"b c #F8F8F7", -"n c #FDFDFD", -"m c gray100", -"M c None", -/* pixels */ -"MMMMMMMMMMMMMMMM", -"MMMMMMMMMMMMMMMM", -"MMMMMMMMMMMMMMMM", -"MMM ... .....MMM", -"MMMXmmmmmmmmXMMM", -"MMMom8rgkcmm+MMM", -"MMM+mqihxccm@MMM", -"MMM#mrigjxjm#MMM", -"MMM%mquiiium&MMM", -"MMM*m00wwq7m=MMM", -"MMM-m545421m;MMM", -"MMM:mmmmmmmm>MMM", -"MMM,<<<<<<<< c #557CAF", -", c #4575B0", -"< c #4877B3", -"1 c #4C7CB6", -"2 c #5F85B3", -"3 c #5988BE", -"4 c #6387B2", -"5 c #6388B3", -"6 c #6B8CB4", -"7 c #6F90B9", -"8 c #7392B7", -"9 c #7593BA", -"0 c #7996BB", -"q c #7C9ABD", -"w c #5E8BC1", -"e c #618FC3", -"r c #6C96CA", -"t c #6C9ACB", -"y c #719ECE", -"u c #709FD1", -"i c #7CA6D1", -"p c #868686", -"a c #8A8A8A", -"s c #939393", -"d c #9B9B9B", -"f c #A3A3A3", -"g c #ABABAB", -"h c gray70", -"j c #BABABA", -"k c #819EC3", -"l c #85A1C5", -"z c #83ABD4", -"x c #8BB1D7", -"c c #91B5DA", -"v c #B8C2CD", -"b c #BDC6D1", -"n c #A3C2E0", -"m c #ACC6E2", -"M c #AFC9E3", -"N c #BED3E9", -"B c #C4C4C4", -"V c #CCCCCC", -"C c #C3CAD2", -"Z c #C9CFD7", -"A c #D2D2D2", -"S c #D7D8DA", -"D c #DCDCDC", -"F c #C3D6EA", -"G c #C6D9EC", -"H c #CCDCEE", -"J c #D5DCE5", -"K c #D2DFEE", -"L c #D1E0EF", -"P c #D9E2ED", -"I c #D5E2F1", -"U c #DAE6F2", -"Y c #DEE9F3", -"T c #E3E3E3", -"R c #E5E6E8", -"E c #ECECEC", -"W c #E3ECF5", -"Q c #E8F0F7", -"! c #EDF3F9", -"~ c #F3F3F3", -"^ c #FBFBFB", -"/ c None", -/* pixels */ -"////////////////////////////////", -"//////////aaaaaa////////////////", -"////////dAE^^^^Tja//////////////", -"//////aS^~TTTDRE^Eha////////////", -"/////s~~Dv4&$$&5b~^Ba///////////", -"////aEES2$1ette1$5R^Ba//////////", -"////A~D:=ymHUHNct=:E!g//////////", -"///s^D6=zLWQWYIKmy;8^Sa/////////", -"///BEC%yKWW!WWUIHxy&JEg/////////", -"//aDT61nUYQQWWYIHiy19~Ba////////", -"//aRD*eFIYWWWYUINyye-~Aa////////", -"//aRS$tGLIUYWYUIcyyr$EDa////////", -"//aTD$tFHIIUUUIM//yt$RDa////////", -"//aTT*emFHKIUI////yw;TAp////////", -"//aVR81zMNHG///////1qRjp////////", -"///g~Z&yy//////////&JTd/////////", -"///aT~0,u/////////;kEV#/////////", -"////f~~>;r///////=5~Da+/////////", -"////pj~~9$<3//3:$k~TRBsX////////", -"/////ahE^Jk:%$:lPEDPjsfs ///////", -"//////afAR~^^^~RDVaAggsff.//////", -"////////afjVSAVjd#+sjggsffX/////", -"//////////aaaaaa///X#jggsdfO ///", -"//////////////////// +jhgddg@ //", -"//////////////////////ohhgfhT# /", -"/////////////EER///////.ghhDTB /", -"////////////E~^~ES////// fADRj /", -"///////////////////////// aABo//", -"/////////////////////////// ///", -"////////////////////////////////", -"////////////////////////////////", -"////////////////////////////////" -}; diff --git a/lib-src/mod-nyq-bench/images/system-search-small.xpm b/lib-src/mod-nyq-bench/images/system-search-small.xpm deleted file mode 100644 index add290916..000000000 --- a/lib-src/mod-nyq-bench/images/system-search-small.xpm +++ /dev/null @@ -1,149 +0,0 @@ -/* XPM */ -static const char *system_search_small[] = { -/* columns rows colors chars-per-pixel */ -"16 16 127 2", -" c #646662", -". c #666864", -"X c #676965", -"o c #686966", -"O c #696B66", -"+ c #6A6B68", -"@ c gray42", -"# c #6A6C68", -"$ c #6B6D69", -"% c #6C6E69", -"& c #6C6D6A", -"* c #6C6E6A", -"= c #6D6F6A", -"- c #6C6E6B", -"; c #6D6E6B", -": c #6D6F6C", -"> c #6E706B", -", c #6F706C", -"< c #6F716C", -"1 c #70716D", -"2 c #747672", -"3 c #767875", -"4 c #7A7C78", -"5 c #7F807D", -"6 c #5980AD", -"7 c #5C85B3", -"8 c #618AB9", -"9 c #6690BF", -"0 c #6893C2", -"q c #6994C5", -"w c #6D97C5", -"e c #6E9AC9", -"r c #6F9BCA", -"t c #6F9CCD", -"y c #729DCF", -"u c #719ECE", -"i c #729ECE", -"p c #729FCE", -"a c #739FCE", -"s c #729ECF", -"d c #729FCF", -"f c #739FCF", -"g c #76A0CD", -"h c #75A1CF", -"j c #78A1CD", -"k c #838580", -"l c #828481", -"z c #848682", -"x c #858784", -"c c #868785", -"v c #888A85", -"b c #898B88", -"n c #898A89", -"m c #8F908F", -"M c #919291", -"N c #939592", -"B c #A3A4A1", -"V c #A7A8A6", -"C c #A8A9A8", -"Z c #B7B7B5", -"A c #B8B8B7", -"S c #8AA6C5", -"D c #8EA8C5", -"F c #81A3CA", -"G c #85A6CA", -"H c #89A9CB", -"J c #96A9C1", -"K c #9BADC2", -"L c #9EAFC4", -"P c #80A7D4", -"I c #8FB1D9", -"U c #96B3D2", -"Y c #97B4D3", -"T c #97B8DB", -"R c #ADBACA", -"E c #A2BEDF", -"W c #B9CADC", -"Q c #ACC6E2", -"! c #AEC8E3", -"~ c #B4CCE6", -"^ c #B6CDE6", -"/ c gray76", -"( c gray77", -") c gray78", -"_ c #C9C9C8", -"` c #CACAC9", -"' c #CBCBCA", -"] c #CBCCCA", -"[ c #C5CCD2", -"{ c gray84", -"} c #D1D5D9", -"| c #D4D6D9", -" . c #D7D8DA", -".. c #D9D9D8", -"X. c #DADAD9", -"o. c #D8DADB", -"O. c #DADADA", -"+. c #DADBDB", -"@. c gray86", -"#. c #DADBDC", -"$. c gray87", -"%. c #DFDFDF", -"&. c #C0D3E9", -"*. c #C7D8EB", -"=. c #C7D9EC", -"-. c #CBDBEC", -";. c #CEDDED", -":. c #D1D9E1", -">. c #D2D9E0", -",. c #D5DCE4", -"<. c #DBE2E9", -"1. c #D1E0F0", -"2. c #D3E1F0", -"3. c #D5E2F0", -"4. c #D6E2F1", -"5. c #D7E4F1", -"6. c #D9E4F1", -"7. c #DFE9F3", -"8. c #E2E2E2", -"9. c #E0E9F3", -"0. c #E0E9F4", -"q. c #E3EBF4", -"w. c #E2EBF5", -"e. c #E3EBF5", -"r. c #E7EEF7", -"t. c #ECF2F8", -"y. c None", -/* pixels */ -"y.y.y.y.3 < 1 < % 4 y.y.y.y.y.y.", -"y.y.y.: ] #.| } .` % y.y.y.y.y.", -"y.y.< +.J w g u 0 K %.> y.y.y.y.", -"y.% +.S d =.0.q.! u D +.% y.y.y.", -"y.V L u 4.r.t.0.1.T u R B y.y.y.", -"O +.9 Q 6.0.q.7.;.P d F +.O y.y.", -"% +.u ~ -.2.5.4.y.y.u u 8.> y.y.", -"% %.g I ~ -.^ Q y.y.f e +.% y.y.", -"k ( G q u y.y.y.y.y.8 H ` z y.y.", -"y.l >.u u y.y.u y.y.u >.O y.y.y.", -"y.$ C W u 7 y.u 6 f [ N c O y.y.", -"y.y.% M <.U j u Y ,.+ A c 2 . y.", -"y.y.y.$ 5 m / %.n y.: Z n ) % ", -"y.y.y.y.y.v % % v y.y.@ $ ` { % ", -"y.y.y.y.y.y.y.y.y.y.y.y.y.: % y.", -"y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y." -}; diff --git a/lib-src/mod-script-pipe/PipeServer.cpp b/lib-src/mod-script-pipe/PipeServer.cpp deleted file mode 100644 index cdeaa3ccd..000000000 --- a/lib-src/mod-script-pipe/PipeServer.cpp +++ /dev/null @@ -1,206 +0,0 @@ -#if defined(WIN32) - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -#include -#include -#include - -const int nBuff = 1024; - -extern "C" int DoSrv( char * pIn ); -extern "C" int DoSrvMore( char * pOut, int nMax ); - -void PipeServer() -{ - HANDLE hPipeToSrv; - HANDLE hPipeFromSrv; - - static const TCHAR pipeNameToSrv[] = _T("\\\\.\\pipe\\ToSrvPipe"); - - hPipeToSrv = CreateNamedPipe( - pipeNameToSrv , - PIPE_ACCESS_DUPLEX, - PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT | PIPE_REJECT_REMOTE_CLIENTS, - PIPE_UNLIMITED_INSTANCES, - nBuff, - nBuff, - 50,//Timeout - always send straight away. - NULL); - if( hPipeToSrv == INVALID_HANDLE_VALUE) - return; - - static const TCHAR pipeNameFromSrv[] = __T("\\\\.\\pipe\\FromSrvPipe"); - - hPipeFromSrv = CreateNamedPipe( - pipeNameFromSrv , - PIPE_ACCESS_DUPLEX, - PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT | PIPE_REJECT_REMOTE_CLIENTS, - PIPE_UNLIMITED_INSTANCES, - nBuff, - nBuff, - 50,//Timeout - always send straight away. - NULL); - if( hPipeFromSrv == INVALID_HANDLE_VALUE) - return; - - BOOL bConnected; - BOOL bSuccess; - DWORD cbBytesRead; - DWORD cbBytesWritten; - CHAR chRequest[ nBuff ]; - CHAR chResponse[ nBuff ]; - - int jj=0; - - for(;;) - { - // open to (incoming) pipe first. - printf( "Obtaining pipe\n" ); - bConnected = ConnectNamedPipe(hPipeToSrv, NULL) ? - TRUE : (GetLastError()==ERROR_PIPE_CONNECTED ); - printf( "Obtained to-srv %i\n", bConnected ); - - // open from (outgoing) pipe second. This could block if there is no reader. - bConnected = ConnectNamedPipe(hPipeFromSrv, NULL) ? - TRUE : (GetLastError()==ERROR_PIPE_CONNECTED ); - printf( "Obtained from-srv %i\n", bConnected ); - - if( bConnected ) - { - for(;;) - { - printf( "About to read\n" ); - bSuccess = ReadFile( hPipeToSrv, chRequest, nBuff, &cbBytesRead, NULL); - - chRequest[ cbBytesRead] = '\0'; - - if( !bSuccess || cbBytesRead==0 ) - break; - - printf( "Rxd %s\n", chRequest ); - - DoSrv( chRequest ); - jj++; - while( true ) - { - int nWritten = DoSrvMore( chResponse, nBuff ); - if( nWritten <= 1 ) - break; - WriteFile( hPipeFromSrv, chResponse, nWritten-1, &cbBytesWritten, NULL); - } - //FlushFileBuffers( hPipeFromSrv ); - } - FlushFileBuffers( hPipeToSrv ); - DisconnectNamedPipe( hPipeToSrv ); - FlushFileBuffers( hPipeFromSrv ); - DisconnectNamedPipe( hPipeFromSrv ); - break; - } - else - { - CloseHandle( hPipeToSrv ); - CloseHandle( hPipeFromSrv ); - } - } - CloseHandle( hPipeToSrv ); - CloseHandle( hPipeFromSrv ); -} - -#else - -#include -#include -#include -#include -#include - -const char fifotmpl[] = "/tmp/audacity_script_pipe.%s.%d"; - -const int nBuff = 1024; - -extern "C" int DoSrv( char * pIn ); -extern "C" int DoSrvMore( char * pOut, int nMax ); - -void PipeServer() -{ - FILE *fromFifo = NULL; - FILE *toFifo = NULL; - int rc; - char buf[nBuff]; - char toFifoName[nBuff]; - char fromFifoName[nBuff]; - - sprintf(toFifoName, fifotmpl, "to", getuid()); - sprintf(fromFifoName, fifotmpl, "from", getuid()); - - unlink(toFifoName); - unlink(fromFifoName); - - // TODO avoid symlink security issues? - - rc = mkfifo(fromFifoName, S_IRWXU) & mkfifo(toFifoName, S_IRWXU); - if (rc < 0) - { - perror("Unable to create fifos"); - printf("Ignoring..."); -// return; - } - - // open to (incoming) pipe first. - toFifo = fopen(toFifoName, "r"); - if (toFifo == NULL) - { - perror("Unable to open fifo to server from script"); - if (fromFifo != NULL) - fclose(fromFifo); - return; - } - - // open from (outgoing) pipe second. This could block if there is no reader. - fromFifo = fopen(fromFifoName, "w"); - if (fromFifo == NULL) - { - perror("Unable to open fifo from server to script"); - return; - } - - while (fgets(buf, sizeof(buf), toFifo) != NULL) - { - int len = strlen(buf); - if (len <= 1) - { - continue; - } - - buf[len - 1] = '\0'; - - printf("Server received %s\n", buf); - DoSrv(buf); - - while (true) - { - len = DoSrvMore(buf, nBuff); - if (len <= 1) - { - break; - } - printf("Server sending %s",buf); - - // len - 1 because we do not send the null character - fwrite(buf, 1, len - 1, fromFifo); - } - fflush(fromFifo); - } - - printf("Read failed on fifo, quitting\n"); - - if (toFifo != NULL) - fclose(toFifo); - - if (fromFifo != NULL) - fclose(fromFifo); - - unlink(toFifoName); - unlink(fromFifoName); -} -#endif diff --git a/lib-src/mod-script-pipe/ScripterCallback.cpp b/lib-src/mod-script-pipe/ScripterCallback.cpp deleted file mode 100644 index ff526dc74..000000000 --- a/lib-src/mod-script-pipe/ScripterCallback.cpp +++ /dev/null @@ -1,197 +0,0 @@ -// ScripterCallback.cpp : -// -// A loadable module that connects a windows named pipe -// to a registered service function that is able to -// process a single command at a time. -// -// The service function is provided by the application -// and not by libscript. mod_script_pipe was developed for -// Audacity. Because it forwards commands -// rather than handling them itself it can be used in -// other projects too. -// -// Enabling other programs to connect to Audacity via a pipe is a potential -// security risk. Use at your own risk. - -#include -#include "ScripterCallback.h" -#include "../../src/Audacity.h" - -/* -There are several functions that can be used in a GUI module. - -//#define versionFnName "GetVersionString" -If the version is wrong, the module will be rejected. -That is it will be loaded and then unloaded. - -//#define ModuleDispatchName "ModuleDispatch" -The most useful function. See the example in this -file. It has several cases/options in it. - -//#define scriptFnName "RegScriptServerFunc" -This function is run from a non gui thread. It was originally -created for the benefit of mod-script-pipe. - -//#define mainPanelFnName "MainPanelFunc" -This function is the hijacking function, to take over Audacity -and replace the main project window with our own wxFrame. - -*/ - -#ifdef _MSC_VER - #define DLL_API _declspec(dllexport) - #define DLL_IMPORT _declspec(dllimport) -#else - #define DLL_API __attribute__ ((visibility("default"))) - #define DLL_IMPORT -#endif - - -typedef enum -{ - ModuleInitialize, - ModuleTerminate, - AppInitialized, - AppQuiting, - ProjectInitialized, - ProjectClosing -} ModuleDispatchTypes; - - -extern void PipeServer(); -typedef DLL_IMPORT int (*tpExecScriptServerFunc)( wxString * pIn, wxString * pOut); -static tpExecScriptServerFunc pScriptServerFn=NULL; - - -extern "C" { - - -DLL_API const wxChar * GetVersionString() -{ - // Make sure that this version of the module requires the version - // of Audacity it is built with. - // For now the versions must match exactly for Audacity to - // agree to load the module. - return AUDACITY_VERSION_STRING; -} - -extern int DLL_API ModuleDispatch(ModuleDispatchTypes type); -// ModuleDispatch -// is called by Audacity to initialize/terminate the module -// We don't (yet) do anything in this, since we have a special function for the scripter -// all we need to do is return 1. -int ModuleDispatch(ModuleDispatchTypes type){ - switch (type){ - case AppInitialized:{ - } - break; - case AppQuiting: { - } - break; - case ProjectInitialized: { - } - break; - default: - break; - } - return 1; -} - -// And here is our special registration function. -int DLL_API RegScriptServerFunc( tpExecScriptServerFunc pFn ) -{ - if( pFn ) - { - pScriptServerFn = pFn; - PipeServer(); - } - - return 4; -} - - -wxString Str2; -wxArrayString aStr; -unsigned int currentLine; -size_t currentPosition; - -// Send the received command to Audacity and build an array of response lines. -// The response lines can be retrieved by calling DoSrvMore repeatedly. -int DoSrv(char *pIn) -{ - // Interpret string as unicode. - // wxWidgets (now) uses unicode internally. - // Scripts must send unicode strings (if going beyond 7-bit ASCII). - // Important for filenames in commands. - wxString Str1(pIn, wxConvUTF8); - Str1.Replace( wxT("\r"), wxT("")); - Str1.Replace( wxT("\n"), wxT("")); - Str2 = wxEmptyString; - (*pScriptServerFn)( &Str1 , &Str2); - - Str2 += wxT('\n'); - size_t outputLength = Str2.Length(); - aStr.Clear(); - size_t iStart = 0; - size_t i; - for(i = 0; i < outputLength; ++i) - { - if( Str2[i] == wxT('\n') ) - { - aStr.Add( Str2.Mid( iStart, i-iStart) + wxT("\n") ); - iStart = i+1; - } - } - - currentLine = 0; - currentPosition = 0; - - return 1; -} - -size_t smin(size_t a, size_t b) { return a < b ? a : b; } - -// Write up to nMax characters of the prepared (by DoSrv) response lines. -// Returns the number of characters sent, including null. -// Zero returned if and only if there's nothing else to send. -int DoSrvMore(char *pOut, size_t nMax) -{ - wxASSERT(currentLine >= 0); - wxASSERT(currentPosition >= 0); - - size_t totalLines = aStr.GetCount(); - while (currentLine < totalLines) - { - wxString lineString = aStr[currentLine]; - size_t lineLength = lineString.Length(); - size_t charsLeftInLine = lineLength - currentPosition; - - wxASSERT(charsLeftInLine >= 0); - - if (charsLeftInLine == 0) - { - // Move to next line - ++currentLine; - currentPosition = 0; - } - else - { - // Write as much of the rest of the line as will fit in the buffer - size_t charsToWrite = smin(charsLeftInLine, nMax - 1); - memcpy(pOut, - lineString.Mid(currentPosition, - currentPosition + charsToWrite).mb_str(), - charsToWrite); - pOut[charsToWrite] = '\0'; - currentPosition += charsToWrite; - // Need to cast to prevent compiler warnings - int charsWritten = static_cast(charsToWrite + 1); - // (Check cast was safe) - wxASSERT(static_cast(charsWritten) == charsToWrite + 1); - return charsWritten; - } - } - return 0; -} - -} // End extern "C" diff --git a/lib-src/mod-script-pipe/ScripterCallback.h b/lib-src/mod-script-pipe/ScripterCallback.h deleted file mode 100644 index 9aadabff3..000000000 --- a/lib-src/mod-script-pipe/ScripterCallback.h +++ /dev/null @@ -1,39 +0,0 @@ - -// The following ifdef block is the standard way of creating macros which make exporting -// from a DLL simpler. All files within this DLL are compiled with the LIBSCRIPT_EXPORTS -// symbol defined on the command line. this symbol should not be defined on any project -// that uses this DLL. This way any other project whose source files include this file see -// SCRIPT_PIPE_DLL_API functions as being imported from a DLL, wheras this DLL sees symbols -// defined with this macro as being exported. - - -/* Magic for dynamic library import and export. This is unfortunately - * compiler-specific because there isn't a standard way to do it. Currently it - * works with the Visual Studio compiler for windows, and for GCC 4+. Anything - * else gets all symbols made public, which gets messy */ -/* The Visual Studio implementation */ -#ifdef _MSC_VER - #define SCRIPT_PIPE_DLL_IMPORT _declspec(dllimport) - #ifdef BUILDING_SCRIPT_PIPE - #define SCRIPT_PIPE_DLL_API _declspec(dllexport) - #elif _DLL - #define SCRIPT_PIPE_DLL_API _declspec(dllimport) - #else - #define AUDACITY_DLL_API - #endif -#endif //_MSC_VER - -/* The GCC implementation */ -#ifdef CC_HASVISIBILITY // this is provided by the configure script, is only -// enabled for suitable GCC versions -/* The incantation is a bit weird here because it uses ELF symbol stuff. If we - * make a symbol "default" it makes it visible (for import or export). Making it - * "hidden" means it is invisible outside the shared object. */ - #define SCRIPT_PIPE_DLL_IMPORT __attribute__((visibility("default"))) - #ifdef BUILDING_SCRIPT_PIPE - #define SCRIPT_PIPE_DLL_API __attribute__((visibility("default"))) - #else - #define SCRIPT_PIPE_DLL_API __attribute__((visibility("default"))) - #endif -#endif - diff --git a/lib-src/mod-track-panel/ModTrackPanelCallback.cpp b/lib-src/mod-track-panel/ModTrackPanelCallback.cpp deleted file mode 100644 index ee7c2585d..000000000 --- a/lib-src/mod-track-panel/ModTrackPanelCallback.cpp +++ /dev/null @@ -1,212 +0,0 @@ -/********************************************************************** - - Audacity: A Digital Audio Editor - - ModTrackPanelCallback.cpp - - James Crook - - Audacity is free software. - This file is licensed under the wxWidgets license, see License.txt - -********************************************************************//** - -\class ModTrackPanelCallback -\brief ModTrackPanelCallback is a class containing all the callback -functions for the second generation TrackPanel. These functions are -added into the standard Audacity Project Menus. - -*//*****************************************************************//** - -\class ModTrackPanelCommandFunctor -\brief We create one of these functors for each menu item or -command which we register with the Command Manager. These take the -click from the menu into the actual function to be called. - -*//********************************************************************/ - -#include -#include "ModTrackPanelCallback.h" -#include "Audacity.h" -#include "ShuttleGui.h" -#include "Project.h" -#include "ModuleManager.h" -#include "Registrar.h" -#include "TrackPanel2.h" - -/* -There are several functions that can be used in a GUI module. - -//#define versionFnName "GetVersionString" -If the version is wrong, the module will be rejected. -That is it will be loaded and then unloaded. - -//#define ModuleDispatchName "ModuleDispatch" -The most useful function. See the example in this -file. It has several cases/options in it. - -//#define scriptFnName "RegScriptServerFunc" -This function is run from a non gui thread. It was originally -created for the benefit of mod-script-pipe. - -//#define mainPanelFnName "MainPanelFunc" -This function is the hijacking function, to take over Audacity -and replace the main project window with our own wxFrame. - -*/ - -// The machinery here is somewhat overkill for what we need. -// It allows us to add lots of menu and other actions into Audacity. -// We need to jump through these hoops even if only adding -// two menu items into Audacity. - -// The OnFunc functrions are functions which can be invoked -// by Audacity. Mostly they are for menu items. They could -// be for buttons. They could be for commands invokable by -// script (but no examples of that yet). -class ModTrackPanelCallback -{ -public: - void OnFuncShowAudioExplorer(); - void OnFuncReplaceTrackPanel(); -}; - -typedef void (ModTrackPanelCallback::*ModTrackPanelCommandFunction)(); - -// We have an instance of this CommandFunctor for each -// instance of a command we attach to Audacity. -// Although the commands have void argument, -// they do receive an instance of ModTrackPanelCallback as a 'this', -// so if we want to, we can pass data to each function instance. -class ModTrackPanelCommandFunctor:public CommandFunctor -{ -public: - ModTrackPanelCommandFunctor(ModTrackPanelCallback *pData, - ModTrackPanelCommandFunction pFunction); - virtual void operator()(int index = 0, const wxEvent * evt=NULL); -public: - ModTrackPanelCallback * mpData; - ModTrackPanelCommandFunction mpFunction; -}; - -// If pData is NULL we will later be passing a NULL 'this' to pFunction. -// This may be quite OK if the class function is written as if it -// could be static. -ModTrackPanelCommandFunctor::ModTrackPanelCommandFunctor(ModTrackPanelCallback *pData, - ModTrackPanelCommandFunction pFunction) -{ - mpData = pData; - mpFunction = pFunction; -} - -// The dispatching function in the command functor. -void ModTrackPanelCommandFunctor::operator()(int index, const wxEvent * WXUNUSED(evt) ) -{ - (mpData->*(mpFunction))(); -} - -#define ModTrackPanelFN(X) new ModTrackPanelCommandFunctor(pModTrackPanelCallback, \ - (ModTrackPanelCommandFunction)(&ModTrackPanelCallback::X)) - - -void ModTrackPanelCallback::OnFuncShowAudioExplorer() -{ - int k=3; - Registrar::ShowNewPanel(); -} - -void ModTrackPanelCallback::OnFuncReplaceTrackPanel() -{ - // Upgrade the factory. Now all TrackPanels will be created as TrackPanel 2's - -#if 0 - AudacityProject *p = GetActiveProject(); - wxASSERT( p!= NULL ); - // Change it's type (No new storage allocated). - TrackPanel2::Upgrade( &p->mTrackPanel ); - int k=4; -#endif -} - -// Oooh look, we're using a NULL object, and hence a NULL 'this'. -// That's OK. -ModTrackPanelCallback * pModTrackPanelCallback=NULL; - -//This is the DLL related machinery that actually gets called by Audacity -//as prt of loading and using a DLL. -//It is MUCH simpler to use C for this interface because then the -//function names are not 'mangled'. -//The function names are important, because they are what Audacity looks -//for. Change the name and they won't be found. -//Change the signature, e.g. return type, and you probably have a crash. -extern "C" { -// GetVersionString -// REQUIRED for the module to be accepted by Audacity. -// Without it Audacity will see a version number mismatch. -MOD_TRACK_PANEL_DLL_API wxChar * GetVersionString() -{ - // Make sure that this version of the module requires the version - // of Audacity it is built with. - // For now, the versions must match exactly for Audacity to - // agree to load the module. - return AUDACITY_VERSION_STRING; -} - -// This is the function that connects us to Audacity. -MOD_TRACK_PANEL_DLL_API int ModuleDispatch(ModuleDispatchTypes type) -{ - switch (type) - { - case AppInitialized: - Registrar::Start(); - // Demand that all track panels be created using the TrackPanel2Factory. - TrackPanel::FactoryFunction = TrackPanel2Factory; - break; - case AppQuiting: - Registrar::Finish(); - break; - case ProjectInitialized: - case MenusRebuilt: - { - AudacityProject *p = GetActiveProject(); - if( p== NULL ) - return 0; - - wxMenuBar * pBar = p->GetMenuBar(); - wxMenu * pMenu = pBar->GetMenu( 7 ); // Menu 7 is the Analyze Menu. - CommandManager * c = p->GetCommandManager(); - - c->SetToMenu( pMenu ); - c->AddSeparator(); - // We add two new commands into the Analyze menu. - c->AddItem( _T("Extra Dialog..."), _T("Experimental Extra Dialog for whatever you want."), - ModTrackPanelFN( OnFuncShowAudioExplorer ) ); - //Second menu tweak no longer needed as we always make TrackPanel2's. - //c->AddItem( _T("Replace TrackPanel..."), _T("Replace Current TrackPanel with TrackPanel2"), - // ModTrackPanelFN( OnFuncReplaceTrackPanel ) ); - } - break; - default: - break; - } - - return 1; -} - -//Example code commented out. -#if 1 -// This is an example function to hijack the main panel -int MOD_TRACK_PANEL_DLL_API MainPanelFunc(int ix) -{ - ix=ix;//compiler food - // If we wanted to hide Audacity's Project, - // we'd create a new wxFrame right here and return a pointer to it - // as our return result. - -// Don't hijack the main panel, just return a NULL; - return NULL; -} -#endif - - -} // End extern "C" diff --git a/lib-src/mod-track-panel/ModTrackPanelCallback.h b/lib-src/mod-track-panel/ModTrackPanelCallback.h deleted file mode 100644 index bae39d4d7..000000000 --- a/lib-src/mod-track-panel/ModTrackPanelCallback.h +++ /dev/null @@ -1,38 +0,0 @@ -// The following ifdef block is the standard way of creating macros which make exporting -// from a DLL simpler. All files within this DLL are compiled with the LIBSCRIPT_EXPORTS -// symbol defined on the command line. this symbol should not be defined on any project -// that uses this DLL. This way any other project whose source files include this file see -// MOD_TRACK_PANEL_DLL_API functions as being imported from a DLL, wheras this DLL sees symbols -// defined with this macro as being exported. - - -/* Magic for dynamic library import and export. This is unfortunately - * compiler-specific because there isn't a standard way to do it. Currently it - * works with the Visual Studio compiler for windows, and for GCC 4+. Anything - * else gets all symbols made public, which gets messy */ -/* The Visual Studio implementation */ -#ifdef _MSC_VER - #define MOD_TRACK_PANEL_DLL_IMPORT _declspec(dllimport) - #ifdef BUILDING_MOD_TRACK_PANEL - #define MOD_TRACK_PANEL_DLL_API _declspec(dllexport) - #elif _DLL - #define MOD_TRACK_PANEL_DLL_API _declspec(dllimport) - #else - #define AUDACITY_DLL_API - #endif -#endif //_MSC_VER - -/* The GCC implementation */ -#ifdef CC_HASVISIBILITY // this is provided by the configure script, is only -// enabled for suitable GCC versions -/* The incantation is a bit weird here because it uses ELF symbol stuff. If we - * make a symbol "default" it makes it visible (for import or export). Making it - * "hidden" means it is invisible outside the shared object. */ - #define MOD_TRACK_PANEL_DLL_IMPORT __attribute__((visibility("default"))) - #ifdef BUILDING_MOD_TRACK_PANEL - #define MOD_TRACK_PANEL_DLL_API __attribute__((visibility("default"))) - #else - #define MOD_TRACK_PANEL_DLL_API __attribute__((visibility("default"))) - #endif -#endif - diff --git a/lib-src/mod-track-panel/Registrar.cpp b/lib-src/mod-track-panel/Registrar.cpp deleted file mode 100644 index a4ba1cc31..000000000 --- a/lib-src/mod-track-panel/Registrar.cpp +++ /dev/null @@ -1,77 +0,0 @@ -/********************************************************************** - - Audacity: A Digital Audio Editor - - Registrar.cpp - - James Crook - - Audacity is free software. - This file is licensed under the wxWidgets license, see License.txt - -********************************************************************//** - -\class Registrar -\brief Registrar is a class that other classes register resources of -various kinds with. It makes a system that is much more amenable to -plugging in of new resources. - -*//********************************************************************/ - -#include -#include "Registrar.h" - -Registrar * pRegistrar = NULL; - -// By defining the external function and including it here, we save ourselves maintaing two lists. -// Also we save ourselves recompiling Registrar each time the classes that regiser change. -// Part of the idea is that the Registrar knows very little about the classes that -// register with it. -#define DISPATCH( Name ) extern int Name##Dispatch( Registrar & R, t_RegistrarDispatchType Type );\ - Name##Dispatch( *pRegistrar, Type ) - -// Not a class function, otherwise the functions called -// are treated as belonging to the class. -int RegistrarDispatch( t_RegistrarDispatchType Type ) -{ - wxASSERT( pRegistrar != NULL ); - - DISPATCH( SkewedRuler ); - DISPATCH( MidiArtist ); - DISPATCH( WaveArtist ); - DISPATCH( EnvelopeArtist ); - DISPATCH( LabelArtist ); - DISPATCH( DragGridSizer ); - DISPATCH( TrackPanel2 ); - return 0; -} - -// Start() -// Static function. Allocates Registrar. -void Registrar::Start() -{ - wxASSERT( pRegistrar ==NULL ); - pRegistrar = new Registrar(); - - RegistrarDispatch( RegResource ); - RegistrarDispatch( RegArtist ); - RegistrarDispatch( RegDataType ); - RegistrarDispatch( RegCommand ); - RegistrarDispatch( RegMenuItem ); -} - -// Finish() -// Static function. DeAllocates Registrar. -void Registrar::Finish() -{ - wxASSERT( pRegistrar !=NULL ); - delete pRegistrar; - pRegistrar = NULL; -} - -void Registrar::ShowNewPanel() -{ - wxASSERT( pRegistrar !=NULL ); - if( pRegistrar->pShowFn != NULL) - pRegistrar->pShowFn(); -} \ No newline at end of file diff --git a/lib-src/mod-track-panel/Registrar.h b/lib-src/mod-track-panel/Registrar.h deleted file mode 100644 index 0d947d8d6..000000000 --- a/lib-src/mod-track-panel/Registrar.h +++ /dev/null @@ -1,45 +0,0 @@ -/********************************************************************** - - Audacity: A Digital Audio Editor - - Registrar.h - - James Crook - - Manages centralised registration of resources. - -**********************************************************************/ - -#ifndef __AUDACITY_REGISTRAR__ -#define __AUDACITY_REGISTRAR__ - -typedef enum -{ - RegResource, - RegArtist, - RegDataType, - RegCommand, - RegMenuItem, - RegLast -} t_RegistrarDispatchType; - -class Registrar { - Registrar::Registrar(){ - pShowFn = NULL;} -public: - // Fairly generic registrar functions. - static void Start(); - static void Finish(); - - // Somewhat specific to this application registrar functions. - // These mostly reflect one-offs, where a more sophisticated - // system would manage a list. - static void ShowNewPanel(); -public: - void (*pShowFn)(void); -}; - - -extern int RegistrarDispatch( t_RegistrarDispatchType Type ); - -#endif diff --git a/lib-src/mod-track-panel/SkewedRuler.cpp b/lib-src/mod-track-panel/SkewedRuler.cpp deleted file mode 100644 index 9763679fc..000000000 --- a/lib-src/mod-track-panel/SkewedRuler.cpp +++ /dev/null @@ -1,136 +0,0 @@ -/********************************************************************** - - Audacity: A Digital Audio Editor - - Registrar.cpp - - James Crook - - Audacity is free software. - This file is licensed under the wxWidgets license, see License.txt - -********************************************************************//** - -\class SkewedRuller -\brief SkewedRuler draws a ruler for aligning two sequences. - -*//********************************************************************/ - -#include -#include "Registrar.h" -#include "SkewedRuler.h" - -extern int SkewedRulerDispatch( Registrar & R, t_RegistrarDispatchType Type ) -{ - switch( Type ) - { - case RegArtist: - break; - case RegDataType: - break; - case RegCommand: - break; - case RegMenuItem: - break; - default: - break; - } - return 1; -} - - -// For now I've bunged these empty dispatch functions into the same -// file as SkewedRuler. -// When I am ready to work on them I will create new files for them. -int MidiArtistDispatch( Registrar & R, t_RegistrarDispatchType Type ) -{ - switch( Type ) - { - case RegArtist: - break; - case RegDataType: - break; - case RegCommand: - break; - case RegMenuItem: - break; - default: - break; - } - return 1; -} - -extern int WaveArtistDispatch( Registrar & R, t_RegistrarDispatchType Type ) -{ - switch( Type ) - { - case RegArtist: - break; - case RegDataType: - break; - case RegCommand: - break; - case RegMenuItem: - break; - default: - break; - } - return 1; -} - -int EnvelopeArtistDispatch( Registrar & R, t_RegistrarDispatchType Type ) -{ - switch( Type ) - { - case RegArtist: - break; - case RegDataType: - break; - case RegCommand: - break; - case RegMenuItem: - break; - default: - break; - } - return 1; -} - -int LabelArtistDispatch( Registrar & R, t_RegistrarDispatchType Type ) -{ - switch( Type ) - { - case RegArtist: - break; - case RegDataType: - break; - case RegCommand: - break; - case RegMenuItem: - break; - default: - break; - } - return 1; -} - -int DragGridSizerDispatch( Registrar & R, t_RegistrarDispatchType Type ) -{ - switch( Type ) - { - case RegArtist: - break; - case RegDataType: - break; - case RegCommand: - break; - case RegMenuItem: - break; - default: - break; - } - return 1; -} - - - diff --git a/lib-src/mod-track-panel/SkewedRuler.h b/lib-src/mod-track-panel/SkewedRuler.h deleted file mode 100644 index 05361108a..000000000 --- a/lib-src/mod-track-panel/SkewedRuler.h +++ /dev/null @@ -1,23 +0,0 @@ -/********************************************************************** - - Audacity: A Digital Audio Editor - - SkewedRuler.h - - James Crook - - Draws a ruler used for aligning two time sequences. - -**********************************************************************/ - -#ifndef __AUDACITY_SKEWED_RULER__ -#define __AUDACITY_SKEWED_RULER__ - - - -class SkewedRuler { -public: - -}; - -#endif diff --git a/lib-src/mod-track-panel/TrackPanel2.cpp b/lib-src/mod-track-panel/TrackPanel2.cpp deleted file mode 100644 index 541d4a1c2..000000000 --- a/lib-src/mod-track-panel/TrackPanel2.cpp +++ /dev/null @@ -1,133 +0,0 @@ -/********************************************************************** - - Audacity: A Digital Audio Editor - - Registrar.cpp - - James Crook - - Audacity is free software. - This file is licensed under the wxWidgets license, see License.txt - -********************************************************************//** - -\class TrackPanel2 -\brief TrackPanel2 is the start of the new TrackPanel. - -*//********************************************************************/ - -#include -#include "ShuttleGui.h" -#include "widgets/LinkingHtmlWindow.h" -#include "SkewedRuler.h" -#include "Registrar.h" -#include "TrackPanel2.h" - -TrackPanel * TrackPanel2Factory(wxWindow * parent, - wxWindowID id, - const wxPoint & pos, - const wxSize & size, - TrackList * tracks, - ViewInfo * viewInfo, - TrackPanelListener * listener, - AdornedRulerPanel * ruler) -{ - return new TrackPanel2( - parent, - id, - pos, - size, - tracks, - viewInfo, - listener, - ruler); -} - -void ShowExtraDialog() -{ - int k=42; - - wxDialog Dlg(NULL, wxID_ANY, wxString(wxT("Experimental Extra Dialog"))); - ShuttleGui S(&Dlg, eIsCreating); - S.StartNotebook(); - { - S.StartNotebookPage( _("Panel 1") ); - S.StartVerticalLay(1); - { - HtmlWindow *html = new LinkingHtmlWindow(S.GetParent(), -1, - wxDefaultPosition, - wxSize(600, 359), - wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER); - html->SetFocus(); - html->SetPage(wxT("

An Html Window

Replace with whatever you like.")); - S.Prop(1).AddWindow( html, wxEXPAND ); - } - S.EndVerticalLay(); - S.EndNotebookPage(); - - S.StartNotebookPage( _("Diagnostics") ); - S.StartVerticalLay(1); - { - HtmlWindow *html = new LinkingHtmlWindow(S.GetParent(), -1, - wxDefaultPosition, - wxSize(600, 359), - wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER); - html->SetFocus(); - html->SetPage(wxT("

Diagnostics

This is an html diagnostics page")); - S.Prop(1).AddWindow( html, wxEXPAND ); - } - S.EndVerticalLay(); - S.EndNotebookPage(); - } - S.EndNotebook(); - - wxButton *ok = new wxButton(S.GetParent(), wxID_OK, _("OK... Audacious!")); - ok->SetDefault(); - S.Prop(0).AddWindow( ok ); - - Dlg.Fit(); - - Dlg.ShowModal(); -} - - -int TrackPanel2Dispatch( Registrar & R, t_RegistrarDispatchType Type ) -{ - switch( Type ) - { - case RegResource: - R.pShowFn = ShowExtraDialog; - break; - case RegArtist: - break; - case RegDataType: - break; - case RegCommand: - break; - case RegMenuItem: - break; - default: - break; - } - return 1; -} - -TrackPanel2::TrackPanel2( - wxWindow * parent, wxWindowID id, const wxPoint & pos, const wxSize & size, - TrackList * tracks, ViewInfo * viewInfo, TrackPanelListener * listener, - AdornedRulerPanel * ruler) : - TrackPanel( - parent, id, pos, size, - tracks, viewInfo, listener, ruler) -{ -} - - -// Here is a sample function that shows that TrackPanel2 is being invoked. -void TrackPanel2::OnPaint(wxPaintEvent & event) -{ -// Hmm... Log debug will only show if you open the log window. -// wxLogDebug( wxT("Paint TrackPanel2 requested") ); - TrackPanel::OnPaint( event ); -} - diff --git a/lib-src/mod-track-panel/TrackPanel2.h b/lib-src/mod-track-panel/TrackPanel2.h deleted file mode 100644 index 51fd22b07..000000000 --- a/lib-src/mod-track-panel/TrackPanel2.h +++ /dev/null @@ -1,44 +0,0 @@ -/********************************************************************** - - Audacity: A Digital Audio Editor - - TrackPanel2.h - - James Crook - -**********************************************************************/ - -#ifndef __AUDACITY_TRACK_PANEL2__ -#define __AUDACITY_TRACK_PANEL2__ - -#include "TrackPanel.h" - -class TrackPanel2 : public TrackPanel -{ -public: - TrackPanel2( - wxWindow * parent, wxWindowID id, - const wxPoint & pos, - const wxSize & size, - TrackList * tracks, - ViewInfo * viewInfo, - TrackPanelListener * listener, - AdornedRulerPanel * ruler); - - // Upgrades an existing TrackPanel to a TrackPanel2 - static void Upgrade( TrackPanel ** ppTrackPanel ); - - virtual void OnPaint(wxPaintEvent & event); -}; - -// Factory function. -TrackPanel * TrackPanel2Factory(wxWindow * parent, - wxWindowID id, - const wxPoint & pos, - const wxSize & size, - TrackList * tracks, - ViewInfo * viewInfo, - TrackPanelListener * listener, - AdornedRulerPanel * ruler); - -#endif diff --git a/lib-src/mod-track-panel/mod-track-panel.sln b/lib-src/mod-track-panel/mod-track-panel.sln deleted file mode 100755 index 2931d638d..000000000 --- a/lib-src/mod-track-panel/mod-track-panel.sln +++ /dev/null @@ -1,22 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2013 for Windows Desktop -VisualStudioVersion = 12.0.30723.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod-track-panel", "mod-track-panel.vcxproj", "{1D40165D-E385-4EAB-A755-CF5EA645F4FA}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1D40165D-E385-4EAB-A755-CF5EA645F4FA}.Debug|Win32.ActiveCfg = Debug|Win32 - {1D40165D-E385-4EAB-A755-CF5EA645F4FA}.Debug|Win32.Build.0 = Debug|Win32 - {1D40165D-E385-4EAB-A755-CF5EA645F4FA}.Release|Win32.ActiveCfg = Release|Win32 - {1D40165D-E385-4EAB-A755-CF5EA645F4FA}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/lib-src/mod-track-panel/mod-track-panel.vcxproj b/lib-src/mod-track-panel/mod-track-panel.vcxproj deleted file mode 100755 index ff0377009..000000000 --- a/lib-src/mod-track-panel/mod-track-panel.vcxproj +++ /dev/null @@ -1,113 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {1D40165D-E385-4EAB-A755-CF5EA645F4FA} - modtrackpanel2 - Win32Proj - - - - DynamicLibrary - v120 - Unicode - true - - - DynamicLibrary - v120 - Unicode - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - - - - Disabled - $(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;$(SolutionDir);..\..\include;..\..\src;..\..\src\include\win32;..\..\src\include;..\..\win\;..\FileDialog;..\expat;..\lib-widget-extra;..\libflac\include;..\libid3tag;..\liblrdf;..\libmad;..\libnyquist;..\libogg\include;..\libresample\include;..\libsamplerate\src;..\libscorealign;..\libsndfile;..\libvamp;..\libvorbis\include;..\portaudio-v19\include;..\portmixer\include;..\portsmf;..\redland\raptor\src;..\slv2;..\sbsms\include;..\soundtouch\include;..\twolame\libtwolame;..\portmidi\pm_common;..\portmidi\pm_win;..\portmidi\porttime;..\ffmpeg\win32;..\ffmpeg;%(AdditionalIncludeDirectories) - BUILDING_MOD_TRACK_PANEL;WXUSINGDLL;__WXMSW__;__WXDEBUG__;WIN32;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - - Level3 - EditAndContinue - Default - - - wxmsw30ud_core.lib;wxbase30ud.lib;wxmsw30ud_html.lib;odbc32.lib;odbccp32.lib;oldnames.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;netapi32.lib;Audacity.lib;%(AdditionalDependencies) - $(OutDir)modules\$(ProjectName).dll - $(WXWIN)\lib\vc_dll;..\..\win\$(IntDir);$(OutDir);%(AdditionalLibraryDirectories) - true - Windows - false - - - - - MaxSpeed - true - $(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;$(SolutionDir);..\..\include;..\..\src;..\..\src\include\win32;..\..\src\include;..\..\win;..\FileDialog;..\expat;..\lib-widget-extra;..\libflac\include;..\libid3tag;..\liblrdf;..\libmad;..\libnyquist;..\libogg\include;..\libresample\include;..\libsamplerate\src;..\libscorealign;..\libsndfile;..\libvamp;..\libvorbis\include;..\portaudio-v19\include;..\portmixer\include;..\portsmf;..\redland\raptor\src;..\slv2;..\sbsms\include;..\soundtouch\include;..\twolame\libtwolame;..\portmidi\pm_common;..\portmidi\pm_win;..\portmidi\porttime;..\ffmpeg\win32;..\ffmpeg;%(AdditionalIncludeDirectories) - BUILDING_MOD_TRACK_PANEL;WXUSINGDLL;__WXMSW__;NDEBUG;_WINDOWS;WIN32;_USRDLL;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level3 - Default - - - wxmsw30u_core.lib;wxbase30u.lib;wxmsw30u_html.lib;odbc32.lib;odbccp32.lib;oldnames.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;netapi32.lib;Audacity.lib;%(AdditionalDependencies) - $(OutDir)modules\$(ProjectName).dll - $(WXWIN)\lib\vc_dll;..\..\win\$(IntDir);$(OutDir);%(AdditionalLibraryDirectories) - true - Windows - true - true - MachineX86 - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/lib-src/mod-track-panel/mod-track-panel.vcxproj.filters b/lib-src/mod-track-panel/mod-track-panel.vcxproj.filters deleted file mode 100755 index 0955dccd8..000000000 --- a/lib-src/mod-track-panel/mod-track-panel.vcxproj.filters +++ /dev/null @@ -1,37 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/src/BatchProcessDialog.cpp b/src/BatchProcessDialog.cpp index 011b806d8..befe54c38 100644 --- a/src/BatchProcessDialog.cpp +++ b/src/BatchProcessDialog.cpp @@ -54,7 +54,7 @@ #include "AllThemeResources.h" -#include "FileDialog.h" +#include "widgets/FileDialog/FileDialog.h" #include "FileNames.h" #include "import/Import.h" #include "widgets/ErrorDialog.h" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c61f6a2cf..71afe0f2a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -921,6 +921,20 @@ list( APPEND SOURCES widgets/ErrorDialog.h widgets/ExpandingToolBar.cpp widgets/ExpandingToolBar.h + widgets/FileDialog/FileDialog.cpp + widgets/FileDialog/FileDialog.h + $<$: + widgets/FileDialog/win/FileDialogPrivate.cpp + widgets/FileDialog/win/FileDialogPrivate.h + > + $<$: + widgets/FileDialog/mac/FileDialogPrivate.mm + widgets/FileDialog/mac/FileDialogPrivate.h + > + $<$: + widgets/FileDialog/gtk/FileDialogPrivate.cpp + widgets/FileDialog/gtk/FileDialogPrivate.h + > widgets/FileHistory.cpp widgets/FileHistory.h widgets/Grabber.cpp @@ -1049,7 +1063,6 @@ list( APPEND LIBRARIES PRIVATE ${CMAKE_REQUIRED_LIBRARIES} wxWidgets - FileDialog expat lame libsndfile diff --git a/src/FileNames.cpp b/src/FileNames.cpp index 8ad99ac1a..b6eba1cf9 100644 --- a/src/FileNames.cpp +++ b/src/FileNames.cpp @@ -37,7 +37,7 @@ used throughout Audacity into this one place. #include "PlatformCompatibility.h" #include "wxFileNameWrapper.h" #include "widgets/AudacityMessageBox.h" -#include "../lib-src/FileDialog/FileDialog.h" +#include "widgets/FileDialog/FileDialog.h" #if defined(__WXMAC__) || defined(__WXGTK__) #include diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp index 9a2fde3ed..a40958645 100644 --- a/src/effects/Equalization.cpp +++ b/src/effects/Equalization.cpp @@ -112,7 +112,7 @@ #include "../widgets/WindowAccessible.h" #endif -#include "FileDialog.h" +#include "../widgets/FileDialog/FileDialog.h" #ifdef EXPERIMENTAL_EQ_SSE_THREADED #include "Equalization48x.h" diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp index c692d9c24..5e4d8fd41 100644 --- a/src/effects/nyquist/Nyquist.cpp +++ b/src/effects/nyquist/Nyquist.cpp @@ -78,7 +78,7 @@ effects from this one class. #include "../../widgets/NumericTextCtrl.h" #include "../../widgets/ProgressDialog.h" -#include "../lib-src/FileDialog/FileDialog.h" +#include "../../widgets/FileDialog/FileDialog.h" #ifndef nyx_returns_start_and_end_time #error You need to update lib-src/libnyquist diff --git a/src/export/Export.cpp b/src/export/Export.cpp index d404a071b..da8caa480 100644 --- a/src/export/Export.cpp +++ b/src/export/Export.cpp @@ -48,7 +48,7 @@ #include "sndfile.h" -#include "FileDialog.h" +#include "../widgets/FileDialog/FileDialog.h" #include "../DirManager.h" #include "../FileFormats.h" diff --git a/src/export/ExportFFmpegDialogs.cpp b/src/export/ExportFFmpegDialogs.cpp index 1cf972f27..f81dbaef1 100644 --- a/src/export/ExportFFmpegDialogs.cpp +++ b/src/export/ExportFFmpegDialogs.cpp @@ -58,7 +58,7 @@ #include #include -#include +#include "../widgets/FileDialog/FileDialog.h" #include "../FileFormats.h" #include "../Mix.h" diff --git a/src/widgets/wxPanelWrapper.h b/src/widgets/wxPanelWrapper.h index 0aaa8f5b7..8a2ffebcf 100644 --- a/src/widgets/wxPanelWrapper.h +++ b/src/widgets/wxPanelWrapper.h @@ -157,7 +157,7 @@ public: } }; -#include "../lib-src/FileDialog/FileDialog.h" +#include "FileDialog/FileDialog.h" #include "../FileNames.h" // for FileTypes class AUDACITY_DLL_API FileDialogWrapper