From aec289ed928fb169a5a00961e5455bc86384a7fe Mon Sep 17 00:00:00 2001 From: tchernobog Date: Thu, 14 Sep 2006 16:20:01 +0000 Subject: [PATCH] - Show Statistics and HoltGraph only when the user wants them git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@1151 3ecf2c5c-341e-0410-92b4-d18e462d057c --- glade/statistics-window.glade | 127 +++++++++++------------------ src/gui_builder.cc | 14 ---- src/statistics_container_window.cc | 8 +- 3 files changed, 48 insertions(+), 101 deletions(-) diff --git a/glade/statistics-window.glade b/glade/statistics-window.glade index b760db8..7e43237 100644 --- a/glade/statistics-window.glade +++ b/glade/statistics-window.glade @@ -1,83 +1,48 @@ - - - + + + - - - True - window1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - stock_chart-edit-type - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - - - - True - True - - - - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - - - - True - False - - - - - - True - True - - - - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - - - - True - False - - - - - - - - - True - True - - - - - - + + 400 + 250 + Statistics + stock_chart-edit-type + GDK_WINDOW_TYPE_HINT_UTILITY + GDK_GRAVITY_SOUTH_EAST + + + True + True + + + True + True + + + + + + False + + + + + True + True + + + + + + False + + + + + diff --git a/src/gui_builder.cc b/src/gui_builder.cc index 21e08b9..d2b970c 100644 --- a/src/gui_builder.cc +++ b/src/gui_builder.cc @@ -674,22 +674,8 @@ GuiBuilder::GuiBuilder(const std::string& gladefile) // HoltGraph container window _holt_container.set_transient_for(main_window); _holt_container.get_holt_widget().set_show_threads(_show_threads); - _holt_container.show(); _statistics_container.get_main_window()->set_transient_for(main_window); - - // Moves and resize windows - int w = gdk_screen_width(), h= gdk_screen_height();; - get_initial_window().move(0,0); - get_initial_window().resize(w,(h/3)*2 - 50); - - _holt_container.move(0, (h/3)*2); - _holt_container.resize(h/3, h/3); - - _statistics_container.get_main_window()->move(h/3 + 15,(h/3)*2); - _statistics_container.get_main_window()->resize(w - h/3 - 15, h/3); - - } diff --git a/src/statistics_container_window.cc b/src/statistics_container_window.cc index 0bd3ace..d2a1e2d 100644 --- a/src/statistics_container_window.cc +++ b/src/statistics_container_window.cc @@ -35,8 +35,8 @@ StatisticsContainerWindow::StatisticsContainerWindow(const std::string& gladefil _refXml->get_widget("StatisticsWindow", _main_win); // This just sets the title of our new window. _main_win->set_title(_("Simulation Statistics")); - - + + _main_win->set_type_hint(Gdk::WINDOW_TYPE_HINT_UTILITY); ScrolledWindow *scroll1, *scroll2; _refXml->get_widget("SchedulableStatisticsScroll", scroll1); @@ -47,15 +47,11 @@ StatisticsContainerWindow::StatisticsContainerWindow(const std::string& gladefil _tab_sim = manage(new TabularSimulationStatisticsWidget()); scroll2->add(*_tab_sim); - - _main_win->show(); - scroll1->show(); scroll2->show(); _tab_sched->show(); _tab_sim->show(); - _main_win->set_type_hint(Gdk::WINDOW_TYPE_HINT_UTILITY); /* _scrolled_tabular.add(_tabular_schedulables_statistics_widget); add(_scrolled_tabular);