Reorganizo vista principal.

[z.facultad/75.52/treemulator.git] / viewer / main.cpp

diff --git a/viewer/main.cpp b/viewer/main.cpp
index 12a80db09f7e649d5cb992c870ebc1cc1fb8a012..692bed8f037f51a776e27cef37d9bc578d372632 100644 (file)
--- a/viewer/main.cpp
+++ b/viewer/main.cpp
@@ -33,9 +33,10 @@ void zoom_out ();
 void zoom_in ();
 void zoom_normal ();
 
-ViewBTree *tree;
+Glib::RefPtr<ViewBTree> tree;
 ViewDebug *vdebug;
 Gnome::Canvas::Canvas *real_canvas;
+ViewProperties *real_frame;
 
 int main(int argc, char *argv[])
 {
@@ -47,15 +48,13 @@ int main(int argc, char *argv[])
        Gtk::HBox hbox;
        Gtk::VBox vbox;
 
-       ViewProperties frame;
        Gtk::ScrolledWindow area;
        Gnome::Canvas::Canvas canvas;
+       ViewProperties frame;
+       ViewDebug debug;
 
-       ViewBTree canvas_grp (canvas.root (), "test.idx");
-       ViewDebug debug (&canvas_grp);
-
-       tree = &canvas_grp;
        real_canvas = &canvas;
+       real_frame = &frame;
        vdebug = &debug;
 
        canvas.set_scroll_region (0, 0, 5000, 5000);
@@ -71,9 +70,9 @@ int main(int argc, char *argv[])
        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);
+       actiongroup->add( Gtk::Action::create("Alejar", Gtk::Stock::ZOOM_OUT), Gtk::AccelKey ("<control>z"), &zoom_out );
+       actiongroup->add( Gtk::Action::create("Acercar", Gtk::Stock::ZOOM_IN), Gtk::AccelKey ("<control>x"), &zoom_in);
+       actiongroup->add( Gtk::Action::create("100 %", Gtk::Stock::ZOOM_100), Gtk::AccelKey ("<control>1"), &zoom_normal);
 
        Glib::RefPtr<Gtk::UIManager> m_refUIManager = Gtk::UIManager::create();
        m_refUIManager->insert_action_group (actiongroup);
@@ -85,12 +84,12 @@ int main(int argc, char *argv[])
        vbox.pack_start (*menubar, false, true, 0);
        vbox.pack_end (hbox, true, true, 5);
 
+       window.add_accel_group (m_refUIManager->get_accel_group ());
        window.add (vbox);
        window.set_size_request (640, 480);
        window.show_all ();
 
        /* Conecto el Canvas con el Frame */
-       canvas_grp.signal_selected ().connect ( sigc::mem_fun (frame, &ViewProperties::ShowItem) );
        Gtk::Main::run(window);
                                                            
        return 0;
@@ -101,6 +100,9 @@ void nuevo_arbol ()
        NewTreeDialog d;
        if (d.run () == Gtk::RESPONSE_OK) {
                uint tot = d.getAmount ();
+               tree = Glib::RefPtr<ViewBTree>(new ViewBTree (real_canvas->root(), "test.idx", d.getBlockSize ()));
+               tree->signal_selected ().connect ( sigc::mem_fun (*real_frame, &ViewProperties::ShowItem) );
+               vdebug->SetTree (tree);
                for (uint i=0; i <= tot; i++) {
                        ClaveFija c(i);