From 779dec403efa57129eb6ef8f8073b7a363b5be73 Mon Sep 17 00:00:00 2001 From: Tim Warren Date: Thu, 2 Apr 2015 14:20:35 -0400 Subject: [PATCH] Icons and a basic toolbar --- Makefile | 4 ++-- README.md | 8 +++++++- platform/msw/tyro.ico | Bin 0 -> 136606 bytes platform/osx/Info.plist | 2 +- platform/osx/tyro.icns | Bin 0 -> 34638 bytes src/DocFrame.h | 6 ++++-- src/Main.cpp | 25 +++++++++++++++++++++++++ 7 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 platform/msw/tyro.ico create mode 100644 platform/osx/tyro.icns diff --git a/Makefile b/Makefile index 87eb92d..8dd34e9 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -CXX = $(shell wx-config --cxx) +CXX = $(shell wx-config --cxx) -Wno-c++11-compat-deprecated-writable-strings TARGET = build/Tyro LDLIBS = $(shell wx-config --libs all) WX_CXXFLAGS = -I./src -static $(shell wx-config --cxxflags) @@ -32,7 +32,7 @@ Tyro.app: all platform/osx/Info.plist cp platform/osx/Info.plist Tyro.app/Contents/ echo -n 'APPL????' > Tyro.app/Contents/PkgInfo cp build/Tyro Tyro.app/Contents/MacOS/Tyro -# cp YourAppMacIcons.icns AnotherResource.txt Tyro.app/Contents/Resources/ + cp platform/osx/tyro.icns Tyro.app/Contents/Resources/ clean: rm -f *.o diff --git a/README.md b/README.md index 17abf73..157d232 100644 --- a/README.md +++ b/README.md @@ -11,4 +11,10 @@ A Cross-platform Code Editor ### Building * Make sure wxWidgets is installed, version 2.8 or 3 -* Open the Code::Blocks project and compile + +#### Mac +* run `make clean Tyro.app` + +#### Linux +* use the Code::Blocks project to compile + diff --git a/platform/msw/tyro.ico b/platform/msw/tyro.ico new file mode 100644 index 0000000000000000000000000000000000000000..937218421e8176c180debff03407bf103c4dd6b7 GIT binary patch literal 136606 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 XF~N}kMjXjll2MhKM^)+?RqhGjg0^^N literal 0 HcmV?d00001 diff --git a/platform/osx/Info.plist b/platform/osx/Info.plist index cb5c366..c74b1ff 100644 --- a/platform/osx/Info.plist +++ b/platform/osx/Info.plist @@ -7,6 +7,6 @@ CFBundleName Tyro CFBundleIconFile - + tyro.icns diff --git a/platform/osx/tyro.icns b/platform/osx/tyro.icns new file mode 100644 index 0000000000000000000000000000000000000000..7a9832d191907a6bd52dd2b51e78e0d0aef1e824 GIT binary patch literal 34638 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 + #include #endif #include diff --git a/src/Main.cpp b/src/Main.cpp index c9505c5..33d96b4 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -28,7 +28,10 @@ MainFrame::MainFrame(wxFrame *frame, const wxString& title) this->SetupMenu(); // create a status bar with some information about the used wxWidgets version + this->SetupStatusBar(); + // create the main toolbar + this->SetupToolbar(); // Set up control layout wxBoxSizer *base_sizer = new wxBoxSizer(wxVERTICAL); @@ -53,7 +56,29 @@ void MainFrame::SetupStatusBar() void MainFrame::SetupToolbar() { + // Icon files + #include "../resources/xpm/48/file-empty.xpm" + #include "../resources/xpm/48/folder.xpm" + #include "../resources/xpm/48/floppy.xpm" + #include "../resources/xpm/48/wrench-screwdriver.xpm" + CreateToolBar(wxNO_BORDER | wxTB_FLAT | wxTB_HORIZONTAL); + + wxToolBar *toolBar = GetToolBar(); + + wxBitmap bitmaps[4]; + + bitmaps[0] = wxBitmap(file_empty); + bitmaps[1] = wxBitmap(folder); + bitmaps[2] = wxBitmap(floppy); + bitmaps[3] = wxBitmap(wrench_screwdriver); + + toolBar->AddTool(wxID_NEW, "New", bitmaps[0], "New file"); + toolBar->AddTool(wxID_OPEN, "Open", bitmaps[1], "Open file"); + toolBar->AddTool(wxID_SAVE, "Save", bitmaps[2], "Save file"); + toolBar->AddSeparator(); + toolBar->AddTool(wxID_ANY, "Settings", bitmaps[3], "Change Settings"); + toolBar->Realize(); } void MainFrame::SetupMenu()