Mejora de ventana principal.

Se agrega :
 - Menu para crear nuevo arbol
 - Menu de zoom :)

diff --git a/viewer/main.cpp b/viewer/main.cpp
index c0aa2997e55ba214bd80b1faac0639462853858d..d5f82abe45b16e891d5f79c188743419321c478d 100644 (file)
--- a/viewer/main.cpp
+++ b/viewer/main.cpp
@@ -6,9 +6,35 @@
 
 #include "view_btree.h"
 #include "view_properties.h"
 
 #include "view_btree.h"
 #include "view_properties.h"

+#include "new_tree_dialog.h"

 
 using namespace Gnome::Canvas;
 
 
 using namespace Gnome::Canvas;
 

+ Glib::ustring ui_info =
+"<ui>"
+"  <menubar name='MenuBar'>"
+"    <menu action='MenuFile'>"
+"      <menuitem action='Nuevo'/>"
+"      <separator/>"
+"      <menuitem action='Salir'/>"
+"    </menu>"
+"   <menu action='MenuZoom'>"
+"      <menuitem action='Alejar'/>"
+"      <menuitem action='Acercar'/>"
+"      <separator/>"
+"      <menuitem action='100 %'/>"
+"    </menu>"
+"  </menubar>"
+"</ui>";
+
+void nuevo_arbol ();
+void zoom_out ();
+void zoom_in ();
+void zoom_normal ();
+
+ViewBTree *tree;
+Gnome::Canvas::Canvas *real_canvas;
+

 int main(int argc, char *argv[])
 {
        Gtk::Main kit(argc, argv);
 int main(int argc, char *argv[])
 {
        Gtk::Main kit(argc, argv);


@@ -17,18 +43,42 @@ int main(int argc, char *argv[])
 
        Gtk::Window window;
        Gtk::HBox hbox;
 
        Gtk::Window window;
        Gtk::HBox hbox;

+       Gtk::VBox vbox;
+

        ViewProperties frame;
        Gtk::ScrolledWindow area;
        Gnome::Canvas::Canvas canvas;
 
        ViewBTree canvas_grp (canvas.root (), "test.idx");
        ViewProperties frame;
        Gtk::ScrolledWindow area;
        Gnome::Canvas::Canvas canvas;
 
        ViewBTree canvas_grp (canvas.root (), "test.idx");

+       tree = &canvas_grp;
+       real_canvas = &canvas;
+

        canvas.set_scroll_region (0, 0, 5000, 5000);
        area.add (canvas);
 
        hbox.pack_start (frame, false, false, 10);
        hbox.pack_start (area);
 
        canvas.set_scroll_region (0, 0, 5000, 5000);
        area.add (canvas);
 
        hbox.pack_start (frame, false, false, 10);
        hbox.pack_start (area);
 

-       window.add (hbox);
+       Glib::RefPtr<Gtk::ActionGroup> actiongroup = Gtk::ActionGroup::create();
+
+       actiongroup->add( Gtk::Action::create("MenuFile", "_Arbol") );
+       actiongroup->add( Gtk::Action::create("Nuevo", Gtk::Stock::NEW), &nuevo_arbol);
+       actiongroup->add( Gtk::Action::create("Salir", Gtk::Stock::QUIT), &Gtk::Main::quit);
+       actiongroup->add( Gtk::Action::create("MenuZoom", "_Zoom"));
+       actiongroup->add( Gtk::Action::create("Alejar", "_Alejar"), &zoom_out );
+       actiongroup->add( Gtk::Action::create("Acercar", "A_cercar"), &zoom_in);
+       actiongroup->add( Gtk::Action::create("100 %", "100 %"), &zoom_normal);
+
+       Glib::RefPtr<Gtk::UIManager> m_refUIManager = Gtk::UIManager::create();
+       m_refUIManager->insert_action_group (actiongroup);
+
+       m_refUIManager->add_ui_from_string(ui_info);
+       Gtk::Widget* menubar = m_refUIManager->get_widget("/MenuBar");
+       menubar->show_all ();
+       vbox.pack_start (*menubar, false, true, 0);
+
+       vbox.pack_end (hbox, true, true, 5);
+       window.add (vbox);

        window.set_size_request (640, 480);
        window.show_all ();
 
        window.set_size_request (640, 480);
        window.show_all ();
 


@@ -38,3 +88,40 @@ int main(int argc, char *argv[])
                                                            
        return 0;
 }
                                                            
        return 0;
 }

+
+void nuevo_arbol ()
+{
+       NewTreeDialog d;
+       if (d.run () == Gtk::RESPONSE_OK) {
+               for (uint i=0; i<=d.getAmount (); i++) {
+                       ClaveFija c(i);
+
+                       tree->AddKey (c);
+               }
+               tree->AddNode (0);
+       }
+}
+
+void zoom_out ()
+{
+       double r = real_canvas->get_pixels_per_unit ();
+       r *= 0.9f;
+       if (r < 0.0001)
+               r = 0.0001;
+       real_canvas->set_pixels_per_unit (r);
+}
+
+void zoom_in ()
+{
+       double r = real_canvas->get_pixels_per_unit ();
+       r *= 1.1f;
+       if (r > 10)
+               r = 10;
+       real_canvas->set_pixels_per_unit (r);
+}
+
+void zoom_normal ()
+{
+       real_canvas->set_pixels_per_unit (1.0f);
+}
+