From 8d83fe77d25b937639b63cf75fbef0edc8b422c4 Mon Sep 17 00:00:00 2001 From: Nathan Vegdahl Date: Sun, 25 Jan 2015 13:30:15 -0800 Subject: [PATCH] Re-enabled the GUI code. --- src/main.rs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main.rs b/src/main.rs index fc16abd..6151f35 100644 --- a/src/main.rs +++ b/src/main.rs @@ -10,15 +10,15 @@ use std::path::Path; use docopt::Docopt; use editor::Editor; use term_ui::TermUI; -//use gui::GUI; +use gui::GUI; mod string_utils; mod buffer; mod files; mod editor; mod term_ui; -//mod font; -//mod gui; +mod font; +mod gui; @@ -58,16 +58,16 @@ fn main() { }; // Initialize and start UI - //if args.flag_gui { - // // GUI - // sdl2::init(sdl2::INIT_VIDEO); - // let mut ui = GUI::new_from_editor(editor); - // ui.main_ui_loop(); - // sdl2::quit(); - //} - //else { + if args.flag_gui { + // GUI + sdl2::init(sdl2::INIT_VIDEO); + let mut ui = GUI::new_from_editor(editor); + ui.main_ui_loop(); + sdl2::quit(); + } + else { // Console UI let mut ui = TermUI::new_from_editor(editor); ui.main_ui_loop(); - //} + } }