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

Add more status bar segments

This commit is contained in:
Timothy Warren 2019-06-03 16:13:12 -04:00
parent 23f9f4e87b
commit a24b62e4b3
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/definitions.h
View File

@ -54,7 +54,10 @@ enum myMargins
enum myStatusBarSections {
STATUS_MESSAGES,
STATUS_CURSOR_LOCATION,
STATUS_CURRENT_LANGUAGE
STATUS_CURRENT_LANGUAGE,
STATUS_LINE_ENDINGS,
STATUS_CODE_PAGE,
STATUS_INDENT
};
// Top level menus

11
src/widgets/MainFrame.cpp
View File

@ -37,7 +37,7 @@ MainFrame::MainFrame(wxFrame *frame, const wxString &title, const wxSize &size)
// Setup StatusBar
Glob_status_bar = new wxStatusBar(this, wxID_ANY);
Glob_status_bar->SetFieldsCount(3);
Glob_status_bar->SetFieldsCount(6);
this->DoLayout();
@ -127,7 +127,7 @@ void MainFrame::SetupStatusBar()
wxAuiToolBar* MainFrame::SetupToolbar()
{
// Icon files
#ifndef __WXGTK__
//#ifndef __WXGTK__
#include "resources/xpm/32/new.xpm"
#include "resources/xpm/32/open.xpm"
#include "resources/xpm/32/save.xpm"
@ -141,14 +141,14 @@ wxAuiToolBar* MainFrame::SetupToolbar()
wxBitmap copy_icon(copy);
wxBitmap cut_icon(cut);
wxBitmap paste_icon(paste);
#else
/*#else
wxBitmap new_file_icon = wxArtProvider::GetBitmap(wxART_NEW, wxART_TOOLBAR);
wxBitmap open_file_icon = wxArtProvider::GetBitmap(wxART_FILE_OPEN, wxART_TOOLBAR);
wxBitmap save_file_icon = wxArtProvider::GetBitmap(wxART_FILE_SAVE, wxART_TOOLBAR);
wxBitmap copy_icon = wxArtProvider::GetBitmap(wxART_COPY, wxART_TOOLBAR);
wxBitmap cut_icon = wxArtProvider::GetBitmap(wxART_CUT, wxART_TOOLBAR);
wxBitmap paste_icon = wxArtProvider::GetBitmap(wxART_PASTE, wxART_TOOLBAR);
#endif
#endif */
toolBar = new wxAuiToolBar(this);
@ -215,11 +215,10 @@ void MainFrame::BindEvents()
case wxID_REDO:
if (editor->CanRedo()) editor->Redo();
break;
#ifndef TRAVIS
case wxID_PREFERENCES:
Glob_pref_pane->Show(this);
break;
#endif
case wxID_FIND:
this->OnEditFind(event);