timw4mail
/
Tyro
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update language mappings a bit, add properties type file

This commit is contained in:
Timothy Warren 2019-06-04 13:51:27 -04:00
parent a24b62e4b3
commit feb97cd517
4 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
config/languages.json
View File

File diff suppressed because one or more lines are too long

2
src/TyroApp.cpp
View File

@ -126,7 +126,6 @@ private:
Glob_lexer_map["batch"] = wxSTC_LEX_BATCH; Glob_lexer_map["batch"] = wxSTC_LEX_BATCH;
Glob_lexer_map["caml"] = wxSTC_LEX_CAML; Glob_lexer_map["caml"] = wxSTC_LEX_CAML;
Glob_lexer_map["cmake"] = wxSTC_LEX_CMAKE; Glob_lexer_map["cmake"] = wxSTC_LEX_CMAKE;
Glob_lexer_map["coffeescript"] = wxSTC_LEX_COFFEESCRIPT;
Glob_lexer_map["cpp"] = wxSTC_LEX_CPP; Glob_lexer_map["cpp"] = wxSTC_LEX_CPP;
Glob_lexer_map["css"] = wxSTC_LEX_CSS; Glob_lexer_map["css"] = wxSTC_LEX_CSS;
Glob_lexer_map["fortran"] = wxSTC_LEX_FORTRAN; Glob_lexer_map["fortran"] = wxSTC_LEX_FORTRAN;
@ -139,6 +138,7 @@ private:
Glob_lexer_map["markdown"] = wxSTC_LEX_MARKDOWN; Glob_lexer_map["markdown"] = wxSTC_LEX_MARKDOWN;
Glob_lexer_map["php"] = wxSTC_LEX_HTML; Glob_lexer_map["php"] = wxSTC_LEX_HTML;
Glob_lexer_map["perl"] = wxSTC_LEX_PERL; Glob_lexer_map["perl"] = wxSTC_LEX_PERL;
Glob_lexer_map["properties"] = wxSTC_LEX_PROPERTIES;
Glob_lexer_map["python"] = wxSTC_LEX_PYTHON; Glob_lexer_map["python"] = wxSTC_LEX_PYTHON;
Glob_lexer_map["ruby"] = wxSTC_LEX_RUBY; Glob_lexer_map["ruby"] = wxSTC_LEX_RUBY;
Glob_lexer_map["rust"] = wxSTC_LEX_CPP; Glob_lexer_map["rust"] = wxSTC_LEX_CPP;

3
src/definitions.h
View File

@ -99,13 +99,14 @@ const wxString TYRO_FILE_OPEN_WILDCARDS =
"Haskell (*.hs,*.lhs,*.las)|*.hs;*.lhs;*.las|" "Haskell (*.hs,*.lhs,*.las)|*.hs;*.lhs;*.las|"
"HTML/XHTML (*.html, *.htm)|*.htm*|" "HTML/XHTML (*.html, *.htm)|*.htm*|"
"Java (*.java)|*.java|" "Java (*.java)|*.java|"
"JavaScript (*.js,*.json,*.ts)|*.js;*.json;*.ts|" "JavaScript (*.js,*.json,*.ts,*.jsx,*.tsx)|*.js;*.json;*.ts;*.jsx;*.tsx|"
"Lisp (*.lsp,*.lisp)|*.lsp;*.lisp|" "Lisp (*.lsp,*.lisp)|*.lsp;*.lisp|"
"Lua (*.lua)|*.lua|" "Lua (*.lua)|*.lua|"
"Makefile |Makefile;makefile.*;MAKEFILE;configure.*;*.mak|" "Makefile |Makefile;makefile.*;MAKEFILE;configure.*;*.mak|"
"Markdown (*.md,*.markdown)|*.md;*.markdown|" "Markdown (*.md,*.markdown)|*.md;*.markdown|"
"Perl (*.pl, *.cgi)|*.pl;*.pm;*.cgi;*.pod|" "Perl (*.pl, *.cgi)|*.pl;*.pm;*.cgi;*.pod|"
"PHP (*.php)|*.php|" "PHP (*.php)|*.php|"
"Properties (*.properties)|*.properties|"
"Python (*.py,*.pyw)|*.py;*.pyw|" "Python (*.py,*.pyw)|*.py;*.pyw|"
"Ruby (*.rb)|*.rb|" "Ruby (*.rb)|*.rb|"
"Rust (*.rs)|*.rs|" "Rust (*.rs)|*.rs|"

15
src/widgets/MainFrame.cpp
View File

@ -9,9 +9,7 @@ extern wxStatusBar *Glob_status_bar;
static TabContainer *notebook = nullptr; static TabContainer *notebook = nullptr;
static FilePane *filePane = nullptr; static FilePane *filePane = nullptr;
#ifndef TRAVIS extern PrefPane *Glob_pref_pane;
extern PrefPane *Glob_pref_pane;
#endif
// Frame icon // Frame icon
@ -127,7 +125,7 @@ void MainFrame::SetupStatusBar()
wxAuiToolBar* MainFrame::SetupToolbar() wxAuiToolBar* MainFrame::SetupToolbar()
{ {
// Icon files // Icon files
//#ifndef __WXGTK__ #ifndef __WXGTK__
#include "resources/xpm/32/new.xpm" #include "resources/xpm/32/new.xpm"
#include "resources/xpm/32/open.xpm" #include "resources/xpm/32/open.xpm"
#include "resources/xpm/32/save.xpm" #include "resources/xpm/32/save.xpm"
@ -137,23 +135,28 @@ wxAuiToolBar* MainFrame::SetupToolbar()
wxBitmap new_file_icon(new_file); wxBitmap new_file_icon(new_file);
wxBitmap open_file_icon(open); wxBitmap open_file_icon(open);
wxBitmap open_folder_icon(open);
wxBitmap save_file_icon(save); wxBitmap save_file_icon(save);
wxBitmap copy_icon(copy); wxBitmap copy_icon(copy);
wxBitmap cut_icon(cut); wxBitmap cut_icon(cut);
wxBitmap paste_icon(paste); wxBitmap paste_icon(paste);
/*#else #else
wxBitmap new_file_icon = wxArtProvider::GetBitmap(wxART_NEW, wxART_TOOLBAR); wxBitmap new_file_icon = wxArtProvider::GetBitmap(wxART_NEW, wxART_TOOLBAR);
wxBitmap open_file_icon = wxArtProvider::GetBitmap(wxART_FILE_OPEN, wxART_TOOLBAR); wxBitmap open_file_icon = wxArtProvider::GetBitmap(wxART_FILE_OPEN, wxART_TOOLBAR);
wxBitmap open_folder_icon = wxArtProvider::GetBitmap(wxART_FOLDER_OPEN, wxART_TOOLBAR);
wxBitmap save_file_icon = wxArtProvider::GetBitmap(wxART_FILE_SAVE, wxART_TOOLBAR); wxBitmap save_file_icon = wxArtProvider::GetBitmap(wxART_FILE_SAVE, wxART_TOOLBAR);
wxBitmap copy_icon = wxArtProvider::GetBitmap(wxART_COPY, wxART_TOOLBAR); wxBitmap copy_icon = wxArtProvider::GetBitmap(wxART_COPY, wxART_TOOLBAR);
wxBitmap cut_icon = wxArtProvider::GetBitmap(wxART_CUT, wxART_TOOLBAR); wxBitmap cut_icon = wxArtProvider::GetBitmap(wxART_CUT, wxART_TOOLBAR);
wxBitmap paste_icon = wxArtProvider::GetBitmap(wxART_PASTE, wxART_TOOLBAR); wxBitmap paste_icon = wxArtProvider::GetBitmap(wxART_PASTE, wxART_TOOLBAR);
#endif */ #endif
toolBar = new wxAuiToolBar(this); toolBar = new wxAuiToolBar(this);
toolBar->AddTool(wxID_NEW, "New", new_file_icon, "New file"); toolBar->AddTool(wxID_NEW, "New", new_file_icon, "New file");
toolBar->AddTool(wxID_OPEN, "Open", open_file_icon, "Open file"); toolBar->AddTool(wxID_OPEN, "Open", open_file_icon, "Open file");
#ifdef __WXGTK__
toolBar->AddTool(myID_OPEN_DIR, "Open Dir", open_folder_icon, "Open folder");
#endif
toolBar->AddTool(wxID_SAVE, "Save", save_file_icon, "Save file"); toolBar->AddTool(wxID_SAVE, "Save", save_file_icon, "Save file");
toolBar->AddSeparator(); toolBar->AddSeparator();