- commit
- 73f7731e85abf361e0d5a143b354281fb8a3bc87
- parent
- 96b8d9041aca1d1fddfae050f55ed25333337ade
- Author
- Tobias Bengfort <tobias.bengfort@gmx.net>
- Date
- 2010-11-02 00:15
absolut path for icons
Diffstat
| M | README | 1 | + |
| M | src/gui/xiRetimer_wxfb.cpp | 33 | ++++++++++++--------------------- |
| D | src/ressources/dialog-close.png | 0 | |
| D | src/ressources/document-properties.png | 0 | |
| D | src/ressources/document-save.png | 0 | |
| D | src/ressources/edit-clear.png | 0 | |
| D | src/ressources/fileopen.png | 0 | |
| D | src/ressources/help-about.png | 0 | |
| D | src/ressources/media-playback-start.png | 0 | |
| D | src/ressources/media-skip-backward.png | 0 | |
| D | src/ressources/media-skip-forward.png | 0 | |
| D | src/ressources/stock_refresh.png | 0 | |
| M | xiRetimer | 0 |
13 files changed, 13 insertions, 21 deletions
diff --git a/README b/README
@@ -12,5 +12,6 @@ timestretch - rubberband 12 12 TODO 13 13 14 14 playback !! -1 15 exits with error 15 16 improve AudioShape 16 17 bugtracking
diff --git a/src/gui/xiRetimer_wxfb.cpp b/src/gui/xiRetimer_wxfb.cpp
@@ -25,18 +25,16 @@ wxInitAllImageHandlers(); 25 25 wxMenuItem* m_open; 26 26 m_open = new wxMenuItem( m_file, wxID_ANY, wxString( wxT("open") ) + wxT('\t') + wxT("CTRL+f"), wxEmptyString, wxITEM_NORMAL ); 27 27 #ifdef __WXMSW__28 -1 m_open->SetBitmaps( wxBitmap( wxT("ressources/fileopen.png"), wxBITMAP_TYPE_ANY ) );29 28 #elif defined( __WXGTK__ )30 -1 m_open->SetBitmap( wxBitmap( wxT("ressources/fileopen.png"), wxBITMAP_TYPE_ANY ) );-1 29 m_open->SetBitmap( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/fileopen.png"), wxBITMAP_TYPE_ANY ) ); 31 30 #endif 32 31 m_file->Append( m_open ); 33 32 34 33 wxMenuItem* m_export; 35 34 m_export = new wxMenuItem( m_file, wxID_ANY, wxString( wxT("export") ) + wxT('\t') + wxT("CTRL+s"), wxEmptyString, wxITEM_NORMAL ); 36 35 #ifdef __WXMSW__37 -1 m_export->SetBitmaps( wxBitmap( wxT("ressources/document-save.png"), wxBITMAP_TYPE_ANY ) );38 36 #elif defined( __WXGTK__ )39 -1 m_export->SetBitmap( wxBitmap( wxT("ressources/document-save.png"), wxBITMAP_TYPE_ANY ) );-1 37 m_export->SetBitmap( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/document-save.png"), wxBITMAP_TYPE_ANY ) ); 40 38 #endif 41 39 m_file->Append( m_export ); 42 40 @@ -46,9 +44,8 @@ wxInitAllImageHandlers(); 46 44 wxMenuItem* m_prefs; 47 45 m_prefs = new wxMenuItem( m_file, wxID_ANY, wxString( wxT("preferences") ) + wxT('\t') + wxT("F5"), wxEmptyString, wxITEM_NORMAL ); 48 46 #ifdef __WXMSW__49 -1 m_prefs->SetBitmaps( wxBitmap( wxT("ressources/document-properties.png"), wxBITMAP_TYPE_ANY ) );50 47 #elif defined( __WXGTK__ )51 -1 m_prefs->SetBitmap( wxBitmap( wxT("ressources/document-properties.png"), wxBITMAP_TYPE_ANY ) );-1 48 m_prefs->SetBitmap( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/document-properties.png"), wxBITMAP_TYPE_ANY ) ); 52 49 #endif 53 50 m_file->Append( m_prefs ); 54 51 @@ -58,9 +55,8 @@ wxInitAllImageHandlers(); 58 55 wxMenuItem* b_exit; 59 56 b_exit = new wxMenuItem( m_file, wxID_ANY, wxString( wxT("Exit") ) , wxEmptyString, wxITEM_NORMAL ); 60 57 #ifdef __WXMSW__61 -1 b_exit->SetBitmaps( wxBitmap( wxT("ressources/dialog-close.png"), wxBITMAP_TYPE_ANY ) );62 58 #elif defined( __WXGTK__ )63 -1 b_exit->SetBitmap( wxBitmap( wxT("ressources/dialog-close.png"), wxBITMAP_TYPE_ANY ) );-1 59 b_exit->SetBitmap( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/window-close.png"), wxBITMAP_TYPE_ANY ) ); 64 60 #endif 65 61 m_file->Append( b_exit ); 66 62 @@ -70,27 +66,24 @@ wxInitAllImageHandlers(); 70 66 wxMenuItem* m_play; 71 67 m_play = new wxMenuItem( m_edit, wxID_ANY, wxString( wxT("play/pause") ) + wxT('\t') + wxT("SPACE"), wxEmptyString, wxITEM_CHECK ); 72 68 #ifdef __WXMSW__73 -1 m_play->SetBitmaps( wxBitmap( wxT("ressources/media-playback-start.png"), wxBITMAP_TYPE_ANY ) );74 69 #elif defined( __WXGTK__ )75 -1 m_play->SetBitmap( wxBitmap( wxT("ressources/media-playback-start.png"), wxBITMAP_TYPE_ANY ) );-1 70 m_play->SetBitmap( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/media-playback-start.png"), wxBITMAP_TYPE_ANY ) ); 76 71 #endif 77 72 m_edit->Append( m_play ); 78 73 79 74 wxMenuItem* m_start; 80 75 m_start = new wxMenuItem( m_edit, wxID_ANY, wxString( wxT("start") ) + wxT('\t') + wxT("CTRL+LEFT"), wxEmptyString, wxITEM_NORMAL ); 81 76 #ifdef __WXMSW__82 -1 m_start->SetBitmaps( wxBitmap( wxT("ressources/media-skip-backward.png"), wxBITMAP_TYPE_ANY ) );83 77 #elif defined( __WXGTK__ )84 -1 m_start->SetBitmap( wxBitmap( wxT("ressources/media-skip-backward.png"), wxBITMAP_TYPE_ANY ) );-1 78 m_start->SetBitmap( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/media-skip-backward.png"), wxBITMAP_TYPE_ANY ) ); 85 79 #endif 86 80 m_edit->Append( m_start ); 87 81 88 82 wxMenuItem* m_end; 89 83 m_end = new wxMenuItem( m_edit, wxID_ANY, wxString( wxT("end") ) + wxT('\t') + wxT("CTRL+RIGHT"), wxEmptyString, wxITEM_NORMAL ); 90 84 #ifdef __WXMSW__91 -1 m_end->SetBitmaps( wxBitmap( wxT("ressources/media-skip-forward.png"), wxBITMAP_TYPE_ANY ) );92 85 #elif defined( __WXGTK__ )93 -1 m_end->SetBitmap( wxBitmap( wxT("ressources/media-skip-forward.png"), wxBITMAP_TYPE_ANY ) );-1 86 m_end->SetBitmap( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/media-skip-forward.png"), wxBITMAP_TYPE_ANY ) ); 94 87 #endif 95 88 m_edit->Append( m_end ); 96 89 @@ -100,18 +93,16 @@ wxInitAllImageHandlers(); 100 93 wxMenuItem* m_clear; 101 94 m_clear = new wxMenuItem( m_edit, wxID_ANY, wxString( wxT("clear markers") ) + wxT('\t') + wxT("CTRL+c"), wxEmptyString, wxITEM_NORMAL ); 102 95 #ifdef __WXMSW__103 -1 m_clear->SetBitmaps( wxBitmap( wxT("ressources/edit-clear.png"), wxBITMAP_TYPE_ANY ) );104 96 #elif defined( __WXGTK__ )105 -1 m_clear->SetBitmap( wxBitmap( wxT("ressources/edit-clear.png"), wxBITMAP_TYPE_ANY ) );-1 97 m_clear->SetBitmap( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/edit-clear.png"), wxBITMAP_TYPE_ANY ) ); 106 98 #endif 107 99 m_edit->Append( m_clear ); 108 100 109 101 wxMenuItem* m_process; 110 102 m_process = new wxMenuItem( m_edit, wxID_ANY, wxString( wxT("update audio data") ) + wxT('\t') + wxT("CTRL+u"), wxEmptyString, wxITEM_NORMAL ); 111 103 #ifdef __WXMSW__112 -1 m_process->SetBitmaps( wxBitmap( wxT("ressources/stock_refresh.png"), wxBITMAP_TYPE_ANY ) );113 104 #elif defined( __WXGTK__ )114 -1 m_process->SetBitmap( wxBitmap( wxT("ressources/stock_refresh.png"), wxBITMAP_TYPE_ANY ) );-1 105 m_process->SetBitmap( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/stock_refresh.png"), wxBITMAP_TYPE_ANY ) ); 115 106 #endif 116 107 m_edit->Append( m_process ); 117 108 @@ -121,9 +112,8 @@ wxInitAllImageHandlers(); 121 112 wxMenuItem* m_about; 122 113 m_about = new wxMenuItem( m_help, wxID_ANY, wxString( wxT("about") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL ); 123 114 #ifdef __WXMSW__124 -1 m_about->SetBitmaps( wxBitmap( wxT("ressources/help-about.png"), wxBITMAP_TYPE_ANY ) );125 115 #elif defined( __WXGTK__ )126 -1 m_about->SetBitmap( wxBitmap( wxT("ressources/help-about.png"), wxBITMAP_TYPE_ANY ) );-1 116 m_about->SetBitmap( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/help-about.png"), wxBITMAP_TYPE_ANY ) ); 127 117 #endif 128 118 m_help->Append( m_about ); 129 119 @@ -180,12 +170,13 @@ AboutDialog::AboutDialog( wxWindow* parent, wxWindowID id, const wxString& title 180 170 wxBoxSizer* bSizer14; 181 171 bSizer14 = new wxBoxSizer( wxVERTICAL ); 182 172183 -1 m_staticText1 = new wxStaticText( this, wxID_ANY, wxT("Created by xi."), wxDefaultPosition, wxDefaultSize, 0 );-1 173 m_staticText1 = new wxStaticText( this, wxID_ANY, wxT("xiRetimer v0.1 by xi."), wxDefaultPosition, wxDefaultSize, 0 ); 184 174 m_staticText1->Wrap( -1 ); 185 175 bSizer14->Add( m_staticText1, 0, wxALIGN_CENTER|wxALL, 5 ); 186 176 187 177 m_staticText2 = new wxStaticText( this, wxID_ANY, wxT("www.github.com/xi"), wxDefaultPosition, wxDefaultSize, 0 ); 188 178 m_staticText2->Wrap( -1 ); -1 179 189 180 bSizer14->Add( m_staticText2, 0, wxALIGN_CENTER|wxALL, 5 ); 190 181 191 182 bSizer4->Add( bSizer14, 1, wxEXPAND, 5 );