Moved more stuff to the GUI namespace! :)

Author: NHDaly

GUIApp.cpp

@@ -112,12 +112,12 @@ void App::run(Window* window_) {
                         DispPoint click_pos(event.button.x, event.button.y);
                         DispPoint rel_pos(event.motion.xrel, event.motion.yrel);
 
-                        list<GUIController*> focus_copy(captured_focus.begin(), captured_focus.end());
+                        list<Controller*> focus_copy(captured_focus.begin(), captured_focus.end());
 
-                        for (list<GUIController*>::iterator it = focus_copy.begin();
+                        for (list<Controller*>::iterator it = focus_copy.begin();
                                             it != focus_copy.end(); ++it) {
 
-                            GUIController *captured = *it;
+                            Controller *captured = *it;
 
                             DispPoint new_pos(click_pos);
 
@@ -214,7 +214,7 @@ void App::run(Window* window_) {
                         for (view_list_t::iterator it = captured_focus.begin();
                              it != captured_focus.end(); ++it) {
 
-                            GUIController *captured = *it;
+                            Controller *captured = *it;
 
                             bool handled = captured->handle_key_down(event.key.keysym);
                             if (!handled) {}
@@ -247,7 +247,7 @@ void App::run(Window* window_) {
                         for (view_list_t::iterator it = captured_focus.begin();
                              it != captured_focus.end(); ++it) {
 
-                            GUIController *captured = *it;
+                            Controller *captured = *it;
 
                             bool handled = captured->handle_key_up(event.key.keysym);
                             if (!handled) {}

GUIApp.h

@@ -20,11 +20,12 @@
 #include <SDL/SDL.h> // To ensure it is #included by main.
 
 
+namespace GUI {
+
 // Throw an instance of GUIQuit to safely tell the application to exit.
 // (This is the same as calling GUIApp::quit())
 class GUIQuit {};
 
-class GUIController;
 
 struct GUITimer_command {
     GUITimer_command(double interval_) : interval(interval_) {
@@ -35,9 +36,9 @@ struct GUITimer_command {
     virtual void execute_command(){}
 };
 
-namespace GUI {
 
 class Window;
+class Controller;
 
 class App {
 public:
@@ -65,9 +66,9 @@ class App {
 
     // Provides a Controller with the ability to receive mouse/keyboard input.
     //  (Views receive mouse input by defualt when hovered over.)
-    void give_focus(GUIController* view) { captured_focus.insert(view); }
-    bool has_focus(GUIController* view) { return captured_focus.count(view) != 0; }
-    void release_focus(GUIController* view) { captured_focus.erase(view); }
+    void give_focus(Controller* view) { captured_focus.insert(view); }
+    bool has_focus(Controller* view) { return captured_focus.count(view) != 0; }
+    void release_focus(Controller* view) { captured_focus.erase(view); }
 
 
     // Equivalent to a user clicking the "x" or pressing cmd-q.
@@ -84,7 +85,7 @@ class App {
     int fps_cap;
     bool cap_frame_rate;
 
-    typedef std::set<GUIController*> view_list_t;
+    typedef std::set<Controller*> view_list_t;
     view_list_t captured_focus;
 
 

GUIButton.h

@@ -25,11 +25,11 @@ class QuitAction {
 };
 
 
-class Button : public GUIImageView { 
+class Button : public ImageView { 
 public:
 
     Button()
-    : GUIImageView(GUIImage("GUIImages/button.bmp")), 
+    : ImageView(GUIImage("GUIImages/button.bmp")), 
     is_pressed(false), is_hovered(false),
     image(GUIImage("GUIImages/button.bmp")), hovered_image(GUIImage("GUIImages/button2.bmp")), 
     clicked_image(GUIImage("GUIImages/button3.bmp"))
@@ -117,17 +117,17 @@ class TextButton : public Button {
 public:
     TextButton(const std::string &button_text_ = "")
     {
-        button_text = new GUITextView(get_w()-30, get_h());
+        button_text = new TextView(get_w()-30, get_h());
         button_text->set_text(button_text_);
         button_text->set_text_size(16);
         attach_subview(button_text, DispPoint(get_w()-button_text->get_w(), 0));
     }
 
-    GUITextView* get_text_view() { return button_text; }
+    TextView* get_text_view() { return button_text; }
     void set_text(const std::string &button_text_) { button_text->set_text(button_text_); }
 
 public:
-    GUITextView *button_text;
+    TextView *button_text;
 };
 
 

GUIController.cpp

@@ -14,15 +14,15 @@
 
 using GUI::App;
 
-void GUIController::capture_focus() {
+void GUI::Controller::capture_focus() {
 
     if (App::get()->has_focus(this)) return;
 
     App::get()->give_focus(this);
 
     got_focus();
 }
-void GUIController::lose_focus() {
+void GUI::Controller::lose_focus() {
     if (!App::get()->has_focus(this)) return; //throw GUIError("Can't lose_focus if didn't already have it.");
 
     App::get()->release_focus(this);

GUIController.h

@@ -12,12 +12,14 @@
 #include "Compatibility.h"
 #include "GUIUtility.h"
 
+namespace GUI {
+    
 // This class is seperated out from GUIView to allow creation of a class to 
 // receive mouse/key events without having to associate it with a displayed view.
-class GUIController {
+class Controller {
 
 public:	
-	virtual ~GUIController() {}
+	virtual ~Controller() {}
 
     // Mouse Events. Following three functions all work the same:
     //  Return true if the mouse-event is finished being handled, false otherwise.
@@ -52,5 +54,6 @@ class GUIController {
     void lose_focus();
 };
 
+} // namespace GUI
 
 #endif

GUIImageView.cpp

@@ -11,15 +11,17 @@
 #include "GUIImage.h"
 #include "GameDisplay.h"
 
-using GUI::View;
+namespace GUI {
 
-GUIImageView::GUIImageView(const GUIImage &image_src)
+ImageView::ImageView(const GUIImage &image_src)
 : View(image_src.getw(), image_src.geth()) 
 { 
     draw_onto_self(image_src, DispPoint(0,0));
 }
 
-GUIImage GUIImageView::get_image() {
+GUIImage ImageView::get_image() {
 
     return GUIImage::create_copy(get_image_ptr());
 }
+
+} // namespace GUI

GUIImageView.h

@@ -12,16 +12,20 @@
 #include "GUIView.h"
 
 class GUIImage;
-class GUIImageView : public GUI::View {
+
+namespace GUI {
+
+class ImageView : public GUI::View {
 public:
 
-    GUIImageView(const GUIImage &image_src);    
+    ImageView(const GUIImage &image_src);    
 
     GUIImage get_image();
 
 //private:
 //    void attach_subview(GUIView* view, DispPoint pos);
 };
 
+} // namespace GUI
 
 #endif /* GUIIMAGEVIEW_H */

GUIMsgNew.cpp

@@ -15,14 +15,14 @@
 
 #include <iostream>
 using std::cout; using std::endl;
-using GUI::App;
-using GUI::Button;
-using GUI::View;
 
 const SDL_Color color = {0xbb, 0xbb, 0xbb, 0};
 
-GUIMsgNew::GUIMsgNew(int w_, int h_, const std::string& msg_, Button_ctrs_t buttons_)
-:View(w_,h_), msg_text(new GUITextView(w_-10, h_-10)), buttons(buttons_)
+
+namespace GUI {
+    
+MsgNew::MsgNew(int w_, int h_, const std::string& msg_, Button_ctrs_t buttons_)
+:View(w_,h_), msg_text(new TextView(w_-10, h_-10)), buttons(buttons_)
 {    
     attach_subview(msg_text, DispPoint(get_w()/2 - msg_text->get_w()/2, 5));
 
@@ -36,25 +36,25 @@ GUIMsgNew::GUIMsgNew(int w_, int h_, const std::string& msg_, Button_ctrs_t butt
 
 }
 
-void GUIMsgNew::set_msg(const std::string msg_) {
+void MsgNew::set_msg(const std::string msg_) {
 
     msg_text->set_text(msg_);
 
 }
-void GUIMsgNew::add_button(Button* button) {
+void MsgNew::add_button(Button* button) {
 
     attach_subview(button, DispPoint(get_w() - 180 - (int)buttons.size()*180, get_h()- 30));
     buttons.push_back(button);
 }
 
 
 
-GUIMsgNew_Scroll_In::GUIMsgNew_Scroll_In(int w_, int h_, const std::string& msg_, Button_ctrs_t buttons_)
-:GUIMsgNew(w_,h_, msg_, buttons_)
+MsgNew_Scroll_In::MsgNew_Scroll_In(int w_, int h_, const std::string& msg_, Button_ctrs_t buttons_)
+:MsgNew(w_,h_, msg_, buttons_)
 { }
 
 
-void GUIMsgNew_Scroll_In::pop_up(int timeout) 
+void MsgNew_Scroll_In::pop_up(int timeout) 
 {
     // Store a copy of the screen for the scroll away.
     GUIImage temp_screen(get_w(), get_h());
@@ -109,9 +109,10 @@ void GUIMsgNew_Scroll_In::pop_up(int timeout)
 
 
 
-void GUIMsgNew::pop_up_modal() 
-{
-    pop_up();
-    
-}
+//void MsgNew_Scroll_In::pop_up_modal() 
+//{
+//    pop_up();
+//}
+
+} // namespace GUI
 

GUIMsgNew.h

@@ -14,18 +14,18 @@
 #include <string>
 #include <vector>
 
-class GUITextView;
 
 namespace GUI {
+
 class Button;
-}
+class TextView;
 
-class GUIMsgNew : public GUI::View {
+class MsgNew : public View {
 public:
-    typedef std::vector<GUI::Button*> Button_ctrs_t;
+    typedef std::vector<Button*> Button_ctrs_t;
 
     // Size of button_texts must == num_buttons
-    GUIMsgNew(int w_, int h_, const std::string& msg = "", Button_ctrs_t buttons = Button_ctrs_t()); 
+    MsgNew(int w_, int h_, const std::string& msg = "", Button_ctrs_t buttons = Button_ctrs_t()); 
 
     void set_msg(const std::string msg_);
 
@@ -34,24 +34,27 @@ class GUIMsgNew : public GUI::View {
     virtual void pop_up(int timeout = -1) = 0; // ms until window disappears.
 
     // Note, this is not yet implemented.
-    virtual void pop_up_modal(); // stop everything else.
+//    virtual void pop_up_modal(); // stop everything else.
 
 private:
 
-    std::vector<GUI::Button*> buttons;
-    GUITextView *msg_text;
+    std::vector<Button*> buttons;
+    TextView *msg_text;
 };
 
-class GUIMsgNew_Scroll_In : public GUIMsgNew {
+class MsgNew_Scroll_In : public MsgNew {
 public:
-    typedef std::vector<GUI::Button*> Button_ctrs_t;
+    typedef std::vector<Button*> Button_ctrs_t;
 
     // Size of button_texts must == num_buttons
-    GUIMsgNew_Scroll_In(int w_, int h_, const std::string& msg = "", Button_ctrs_t buttons = Button_ctrs_t()); 
+    MsgNew_Scroll_In(int w_, int h_, const std::string& msg = "", Button_ctrs_t buttons = Button_ctrs_t()); 
 
     virtual void pop_up(int timeout = -1) = 0; // ms until window disappears.
 
+//    virtual void pop_up_modal(); // stop everything else.
+
 };
 
+} // namespace GUI
 
 #endif

GUIScrollView.h

@@ -62,10 +62,10 @@ class GUIScrollView : public View  {
         bool clicked;
         DispPoint click;
     };
-    class ScrollArrow : public GUIImageView {
+    class ScrollArrow : public ImageView {
     public:
         ScrollArrow(bool up_down_, const GUIImage& image)
-        : GUIImageView(image), up_down(up_down_) { }
+        : ImageView(image), up_down(up_down_) { }
 
         virtual bool handle_mouse_down(DispPoint coord);
         virtual bool handle_mouse_up(DispPoint coord);